diff --git a/TODO.md b/TODO.md
index 227a032..5abbc22 100644
--- a/TODO.md
+++ b/TODO.md
@@ -57,6 +57,7 @@ Battle
 * Add a battle log display
 * Allow to move targetting indicator with arrow keys
 * Add targetting shortcuts for "previous target", "next enemy" and "next ally"
+* Area targetting should include the hotkeyed ship at best (apply exclusion and power limit), not necessarily center on it
 
 Ships models and equipments
 ---------------------------
@@ -89,6 +90,7 @@ Common UI
 
 * Add caret/focus to text input
 * Add a standard confirm dialog
+* Hover out when using keyboard shortcuts
 * Mobile: think UI layout so that fingers do not block the view (right and left handed)
 * Mobile: display tooltips larger and on the side of screen where the finger is not
 * Mobile: targetting in two times, using a draggable target indicator
diff --git a/out/ai.html b/out/ai.html
index 9674653..4355222 100644
--- a/out/ai.html
+++ b/out/ai.html
@@ -96,7 +96,7 @@
 
     <script>
         window.onload = function () {
-            TS.SpaceTac.AIDuel.setup(document.getElementById("duel"));
+            TK.SpaceTac.AIDuel.setup(document.getElementById("duel"));
         };
     </script>
 </body>
diff --git a/out/index.html b/out/index.html
index 98667c3..2ba9520 100644
--- a/out/index.html
+++ b/out/index.html
@@ -49,7 +49,7 @@
     <script>
         window.oncontextmenu = function (e) { e.preventDefault(); };
         window.onload = function () {
-            window.game = new TS.SpaceTac.MainUI();
+            window.game = new TK.SpaceTac.MainUI();
         };
     </script>
 </body>
