diff --git a/attack.php b/attack.php
index d80cfebad..7df75ea21 100644
--- a/attack.php
+++ b/attack.php
@@ -79,7 +79,7 @@
 {
     echo $langvars['l_att_noturn'] . '<br><br>';
 }
-elseif (Bad\Team::sameTeam($playerinfo['team'], $targetinfo['team']))
+elseif (Tki\Team::sameTeam($playerinfo['team'], $targetinfo['team']))
 {
     echo "<div style='color:#ff0;'>" . $langvars['l_team_noattack_members'] . "</div>\n";
 }
diff --git a/classes/Ibank.php b/classes/Ibank.php
index 7f5bbbc9c..749710ab0 100644
--- a/classes/Ibank.php
+++ b/classes/Ibank.php
@@ -21,7 +21,7 @@
 // behaviors. But in the interest of saying goodbye to the includes directory, and raw functions, this
 // will at least allow us to auto-load and use classes instead. Plenty to do in the future, though!
 
-namespace Bad;
+namespace Tki;
 
 class Ibank
 {
diff --git a/classes/Log.php b/classes/Log.php
index ed63c0946..d9b560dbe 100644
--- a/classes/Log.php
+++ b/classes/Log.php
@@ -21,7 +21,7 @@
 // behaviors. But in the interest of saying goodbye to the includes directory, and raw functions, this
 // will at least allow us to auto-load and use classes instead. Plenty to do in the future, though!
 
-namespace Bad;
+namespace Tki;
 
 class Log
 {
diff --git a/classes/Planet.php b/classes/Planet.php
index 07f7c84eb..935acbf05 100644
--- a/classes/Planet.php
+++ b/classes/Planet.php
@@ -21,7 +21,7 @@
 // behaviors. But in the interest of saying goodbye to the includes directory, and raw functions, this
 // will at least allow us to auto-load and use classes instead. Plenty to do in the future, though!
 
-namespace Bad;
+namespace Tki;
 
 class Planet
 {
diff --git a/classes/PlanetReport.php b/classes/PlanetReport.php
index cbf025afa..f26f777fb 100644
--- a/classes/PlanetReport.php
+++ b/classes/PlanetReport.php
@@ -21,7 +21,7 @@
 // behaviors. But in the interest of saying goodbye to the includes directory, and raw functions, this
 // will at least allow us to auto-load and use classes instead. Plenty to do in the future, though!
 
-namespace Bad;
+namespace Tki;
 
 class PlanetReport
 {
diff --git a/classes/PlanetReportCE.php b/classes/PlanetReportCE.php
index b8dab8391..f94e940e2 100644
--- a/classes/PlanetReportCE.php
+++ b/classes/PlanetReportCE.php
@@ -21,7 +21,7 @@
 // behaviors. But in the interest of saying goodbye to the includes directory, and raw functions, this
 // will at least allow us to auto-load and use classes instead. Plenty to do in the future, though!
 
-namespace Bad;
+namespace Tki;
 
 class PlanetReportCE
 {
diff --git a/classes/Team.php b/classes/Team.php
index 9bbb5ff58..4abe8ec1c 100644
--- a/classes/Team.php
+++ b/classes/Team.php
@@ -17,7 +17,7 @@
 //
 // File: classes/Team.php
 
-namespace Bad;
+namespace Tki;
 
 class Team
 {
diff --git a/classes/Traderoute.php b/classes/Traderoute.php
index abb640229..c95fba4fe 100644
--- a/classes/Traderoute.php
+++ b/classes/Traderoute.php
@@ -20,7 +20,7 @@
 // FUTURE: These are horribly bad. But in the interest of saying goodbye to the includes directory, and raw functions, this
 // will at least allow us to auto-load and use classes instead. Plenty to do in the future, though!
 
-namespace Bad;
+namespace Tki;
 
 class Traderoute
 {
diff --git a/classes/Xenobe.php b/classes/Xenobe.php
index 7d97a2676..e367d0349 100644
--- a/classes/Xenobe.php
+++ b/classes/Xenobe.php
@@ -20,7 +20,7 @@
 // FUTURE: These are horribly bad. But in the interest of saying goodbye to the includes directory, and raw functions, this
 // will at least allow us to auto-load and use classes instead. Plenty to do in the future, though!
 
-namespace Bad;
+namespace Tki;
 
 class Xenobe
 {
diff --git a/composer.json b/composer.json
index 73c0d72e8..466fed944 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         "adodb/adodb-php": "v5.20.4"
     },
     "autoload": {
-        "psr-4": { "Tki\\": ["classes/", "config/"], "Bad\\": "classes/"}
+        "psr-4": { "Tki\\": ["classes/", "config/"], "Tki\\": "classes/"}
     },
     "scripts": {
         "post-update-cmd": [
diff --git a/ibank.php b/ibank.php
index 534c8c192..baf140929 100644
--- a/ibank.php
+++ b/ibank.php
@@ -52,7 +52,7 @@
 
 if (!$tkireg->allow_ibank)
 {
-    Bad\Ibank::ibankError($pdo_db, $langvars, $langvars['l_ibank_malfunction'], "main.php", $lang, $tkireg, $template);
+    Tki\Ibank::ibankError($pdo_db, $langvars, $langvars['l_ibank_malfunction'], "main.php", $lang, $tkireg, $template);
 }
 
 // Detect if this variable exists, and filter it. Returns false if anything wasn't right.
@@ -73,59 +73,59 @@
 
 if ($command == 'login') // Main menu
 {
-    Bad\Ibank::ibankLogin($langvars, $playerinfo, $account);
+    Tki\Ibank::ibankLogin($langvars, $playerinfo, $account);
 }
 elseif ($command == 'withdraw') // Withdraw menu
 {
-    Bad\Ibank::ibankWithdraw($langvars, $account);
+    Tki\Ibank::ibankWithdraw($langvars, $account);
 }
 elseif ($command == 'withdraw2') // Withdraw operation
 {
-    Bad\Ibank::ibankWithdraw2($pdo_db, $lang, $langvars, $playerinfo, $amount, $account, $tkireg, $template);
+    Tki\Ibank::ibankWithdraw2($pdo_db, $lang, $langvars, $playerinfo, $amount, $account, $tkireg, $template);
 }
 elseif ($command == 'deposit') // Deposit menu
 {
-    Bad\Ibank::ibankDeposit($pdo_db, $lang, $account, $playerinfo);
+    Tki\Ibank::ibankDeposit($pdo_db, $lang, $account, $playerinfo);
 }
 elseif ($command == 'deposit2') // Deposit operation
 {
-    Bad\Ibank::ibankDeposit2($pdo_db, $lang, $langvars, $playerinfo, $amount, $account, $tkireg, $template);
+    Tki\Ibank::ibankDeposit2($pdo_db, $lang, $langvars, $playerinfo, $amount, $account, $tkireg, $template);
 }
 elseif ($command == 'transfer') // Main transfer menu
 {
-    Bad\Ibank::ibankTransfer($pdo_db, $langvars, $playerinfo, $tkireg);
+    Tki\Ibank::ibankTransfer($pdo_db, $langvars, $playerinfo, $tkireg);
 }
 elseif ($command == 'transfer2') // Specific transfer menu (ship or planet)
 {
-    Bad\Ibank::ibankTransfer2($db, $pdo_db, $lang, $langvars, $tkireg, $playerinfo, $account, $ship_id, $splanet_id, $dplanet_id, $template);
+    Tki\Ibank::ibankTransfer2($db, $pdo_db, $lang, $langvars, $tkireg, $playerinfo, $account, $ship_id, $splanet_id, $dplanet_id, $template);
 }
 elseif ($command == 'transfer3') // Transfer operation
 {
-    Bad\Ibank::ibankTransfer3($db, $pdo_db, $lang, $langvars, $playerinfo, $account, $ship_id, $splanet_id, $dplanet_id, $amount, $tkireg, $template);
+    Tki\Ibank::ibankTransfer3($db, $pdo_db, $lang, $langvars, $playerinfo, $account, $ship_id, $splanet_id, $dplanet_id, $amount, $tkireg, $template);
 }
 elseif ($command == 'loans') // Loans menu
 {
-    Bad\Ibank::ibankLoans($pdo_db, $langvars, $tkireg, $playerinfo, $account);
+    Tki\Ibank::ibankLoans($pdo_db, $langvars, $tkireg, $playerinfo, $account);
 }
 elseif ($command == 'borrow') // Borrow operation
 {
-    Bad\Ibank::ibankBorrow($pdo_db, $lang, $langvars, $tkireg, $playerinfo, $active_template, $account, $amount, $template);
+    Tki\Ibank::ibankBorrow($pdo_db, $lang, $langvars, $tkireg, $playerinfo, $active_template, $account, $amount, $template);
 }
 elseif ($command == 'repay') // Repay operation
 {
-    Bad\Ibank::ibankRepay($pdo_db, $lang, $langvars, $playerinfo, $account, $amount, $active_template, $tkireg, $template);
+    Tki\Ibank::ibankRepay($pdo_db, $lang, $langvars, $playerinfo, $account, $amount, $active_template, $tkireg, $template);
 }
 elseif ($command == 'consolidate') // Consolidate menu
 {
-    Bad\Ibank::ibankConsolidate($langvars, $tkireg, $dplanet_id);
+    Tki\Ibank::ibankConsolidate($langvars, $tkireg, $dplanet_id);
 }
 elseif ($command == 'consolidate2') // Consolidate compute
 {
-    Bad\Ibank::ibankConsolidate2($db, $pdo_db, $lang, $langvars, $playerinfo, $tkireg, $dplanet_id, $minimum, $maximum, $template);
+    Tki\Ibank::ibankConsolidate2($db, $pdo_db, $lang, $langvars, $playerinfo, $tkireg, $dplanet_id, $minimum, $maximum, $template);
 }
 elseif ($command == 'consolidate3') // Consolidate operation
 {
-    Bad\Ibank::ibankConsolidate3($db, $pdo_db, $langvars, $playerinfo, $tkireg, $dplanet_id, $minimum, $maximum, $template);
+    Tki\Ibank::ibankConsolidate3($db, $pdo_db, $langvars, $playerinfo, $tkireg, $dplanet_id, $minimum, $maximum, $template);
 }
 else
 {
diff --git a/planet.php b/planet.php
index 0a15a7e6a..a746d6ad5 100644
--- a/planet.php
+++ b/planet.php
@@ -302,7 +302,7 @@
 
             $retOwnerInfo = null;
 
-            $owner_found = Bad\Planet::getOwner($pdo_db, $db, $planetinfo['planet_id'], $retOwnerInfo);
+            $owner_found = Tki\Planet::getOwner($pdo_db, $db, $planetinfo['planet_id'], $retOwnerInfo);
             if ($owner_found === true && !is_null($retOwnerInfo))
             {
                 if ($retOwnerInfo['team'] == $playerinfo['team'] && ($playerinfo['team'] != 0 || $retOwnerInfo['team'] != 0))
@@ -553,7 +553,7 @@
             }
 
             $retOwnerInfo = null;
-            $owner_found = Bad\Planet::getOwner($pdo_db, $db, $planetinfo['planet_id'], $retOwnerInfo);
+            $owner_found = Tki\Planet::getOwner($pdo_db, $db, $planetinfo['planet_id'], $retOwnerInfo);
             if ($owner_found === true && !is_null($retOwnerInfo))
             {
                 if ($retOwnerInfo['team'] == $playerinfo['team'] && ($playerinfo['team'] != 0 || $retOwnerInfo['team'] != 0))
@@ -589,7 +589,7 @@
             unset($_SESSION['planet_selected']);
 
             $retOwnerInfo = null;
-            $owner_found = Bad\Planet::getOwner($pdo_db, $db, $planetinfo['planet_id'], $retOwnerInfo);
+            $owner_found = Tki\Planet::getOwner($pdo_db, $db, $planetinfo['planet_id'], $retOwnerInfo);
             if ($owner_found === true && !is_null($retOwnerInfo))
             {
                 if ($retOwnerInfo['team'] == $playerinfo['team'] && ($playerinfo['team'] != 0 || $retOwnerInfo['team'] != 0))
diff --git a/planet_report.php b/planet_report.php
index 033749b09..1365c0704 100644
--- a/planet_report.php
+++ b/planet_report.php
@@ -42,25 +42,25 @@
 {
     $title = $title . ": Status";
     echo "<h1>" . $title . "</h1>\n";
-    Bad\PlanetReport::standardReport($pdo_db, $db, $langvars, $playerinfo, $sort, $tkireg);
+    Tki\PlanetReport::standardReport($pdo_db, $db, $langvars, $playerinfo, $sort, $tkireg);
 }
 elseif ($preptype == 2)                  // Display the production values of your planets and allow changing
 {
     $title = $title . ": Production";
     echo "<h1>" . $title . "</h1>\n";
-    Bad\PlanetReport::planetProductionChange($pdo_db, $db, $langvars, $playerinfo, $sort, $tkireg);
+    Tki\PlanetReport::planetProductionChange($pdo_db, $db, $langvars, $playerinfo, $sort, $tkireg);
 }
 elseif ($preptype == 0)                  // For typing in manually to get a report menu
 {
     $title = $title . ": Menu";
     echo "<h1>" . $title . "</h1>\n";
-    Bad\PlanetReport::planetReportMenu($playerinfo, $langvars);
+    Tki\PlanetReport::planetReportMenu($playerinfo, $langvars);
 }
 else                                  // Display the menu if no valid options are passed in
 {
     $title = $title . ": Status";
     echo "<h1>" . $title . "</h1>\n";
-    Bad\PlanetReport::planetReportMenu($playerinfo, $langvars);
+    Tki\PlanetReport::planetReportMenu($playerinfo, $langvars);
 }
 
 echo "<br><br>";
diff --git a/planet_report_ce.php b/planet_report_ce.php
index dc97efece..a3509488e 100644
--- a/planet_report_ce.php
+++ b/planet_report_ce.php
@@ -42,15 +42,15 @@
 
 if ($tpcreds !== null && $tpcreds !== false)
 {
-    Bad\PlanetReportCE::collectCredits($pdo_db, $db, $langvars, $tpcreds, $tkireg);
+    Tki\PlanetReportCE::collectCredits($pdo_db, $db, $langvars, $tpcreds, $tkireg);
 }
 elseif ($buildp !== null && $builds !== null)
 {
-    Bad\PlanetReportCE::buildBase($pdo_db, $db, $langvars, $buildp, $builds, $tkireg);
+    Tki\PlanetReportCE::buildBase($pdo_db, $db, $langvars, $buildp, $builds, $tkireg);
 }
 else
 {
-    Bad\PlanetReportCE::changePlanetProduction($pdo_db, $db, $langvars, $_POST, $tkireg);
+    Tki\PlanetReportCE::changePlanetProduction($pdo_db, $db, $langvars, $_POST, $tkireg);
 }
 
 echo '<br><br>';
diff --git a/port.php b/port.php
index 04e29a5c2..81dd7a14e 100644
--- a/port.php
+++ b/port.php
@@ -291,7 +291,7 @@
     // Kami Multi-browser window upgrade fix
     $_SESSION['port_shopping'] = true;
 
-    if (Bad\Ibank::isLoanPending($pdo_db, $playerinfo['ship_id'], $tkireg))
+    if (Tki\Ibank::isLoanPending($pdo_db, $playerinfo['ship_id'], $tkireg))
     {
         echo $langvars['l_port_loannotrade'] . "<p>";
         echo "<a href=ibank.php>" . $langvars['l_ibank_term'] . "</a><p>";
diff --git a/port2.php b/port2.php
index 7b8106892..8f9b779f8 100644
--- a/port2.php
+++ b/port2.php
@@ -152,7 +152,7 @@ function php_change_delta($desired_value, $current_value, $upgrade_cost)
         }
         unset ($_SESSION['port_shopping']);
 
-        if (Bad\Ibank::isLoanPending($pdo_db, $playerinfo['ship_id'], $tkireg))
+        if (Tki\Ibank::isLoanPending($pdo_db, $playerinfo['ship_id'], $tkireg))
         {
             echo $langvars['l_port_loannotrade'] . "<p>";
             echo "<a href=ibank.php>" . $langvars['l_ibank_term'] . "</a><p>";
diff --git a/scheduler/sched_xenobe.php b/scheduler/sched_xenobe.php
index 223c022c8..81bb37168 100644
--- a/scheduler/sched_xenobe.php
+++ b/scheduler/sched_xenobe.php
@@ -46,7 +46,7 @@
     $xenobeisdead = 0;
     $playerinfo = $res->fields;
     // Regenerate / Buy stats
-    Bad\Xenobe::xenobeRegen($pdo_db, $db, $playerinfo, $xen_unemployment, $tkireg);
+    Tki\Xenobe::xenobeRegen($pdo_db, $db, $playerinfo, $xen_unemployment, $tkireg);
 
     // Run through orders
     $furcount++;
@@ -74,7 +74,7 @@
                     {
                         $furcount0a++;
                         Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_XENOBE_ATTACK, "$rowo0[character_name]");
-                        Bad\Xenobe::xenobeToShip($pdo_db, $db, $rowo0['ship_id'], $tkireg, $playerinfo, $langvars);
+                        Tki\Xenobe::xenobeToShip($pdo_db, $db, $rowo0['ship_id'], $tkireg, $playerinfo, $langvars);
                         if ($xenobeisdead > 0)
                         {
                             $res->MoveNext();
@@ -86,7 +86,7 @@
                 {
                     $furcount0a++;
                     Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_XENOBE_ATTACK, "$rowo0[character_name]");
-                    Bad\Xenobe::xenobeToShip($pdo_db, $db, $rowo0['ship_id'], $tkireg, $playerinfo, $langvars);
+                    Tki\Xenobe::xenobeToShip($pdo_db, $db, $rowo0['ship_id'], $tkireg, $playerinfo, $langvars);
                     if ($xenobeisdead > 0)
                     {
                         $res->MoveNext();
@@ -100,7 +100,7 @@
             $furcount1++;
             // Roam to a new sector before doing anything else
             $targetlink = $playerinfo['sector'];
-            Bad\Xenobe::xenobeMove($pdo_db, $db, $playerinfo, $targetlink, $langvars, $tkireg);
+            Tki\Xenobe::xenobeMove($pdo_db, $db, $playerinfo, $targetlink, $langvars, $tkireg);
             if ($xenobeisdead > 0)
             {
                 $res->MoveNext();
@@ -123,7 +123,7 @@
                     {
                         $furcount1a++;
                         Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_XENOBE_ATTACK, "$rowo1[character_name]");
-                        Bad\Xenobe::xenobeToShip($pdo_db, $db, $rowo1['ship_id'], $tkireg, $playerinfo, $langvars);
+                        Tki\Xenobe::xenobeToShip($pdo_db, $db, $rowo1['ship_id'], $tkireg, $playerinfo, $langvars);
                         if ($xenobeisdead > 0)
                         {
                             $res->MoveNext();
@@ -137,11 +137,11 @@
                     Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_XENOBE_ATTACK, "$rowo1[character_name]");
                     if (!$rowo1['planet_id'] == 0)
                     {              // Is on planet
-                        Bad\Xenobe::xenobeToPlanet($pdo_db, $db, $rowo1['planet_id'], $tkireg, $playerinfo, $langvars);
+                        Tki\Xenobe::xenobeToPlanet($pdo_db, $db, $rowo1['planet_id'], $tkireg, $playerinfo, $langvars);
                     }
                     else
                     {
-                        Bad\Xenobe::xenobeToShip($pdo_db, $db, $rowo1['ship_id'], $tkireg, $playerinfo, $langvars);
+                        Tki\Xenobe::xenobeToShip($pdo_db, $db, $rowo1['ship_id'], $tkireg, $playerinfo, $langvars);
                     }
 
                     if ($xenobeisdead > 0)
@@ -158,7 +158,7 @@
             $furcount2++;
             // ROAM TO A NEW SECTOR BEFORE DOING ANYTHING ELSE
             $targetlink = $playerinfo['sector'];
-            Bad\Xenobe::xenobeMove($pdo_db, $db, $playerinfo, $targetlink, $langvars, $tkireg);
+            Tki\Xenobe::xenobeMove($pdo_db, $db, $playerinfo, $targetlink, $langvars, $tkireg);
             if ($xenobeisdead > 0)
             {
                 $res->MoveNext();
@@ -166,7 +166,7 @@
             }
 
             // NOW TRADE BEFORE WE DO ANY AGGRESSION CHECKS
-            Bad\Xenobe::xenobeTrade($pdo_db, $db, $playerinfo, $tkireg);
+            Tki\Xenobe::xenobeTrade($pdo_db, $db, $playerinfo, $tkireg);
             // FIND A TARGET
             // IN MY SECTOR, NOT MYSELF
             $reso2 = $db->Execute("SELECT * FROM {$db->prefix}ships WHERE sector = ? and email! = ? and ship_id > 1", array($targetlink, $playerinfo['email']));
@@ -185,7 +185,7 @@
                     {
                         $furcount2a++;
                         Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_XENOBE_ATTACK, "$rowo2[character_name]");
-                        Bad\Xenobe::xenobeToShip($pdo_db, $db, $rowo2['ship_id'], $tkireg, $playerinfo, $langvars);
+                        Tki\Xenobe::xenobeToShip($pdo_db, $db, $rowo2['ship_id'], $tkireg, $playerinfo, $langvars);
                         if ($xenobeisdead > 0)
                         {
                             $res->MoveNext();
@@ -199,11 +199,11 @@
                     Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_XENOBE_ATTACK, "$rowo2[character_name]");
                     if (!$rowo2['planet_id'] == 0)
                     {              // IS ON PLANET
-                        Bad\Xenobe::xenobeToPlanet($pdo_db, $db, $rowo2['planet_id'], $tkireg, $playerinfo, $langvars);
+                        Tki\Xenobe::xenobeToPlanet($pdo_db, $db, $rowo2['planet_id'], $tkireg, $playerinfo, $langvars);
                     }
                     else
                     {
-                        Bad\Xenobe::xenobeToShip($pdo_db, $db, $rowo2['ship_id'], $tkireg, $playerinfo, $langvars);
+                        Tki\Xenobe::xenobeToShip($pdo_db, $db, $rowo2['ship_id'], $tkireg, $playerinfo, $langvars);
                     }
 
                     if ($xenobeisdead > 0)
@@ -225,7 +225,7 @@
             if ($hunt == 0)
             {
                 $furcount3h++;
-                Bad\Xenobe::xenobeHunter($pdo_db, $db, $playerinfo, $xenobeisdead, $langvars, $tkireg);
+                Tki\Xenobe::xenobeHunter($pdo_db, $db, $playerinfo, $xenobeisdead, $langvars, $tkireg);
                 if ($xenobeisdead > 0)
                 {
                     $res->MoveNext();
@@ -235,7 +235,7 @@
             else
             {
                 // ROAM TO A NEW SECTOR BEFORE DOING ANYTHING ELSE
-                Bad\Xenobe::xenobeMove($pdo_db, $db, $playerinfo, $targetlink, $langvars, $tkireg);
+                Tki\Xenobe::xenobeMove($pdo_db, $db, $playerinfo, $targetlink, $langvars, $tkireg);
                 if ($xenobeisdead > 0)
                 {
                     $res->MoveNext();
@@ -260,7 +260,7 @@
                         {
                             $furcount3a++;
                             Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_XENOBE_ATTACK, "$rowo3[character_name]");
-                            Bad\Xenobe::xenobeToShip($pdo_db, $db, $rowo3['ship_id'], $tkireg, $playerinfo, $langvars);
+                            Tki\Xenobe::xenobeToShip($pdo_db, $db, $rowo3['ship_id'], $tkireg, $playerinfo, $langvars);
                             if ($xenobeisdead > 0)
                             {
                                 $res->MoveNext();
@@ -274,11 +274,11 @@
                         Tki\PlayerLog::writeLog($pdo_db, $db, $playerinfo['ship_id'], LOG_XENOBE_ATTACK, "$rowo3[character_name]");
                         if (!$rowo3['planet_id'] == 0)
                         {              // IS ON PLANET
-                            Bad\Xenobe::xenobeToPlanet($pdo_db, $db, $rowo3['planet_id'], $tkireg, $playerinfo, $langvars);
+                            Tki\Xenobe::xenobeToPlanet($pdo_db, $db, $rowo3['planet_id'], $tkireg, $playerinfo, $langvars);
                         }
                         else
                         {
-                            Bad\Xenobe::xenobeToShip($pdo_db, $db, $rowo3['ship_id'], $tkireg, $playerinfo, $langvars);
+                            Tki\Xenobe::xenobeToShip($pdo_db, $db, $rowo3['ship_id'], $tkireg, $playerinfo, $langvars);
                         }
 
                         if ($xenobeisdead > 0)
diff --git a/ship.php b/ship.php
index e3701462b..3667ae45b 100644
--- a/ship.php
+++ b/ship.php
@@ -51,7 +51,7 @@
     echo $langvars['l_ship_perform'] . "<br><br>";
     echo "<a href=scan.php?ship_id=$ship_id>" . $langvars['l_planet_scn_link'] . "</a><br>";
 
-    if (!Bad\Team::sameTeam($playerinfo['team'], $othership['team']))
+    if (!Tki\Team::sameTeam($playerinfo['team'], $othership['team']))
     {
         echo "<a href=attack.php?ship_id=$ship_id>" . $langvars['l_planet_att_link'] . "</a><br>";
     }
diff --git a/teams.php b/teams.php
index 12ed5d53c..e35912030 100644
--- a/teams.php
+++ b/teams.php
@@ -132,12 +132,12 @@
 switch ($teamwhat)
 {
         case 1: // INFO on single team
-            Bad\Team::showInfo($pdo_db, $db, $langvars, $whichteam, 0, $playerinfo, $invite_info, $team, $tkireg);
+            Tki\Team::showInfo($pdo_db, $db, $langvars, $whichteam, 0, $playerinfo, $invite_info, $team, $tkireg);
             echo "<br><br><a href=\"teams.php\">" . $langvars['l_clickme'] . "</a> " . $langvars['l_team_menu'] . ".<br><br>";
             break;
 
         case 2: // LEAVE
-            if (!Bad\Team::isTeamMember($team, $playerinfo))
+            if (!Tki\Team::isTeamMember($team, $playerinfo))
             {
                 echo "<strong><font color=red>An error occured</font></strong><br>You are not a member of this Team.";
                 echo "<br><br><a href=\"teams.php\">" . $langvars['l_clickme'] . "</a> " . $langvars['l_team_menu'] . ".<br><br>";
@@ -152,7 +152,7 @@
             {
                 if ($team['number_of_members'] == 1)
                 {
-                    if (!Bad\Team::isTeamOwner($team, $playerinfo))
+                    if (!Tki\Team::isTeamOwner($team, $playerinfo))
                     {
                         $langvars['l_team_error'] = str_replace("[error]", "<strong><font color=red>An error occured</font></strong><br>", $langvars['l_team_error']);
                         echo $langvars['l_team_error'];
@@ -198,7 +198,7 @@
                 }
                 else
                 {
-                    if (Bad\Team::isTeamOwner($team, $playerinfo))
+                    if (Tki\Team::isTeamOwner($team, $playerinfo))
                     {
                         echo $langvars['l_team_youarecoord'] . " <strong>$team[team_name]</strong>. " . $langvars['l_team_relinq'] . "<br><br>";
                         echo "<form accept-charset='utf-8' action='teams.php' method=post>";
@@ -210,7 +210,7 @@
                         while (!$res->EOF)
                         {
                             $row = $res->fields;
-                            if (!Bad\Team::isTeamOwner($team, $row))
+                            if (!Tki\Team::isTeamOwner($team, $row))
                             {
                                 echo "<option value='{$row['ship_id']}'>{$row['character_name']}";
                             }
@@ -337,7 +337,7 @@
             // If not display "An error occured, You are not the leader of this Team." message.
             // Then show link back and break;
 
-            if (Bad\Team::isTeamOwner($team, $playerinfo) === false)
+            if (Tki\Team::isTeamOwner($team, $playerinfo) === false)
             {
                 $langvars['l_team_error'] = str_replace("[error]", "<strong><font color=red>An error occured</font></strong><br>", $langvars['l_team_error']);
                 echo $langvars['l_team_error'];
@@ -401,7 +401,7 @@
                 $teamname = trim(htmlentities($teamname, ENT_HTML5, 'UTF-8'));
                 $teamdesc = trim(htmlentities($teamdesc, ENT_HTML5, 'UTF-8'));
 
-                if (!Bad\Team::validateTeam($pdo_db, $db, $teamname, $teamdesc, $playerinfo['ship_id']))
+                if (!Tki\Team::validateTeam($pdo_db, $db, $teamname, $teamdesc, $playerinfo['ship_id']))
                 {
                     echo "<span style='color:#f00;'>Team Creation Failed</span><br>Sorry you have either entered an invalid Team name or Team Description.<br>\n";
                     echo "<br><br><a href=\"teams.php\">" . $langvars['l_clickme'] . "</a> " . $langvars['l_team_menu'] . ".<br><br>";
@@ -421,7 +421,7 @@
             break;
 
         case 7: // INVITE player
-            if (Bad\Team::isTeamMember($team, $playerinfo) === false)
+            if (Tki\Team::isTeamMember($team, $playerinfo) === false)
             {
                 echo "<br>You are not in this team!<br>";
                 echo "<br><br><a href=\"teams.php\">" . $langvars['l_clickme'] . "</a> " . $langvars['l_team_menu'] . ".<br><br>";
@@ -439,7 +439,7 @@
                 while (!$res->EOF)
                 {
                     $row = $res->fields;
-                    if (Bad\Team::isTeamOwner($team, $row) === false)
+                    if (Tki\Team::isTeamOwner($team, $row) === false)
                     {
                         echo "<option value='{$row['ship_id']}'>{$row['character_name']}";
                     }
@@ -498,7 +498,7 @@
             // If not display "An error occured, You are not the leader of this Team." message.
             // Then show link back and break;
 
-            if (Bad\Team::isTeamOwner($team, $playerinfo) === false)
+            if (Tki\Team::isTeamOwner($team, $playerinfo) === false)
             {
                 $langvars['l_team_error'] = str_replace("[error]", "<strong><font color=red>An error occured</font></strong><br>", $langvars['l_team_error']);
                 echo $langvars['l_team_error'];
@@ -525,7 +525,7 @@
                 $teamname = trim(htmlentities($teamname, ENT_HTML5, 'UTF-8'));
                 $teamdesc = trim(htmlentities($teamdesc, ENT_HTML5, 'UTF-8'));
 
-                if (Bad\Team::validateTeam($pdo_db, $db, $teamname, $teamdesc, $playerinfo['ship_id']) === false)
+                if (Tki\Team::validateTeam($pdo_db, $db, $teamname, $teamdesc, $playerinfo['ship_id']) === false)
                 {
                     echo "<span style='color:#f00;'>Team Edit Failed</span><br>Sorry you have either entered an invalid Team name or Team Description.<br>\n";
                     echo "<br><br><a href=\"teams.php\">" . $langvars['l_clickme'] . "</a> " . $langvars['l_team_menu'] . ".<br><br>";
@@ -554,7 +554,7 @@
             if ($playerinfo['team'] == 0)
             {
                 echo $langvars['l_team_notmember'];
-                Bad\Team::displayInviteInfo($langvars, $playerinfo, $invite_info);
+                Tki\Team::displayInviteInfo($langvars, $playerinfo, $invite_info);
             }
             else
             {
@@ -577,8 +577,8 @@
                     Tki\Db::logDbErrors($pdo_db, $db, $result, __LINE__, __FILE__);
                     $whichinvitingteam = $result->fields;
                 }
-                $isowner = Bad\Team::isTeamOwner($whichteam, $playerinfo);
-                Bad\Team::showInfo($pdo_db, $db, $langvars, $playerinfo['team'], $isowner, $playerinfo, $invite_info, $team, $tkireg);
+                $isowner = Tki\Team::isTeamOwner($whichteam, $playerinfo);
+                Tki\Team::showInfo($pdo_db, $db, $langvars, $playerinfo['team'], $isowner, $playerinfo, $invite_info, $team, $tkireg);
             }
 
             $res = $db->Execute("SELECT COUNT(*) as total FROM {$db->prefix}teams WHERE admin='N'");
@@ -587,7 +587,7 @@
 
             if ($num_res['total'] > 0)
             {
-                Bad\Team::displayAllTeams($pdo_db, $db, $langvars, $tkireg, $order, $type);
+                Tki\Team::displayAllTeams($pdo_db, $db, $langvars, $tkireg, $order, $type);
             }
             else
             {
diff --git a/traderoute.php b/traderoute.php
index 96a2b23ed..971cb2586 100644
--- a/traderoute.php
+++ b/traderoute.php
@@ -40,7 +40,7 @@
 if ($traderoutes !== null)
 {
     Tki\AdminLog::writeLog($pdo_db, $db, 902, "{$playerinfo['ship_id']}|Tried to insert a hardcoded TradeRoute.");
-    Bad\Traderoute::traderouteDie($pdo_db, $lang, $tkireg, "<div style='color:#fff; font-size: 12px;'>[<span style='color:#ff0;'>The Governor</span>] <span style='color:#f00;'>Detected Traderoute Hack!</span></div>\n", $template);
+    Tki\Traderoute::traderouteDie($pdo_db, $lang, $tkireg, "<div style='color:#fff; font-size: 12px;'>[<span style='color:#ff0;'>The Governor</span>] <span style='color:#f00;'>Detected Traderoute Hack!</span></div>\n", $template);
 }
 
 $traderoutes = array();
@@ -114,32 +114,32 @@
 if ($command == 'new')
 {
     // Displays new trade route form
-    Bad\Traderoute::traderouteNew($pdo_db, $db, $lang, $tkireg, null, $template, $num_traderoutes, $playerinfo);
+    Tki\Traderoute::traderouteNew($pdo_db, $db, $lang, $tkireg, null, $template, $num_traderoutes, $playerinfo);
 }
 elseif ($command == 'create')
 {
     // Enters new route in db
-    Bad\Traderoute::traderouteCreate($db, $pdo_db, $lang, $tkireg, $template, $playerinfo, $num_traderoutes, $ptype1, $ptype2, $port_id1, $port_id2, $planet_id1, $planet_id2, $team_planet_id1, $team_planet_id2, $move_type, $circuit_type, $editing);
+    Tki\Traderoute::traderouteCreate($db, $pdo_db, $lang, $tkireg, $template, $playerinfo, $num_traderoutes, $ptype1, $ptype2, $port_id1, $port_id2, $planet_id1, $planet_id2, $team_planet_id1, $team_planet_id2, $move_type, $circuit_type, $editing);
 }
 elseif ($command == 'edit')
 {
     // Displays new trade route form, edit
-    Bad\Traderoute::traderouteNew($pdo_db, $db, $lang, $tkireg, $traderoute_id, $template, $num_traderoutes, $playerinfo);
+    Tki\Traderoute::traderouteNew($pdo_db, $db, $lang, $tkireg, $traderoute_id, $template, $num_traderoutes, $playerinfo);
 }
 elseif ($command == 'delete')
 {
     // Displays delete info
-    Bad\Traderoute::traderouteDelete($pdo_db, $db, $lang, $langvars, $tkireg, $template, $playerinfo, $confirm, $traderoute_id, $traderoutes);
+    Tki\Traderoute::traderouteDelete($pdo_db, $db, $lang, $langvars, $tkireg, $template, $playerinfo, $confirm, $traderoute_id, $traderoutes);
 }
 elseif ($command == 'settings')
 {
     // Global traderoute settings form
-    Bad\Traderoute::traderouteSettings($pdo_db, $lang, $tkireg, $template, $playerinfo);
+    Tki\Traderoute::traderouteSettings($pdo_db, $lang, $tkireg, $template, $playerinfo);
 }
 elseif ($command == 'setsettings')
 {
     // Enters settings in db
-    Bad\Traderoute::traderouteSetsettings($db, $pdo_db, $lang, $tkireg, $template, $playerinfo, $colonists, $fighters, $torps, $energy);
+    Tki\Traderoute::traderouteSetsettings($db, $pdo_db, $lang, $tkireg, $template, $playerinfo, $colonists, $fighters, $torps, $energy);
 }
 elseif ($engage !== null)
 {
@@ -150,7 +150,7 @@
         $result = $db->Execute("SELECT * FROM {$db->prefix}ships WHERE email=?", array($_SESSION['username']));
         Tki\Db::logDbErrors($pdo_db, $db, $result, __LINE__, __FILE__);
         $playerinfo = $result->fields;
-        Bad\Traderoute::traderouteEngage($db, $pdo_db, $lang, $i, $langvars, $tkireg, $playerinfo, $engage, $dist, $traderoutes, $portfull);
+        Tki\Traderoute::traderouteEngage($db, $pdo_db, $lang, $i, $langvars, $tkireg, $playerinfo, $engage, $dist, $traderoutes, $portfull);
         $i--;
     }
 }
@@ -342,7 +342,7 @@
                 $dst = $planet2['sector_id'];
             }
 
-            $dist = Bad\Traderoute::traderouteDistance($pdo_db, $db, $traderoutes[$i]['source_type'], $traderoutes[$i]['dest_type'], $src, $dst, $traderoutes[$i]['circuit'], $playerinfo, $tkireg);
+            $dist = Tki\Traderoute::traderouteDistance($pdo_db, $db, $traderoutes[$i]['source_type'], $traderoutes[$i]['dest_type'], $src, $dst, $traderoutes[$i]['circuit'], $playerinfo, $tkireg);
 
             $langvars['l_tdr_escooped_temp'] = str_replace("[tdr_dist_triptime]", $dist['triptime'], $langvars['l_tdr_escooped']);
             $langvars['l_tdr_escooped2_temp'] = str_replace("[tdr_dist_scooped]", $dist['scooped'], $langvars['l_tdr_escooped2']);
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 0ef92980a..9eada90b0 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -7,5 +7,5 @@
 
 return array(
     'Tki\\' => array($baseDir . '/classes', $baseDir . '/config'),
-    'Bad\\' => array($baseDir . '/classes'),
+    'Tki\\' => array($baseDir . '/classes'),
 );
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index f2a331ac7..d31761e1c 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -19,7 +19,7 @@ class ComposerStaticInita544dbd9d1e6088f7541c342d08c3f73
         ),
         'B' => 
         array (
-            'Bad\\' => 4,
+            'Tki\\' => 4,
         ),
     );
 
@@ -29,7 +29,7 @@ class ComposerStaticInita544dbd9d1e6088f7541c342d08c3f73
             0 => __DIR__ . '/../..' . '/classes',
             1 => __DIR__ . '/../..' . '/config',
         ),
-        'Bad\\' => 
+        'Tki\\' => 
         array (
             0 => __DIR__ . '/../..' . '/classes',
         ),