diff --git a/out/loot.html b/out/loot.html
index 3903b23..98590de 100644
--- a/out/loot.html
+++ b/out/loot.html
@@ -65,17 +65,17 @@
 
     <script>
         window.onload = function () {
-            var generator = new TS.SpaceTac.LootGenerator();
+            var generator = new TK.SpaceTac.LootGenerator();
             var result = document.getElementById("result");
             var current_level = 1;
             var current_name = "";
             var qualities = {}
 
-            qualities[TS.SpaceTac.EquipmentQuality.WEAK] = "#e66";
-            qualities[TS.SpaceTac.EquipmentQuality.COMMON] = "#eee";
-            qualities[TS.SpaceTac.EquipmentQuality.FINE] = "#669";
-            qualities[TS.SpaceTac.EquipmentQuality.PREMIUM] = "#66b";
-            qualities[TS.SpaceTac.EquipmentQuality.LEGENDARY] = "#66e";
+            qualities[TK.SpaceTac.EquipmentQuality.WEAK] = "#e66";
+            qualities[TK.SpaceTac.EquipmentQuality.COMMON] = "#eee";
+            qualities[TK.SpaceTac.EquipmentQuality.FINE] = "#669";
+            qualities[TK.SpaceTac.EquipmentQuality.PREMIUM] = "#66b";
+            qualities[TK.SpaceTac.EquipmentQuality.LEGENDARY] = "#66e";
 
             function update() {
                 result.innerHTML = "";
@@ -83,7 +83,7 @@
                     if (template.name != current_name) {
                         return;
                     }
-                    TS.iterenum(TS.SpaceTac.EquipmentQuality, function (quality) {
+                    TK.iterenum(TK.SpaceTac.EquipmentQuality, function (quality) {
                         var loot = template.generate(current_level, quality);
 
                         var block = document.createElement("div");
@@ -101,7 +101,7 @@
                 });
             }
 
-            TS.sortedBy(generator.templates, function (template) {
+            TK.sortedBy(generator.templates, function (template) {
                 return template.name;
             }).forEach(function (template) {
                 var opt = document.createElement('option');
diff --git a/src/MainUI.spec.ts b/src/MainUI.spec.ts
index 0495cf3..ede0f39 100644
--- a/src/MainUI.spec.ts
+++ b/src/MainUI.spec.ts
@@ -4,7 +4,7 @@ if (typeof window != "undefined") {
     (<any>window).describe = (<any>window).describe || function () { };
 }
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     class FakeStorage {
         data: any = {}
         getItem(name: string) {
diff --git a/src/MainUI.ts b/src/MainUI.ts
index 85e33cf..8891b3c 100644
--- a/src/MainUI.ts
+++ b/src/MainUI.ts
@@ -4,7 +4,7 @@ if (typeof window != "undefined") {
     (<any>window).describe = (<any>window).describe || function () { };
 }
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Router between game views
     export class MainUI extends Phaser.Game {
         // Current game session
diff --git a/src/common b/src/common
index 18a9b3c..c77c859 160000
--- a/src/common
+++ b/src/common
@@ -1 +1 @@
-Subproject commit 18a9b3c75b576af53362b7ce6d5081d71050cde4
+Subproject commit c77c859359e3cee3700dcd7a28431f2f0b49e0a2
diff --git a/src/core/ArenaLocation.spec.ts b/src/core/ArenaLocation.spec.ts
index eb3e792..a6739bb 100644
--- a/src/core/ArenaLocation.spec.ts
+++ b/src/core/ArenaLocation.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("ArenaLocation", () => {
         it("gets distance and angle between two locations", () => {
             expect(arenaDistance({ x: 0, y: 0 }, { x: 1, y: 1 })).toBeCloseTo(Math.sqrt(2), 8);
diff --git a/src/core/ArenaLocation.ts b/src/core/ArenaLocation.ts
index 77d902a..b6b361f 100644
--- a/src/core/ArenaLocation.ts
+++ b/src/core/ArenaLocation.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Location in the arena (coordinates only)
      */
diff --git a/src/core/Battle.spec.ts b/src/core/Battle.spec.ts
index 436eb0a..7aacc11 100644
--- a/src/core/Battle.spec.ts
+++ b/src/core/Battle.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("Battle", function () {
         it("defines play order by initiative throws", function () {
             var fleet1 = new Fleet();
@@ -372,7 +372,7 @@ module TS.SpaceTac {
             let battle = Battle.newQuickRandom();
             battle.ai_playing = true;
 
-            let serializer = new Serializer(TS.SpaceTac);
+            let serializer = new Serializer(TK.SpaceTac);
             let data = serializer.serialize(battle);
 
             let loaded = serializer.unserialize(data);
diff --git a/src/core/Battle.ts b/src/core/Battle.ts
index 2a659ff..1ce58a3 100644
--- a/src/core/Battle.ts
+++ b/src/core/Battle.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // A turn-based battle between fleets
     export class Battle {
         // Flag indicating if the battle is ended
diff --git a/src/core/BattleCheats.spec.ts b/src/core/BattleCheats.spec.ts
index b4a165e..1ee201f 100644
--- a/src/core/BattleCheats.spec.ts
+++ b/src/core/BattleCheats.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("BattleCheats", function () {
         it("wins a battle", function () {
             let battle = Battle.newQuickRandom();
diff --git a/src/core/BattleCheats.ts b/src/core/BattleCheats.ts
index f162b89..f4ca3f4 100644
--- a/src/core/BattleCheats.ts
+++ b/src/core/BattleCheats.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Cheat helpers for current battle
      * 
diff --git a/src/core/BattleLog.spec.ts b/src/core/BattleLog.spec.ts
index 796a65e..2356a4b 100644
--- a/src/core/BattleLog.spec.ts
+++ b/src/core/BattleLog.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="events/BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Check a single game log event
     function checkEvent(got: BaseBattleEvent, ship: Ship, code: string,
         target_ship: Ship | null = null, target_x: number | null = null, target_y: number | null = null): void {
diff --git a/src/core/BattleLog.ts b/src/core/BattleLog.ts
index ce877bd..504c244 100644
--- a/src/core/BattleLog.ts
+++ b/src/core/BattleLog.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Function called to inform subscribers of new events.
      */
diff --git a/src/core/BattleOutcome.spec.ts b/src/core/BattleOutcome.spec.ts
index 9b118d0..3b0f8a0 100644
--- a/src/core/BattleOutcome.spec.ts
+++ b/src/core/BattleOutcome.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("BattleOutcome", () => {
         it("generates loot from defeated ships", () => {
             var fleet1 = new Fleet();
diff --git a/src/core/BattleOutcome.ts b/src/core/BattleOutcome.ts
index 595d634..2acdff9 100644
--- a/src/core/BattleOutcome.ts
+++ b/src/core/BattleOutcome.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Result of an ended battle
      * 
diff --git a/src/core/BattleStats.spec.ts b/src/core/BattleStats.spec.ts
index 6d019e7..f933770 100644
--- a/src/core/BattleStats.spec.ts
+++ b/src/core/BattleStats.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("BattleStats", function () {
         it("collects stats", function () {
             let stats = new BattleStats();
diff --git a/src/core/BattleStats.ts b/src/core/BattleStats.ts
index 30df432..a0f741e 100644
--- a/src/core/BattleStats.ts
+++ b/src/core/BattleStats.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Statistics collection over a battle
      */
diff --git a/src/core/Cooldown.spec.ts b/src/core/Cooldown.spec.ts
index c0a5258..f973ce8 100644
--- a/src/core/Cooldown.spec.ts
+++ b/src/core/Cooldown.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Cooldown", function () {
         it("applies overheat and cooldown", function () {
             let cooldown = new Cooldown();
diff --git a/src/core/Cooldown.ts b/src/core/Cooldown.ts
index 67e4525..0603cad 100644
--- a/src/core/Cooldown.ts
+++ b/src/core/Cooldown.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Cooldown system for equipments
      */
diff --git a/src/core/Drone.spec.ts b/src/core/Drone.spec.ts
index 6e80895..218c2cd 100644
--- a/src/core/Drone.spec.ts
+++ b/src/core/Drone.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="effects/BaseEffect.ts" />
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Fake effect to capture apply requests
      */
diff --git a/src/core/Drone.ts b/src/core/Drone.ts
index ec26828..ff74ca0 100644
--- a/src/core/Drone.ts
+++ b/src/core/Drone.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Drones are static objects that apply effects in a circular zone around themselves.
      */
diff --git a/src/core/Equipment.spec.ts b/src/core/Equipment.spec.ts
index 49e16c3..2d41a74 100644
--- a/src/core/Equipment.spec.ts
+++ b/src/core/Equipment.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Equipment", () => {
         it("generates a full name", function () {
             let equipment = new Equipment(SlotType.Weapon, "rayofdeath");
diff --git a/src/core/Equipment.ts b/src/core/Equipment.ts
index adb4e98..8e74453 100644
--- a/src/core/Equipment.ts
+++ b/src/core/Equipment.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Quality of loot.
      */
diff --git a/src/core/ExclusionAreas.spec.ts b/src/core/ExclusionAreas.spec.ts
index fda2581..0b4a024 100644
--- a/src/core/ExclusionAreas.spec.ts
+++ b/src/core/ExclusionAreas.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("ExclusionAreas", function () {
         it("constructs from a ship or battle", function () {
             let battle = new Battle();
diff --git a/src/core/ExclusionAreas.ts b/src/core/ExclusionAreas.ts
index 3f2e2f8..9befc2e 100644
--- a/src/core/ExclusionAreas.ts
+++ b/src/core/ExclusionAreas.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Helper for working with exclusion areas (areas where a ship cannot go)
      * 
diff --git a/src/core/Fleet.spec.ts b/src/core/Fleet.spec.ts
index 8a516a9..49445b4 100644
--- a/src/core/Fleet.spec.ts
+++ b/src/core/Fleet.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("Fleet", function () {
         it("get average level", function () {
             var fleet = new Fleet();
diff --git a/src/core/Fleet.ts b/src/core/Fleet.ts
index ad6ea6a..2d5cefd 100644
--- a/src/core/Fleet.ts
+++ b/src/core/Fleet.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * A fleet of ships, all belonging to the same player
      */
diff --git a/src/core/FleetGenerator.ts b/src/core/FleetGenerator.ts
index 2308314..35ef161 100644
--- a/src/core/FleetGenerator.ts
+++ b/src/core/FleetGenerator.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Generator of balanced ships to form a fleet
     export class FleetGenerator {
         // Random generator to use
diff --git a/src/core/GameSession.spec.ts b/src/core/GameSession.spec.ts
index 6fa5e2b..4940e11 100644
--- a/src/core/GameSession.spec.ts
+++ b/src/core/GameSession.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("GameSession", () => {
         /**
          * Compare two sessions
diff --git a/src/core/GameSession.ts b/src/core/GameSession.ts
index 025574a..252509e 100644
--- a/src/core/GameSession.ts
+++ b/src/core/GameSession.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * A game session, binding a universe and a player
      * 
@@ -41,13 +41,13 @@ module TS.SpaceTac {
 
         // Load a game state from a string
         static loadFromString(serialized: string): GameSession {
-            var serializer = new Serializer(TS.SpaceTac);
+            var serializer = new Serializer(TK.SpaceTac);
             return <GameSession>serializer.unserialize(serialized);
         }
 
         // Serializes the game state to a string
         saveToString(): string {
-            var serializer = new Serializer(TS.SpaceTac);
+            var serializer = new Serializer(TK.SpaceTac);
             return serializer.serialize(this);
         }
 
diff --git a/src/core/LootGenerator.spec.ts b/src/core/LootGenerator.spec.ts
index dddadfe..79ef270 100644
--- a/src/core/LootGenerator.spec.ts
+++ b/src/core/LootGenerator.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="LootTemplate.ts" />
 
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     class TestTemplate extends LootTemplate {
         constructor() {
             super(SlotType.Shield, "Hexagrid Shield");
diff --git a/src/core/LootGenerator.ts b/src/core/LootGenerator.ts
index 757c83c..e36f765 100644
--- a/src/core/LootGenerator.ts
+++ b/src/core/LootGenerator.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Equipment generator from loot templates
      * 
@@ -34,7 +34,7 @@ module TS.SpaceTac {
         // Fill the list of templates
         populate(): void {
             let templates: LootTemplate[] = [];
-            let namespace: any = TS.SpaceTac.Equipments;
+            let namespace: any = TK.SpaceTac.Equipments;
             for (var template_name in namespace) {
                 if (template_name && template_name.indexOf("Abstract") != 0) {
                     let template_class = namespace[template_name];
diff --git a/src/core/LootQualityModifiers.ts b/src/core/LootQualityModifiers.ts
index dbcff5a..a777b9d 100644
--- a/src/core/LootQualityModifiers.ts
+++ b/src/core/LootQualityModifiers.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Modifiers of basic loot, to obtain different quality levels
      */
diff --git a/src/core/LootTemplate.spec.ts b/src/core/LootTemplate.spec.ts
index ea1d584..0535fab 100644
--- a/src/core/LootTemplate.spec.ts
+++ b/src/core/LootTemplate.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="effects/BaseEffect.ts" />
 
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     class FakeEffect extends BaseEffect {
         fakevalue: number
         constructor(val = 5) {
diff --git a/src/core/LootTemplate.ts b/src/core/LootTemplate.ts
index c267b39..76cff85 100644
--- a/src/core/LootTemplate.ts
+++ b/src/core/LootTemplate.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * A leveled value is an iterator yielding the desired value for each level (first item is for level 1, and so on)
      */
diff --git a/src/core/MoveFireSimulator.spec.ts b/src/core/MoveFireSimulator.spec.ts
index 0442ec3..67711cf 100644
--- a/src/core/MoveFireSimulator.spec.ts
+++ b/src/core/MoveFireSimulator.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("MoveFireSimulator", function () {
 
         function simpleWeaponCase(distance = 10, ship_ap = 5, weapon_ap = 3, engine_distance = 5): [Ship, MoveFireSimulator, BaseAction] {
diff --git a/src/core/MoveFireSimulator.ts b/src/core/MoveFireSimulator.ts
index f8a16ed..a2dd89c 100644
--- a/src/core/MoveFireSimulator.ts
+++ b/src/core/MoveFireSimulator.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Error codes for approach simulation
      */
diff --git a/src/core/NameGenerator.spec.ts b/src/core/NameGenerator.spec.ts
index e9405ae..2d8a55b 100644
--- a/src/core/NameGenerator.spec.ts
+++ b/src/core/NameGenerator.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("NameGenerator", () => {
         it("generates unique names", () => {
             var random = new SkewedRandomGenerator([0.48, 0.9, 0.1]);
diff --git a/src/core/NameGenerator.ts b/src/core/NameGenerator.ts
index 36d93c2..45db198 100644
--- a/src/core/NameGenerator.ts
+++ b/src/core/NameGenerator.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // A unique name generator
     export class NameGenerator {
         // List of available choices
diff --git a/src/core/Player.spec.ts b/src/core/Player.spec.ts
index 3ee72d3..c75245d 100644
--- a/src/core/Player.spec.ts
+++ b/src/core/Player.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("Player", function () {
         it("keeps track of visited locations", function () {
             let player = new Player();
diff --git a/src/core/Player.ts b/src/core/Player.ts
index d869302..bd5bc86 100644
--- a/src/core/Player.ts
+++ b/src/core/Player.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // One player (human or IA)
     export class Player {
         // Player's name
diff --git a/src/core/Range.spec.ts b/src/core/Range.spec.ts
index 65b63d4..a715e04 100644
--- a/src/core/Range.spec.ts
+++ b/src/core/Range.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     function checkProportional(range: Range, value1: number, value2: number) {
         expect(range.getProportional(value1)).toEqual(value2);
         expect(range.getReverseProportional(value2)).toEqual(value1);
diff --git a/src/core/Range.ts b/src/core/Range.ts
index 839f888..aac90ce 100644
--- a/src/core/Range.ts
+++ b/src/core/Range.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Range of number values
     export class Range {
         // Minimal value
diff --git a/src/core/Ship.spec.ts b/src/core/Ship.spec.ts
index 43ea025..061a67c 100644
--- a/src/core/Ship.spec.ts
+++ b/src/core/Ship.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Ship", function () {
         it("creates a full name", function () {
             let ship = new Ship();
diff --git a/src/core/Ship.ts b/src/core/Ship.ts
index c39f9d6..a84ab94 100644
--- a/src/core/Ship.ts
+++ b/src/core/Ship.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * A single ship in a fleet
      */
diff --git a/src/core/ShipGenerator.spec.ts b/src/core/ShipGenerator.spec.ts
index c5e2b8c..d9422c3 100644
--- a/src/core/ShipGenerator.spec.ts
+++ b/src/core/ShipGenerator.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("ShipGenerator", function () {
         it("can use ship model", function () {
             var gen = new ShipGenerator();
diff --git a/src/core/ShipGenerator.ts b/src/core/ShipGenerator.ts
index 50d5a3d..ec533b8 100644
--- a/src/core/ShipGenerator.ts
+++ b/src/core/ShipGenerator.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Generator of random ship
      */
diff --git a/src/core/ShipLevel.spec.ts b/src/core/ShipLevel.spec.ts
index af6fc4d..40d8dde 100644
--- a/src/core/ShipLevel.spec.ts
+++ b/src/core/ShipLevel.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("ShipLevel", () => {
         it("level up from experience points", () => {
             let level = new ShipLevel();
diff --git a/src/core/ShipLevel.ts b/src/core/ShipLevel.ts
index 49be6cb..5896534 100644
--- a/src/core/ShipLevel.ts
+++ b/src/core/ShipLevel.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Level and experience system for a ship.
      */
diff --git a/src/core/ShipModel.ts b/src/core/ShipModel.ts
index 6433f03..bc237f8 100644
--- a/src/core/ShipModel.ts
+++ b/src/core/ShipModel.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // A model of ship
     //  It defines the ship looks, and available slots for equipment
     export class ShipModel {
diff --git a/src/core/ShipValue.spec.ts b/src/core/ShipValue.spec.ts
index 8e7aa7c..a6acae7 100644
--- a/src/core/ShipValue.spec.ts
+++ b/src/core/ShipValue.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("ShipValue", function () {
         it("is initially not limited", function () {
             var attr = new ShipValue("test");
diff --git a/src/core/ShipValue.ts b/src/core/ShipValue.ts
index d07e2fd..0579fe2 100644
--- a/src/core/ShipValue.ts
+++ b/src/core/ShipValue.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     const SHIP_VALUES_DESCRIPTIONS: { [name: string]: string } = {
         "materials skill": "Usage of physical materials such as bullets, shells...",
         "photons skill": "Forces of light, and electromagnetic radiation",
diff --git a/src/core/Shop.spec.ts b/src/core/Shop.spec.ts
index 1dda8a6..2ba2069 100644
--- a/src/core/Shop.spec.ts
+++ b/src/core/Shop.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Shop", () => {
         it("generates a stock", () => {
             let shop = new Shop();
diff --git a/src/core/Shop.ts b/src/core/Shop.ts
index fcda904..5e4296d 100644
--- a/src/core/Shop.ts
+++ b/src/core/Shop.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * A shop is a place to buy/sell equipments
      */
diff --git a/src/core/Slot.spec.ts b/src/core/Slot.spec.ts
index bfb4980..b6129f3 100644
--- a/src/core/Slot.spec.ts
+++ b/src/core/Slot.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Slot", () => {
         it("checks equipment type", () => {
             var ship = new Ship();
diff --git a/src/core/Slot.ts b/src/core/Slot.ts
index e5bf94c..e193536 100644
--- a/src/core/Slot.ts
+++ b/src/core/Slot.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Types of slots
     export enum SlotType {
         Hull,
diff --git a/src/core/Star.spec.ts b/src/core/Star.spec.ts
index 9784efa..548a63a 100644
--- a/src/core/Star.spec.ts
+++ b/src/core/Star.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Star", () => {
         it("lists links to other stars", () => {
             var universe = new Universe();
diff --git a/src/core/Star.ts b/src/core/Star.ts
index 3fbeb8d..3aa396a 100644
--- a/src/core/Star.ts
+++ b/src/core/Star.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // A star system
     export class Star {
 
diff --git a/src/core/StarLink.spec.ts b/src/core/StarLink.spec.ts
index 662ab0c..1591465 100644
--- a/src/core/StarLink.spec.ts
+++ b/src/core/StarLink.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("StarLink", () => {
         it("checks link intersection", () => {
             var star1 = new Star(null, 0, 0);
diff --git a/src/core/StarLink.ts b/src/core/StarLink.ts
index 6ec53c8..57cf90a 100644
--- a/src/core/StarLink.ts
+++ b/src/core/StarLink.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // An hyperspace link between two star systems
     export class StarLink {
         // Stars
diff --git a/src/core/StarLocation.spec.ts b/src/core/StarLocation.spec.ts
index f5d3d7e..0fefaba 100644
--- a/src/core/StarLocation.spec.ts
+++ b/src/core/StarLocation.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("StarLocation", () => {
         it("removes generated encounters that lose", function () {
             var location = new StarLocation(undefined, StarLocationType.PLANET, 0, 0);
diff --git a/src/core/StarLocation.ts b/src/core/StarLocation.ts
index 548bb8d..4679413 100644
--- a/src/core/StarLocation.ts
+++ b/src/core/StarLocation.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     export enum StarLocationType {
         STAR,
         WARP,
diff --git a/src/core/Target.spec.ts b/src/core/Target.spec.ts
index a025f30..9d30acf 100644
--- a/src/core/Target.spec.ts
+++ b/src/core/Target.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Target", () => {
         it("initializes from ship or location", () => {
             var target: Target;
diff --git a/src/core/Target.ts b/src/core/Target.ts
index 79a3c64..af68a87 100644
--- a/src/core/Target.ts
+++ b/src/core/Target.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Find the nearest intersection between a line and a circle
     //  Circle is supposed to be centered at (0,0)
     //  Nearest intersection to (x1,y1) is returned
diff --git a/src/core/TestTools.spec.ts b/src/core/TestTools.spec.ts
index dedb41f..cb8c2fb 100644
--- a/src/core/TestTools.spec.ts
+++ b/src/core/TestTools.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("TestTools", () => {
         it("set ship power", () => {
             let ship = new Ship();
diff --git a/src/core/TestTools.ts b/src/core/TestTools.ts
index a15885d..0aa2c95 100644
--- a/src/core/TestTools.ts
+++ b/src/core/TestTools.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // unit testing utilities
     export class TestTools {
 
diff --git a/src/core/Universe.spec.ts b/src/core/Universe.spec.ts
index 06175f6..6bca67c 100644
--- a/src/core/Universe.spec.ts
+++ b/src/core/Universe.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Universe", () => {
         it("generates star systems", () => {
             var universe = new Universe();
diff --git a/src/core/Universe.ts b/src/core/Universe.ts
index b2e8eff..5b5666b 100644
--- a/src/core/Universe.ts
+++ b/src/core/Universe.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Main game universe
      */
diff --git a/src/core/actions/BaseAction.spec.ts b/src/core/actions/BaseAction.spec.ts
index 0e94fd8..84450a1 100644
--- a/src/core/actions/BaseAction.spec.ts
+++ b/src/core/actions/BaseAction.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("BaseAction", function () {
         it("check if equipment can be used with remaining AP", function () {
             var equipment = new Equipment(SlotType.Hull);
diff --git a/src/core/actions/BaseAction.ts b/src/core/actions/BaseAction.ts
index 37d6fff..c708f3c 100644
--- a/src/core/actions/BaseAction.ts
+++ b/src/core/actions/BaseAction.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Targetting mode for an action.
      * 
diff --git a/src/core/actions/DeployDroneAction.spec.ts b/src/core/actions/DeployDroneAction.spec.ts
index b7d45d3..0e1a815 100644
--- a/src/core/actions/DeployDroneAction.spec.ts
+++ b/src/core/actions/DeployDroneAction.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="../effects/BaseEffect.ts" />
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("DeployDroneAction", function () {
         it("stores useful information", function () {
             let equipment = new Equipment(SlotType.Weapon, "testdrone");
diff --git a/src/core/actions/DeployDroneAction.ts b/src/core/actions/DeployDroneAction.ts
index f2d03b9..4efac47 100644
--- a/src/core/actions/DeployDroneAction.ts
+++ b/src/core/actions/DeployDroneAction.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseAction.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Action to deploy a drone in space
      */
diff --git a/src/core/actions/EndTurnAction.spec.ts b/src/core/actions/EndTurnAction.spec.ts
index de408b9..367fcda 100644
--- a/src/core/actions/EndTurnAction.spec.ts
+++ b/src/core/actions/EndTurnAction.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("EndTurnAction", () => {
         it("can't be applied to non-playing ship", () => {
             spyOn(console, "warn").and.stub();
diff --git a/src/core/actions/EndTurnAction.ts b/src/core/actions/EndTurnAction.ts
index b7a9ccf..3547646 100644
--- a/src/core/actions/EndTurnAction.ts
+++ b/src/core/actions/EndTurnAction.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Action to end the ship's turn
     export class EndTurnAction extends BaseAction {
         constructor() {
diff --git a/src/core/actions/FireWeaponAction.spec.ts b/src/core/actions/FireWeaponAction.spec.ts
index 5482ef1..81fd4d9 100644
--- a/src/core/actions/FireWeaponAction.spec.ts
+++ b/src/core/actions/FireWeaponAction.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="../effects/BaseEffect.ts" />
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("FireWeaponAction", function () {
         it("constructs correctly", function () {
             let equipment = new Equipment(SlotType.Weapon, "testweapon");
diff --git a/src/core/actions/FireWeaponAction.ts b/src/core/actions/FireWeaponAction.ts
index 5be3244..eecf436 100644
--- a/src/core/actions/FireWeaponAction.ts
+++ b/src/core/actions/FireWeaponAction.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseAction.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Action to fire a weapon on another ship, or in space
      */
diff --git a/src/core/actions/MoveAction.spec.ts b/src/core/actions/MoveAction.spec.ts
index 259b8f7..8c56c62 100644
--- a/src/core/actions/MoveAction.spec.ts
+++ b/src/core/actions/MoveAction.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("MoveAction", function () {
         it("checks movement against remaining AP", function () {
             var ship = new Ship();
diff --git a/src/core/actions/MoveAction.ts b/src/core/actions/MoveAction.ts
index bbe7685..51b0e7c 100644
--- a/src/core/actions/MoveAction.ts
+++ b/src/core/actions/MoveAction.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Action to move to a given location
     export class MoveAction extends BaseAction {
         // Distance allowed for each power point (raw, without applying maneuvrability)
diff --git a/src/core/actions/ToggleAction.ts b/src/core/actions/ToggleAction.ts
index b12d498..5ff01c9 100644
--- a/src/core/actions/ToggleAction.ts
+++ b/src/core/actions/ToggleAction.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseAction.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Action to toggle some effects on the ship or around it, until next turn start
      */
diff --git a/src/core/ai/AIDuel.ts b/src/core/ai/AIDuel.ts
index a90ac58..4b1fe0e 100644
--- a/src/core/ai/AIDuel.ts
+++ b/src/core/ai/AIDuel.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Duel between two AIs, over multiple battles
      */
diff --git a/src/core/ai/AbstractAI.ts b/src/core/ai/AbstractAI.ts
index dbe2be4..24c048d 100644
--- a/src/core/ai/AbstractAI.ts
+++ b/src/core/ai/AbstractAI.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Base class for all Artificial Intelligence interaction
      */
diff --git a/src/core/ai/Maneuver.spec.ts b/src/core/ai/Maneuver.spec.ts
index d1a7035..2b9d93d 100644
--- a/src/core/ai/Maneuver.spec.ts
+++ b/src/core/ai/Maneuver.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Maneuver", function () {
         it("guesses weapon effects", function () {
             let battle = new Battle();
diff --git a/src/core/ai/Maneuver.ts b/src/core/ai/Maneuver.ts
index 009383d..e4003d4 100644
--- a/src/core/ai/Maneuver.ts
+++ b/src/core/ai/Maneuver.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Ship maneuver for an artifical intelligence
      * 
diff --git a/src/core/ai/TacticalAI.spec.ts b/src/core/ai/TacticalAI.spec.ts
index ed0573b..a93c5be 100644
--- a/src/core/ai/TacticalAI.spec.ts
+++ b/src/core/ai/TacticalAI.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="Maneuver.ts" />
 
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("TacticalAI", function () {
         class FixedManeuver extends Maneuver {
             score: number;
diff --git a/src/core/ai/TacticalAI.ts b/src/core/ai/TacticalAI.ts
index 42e7fb9..7313ccd 100644
--- a/src/core/ai/TacticalAI.ts
+++ b/src/core/ai/TacticalAI.ts
@@ -1,6 +1,6 @@
 /// <reference path="AbstractAI.ts"/>
 /// <reference path="Maneuver.ts"/>
-module TS.SpaceTac {
+module TK.SpaceTac {
 
     export type TacticalProducer = Iterator<Maneuver>;
     export type TacticalEvaluator = (maneuver: Maneuver) => number;
diff --git a/src/core/ai/TacticalAIHelpers.spec.ts b/src/core/ai/TacticalAIHelpers.spec.ts
index 74b54a9..c7f3031 100644
--- a/src/core/ai/TacticalAIHelpers.spec.ts
+++ b/src/core/ai/TacticalAIHelpers.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("TacticalAIHelpers", function () {
         it("produces direct weapon shots", function () {
             let battle = new Battle();
diff --git a/src/core/ai/TacticalAIHelpers.ts b/src/core/ai/TacticalAIHelpers.ts
index 08eb6e1..07e8880 100644
--- a/src/core/ai/TacticalAIHelpers.ts
+++ b/src/core/ai/TacticalAIHelpers.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Iterator of a list of "random" arena coordinates, based on a grid
      */
diff --git a/src/core/effects/AttributeEffect.spec.ts b/src/core/effects/AttributeEffect.spec.ts
index 8eea909..c0993b0 100644
--- a/src/core/effects/AttributeEffect.spec.ts
+++ b/src/core/effects/AttributeEffect.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("AttributeEffect", function () {
         it("is not applied directly", function () {
             let ship = new Ship();
diff --git a/src/core/effects/AttributeEffect.ts b/src/core/effects/AttributeEffect.ts
index 95f1293..c06cae3 100644
--- a/src/core/effects/AttributeEffect.ts
+++ b/src/core/effects/AttributeEffect.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseEffect.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Effect to modify an attribute.
      * 
diff --git a/src/core/effects/AttributeLimitEffect.spec.ts b/src/core/effects/AttributeLimitEffect.spec.ts
index 4b269a1..7b5a924 100644
--- a/src/core/effects/AttributeLimitEffect.spec.ts
+++ b/src/core/effects/AttributeLimitEffect.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("AttributeLimitEffect", function () {
         it("limits an attribute", function () {
             let battle = new Battle();
diff --git a/src/core/effects/AttributeLimitEffect.ts b/src/core/effects/AttributeLimitEffect.ts
index e5fff61..2708557 100644
--- a/src/core/effects/AttributeLimitEffect.ts
+++ b/src/core/effects/AttributeLimitEffect.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseEffect.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Enforce a limitation on ship attribute final value
      * 
diff --git a/src/core/effects/BaseEffect.spec.ts b/src/core/effects/BaseEffect.spec.ts
index acf04c5..a01fcc1 100644
--- a/src/core/effects/BaseEffect.spec.ts
+++ b/src/core/effects/BaseEffect.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("BaseEffect", function () {
         it("gets a fixed or variable amount", function () {
             let effect = new BaseEffect("test");
diff --git a/src/core/effects/BaseEffect.ts b/src/core/effects/BaseEffect.ts
index d94b112..5a85e5a 100644
--- a/src/core/effects/BaseEffect.ts
+++ b/src/core/effects/BaseEffect.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     export type EffectAmount = number | { base: number, span: number };
 
     /**
diff --git a/src/core/effects/DamageEffect.spec.ts b/src/core/effects/DamageEffect.spec.ts
index a68c92f..c4888cc 100644
--- a/src/core/effects/DamageEffect.spec.ts
+++ b/src/core/effects/DamageEffect.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("DamageEffect", function () {
         it("applies damage and wear", function () {
             var ship = new Ship();
diff --git a/src/core/effects/DamageEffect.ts b/src/core/effects/DamageEffect.ts
index abea803..4ff67f3 100644
--- a/src/core/effects/DamageEffect.ts
+++ b/src/core/effects/DamageEffect.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseEffect.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Apply damage on a ship.
      * 
diff --git a/src/core/effects/DamageModifierEffect.ts b/src/core/effects/DamageModifierEffect.ts
index b53256f..207ab04 100644
--- a/src/core/effects/DamageModifierEffect.ts
+++ b/src/core/effects/DamageModifierEffect.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseEffect.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Modify damage on ships.
      */
diff --git a/src/core/effects/RepelEffect.spec.ts b/src/core/effects/RepelEffect.spec.ts
index 2e31380..09b9bc0 100644
--- a/src/core/effects/RepelEffect.spec.ts
+++ b/src/core/effects/RepelEffect.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("RepelEffect", function () {
         it("shows a textual description", function () {
             expect(new RepelEffect(34).getDescription()).toEqual("repel ships 34km away");
diff --git a/src/core/effects/RepelEffect.ts b/src/core/effects/RepelEffect.ts
index 3370378..079228f 100644
--- a/src/core/effects/RepelEffect.ts
+++ b/src/core/effects/RepelEffect.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseEffect.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Repel ships from a central point
      */
diff --git a/src/core/effects/StickyEffect.ts b/src/core/effects/StickyEffect.ts
index 0ca58dc..836e4a5 100644
--- a/src/core/effects/StickyEffect.ts
+++ b/src/core/effects/StickyEffect.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseEffect.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Wrapper around another effect, to make it stick to a ship.
      * 
diff --git a/src/core/effects/ValueEffect.spec.ts b/src/core/effects/ValueEffect.spec.ts
index 5b062d7..1abfbff 100644
--- a/src/core/effects/ValueEffect.spec.ts
+++ b/src/core/effects/ValueEffect.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     describe("ValueEffect", function () {
         it("adds an amount to a ship value", function () {
             let effect = new ValueEffect("shield", 20);
diff --git a/src/core/effects/ValueEffect.ts b/src/core/effects/ValueEffect.ts
index c5e361d..aec5b16 100644
--- a/src/core/effects/ValueEffect.ts
+++ b/src/core/effects/ValueEffect.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseEffect.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Effect to add (or subtract if negative) an amount to a ship value.
      * 
diff --git a/src/core/effects/ValueTransferEffect.spec.ts b/src/core/effects/ValueTransferEffect.spec.ts
index dc108f3..3ba6aad 100644
--- a/src/core/effects/ValueTransferEffect.spec.ts
+++ b/src/core/effects/ValueTransferEffect.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("ValueTransferEffect", function () {
         it("takes or gives value", function () {
             let ship1 = new Ship();
diff --git a/src/core/effects/ValueTransferEffect.ts b/src/core/effects/ValueTransferEffect.ts
index 1e8f2ba..73b8bda 100644
--- a/src/core/effects/ValueTransferEffect.ts
+++ b/src/core/effects/ValueTransferEffect.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseEffect.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Transfer a value between two ships.
      */
diff --git a/src/core/equipments/DamageProtector.spec.ts b/src/core/equipments/DamageProtector.spec.ts
index fe6ccf2..90eea3c 100644
--- a/src/core/equipments/DamageProtector.spec.ts
+++ b/src/core/equipments/DamageProtector.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("DamageProtector", function () {
         it("generates equipment based on level", function () {
             let template = new DamageProtector();
diff --git a/src/core/equipments/DamageProtector.ts b/src/core/equipments/DamageProtector.ts
index 4074bd0..860c658 100644
--- a/src/core/equipments/DamageProtector.ts
+++ b/src/core/equipments/DamageProtector.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     export class DamageProtector extends LootTemplate {
         constructor() {
             super(SlotType.Weapon, "Damage Protector", "Extend a time-displacement subfield, to reduce damage taken by ships around", 145);
diff --git a/src/core/equipments/Engines.spec.ts b/src/core/equipments/Engines.spec.ts
index 562d1aa..00a0206 100644
--- a/src/core/equipments/Engines.spec.ts
+++ b/src/core/equipments/Engines.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("Engines", function () {
         it("generates RocketEngine based on level", function () {
             let template = new RocketEngine();
diff --git a/src/core/equipments/Engines.ts b/src/core/equipments/Engines.ts
index 79f81b5..0a1fd32 100644
--- a/src/core/equipments/Engines.ts
+++ b/src/core/equipments/Engines.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     export class RocketEngine extends LootTemplate {
         constructor() {
             super(SlotType.Engine, "Rocket Engine", "First-era conventional deep-space engine, based on gas exhausts pushed through a nozzle", 120);
diff --git a/src/core/equipments/GatlingGun.spec.ts b/src/core/equipments/GatlingGun.spec.ts
index e3d6abb..6149a01 100644
--- a/src/core/equipments/GatlingGun.spec.ts
+++ b/src/core/equipments/GatlingGun.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("GatlingGun", function () {
         it("generates equipment based on level", function () {
             let template = new GatlingGun();
diff --git a/src/core/equipments/GatlingGun.ts b/src/core/equipments/GatlingGun.ts
index a442af7..828dafc 100644
--- a/src/core/equipments/GatlingGun.ts
+++ b/src/core/equipments/GatlingGun.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     export class GatlingGun extends LootTemplate {
         constructor() {
             super(SlotType.Weapon, "Gatling Gun", "Mechanical weapon using loads of metal bullets propelled by guided explosions");
diff --git a/src/core/equipments/Hulls.spec.ts b/src/core/equipments/Hulls.spec.ts
index 36d2fad..cafa830 100644
--- a/src/core/equipments/Hulls.spec.ts
+++ b/src/core/equipments/Hulls.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("Hulls", function () {
         it("generates IronHull based on level", function () {
             let template = new IronHull();
diff --git a/src/core/equipments/Hulls.ts b/src/core/equipments/Hulls.ts
index 87f89e8..d2e8761 100644
--- a/src/core/equipments/Hulls.ts
+++ b/src/core/equipments/Hulls.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     export class IronHull extends LootTemplate {
         constructor() {
             super(SlotType.Hull, "Iron Hull", "Protective hull, based on layered iron alloys");
diff --git a/src/core/equipments/NuclearReactor.spec.ts b/src/core/equipments/NuclearReactor.spec.ts
index cb311cd..8ec2af5 100644
--- a/src/core/equipments/NuclearReactor.spec.ts
+++ b/src/core/equipments/NuclearReactor.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("NuclearReactor", function () {
         it("generates equipment based on level", function () {
             let template = new NuclearReactor();
diff --git a/src/core/equipments/NuclearReactor.ts b/src/core/equipments/NuclearReactor.ts
index 5a26adb..fdee608 100644
--- a/src/core/equipments/NuclearReactor.ts
+++ b/src/core/equipments/NuclearReactor.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     export class NuclearReactor extends LootTemplate {
         constructor() {
             super(SlotType.Power, "Nuclear Reactor", "A standard nuclear power core, drawing power from atom fusion cycles", 395);
diff --git a/src/core/equipments/PowerDepleter.spec.ts b/src/core/equipments/PowerDepleter.spec.ts
index 804544e..5f05d5f 100644
--- a/src/core/equipments/PowerDepleter.spec.ts
+++ b/src/core/equipments/PowerDepleter.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("PowerDepleter", () => {
         it("generates equipment based on level", function () {
             let template = new PowerDepleter();
diff --git a/src/core/equipments/PowerDepleter.ts b/src/core/equipments/PowerDepleter.ts
index 4ce9198..36a1cf9 100644
--- a/src/core/equipments/PowerDepleter.ts
+++ b/src/core/equipments/PowerDepleter.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     export class PowerDepleter extends LootTemplate {
         constructor() {
             super(SlotType.Weapon, "Power Depleter", "Direct-hit weapon that creates an antimatter well near the target, sucking its power surplus");
diff --git a/src/core/equipments/RepairDrone.spec.ts b/src/core/equipments/RepairDrone.spec.ts
index 8c1b466..c59e209 100644
--- a/src/core/equipments/RepairDrone.spec.ts
+++ b/src/core/equipments/RepairDrone.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("RepairDrone", function () {
         it("generates equipment based on level", function () {
             let template = new RepairDrone();
diff --git a/src/core/equipments/RepairDrone.ts b/src/core/equipments/RepairDrone.ts
index 69afbdc..e12a9bc 100644
--- a/src/core/equipments/RepairDrone.ts
+++ b/src/core/equipments/RepairDrone.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     /**
      * Drone that repairs damage done to the hull.
      */
diff --git a/src/core/equipments/ShieldTransfer.spec.ts b/src/core/equipments/ShieldTransfer.spec.ts
index 0e6f435..803a27c 100644
--- a/src/core/equipments/ShieldTransfer.spec.ts
+++ b/src/core/equipments/ShieldTransfer.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("ShieldTransfer", () => {
         it("generates equipment based on level", function () {
             let template = new ShieldTransfer();
diff --git a/src/core/equipments/ShieldTransfer.ts b/src/core/equipments/ShieldTransfer.ts
index aa244f6..5ea3a92 100644
--- a/src/core/equipments/ShieldTransfer.ts
+++ b/src/core/equipments/ShieldTransfer.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     export class ShieldTransfer extends LootTemplate {
         constructor() {
             super(SlotType.Weapon, "Shield Transfer", "Generates small gravity wells between the ship's and the target's shields, stealing physical properties and energy");
diff --git a/src/core/equipments/Shields.spec.ts b/src/core/equipments/Shields.spec.ts
index eb1327f..8a0eed8 100644
--- a/src/core/equipments/Shields.spec.ts
+++ b/src/core/equipments/Shields.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("Shields", function () {
         it("generates ForceField based on level", function () {
             let template = new ForceField();
diff --git a/src/core/equipments/Shields.ts b/src/core/equipments/Shields.ts
index 733911f..1668342 100644
--- a/src/core/equipments/Shields.ts
+++ b/src/core/equipments/Shields.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     export class ForceField extends LootTemplate {
         constructor() {
             super(SlotType.Shield, "Force Field", "A basic force field, generated by radiating waves of compressed energy", 95);
diff --git a/src/core/equipments/SubMunitionMissile.spec.ts b/src/core/equipments/SubMunitionMissile.spec.ts
index 90d1a15..d9a847e 100644
--- a/src/core/equipments/SubMunitionMissile.spec.ts
+++ b/src/core/equipments/SubMunitionMissile.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     describe("SubMunitionMissile", function () {
         it("generates equipment based on level", function () {
             let template = new SubMunitionMissile();
diff --git a/src/core/equipments/SubMunitionMissile.ts b/src/core/equipments/SubMunitionMissile.ts
index b3253db..fbbb69d 100644
--- a/src/core/equipments/SubMunitionMissile.ts
+++ b/src/core/equipments/SubMunitionMissile.ts
@@ -1,6 +1,6 @@
 /// <reference path="../LootTemplate.ts"/>
 
-module TS.SpaceTac.Equipments {
+module TK.SpaceTac.Equipments {
     export class SubMunitionMissile extends LootTemplate {
         constructor() {
             super(SlotType.Weapon, "SubMunition Missile", "Explosive missile releasing small shelled payloads, that will in turn explode on impact", 163);
diff --git a/src/core/events/ActionAppliedEvent.ts b/src/core/events/ActionAppliedEvent.ts
index 6692f7b..91d5e00 100644
--- a/src/core/events/ActionAppliedEvent.ts
+++ b/src/core/events/ActionAppliedEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Event logged when an action is used.
      */
diff --git a/src/core/events/ActiveEffectsEvent.ts b/src/core/events/ActiveEffectsEvent.ts
index 7d5be8f..bf73f63 100644
--- a/src/core/events/ActiveEffectsEvent.ts
+++ b/src/core/events/ActiveEffectsEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Event logged when a list of active effects changes
      */
diff --git a/src/core/events/BaseBattleEvent.ts b/src/core/events/BaseBattleEvent.ts
index aa12e78..cb4ba5f 100644
--- a/src/core/events/BaseBattleEvent.ts
+++ b/src/core/events/BaseBattleEvent.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Base class for battle events
      * 
diff --git a/src/core/events/DamageEvent.ts b/src/core/events/DamageEvent.ts
index 850f5ef..6baa128 100644
--- a/src/core/events/DamageEvent.ts
+++ b/src/core/events/DamageEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Event logged when a ship takes damage
     export class DamageEvent extends BaseLogShipEvent {
         // Damage to hull
diff --git a/src/core/events/DeathEvent.ts b/src/core/events/DeathEvent.ts
index 7496fb9..5ab2c7f 100644
--- a/src/core/events/DeathEvent.ts
+++ b/src/core/events/DeathEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Event logged when a ship is dead
     export class DeathEvent extends BaseLogShipEvent {
         constructor(ship: Ship) {
diff --git a/src/core/events/DroneAppliedEvent.ts b/src/core/events/DroneAppliedEvent.ts
index 1010505..dbd9322 100644
--- a/src/core/events/DroneAppliedEvent.ts
+++ b/src/core/events/DroneAppliedEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Event logged when a drone applies its effects
      */
diff --git a/src/core/events/DroneDeployedEvent.ts b/src/core/events/DroneDeployedEvent.ts
index de86aa7..13ca985 100644
--- a/src/core/events/DroneDeployedEvent.ts
+++ b/src/core/events/DroneDeployedEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Event logged when a drone is deployed by a ship
     export class DroneDeployedEvent extends BaseLogShipEvent {
         // Pointer to the drone
diff --git a/src/core/events/DroneDestroyedEvent.ts b/src/core/events/DroneDestroyedEvent.ts
index 5f23157..263af05 100644
--- a/src/core/events/DroneDestroyedEvent.ts
+++ b/src/core/events/DroneDestroyedEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Event logged when a drone is destroyed
     export class DroneDestroyedEvent extends BaseLogShipEvent {
         // Pointer to the drone
diff --git a/src/core/events/EndBattleEvent.ts b/src/core/events/EndBattleEvent.ts
index bd92614..442eaf4 100644
--- a/src/core/events/EndBattleEvent.ts
+++ b/src/core/events/EndBattleEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Event logged when the battle ended
     //  This is always the last event of a battle log
     export class EndBattleEvent extends BaseBattleEvent {
diff --git a/src/core/events/FireEvent.ts b/src/core/events/FireEvent.ts
index 51a2502..29a5dc6 100644
--- a/src/core/events/FireEvent.ts
+++ b/src/core/events/FireEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     // Event logged when a weapon is used on a target
     export class FireEvent extends BaseLogShipTargetEvent {
         // Weapon used
diff --git a/src/core/events/MoveEvent.spec.ts b/src/core/events/MoveEvent.spec.ts
index 6aea14e..cdd0e59 100644
--- a/src/core/events/MoveEvent.spec.ts
+++ b/src/core/events/MoveEvent.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("MoveEvent", function () {
         it("get reverse event", function () {
             let ship = new Ship();
diff --git a/src/core/events/MoveEvent.ts b/src/core/events/MoveEvent.ts
index b980763..3382f4e 100644
--- a/src/core/events/MoveEvent.ts
+++ b/src/core/events/MoveEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Event making a ship move 
      */
diff --git a/src/core/events/ShipChangeEvent.spec.ts b/src/core/events/ShipChangeEvent.spec.ts
index d024655..3346b07 100644
--- a/src/core/events/ShipChangeEvent.spec.ts
+++ b/src/core/events/ShipChangeEvent.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("ShipChangeEvent", function () {
         it("get reverse event", function () {
             let ship1 = new Ship();
diff --git a/src/core/events/ShipChangeEvent.ts b/src/core/events/ShipChangeEvent.ts
index 5371a22..e07fdb7 100644
--- a/src/core/events/ShipChangeEvent.ts
+++ b/src/core/events/ShipChangeEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Event that changes the current playing ship
      */
diff --git a/src/core/events/ToggleEvent.ts b/src/core/events/ToggleEvent.ts
index 312275a..23f686c 100644
--- a/src/core/events/ToggleEvent.ts
+++ b/src/core/events/ToggleEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Event logged when a toggle action is activated or deactivated
      */
diff --git a/src/core/events/ValueChangeEvent.spec.ts b/src/core/events/ValueChangeEvent.spec.ts
index b72ca20..c25e2aa 100644
--- a/src/core/events/ValueChangeEvent.spec.ts
+++ b/src/core/events/ValueChangeEvent.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("ValueChangeEvent", function () {
         it("get reverse event", function () {
             let ship = new Ship();
diff --git a/src/core/events/ValueChangeEvent.ts b/src/core/events/ValueChangeEvent.ts
index 38dacb5..8b5baae 100644
--- a/src/core/events/ValueChangeEvent.ts
+++ b/src/core/events/ValueChangeEvent.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseBattleEvent.ts"/>
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Event logged when a ship value or attribute changed
      */
diff --git a/src/core/missions/ActiveMissions.spec.ts b/src/core/missions/ActiveMissions.spec.ts
index 3833b2a..938c28f 100644
--- a/src/core/missions/ActiveMissions.spec.ts
+++ b/src/core/missions/ActiveMissions.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("ActiveMissions", () => {
         it("starts the main story arc", function () {
             let missions = new ActiveMissions();
diff --git a/src/core/missions/ActiveMissions.ts b/src/core/missions/ActiveMissions.ts
index 83a4b82..212f25d 100644
--- a/src/core/missions/ActiveMissions.ts
+++ b/src/core/missions/ActiveMissions.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * A list of active missions
      */
diff --git a/src/core/missions/MainStory.spec.ts b/src/core/missions/MainStory.spec.ts
index 9d4ebd4..3d0c062 100644
--- a/src/core/missions/MainStory.spec.ts
+++ b/src/core/missions/MainStory.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("MainStory", () => {
         function checkPart(story: Mission, index: number, title: string, completed = false) {
             let result = story.checkStatus();
diff --git a/src/core/missions/MainStory.ts b/src/core/missions/MainStory.ts
index 7b0be9e..0149a4d 100644
--- a/src/core/missions/MainStory.ts
+++ b/src/core/missions/MainStory.ts
@@ -1,6 +1,6 @@
 /// <reference path="Mission.ts" />
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     function randomLocation(random: RandomGenerator, stars: Star[], excludes: StarLocation[] = []) {
         let star = stars.length == 1 ? stars[0] : random.choice(stars);
         return RandomGenerator.global.choice(star.locations.filter(loc => !contains(excludes, loc)));
diff --git a/src/core/missions/Mission.spec.ts b/src/core/missions/Mission.spec.ts
index e86ee03..2a9b5f0 100644
--- a/src/core/missions/Mission.spec.ts
+++ b/src/core/missions/Mission.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("Mission", () => {
         it("check step status", function () {
             let universe = new Universe();
diff --git a/src/core/missions/Mission.ts b/src/core/missions/Mission.ts
index d60c774..9f43a1c 100644
--- a/src/core/missions/Mission.ts
+++ b/src/core/missions/Mission.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Reward for a mission (either an equipment or money)
      */
diff --git a/src/core/missions/MissionGenerator.spec.ts b/src/core/missions/MissionGenerator.spec.ts
index 4ba3082..be4b716 100644
--- a/src/core/missions/MissionGenerator.spec.ts
+++ b/src/core/missions/MissionGenerator.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("MissionGenerator", function () {
         it("generates escort missions", function () {
             let universe = new Universe();
diff --git a/src/core/missions/MissionGenerator.ts b/src/core/missions/MissionGenerator.ts
index 144c3c9..cfc4b00 100644
--- a/src/core/missions/MissionGenerator.ts
+++ b/src/core/missions/MissionGenerator.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     const POOL_SHIP_NAMES = [
         "Zert",
         "Ob'tec",
diff --git a/src/core/missions/MissionPart.ts b/src/core/missions/MissionPart.ts
index 6968256..25f8340 100644
--- a/src/core/missions/MissionPart.ts
+++ b/src/core/missions/MissionPart.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * An abstract part of a mission, describing the goal
      */
diff --git a/src/core/missions/MissionPartCleanLocation.spec.ts b/src/core/missions/MissionPartCleanLocation.spec.ts
index a8dc877..5dbfd3c 100644
--- a/src/core/missions/MissionPartCleanLocation.spec.ts
+++ b/src/core/missions/MissionPartCleanLocation.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("MissionPartEscort", () => {
         it("completes when the fleet is at location, and the encounter is clean", function () {
             let destination = new StarLocation(new Star(null, 0, 0, "Atanax"));
diff --git a/src/core/missions/MissionPartCleanLocation.ts b/src/core/missions/MissionPartCleanLocation.ts
index 02317a7..5ca47f1 100644
--- a/src/core/missions/MissionPartCleanLocation.ts
+++ b/src/core/missions/MissionPartCleanLocation.ts
@@ -1,6 +1,6 @@
 /// <reference path="MissionPartGoTo.ts" />
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * A mission part that requires the fleet to clean a specific location of enemies
      */
diff --git a/src/core/missions/MissionPartConversation.spec.ts b/src/core/missions/MissionPartConversation.spec.ts
index fd27c0c..de6b005 100644
--- a/src/core/missions/MissionPartConversation.spec.ts
+++ b/src/core/missions/MissionPartConversation.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("MissionPartConversation", () => {
         it("advances through conversation", function () {
             let universe = new Universe();
diff --git a/src/core/missions/MissionPartConversation.ts b/src/core/missions/MissionPartConversation.ts
index 3bff2bd..8bf7bfb 100644
--- a/src/core/missions/MissionPartConversation.ts
+++ b/src/core/missions/MissionPartConversation.ts
@@ -1,6 +1,6 @@
 /// <reference path="MissionPart.ts" />
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * A single conversation piece
      */
diff --git a/src/core/missions/MissionPartEscort.spec.ts b/src/core/missions/MissionPartEscort.spec.ts
index f81e5bb..39157e8 100644
--- a/src/core/missions/MissionPartEscort.spec.ts
+++ b/src/core/missions/MissionPartEscort.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("MissionPartEscort", () => {
         it("completes when the fleet is at location, with its escort", function () {
             let destination = new StarLocation(new Star(null, 0, 0, "Atanax"));
diff --git a/src/core/missions/MissionPartEscort.ts b/src/core/missions/MissionPartEscort.ts
index 86bc36f..b32cb92 100644
--- a/src/core/missions/MissionPartEscort.ts
+++ b/src/core/missions/MissionPartEscort.ts
@@ -1,6 +1,6 @@
 /// <reference path="MissionPartGoTo.ts" />
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * A mission part that requires the fleet to escort a specific ship to a destination
      */
diff --git a/src/core/missions/MissionPartGoTo.spec.ts b/src/core/missions/MissionPartGoTo.spec.ts
index 193bead..b2ce272 100644
--- a/src/core/missions/MissionPartGoTo.spec.ts
+++ b/src/core/missions/MissionPartGoTo.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Specs {
+module TK.SpaceTac.Specs {
     describe("MissionPartGoTo", () => {
         it("completes when the fleet is at location, without encounter", function () {
             let destination = new StarLocation(new Star(null, 0, 0, "Atanax"));
diff --git a/src/core/missions/MissionPartGoTo.ts b/src/core/missions/MissionPartGoTo.ts
index 0c48b8e..1d40382 100644
--- a/src/core/missions/MissionPartGoTo.ts
+++ b/src/core/missions/MissionPartGoTo.ts
@@ -1,6 +1,6 @@
 /// <reference path="MissionPart.ts" />
 
-module TS.SpaceTac {
+module TK.SpaceTac {
     /**
      * Level of hint to help find a destination
      */
diff --git a/src/multi/Connection.spec.ts b/src/multi/Connection.spec.ts
index 7c526ec..9a2425a 100644
--- a/src/multi/Connection.spec.ts
+++ b/src/multi/Connection.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Multi.Specs {
+module TK.SpaceTac.Multi.Specs {
     describe("Connection", function () {
         async_it("finds an unused token", async function () {
             let storage = new FakeRemoteStorage();
@@ -17,7 +17,7 @@ module TS.SpaceTac.Multi.Specs {
 
         async_it("loads a session by its id", async function () {
             let session = new GameSession();
-            let serializer = new Serializer(TS.SpaceTac);
+            let serializer = new Serializer(TK.SpaceTac);
             let storage = new FakeRemoteStorage();
             let connection = new Connection("test", storage);
 
diff --git a/src/multi/Connection.ts b/src/multi/Connection.ts
index 052926f..9ff23b1 100644
--- a/src/multi/Connection.ts
+++ b/src/multi/Connection.ts
@@ -1,10 +1,10 @@
-module TS.SpaceTac.Multi {
+module TK.SpaceTac.Multi {
     /**
      * Multiplayer connection to a Parse server
      */
     export class Connection {
         device_id: string
-        serializer = new Serializer(TS.SpaceTac)
+        serializer = new Serializer(TK.SpaceTac)
         token_chars = "abcdefghjkmnpqrstuvwxyz123456789"
         storage: IRemoteStorage
 
diff --git a/src/multi/Exchange.spec.ts b/src/multi/Exchange.spec.ts
index 0a230a7..027fdaa 100644
--- a/src/multi/Exchange.spec.ts
+++ b/src/multi/Exchange.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Multi.Specs {
+module TK.SpaceTac.Multi.Specs {
     describe("Exchange", function () {
         function newExchange(token: string, storage = new FakeRemoteStorage()): [FakeRemoteStorage, Exchange, Exchange] {
             let connection = new Connection("test", storage);
diff --git a/src/multi/Exchange.ts b/src/multi/Exchange.ts
index 6d5c101..14f6a98 100644
--- a/src/multi/Exchange.ts
+++ b/src/multi/Exchange.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Multi {
+module TK.SpaceTac.Multi {
     /**
      * Network communication of two peers around a shared session
      * 
diff --git a/src/multi/RemoteStorage.spec.ts b/src/multi/RemoteStorage.spec.ts
index 832adcb..ff45936 100644
--- a/src/multi/RemoteStorage.spec.ts
+++ b/src/multi/RemoteStorage.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.Multi.Specs {
+module TK.SpaceTac.Multi.Specs {
     describe("FakeRemoteStorage", function () {
         async_it("can fetch a single record", async function () {
             let storage = new FakeRemoteStorage();
diff --git a/src/multi/RemoteStorage.ts b/src/multi/RemoteStorage.ts
index f05320e..b275ade 100644
--- a/src/multi/RemoteStorage.ts
+++ b/src/multi/RemoteStorage.ts
@@ -1,6 +1,6 @@
 /// <reference path="../lib/parse.d.ts" />
 
-module TS.SpaceTac.Multi {
+module TK.SpaceTac.Multi {
     /**
      * Interface for a remote storage, used for networking/multiplayer features
      */
diff --git a/src/ui/BaseView.spec.ts b/src/ui/BaseView.spec.ts
index b976ef4..2c10361 100644
--- a/src/ui/BaseView.spec.ts
+++ b/src/ui/BaseView.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="TestGame.ts" />
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("BaseView", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/BaseView.ts b/src/ui/BaseView.ts
index 38e93f4..2449351 100644
--- a/src/ui/BaseView.ts
+++ b/src/ui/BaseView.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Base class for all game views
      */
diff --git a/src/ui/Boot.spec.ts b/src/ui/Boot.spec.ts
index bb482c6..34e3955 100644
--- a/src/ui/Boot.spec.ts
+++ b/src/ui/Boot.spec.ts
@@ -1,7 +1,7 @@
 /// <reference path="TestGame.ts" />
 /// <reference path="Boot.ts" />
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("Boot", () => {
         let testgame = setupSingleView(testgame => [new Boot(), []]);
 
diff --git a/src/ui/Boot.ts b/src/ui/Boot.ts
index 4f9b9a5..54e5311 100644
--- a/src/ui/Boot.ts
+++ b/src/ui/Boot.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     export class Boot extends Phaser.State {
         preload() {
             this.load.image("preload-background", "assets/images/preload/bar-background.png");
diff --git a/src/ui/Preload.spec.ts b/src/ui/Preload.spec.ts
index 8e51ce7..af70cd4 100644
--- a/src/ui/Preload.spec.ts
+++ b/src/ui/Preload.spec.ts
@@ -1,7 +1,7 @@
 /// <reference path="TestGame.ts" />
 /// <reference path="Preload.ts" />
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("Preload", () => {
         let testgame = setupSingleView(testgame => [new Preload(), []]);
 
diff --git a/src/ui/Preload.ts b/src/ui/Preload.ts
index 6c00523..ea0ea22 100644
--- a/src/ui/Preload.ts
+++ b/src/ui/Preload.ts
@@ -1,6 +1,6 @@
 /// <reference path="BaseView.ts"/>
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     export class Preload extends BaseView {
         private preloadBar: Phaser.Image;
 
diff --git a/src/ui/Router.spec.ts b/src/ui/Router.spec.ts
index d7f01df..4a62770 100644
--- a/src/ui/Router.spec.ts
+++ b/src/ui/Router.spec.ts
@@ -1,7 +1,7 @@
 /// <reference path="TestGame.ts" />
 /// <reference path="Router.ts" />
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("Router", () => {
         let testgame = setupSingleView(testgame => [new Router(), []]);
 
diff --git a/src/ui/Router.ts b/src/ui/Router.ts
index 43ac4dd..7acd61a 100644
--- a/src/ui/Router.ts
+++ b/src/ui/Router.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // Router to other states
     export class Router extends Phaser.State {
         create() {
diff --git a/src/ui/TestGame.ts b/src/ui/TestGame.ts
index f5c06e5..20e2591 100644
--- a/src/ui/TestGame.ts
+++ b/src/ui/TestGame.ts
@@ -1,7 +1,7 @@
 /// <reference path="battle/BattleView.ts"/>
 /// <reference path="map/UniverseMapView.ts"/>
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     let test_ui: MainUI;
 
     /**
diff --git a/src/ui/battle/ActionBar.spec.ts b/src/ui/battle/ActionBar.spec.ts
index 3e3e145..23ee3ae 100644
--- a/src/ui/battle/ActionBar.spec.ts
+++ b/src/ui/battle/ActionBar.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="../TestGame.ts"/>
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("ActionBar", function () {
         let testgame = setupBattleview();
 
diff --git a/src/ui/battle/ActionBar.ts b/src/ui/battle/ActionBar.ts
index 78bcb5b..9e9d914 100644
--- a/src/ui/battle/ActionBar.ts
+++ b/src/ui/battle/ActionBar.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // Bar with all available action icons displayed
     export class ActionBar extends Phaser.Group {
         // Link to the parent battleview
diff --git a/src/ui/battle/ActionIcon.ts b/src/ui/battle/ActionIcon.ts
index 57ba160..9bb8e76 100644
--- a/src/ui/battle/ActionIcon.ts
+++ b/src/ui/battle/ActionIcon.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // Icon to activate a ship capability (move, fire...)
     export class ActionIcon extends Phaser.Button {
         // Link to the parent bar
diff --git a/src/ui/battle/ActionTooltip.spec.ts b/src/ui/battle/ActionTooltip.spec.ts
index 629d094..09e5d99 100644
--- a/src/ui/battle/ActionTooltip.spec.ts
+++ b/src/ui/battle/ActionTooltip.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="../TestGame.ts"/>
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("ActionTooltip", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/battle/ActionTooltip.ts b/src/ui/battle/ActionTooltip.ts
index 8ee3d1b..82131e5 100644
--- a/src/ui/battle/ActionTooltip.ts
+++ b/src/ui/battle/ActionTooltip.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Tooltip displaying action information
      */
diff --git a/src/ui/battle/Arena.ts b/src/ui/battle/Arena.ts
index 4c1ae97..de19769 100644
--- a/src/ui/battle/Arena.ts
+++ b/src/ui/battle/Arena.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Graphical representation of a battle
      * 
diff --git a/src/ui/battle/ArenaDrone.ts b/src/ui/battle/ArenaDrone.ts
index 7971b45..8e5de38 100644
--- a/src/ui/battle/ArenaDrone.ts
+++ b/src/ui/battle/ArenaDrone.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Drone sprite in the arena
      */
diff --git a/src/ui/battle/ArenaShip.spec.ts b/src/ui/battle/ArenaShip.spec.ts
index d854545..c55eb79 100644
--- a/src/ui/battle/ArenaShip.spec.ts
+++ b/src/ui/battle/ArenaShip.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="../TestGame.ts"/>
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("ArenaShip", function () {
         let testgame = setupBattleview();
 
diff --git a/src/ui/battle/ArenaShip.ts b/src/ui/battle/ArenaShip.ts
index 025e0b0..17fd140 100644
--- a/src/ui/battle/ArenaShip.ts
+++ b/src/ui/battle/ArenaShip.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // Ship sprite in the arena (BattleView)
     export class ArenaShip extends Phaser.Group {
         // Link to the view
diff --git a/src/ui/battle/BattleSplash.ts b/src/ui/battle/BattleSplash.ts
index 86c4bfe..2dc3069 100644
--- a/src/ui/battle/BattleSplash.ts
+++ b/src/ui/battle/BattleSplash.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Splash screen at the start of battle
      */
diff --git a/src/ui/battle/BattleView.spec.ts b/src/ui/battle/BattleView.spec.ts
index f40889e..950b2b6 100644
--- a/src/ui/battle/BattleView.spec.ts
+++ b/src/ui/battle/BattleView.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="../TestGame.ts"/>
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("BattleView", function () {
         let testgame = setupBattleview();
 
diff --git a/src/ui/battle/BattleView.ts b/src/ui/battle/BattleView.ts
index 1327e6c..1872dbd 100644
--- a/src/ui/battle/BattleView.ts
+++ b/src/ui/battle/BattleView.ts
@@ -1,6 +1,6 @@
 /// <reference path="../BaseView.ts"/>
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // Interactive view of a Battle
     export class BattleView extends BaseView {
         // Displayed battle
diff --git a/src/ui/battle/LogProcessor.spec.ts b/src/ui/battle/LogProcessor.spec.ts
index 27b7a1e..61e0b26 100644
--- a/src/ui/battle/LogProcessor.spec.ts
+++ b/src/ui/battle/LogProcessor.spec.ts
@@ -1,7 +1,7 @@
 /// <reference path="../TestGame.ts"/>
 /// <reference path="../../core/events/BaseBattleEvent.ts"/>
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     class FakeEvent extends BaseBattleEvent {
         diff: number
 
diff --git a/src/ui/battle/LogProcessor.ts b/src/ui/battle/LogProcessor.ts
index 085bda7..f19584d 100644
--- a/src/ui/battle/LogProcessor.ts
+++ b/src/ui/battle/LogProcessor.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Processor of events coming from the battle log
      * 
diff --git a/src/ui/battle/MultiBattle.ts b/src/ui/battle/MultiBattle.ts
index 4dea16f..ebe660c 100644
--- a/src/ui/battle/MultiBattle.ts
+++ b/src/ui/battle/MultiBattle.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Tool to synchronize two players sharing a battle over network
      */
@@ -35,7 +35,7 @@ module TS.SpaceTac.UI {
             this.exchange = new Multi.Exchange(view.getConnection(), token, primary);
             await this.exchange.start();
 
-            this.serializer = new Serializer(TS.SpaceTac);
+            this.serializer = new Serializer(TK.SpaceTac);
             this.processed = this.battle.log.events.length;
             this.timer = view.timer;
 
diff --git a/src/ui/battle/OutcomeDialog.ts b/src/ui/battle/OutcomeDialog.ts
index 09c99a1..0079e7a 100644
--- a/src/ui/battle/OutcomeDialog.ts
+++ b/src/ui/battle/OutcomeDialog.ts
@@ -1,6 +1,6 @@
 /// <reference path="../common/UIDialog.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Dialog to display battle outcome
      */
diff --git a/src/ui/battle/RangeHint.ts b/src/ui/battle/RangeHint.ts
index eb36e5b..05a7301 100644
--- a/src/ui/battle/RangeHint.ts
+++ b/src/ui/battle/RangeHint.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Graphical hints for movement and weapon range
      */
diff --git a/src/ui/battle/ShipList.spec.ts b/src/ui/battle/ShipList.spec.ts
index 36ed507..9280c11 100644
--- a/src/ui/battle/ShipList.spec.ts
+++ b/src/ui/battle/ShipList.spec.ts
@@ -1,6 +1,6 @@
 /// <reference path="../TestGame.ts"/>
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("ShipList", function () {
         let testgame = setupBattleview();
 
diff --git a/src/ui/battle/ShipList.ts b/src/ui/battle/ShipList.ts
index ff3b284..c90cfa9 100644
--- a/src/ui/battle/ShipList.ts
+++ b/src/ui/battle/ShipList.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // Bar with all playing ships, by play order
     export class ShipList extends Phaser.Image {
         // Link to the parent battleview
diff --git a/src/ui/battle/ShipListItem.ts b/src/ui/battle/ShipListItem.ts
index 9bc4c09..87caa01 100644
--- a/src/ui/battle/ShipListItem.ts
+++ b/src/ui/battle/ShipListItem.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // One item in a ship list (used in BattleView)
     export class ShipListItem extends Phaser.Button {
         // Reference to the view
diff --git a/src/ui/battle/ShipTooltip.spec.ts b/src/ui/battle/ShipTooltip.spec.ts
index 259da67..3c9f864 100644
--- a/src/ui/battle/ShipTooltip.spec.ts
+++ b/src/ui/battle/ShipTooltip.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("ShipTooltip", function () {
         let testgame = setupBattleview();
 
diff --git a/src/ui/battle/ShipTooltip.ts b/src/ui/battle/ShipTooltip.ts
index 9804e1d..8c1f3e0 100644
--- a/src/ui/battle/ShipTooltip.ts
+++ b/src/ui/battle/ShipTooltip.ts
@@ -1,6 +1,6 @@
 /// <reference path="../common/Tooltip.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Tooltip to display ship information on hover
      */
diff --git a/src/ui/battle/Targetting.spec.ts b/src/ui/battle/Targetting.spec.ts
index 27c05eb..55e2ffe 100644
--- a/src/ui/battle/Targetting.spec.ts
+++ b/src/ui/battle/Targetting.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("Targetting", function () {
         let testgame = setupBattleview();
 
diff --git a/src/ui/battle/Targetting.ts b/src/ui/battle/Targetting.ts
index 3754bac..f93a542 100644
--- a/src/ui/battle/Targetting.ts
+++ b/src/ui/battle/Targetting.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Targetting system on the arena
      * 
diff --git a/src/ui/battle/WeaponEffect.spec.ts b/src/ui/battle/WeaponEffect.spec.ts
index 854c28e..74f52cf 100644
--- a/src/ui/battle/WeaponEffect.spec.ts
+++ b/src/ui/battle/WeaponEffect.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("WeaponEffect", function () {
         let testgame = setupBattleview();
 
diff --git a/src/ui/battle/WeaponEffect.ts b/src/ui/battle/WeaponEffect.ts
index 3a03437..765da7f 100644
--- a/src/ui/battle/WeaponEffect.ts
+++ b/src/ui/battle/WeaponEffect.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // Particle that is rotated to always face its ongoing direction
     class BulletParticle extends Phaser.Particle {
         update(): void {
diff --git a/src/ui/character/CharacterCargo.spec.ts b/src/ui/character/CharacterCargo.spec.ts
index c6f85bd..7f20995 100644
--- a/src/ui/character/CharacterCargo.spec.ts
+++ b/src/ui/character/CharacterCargo.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("CharacterCargo", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/character/CharacterCargo.ts b/src/ui/character/CharacterCargo.ts
index c1f7d66..ca22a8a 100644
--- a/src/ui/character/CharacterCargo.ts
+++ b/src/ui/character/CharacterCargo.ts
@@ -1,6 +1,6 @@
 /// <reference path="CharacterEquipment.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Display a ship cargo slot
      */
diff --git a/src/ui/character/CharacterEquipment.spec.ts b/src/ui/character/CharacterEquipment.spec.ts
index c6dd796..457b5fa 100644
--- a/src/ui/character/CharacterEquipment.spec.ts
+++ b/src/ui/character/CharacterEquipment.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("CharacterEquipment", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/character/CharacterEquipment.ts b/src/ui/character/CharacterEquipment.ts
index cfd9313..eee9805 100644
--- a/src/ui/character/CharacterEquipment.ts
+++ b/src/ui/character/CharacterEquipment.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Interface for any graphical area that may contain or receive an equipment
      */
diff --git a/src/ui/character/CharacterFleetMember.spec.ts b/src/ui/character/CharacterFleetMember.spec.ts
index 8ef82f3..cb9bba1 100644
--- a/src/ui/character/CharacterFleetMember.spec.ts
+++ b/src/ui/character/CharacterFleetMember.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("CharacterFleetMember", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/character/CharacterFleetMember.ts b/src/ui/character/CharacterFleetMember.ts
index 9a851c7..dbe5f0a 100644
--- a/src/ui/character/CharacterFleetMember.ts
+++ b/src/ui/character/CharacterFleetMember.ts
@@ -1,6 +1,6 @@
 /// <reference path="CharacterEquipment.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Display a fleet member in the side of character sheet
      */
diff --git a/src/ui/character/CharacterLootSlot.spec.ts b/src/ui/character/CharacterLootSlot.spec.ts
index 0708ab3..722b1ae 100644
--- a/src/ui/character/CharacterLootSlot.spec.ts
+++ b/src/ui/character/CharacterLootSlot.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("CharacterLootSlot", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/character/CharacterLootSlot.ts b/src/ui/character/CharacterLootSlot.ts
index 11a98a4..55551ec 100644
--- a/src/ui/character/CharacterLootSlot.ts
+++ b/src/ui/character/CharacterLootSlot.ts
@@ -1,7 +1,7 @@
 /// <reference path="CharacterCargo.ts" />
 /// <reference path="CharacterEquipment.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Display a loot slot
      */
diff --git a/src/ui/character/CharacterSheet.spec.ts b/src/ui/character/CharacterSheet.spec.ts
index d92c5b7..b81918a 100644
--- a/src/ui/character/CharacterSheet.spec.ts
+++ b/src/ui/character/CharacterSheet.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("CharacterSheet", function () {
 
         describe("in UI", function () {
diff --git a/src/ui/character/CharacterSheet.ts b/src/ui/character/CharacterSheet.ts
index 772c8f8..98d3bfd 100644
--- a/src/ui/character/CharacterSheet.ts
+++ b/src/ui/character/CharacterSheet.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     export type CharacterEquipmentDrop = {
         message: string
         callback: (equipment: Equipment) => any
diff --git a/src/ui/character/CharacterShopSlot.spec.ts b/src/ui/character/CharacterShopSlot.spec.ts
index 16e0f3e..e436023 100644
--- a/src/ui/character/CharacterShopSlot.spec.ts
+++ b/src/ui/character/CharacterShopSlot.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("CharacterShopSlot", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/character/CharacterShopSlot.ts b/src/ui/character/CharacterShopSlot.ts
index bc164f0..8835edf 100644
--- a/src/ui/character/CharacterShopSlot.ts
+++ b/src/ui/character/CharacterShopSlot.ts
@@ -1,6 +1,6 @@
 /// <reference path="CharacterLootSlot.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Display a shop slot
      */
diff --git a/src/ui/character/CharacterSlot.spec.ts b/src/ui/character/CharacterSlot.spec.ts
index 4c67a94..515da7b 100644
--- a/src/ui/character/CharacterSlot.spec.ts
+++ b/src/ui/character/CharacterSlot.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("CharacterSlot", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/character/CharacterSlot.ts b/src/ui/character/CharacterSlot.ts
index 75d248d..502b9f2 100644
--- a/src/ui/character/CharacterSlot.ts
+++ b/src/ui/character/CharacterSlot.ts
@@ -1,6 +1,6 @@
 /// <reference path="CharacterEquipment.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Display a ship slot, with equipment attached to it
      */
diff --git a/src/ui/common/Animations.spec.ts b/src/ui/common/Animations.spec.ts
index 5324383..5939249 100644
--- a/src/ui/common/Animations.spec.ts
+++ b/src/ui/common/Animations.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("Animations", () => {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/common/Animations.ts b/src/ui/common/Animations.ts
index a0ee73f..afff2c3 100644
--- a/src/ui/common/Animations.ts
+++ b/src/ui/common/Animations.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     interface PhaserGraphics {
         x: number
         y: number
diff --git a/src/ui/common/Audio.ts b/src/ui/common/Audio.ts
index 458c8bd..04b266b 100644
--- a/src/ui/common/Audio.ts
+++ b/src/ui/common/Audio.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // Utility functions for sounds
     export class Audio {
         private game: MainUI
diff --git a/src/ui/common/InputManager.ts b/src/ui/common/InputManager.ts
index 1bfd5c6..bb7a3b4 100644
--- a/src/ui/common/InputManager.ts
+++ b/src/ui/common/InputManager.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     type KeyPressedCallback = (key: string) => void;
 
     /**
diff --git a/src/ui/common/Messages.ts b/src/ui/common/Messages.ts
index 3b1d584..2e35990 100644
--- a/src/ui/common/Messages.ts
+++ b/src/ui/common/Messages.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // A single displayed message
     class Message extends Phaser.Group {
         view: BaseView
diff --git a/src/ui/common/ParticleBuilder.spec.ts b/src/ui/common/ParticleBuilder.spec.ts
index 89b009d..77bf558 100644
--- a/src/ui/common/ParticleBuilder.spec.ts
+++ b/src/ui/common/ParticleBuilder.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("ParticleBuilder", () => {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/common/ParticleBuilder.ts b/src/ui/common/ParticleBuilder.ts
index 3bbf159..0d9766b 100644
--- a/src/ui/common/ParticleBuilder.ts
+++ b/src/ui/common/ParticleBuilder.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Particle shapes
      */
diff --git a/src/ui/common/Tooltip.spec.ts b/src/ui/common/Tooltip.spec.ts
index 2cce48d..2a7b22f 100644
--- a/src/ui/common/Tooltip.spec.ts
+++ b/src/ui/common/Tooltip.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("Tooltip", () => {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/common/Tooltip.ts b/src/ui/common/Tooltip.ts
index e0f0c10..f8a3742 100644
--- a/src/ui/common/Tooltip.ts
+++ b/src/ui/common/Tooltip.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
 
     class TooltipContainer extends Phaser.Group {
         view: BaseView
diff --git a/src/ui/common/UIComponent.spec.ts b/src/ui/common/UIComponent.spec.ts
index 1005df6..75b0d4e 100644
--- a/src/ui/common/UIComponent.spec.ts
+++ b/src/ui/common/UIComponent.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("UIComponent", () => {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/common/UIComponent.ts b/src/ui/common/UIComponent.ts
index b27c17f..f40ce2f 100644
--- a/src/ui/common/UIComponent.ts
+++ b/src/ui/common/UIComponent.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     export type UIInternalComponent = Phaser.Group | Phaser.Image | Phaser.Button | Phaser.Sprite | Phaser.Graphics;
 
     export type UIImageInfo = string | { key: string, frame?: number, frame1?: number, frame2?: number };
diff --git a/src/ui/common/UIDialog.spec.ts b/src/ui/common/UIDialog.spec.ts
index ee483a8..d72f913 100644
--- a/src/ui/common/UIDialog.spec.ts
+++ b/src/ui/common/UIDialog.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("UIDialog", () => {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/common/UIDialog.ts b/src/ui/common/UIDialog.ts
index c68085f..f2104c9 100644
--- a/src/ui/common/UIDialog.ts
+++ b/src/ui/common/UIDialog.ts
@@ -1,6 +1,6 @@
 /// <reference path="../common/UIComponent.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Base class for modal dialogs
      * 
diff --git a/src/ui/common/UILabel.ts b/src/ui/common/UILabel.ts
index 50a1adf..349b1db 100644
--- a/src/ui/common/UILabel.ts
+++ b/src/ui/common/UILabel.ts
@@ -1,6 +1,6 @@
 /// <reference path="UIComponent.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * UI component to display a text
      */
diff --git a/src/ui/common/UITextInput.ts b/src/ui/common/UITextInput.ts
index 442700a..c5c5845 100644
--- a/src/ui/common/UITextInput.ts
+++ b/src/ui/common/UITextInput.ts
@@ -1,6 +1,6 @@
 /// <reference path="UIComponent.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * UI component to allow the user to enter a small text
      */
diff --git a/src/ui/common/UITools.spec.ts b/src/ui/common/UITools.spec.ts
index 5369554..c1d9cd7 100644
--- a/src/ui/common/UITools.spec.ts
+++ b/src/ui/common/UITools.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("UITools", function () {
         describe("in UI", function () {
             let testgame = setupEmptyView();
diff --git a/src/ui/common/UITools.ts b/src/ui/common/UITools.ts
index 50666ba..2dde7ef 100644
--- a/src/ui/common/UITools.ts
+++ b/src/ui/common/UITools.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     export type IBounded = {
         x: number
         y: number
diff --git a/src/ui/common/UIWaitingDialog.ts b/src/ui/common/UIWaitingDialog.ts
index 12a7d77..310fbc6 100644
--- a/src/ui/common/UIWaitingDialog.ts
+++ b/src/ui/common/UIWaitingDialog.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Dialog with a waiting indicator
      */
diff --git a/src/ui/common/ValueBar.spec.ts b/src/ui/common/ValueBar.spec.ts
index bd0fca7..81ec295 100644
--- a/src/ui/common/ValueBar.spec.ts
+++ b/src/ui/common/ValueBar.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("ValueBar", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/common/ValueBar.ts b/src/ui/common/ValueBar.ts
index c203cc6..7f249fc 100644
--- a/src/ui/common/ValueBar.ts
+++ b/src/ui/common/ValueBar.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Orientation of a ValueBar.
      * 
diff --git a/src/ui/intro/IntroSteps.ts b/src/ui/intro/IntroSteps.ts
index 7e24076..b26a42b 100644
--- a/src/ui/intro/IntroSteps.ts
+++ b/src/ui/intro/IntroSteps.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Sequence of steps presenting the campaign intro.
      */
diff --git a/src/ui/intro/IntroView.ts b/src/ui/intro/IntroView.ts
index 9573054..fc41a06 100644
--- a/src/ui/intro/IntroView.ts
+++ b/src/ui/intro/IntroView.ts
@@ -1,6 +1,6 @@
 /// <reference path="../BaseView.ts"/>
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * View introducing the campaign story.
      */
diff --git a/src/ui/intro/ProgressiveMessage.ts b/src/ui/intro/ProgressiveMessage.ts
index 8649246..a78f02c 100644
--- a/src/ui/intro/ProgressiveMessage.ts
+++ b/src/ui/intro/ProgressiveMessage.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Style for a message display
      */
diff --git a/src/ui/map/ActiveMissionsDisplay.spec.ts b/src/ui/map/ActiveMissionsDisplay.spec.ts
index 93efe48..299be58 100644
--- a/src/ui/map/ActiveMissionsDisplay.spec.ts
+++ b/src/ui/map/ActiveMissionsDisplay.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("ActiveMissionsDisplay", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/map/ActiveMissionsDisplay.ts b/src/ui/map/ActiveMissionsDisplay.ts
index aa06a2f..7ee753b 100644
--- a/src/ui/map/ActiveMissionsDisplay.ts
+++ b/src/ui/map/ActiveMissionsDisplay.ts
@@ -1,6 +1,6 @@
 /// <reference path="../common/UIComponent.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Widget to display the active missions list
      */
diff --git a/src/ui/map/ConversationDisplay.ts b/src/ui/map/ConversationDisplay.ts
index 64af708..23117fe 100644
--- a/src/ui/map/ConversationDisplay.ts
+++ b/src/ui/map/ConversationDisplay.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Display of an active conversation
      */
diff --git a/src/ui/map/CurrentLocationMarker.ts b/src/ui/map/CurrentLocationMarker.ts
index 2830497..23b62cd 100644
--- a/src/ui/map/CurrentLocationMarker.ts
+++ b/src/ui/map/CurrentLocationMarker.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Marker to show current location on the map
      */
diff --git a/src/ui/map/FleetDisplay.spec.ts b/src/ui/map/FleetDisplay.spec.ts
index 1252d6c..a8fefaa 100644
--- a/src/ui/map/FleetDisplay.spec.ts
+++ b/src/ui/map/FleetDisplay.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("FleetDisplay", function () {
         let testgame = setupMapview();
 
diff --git a/src/ui/map/FleetDisplay.ts b/src/ui/map/FleetDisplay.ts
index ca3daf9..bdd89f9 100644
--- a/src/ui/map/FleetDisplay.ts
+++ b/src/ui/map/FleetDisplay.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     const SCALING = 0.00005;
     const LOCATIONS: [number, number][] = [
         [80, 0],
diff --git a/src/ui/map/MapLocationMenu.ts b/src/ui/map/MapLocationMenu.ts
index 6693292..f213abb 100644
--- a/src/ui/map/MapLocationMenu.ts
+++ b/src/ui/map/MapLocationMenu.ts
@@ -1,6 +1,6 @@
 /// <reference path="../common/UIComponent.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Menu to display selected map location, and associated actions
      */
diff --git a/src/ui/map/MissionLocationMarker.ts b/src/ui/map/MissionLocationMarker.ts
index c6ff9b9..0164cd6 100644
--- a/src/ui/map/MissionLocationMarker.ts
+++ b/src/ui/map/MissionLocationMarker.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Marker to show a mission location on the map
      */
diff --git a/src/ui/map/MissionsDialog.spec.ts b/src/ui/map/MissionsDialog.spec.ts
index 46b76b6..b93bbf2 100644
--- a/src/ui/map/MissionsDialog.spec.ts
+++ b/src/ui/map/MissionsDialog.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("MissionsDialog", function () {
         let testgame = setupEmptyView();
 
diff --git a/src/ui/map/MissionsDialog.ts b/src/ui/map/MissionsDialog.ts
index 2ba6c40..96bf968 100644
--- a/src/ui/map/MissionsDialog.ts
+++ b/src/ui/map/MissionsDialog.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Dialog to show available missions
      */
diff --git a/src/ui/map/StarSystemDisplay.spec.ts b/src/ui/map/StarSystemDisplay.spec.ts
index 04e85ed..06b8c73 100644
--- a/src/ui/map/StarSystemDisplay.spec.ts
+++ b/src/ui/map/StarSystemDisplay.spec.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("StarSystemDisplay", function () {
         let testgame = setupMapview();
 
diff --git a/src/ui/map/StarSystemDisplay.ts b/src/ui/map/StarSystemDisplay.ts
index fa984da..3e5349f 100644
--- a/src/ui/map/StarSystemDisplay.ts
+++ b/src/ui/map/StarSystemDisplay.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     // Group to display a star system
     export class StarSystemDisplay extends Phaser.Image {
         view: UniverseMapView
diff --git a/src/ui/map/UniverseMapView.ts b/src/ui/map/UniverseMapView.ts
index eaf511d..5859973 100644
--- a/src/ui/map/UniverseMapView.ts
+++ b/src/ui/map/UniverseMapView.ts
@@ -1,6 +1,6 @@
 /// <reference path="../BaseView.ts"/>
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Interactive map of the universe
      */
diff --git a/src/ui/menu/LoadDialog.spec.ts b/src/ui/menu/LoadDialog.spec.ts
index a255752..fe48038 100644
--- a/src/ui/menu/LoadDialog.spec.ts
+++ b/src/ui/menu/LoadDialog.spec.ts
@@ -1,7 +1,7 @@
 /// <reference path="../TestGame.ts" />
 /// <reference path="MainMenu.ts" />
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("LoadDialog", () => {
         let testgame = setupSingleView(testgame => [new MainMenu(), []]);
 
diff --git a/src/ui/menu/LoadDialog.ts b/src/ui/menu/LoadDialog.ts
index 5663855..20d1cfe 100644
--- a/src/ui/menu/LoadDialog.ts
+++ b/src/ui/menu/LoadDialog.ts
@@ -1,6 +1,6 @@
 /// <reference path="../common/UIComponent.ts"/>
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Dialog to load a saved game, or join an online one
      */
diff --git a/src/ui/menu/MainMenu.spec.ts b/src/ui/menu/MainMenu.spec.ts
index f99736d..75a258e 100644
--- a/src/ui/menu/MainMenu.spec.ts
+++ b/src/ui/menu/MainMenu.spec.ts
@@ -1,7 +1,7 @@
 /// <reference path="../TestGame.ts" />
 /// <reference path="MainMenu.ts" />
 
-module TS.SpaceTac.UI.Specs {
+module TK.SpaceTac.UI.Specs {
     describe("MainMenu", () => {
         let testgame = setupSingleView(testgame => [new MainMenu(), []]);
 
diff --git a/src/ui/menu/MainMenu.ts b/src/ui/menu/MainMenu.ts
index 6660696..e223419 100644
--- a/src/ui/menu/MainMenu.ts
+++ b/src/ui/menu/MainMenu.ts
@@ -1,6 +1,6 @@
 /// <reference path="../BaseView.ts"/>
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Main menu (first interactive screen)
      */
diff --git a/src/ui/options/GameOptions.ts b/src/ui/options/GameOptions.ts
index eaea14c..12052d0 100644
--- a/src/ui/options/GameOptions.ts
+++ b/src/ui/options/GameOptions.ts
@@ -1,4 +1,4 @@
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     class GameOption<T> {
         code: string
         current: T
diff --git a/src/ui/options/OptionsDialog.ts b/src/ui/options/OptionsDialog.ts
index 4141d13..8ec303c 100644
--- a/src/ui/options/OptionsDialog.ts
+++ b/src/ui/options/OptionsDialog.ts
@@ -1,6 +1,6 @@
 /// <reference path="../common/UIDialog.ts" />
 
-module TS.SpaceTac.UI {
+module TK.SpaceTac.UI {
     /**
      * Dialog to display game options
      */