diff --git a/attack.php b/attack.php
index aeb6207cf..e223e3f3c 100644
--- a/attack.php
+++ b/attack.php
@@ -50,7 +50,7 @@
 // or it will fail to log the sql.
 $result = $db->Execute(
     "LOCK TABLES {$db->prefix}adodb_logsql WRITE, {$db->prefix}languages READ, " .
-    "{$db->prefix}ibank_accounts READ, {$db->prefix}sector_defence WRITE, " .
+    "{$db->prefix}ibank_accounts READ, {$db->prefix}sector_defense WRITE, " .
     "{$db->prefix}ships WRITE, {$db->prefix}universe WRITE, {$db->prefix}bounty WRITE, " .
     "{$db->prefix}zones READ, {$db->prefix}planets WRITE, " .
     "{$db->prefix}news WRITE, {$db->prefix}movement_log WRITE, {$db->prefix}logs WRITE;"
@@ -179,7 +179,7 @@
             Tki\PlayerLog::WriteLog($pdo_db, $targetinfo['ship_id'], LOG_ATTACK_EWD, "$playerinfo[character_name]");
             $result_warp = $db->Execute(
                 "UPDATE {$db->prefix}ships SET sector = $dest_sector, " .
-                "dev_emerwarp = dev_emerwarp - 1, cleared_defences = ' ' " .
+                "dev_emerwarp = dev_emerwarp - 1, cleared_defenses = ' ' " .
                 "WHERE ship_id = ?;",
                 array($targetinfo['ship_id'])
             );
@@ -617,7 +617,7 @@
                         "UPDATE {$db->prefix}ships SET hull = 0, engines = 0, power = 0, sensors = 0, computer = 0, beams = 0, torp_launchers = 0, " .
                         "torps = 0, armor = 0, armor_pts = 100, cloak = 0, shields = 0, sector = 0, ship_organics = 0, ship_ore = 0, ship_goods = 0, " .
                         "ship_energy = ?, ship_colonists = 0, ship_fighters = 100, dev_warpedit = 0, dev_genesis = 0, dev_beacon = 0, dev_emerwarp = 0, " .
-                        "dev_escapepod = 'N', dev_fuelscoop = 'N', dev_minedeflector = 0, on_planet = 'N', rating = ?, cleared_defences = ' ', " .
+                        "dev_escapepod = 'N', dev_fuelscoop = 'N', dev_minedeflector = 0, on_planet = 'N', rating = ?, cleared_defenses = ' ', " .
                         "dev_lssd = 'N' WHERE ship_id = ?;",
                         array($tkireg->start_energy, $rating, $targetinfo['ship_id'])
                     );
diff --git a/check_fighters.php b/check_fighters.php
index 713a8d982..c093b85a6 100644
--- a/check_fighters.php
+++ b/check_fighters.php
@@ -32,10 +32,10 @@
 $stmt->execute();
 $sectorinfo = $stmt->fetch(PDO::FETCH_ASSOC);
 
-$result3 = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? and defence_type ='F' ORDER BY quantity DESC;", array($sector));
+$result3 = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? and defense_type ='F' ORDER BY quantity DESC;", array($sector));
 Tki\Db::LogDbErrors($pdo_db, $result3, __LINE__, __FILE__);
 
-// Put the defence information into the array "defences"
+// Put the defense information into the array "defenses"
 $i = 0;
 $total_sector_fighters = 0;
 $owner = true;
@@ -63,9 +63,9 @@
 while (!$result3->EOF)
 {
     $row = $result3->fields;
-    $defences[$i] = $row;
-    $total_sector_fighters += $defences[$i]['quantity'];
-    if ($defences[$i]['ship_id'] != $playerinfo['ship_id'])
+    $defenses[$i] = $row;
+    $total_sector_fighters += $defenses[$i]['quantity'];
+    if ($defenses[$i]['ship_id'] != $playerinfo['ship_id'])
     {
         $owner = false;
     }
@@ -73,12 +73,12 @@
     $result3->MoveNext();
 }
 
-$num_defences = $i;
-if ($num_defences > 0 && $total_sector_fighters > 0 && !$owner)
+$num_defenses = $i;
+if ($num_defenses > 0 && $total_sector_fighters > 0 && !$owner)
 {
     // Find out if the fighter owner and player are on the same team
-    // All sector defences must be owned by members of the same team
-    $fm_owner = $defences[0]['ship_id'];
+    // All sector defenses must be owned by members of the same team
+    $fm_owner = $defenses[0]['ship_id'];
     $result2 = $db->Execute("SELECT * FROM {$db->prefix}ships WHERE ship_id = ?;", array($fm_owner));
     Tki\Db::LogDbErrors($pdo_db, $result2, __LINE__, __FILE__);
     $fighters_owner = $result2->fields;
@@ -87,14 +87,14 @@
         switch ($response)
         {
             case "fight":
-                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defences = ' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
+                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defenses = ' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
                 Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
                 echo "<h1>" . $title . "</h1>\n";
                 include_once './sector_fighters.php';
                 break;
 
             case "retreat":
-                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defences = ' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
+                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defenses = ' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
                 Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
                 $stamp = date("Y-m-d H:i:s");
                 $resx = $db->Execute("UPDATE {$db->prefix}ships SET last_login='$stamp', turns = turns - 2, turns_used = turns_used + 2, sector=? WHERE ship_id=?;", array($playerinfo['sector'], $playerinfo['ship_id']));
@@ -105,7 +105,7 @@
                 die();
 
             case "pay":
-                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defences = ' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
+                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defenses = ' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
                 Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
                 $fighterstoll = $total_sector_fighters * $fighter_price * 0.6;
                 if ($playerinfo['credits'] < $fighterstoll)
@@ -131,7 +131,7 @@
                 break;
 
             case "sneak":
-                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defences = ' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
+                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defenses = ' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
                 Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
                 $success = Tki\Scan::success($fighters_owner['sensors'], $playerinfo['cloak']);
                 if ($success < 5)
@@ -145,7 +145,7 @@
                 $roll = random_int(1, 100);
                 if ($roll < $success)
                 {
-                    // Sector defences detect incoming ship
+                    // Sector defenses detect incoming ship
                     echo "<h1>" . $title . "</h1>\n";
                     echo $langvars['l_chf_thefightersdetectyou'] . "<br>";
                     include_once './sector_fighters.php';
@@ -153,21 +153,21 @@
                 }
                 else
                 {
-                    // Sector defences don't detect incoming ship
+                    // Sector defenses don't detect incoming ship
                     $ok = 1;
                 }
                 break;
 
             default:
                 $interface_string = $calledfrom . '?sector=' . $sector . '&destination=' . $destination . '&engage=' . $engage;
-                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defences = ? WHERE ship_id = ?;", array($interface_string, $playerinfo['ship_id']));
+                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defenses = ? WHERE ship_id = ?;", array($interface_string, $playerinfo['ship_id']));
                 Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
                 $fighterstoll = $total_sector_fighters * $fighter_price * 0.6;
                 echo "<h1>" . $title . "</h1>\n";
                 echo "<form accept-charset='utf-8' action='{$calledfrom}' method='post'>";
                 $langvars['l_chf_therearetotalfightersindest'] = str_replace("[chf_total_sector_fighters]", $total_sector_fighters, $langvars['l_chf_therearetotalfightersindest']);
                 echo $langvars['l_chf_therearetotalfightersindest'] . "<br>";
-                if ($defences[0]['fm_setting'] == "toll")
+                if ($defenses[0]['fm_setting'] == "toll")
                 {
                     $langvars['l_chf_creditsdemanded'] = str_replace("[chf_number_fighterstoll]", number_format($fighterstoll, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']), $langvars['l_chf_creditsdemanded']);
                     echo $langvars['l_chf_creditsdemanded'] . "<br>";
@@ -175,7 +175,7 @@
 
                 $langvars['l_chf_youcanretreat'] = str_replace("[retreat]", "<strong>Retreat</strong>", $langvars['l_chf_youcanretreat']);
                 echo $langvars['l_chf_youcan'] . " <br><input type='radio' name='response' value='retreat'>" . $langvars['l_chf_youcanretreat'] . "<br></input>";
-                if ($defences[0]['fm_setting'] == "toll")
+                if ($defenses[0]['fm_setting'] == "toll")
                 {
                     $langvars['l_chf_inputpay'] = str_replace("[pay]", "<strong>Pay</strong>", $langvars['l_chf_inputpay']);
                     echo "<input type='radio' name='response' checked value='pay'>" . $langvars['l_chf_inputpay'] . "<br></input>";
@@ -198,7 +198,7 @@
 
         }
         // Clean up any sectors that have used up all mines or fighters
-        $resx = $db->Execute("DELETE FROM {$db->prefix}sector_defence WHERE quantity <= 0 ");
+        $resx = $db->Execute("DELETE FROM {$db->prefix}sector_defense WHERE quantity <= 0 ");
         Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
     }
 }
diff --git a/check_mines.php b/check_mines.php
index c479c1642..e55825160 100644
--- a/check_mines.php
+++ b/check_mines.php
@@ -32,26 +32,26 @@
 $stmt->execute();
 $sectorinfo = $stmt->fetch(PDO::FETCH_ASSOC);
 
-// Put the defence information into the array "defenceinfo"
-$result3 = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? and defence_type ='M'", array($sector));
+// Put the defense information into the array "defenseinfo"
+$result3 = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? and defense_type ='M'", array($sector));
 Tki\Db::LogDbErrors($pdo_db, $result3, __LINE__, __FILE__);
 
 // Correct the targetship bug to reflect the player info
 $targetship = $playerinfo;
 
-$num_defences = 0;
+$num_defenses = 0;
 $total_sector_mines = 0;
 $owner = true;
 while (!$result3->EOF)
 {
     $row = $result3->fields;
-    $defences[$num_defences] = $row;
-    $total_sector_mines += $defences[$num_defences]['quantity'];
-    if ($defences[$num_defences]['ship_id'] != $playerinfo['ship_id'])
+    $defenses[$num_defenses] = $row;
+    $total_sector_mines += $defenses[$num_defenses]['quantity'];
+    if ($defenses[$num_defenses]['ship_id'] != $playerinfo['ship_id'])
     {
         $owner = false;
     }
-    $num_defences++;
+    $num_defenses++;
     $result3->MoveNext();
 }
 
@@ -64,10 +64,10 @@
 //    3) You are not the owner or on the team of the owner - team 0 dosent count
 //    4) You ship is at least $tkireg->mine_hullsize (setable in config/classic_config.ini.php) big
 
-if ($num_defences > 0 && $total_sector_mines > 0 && !$owner && $shipavg > $tkireg->mine_hullsize)
+if ($num_defenses > 0 && $total_sector_mines > 0 && !$owner && $shipavg > $tkireg->mine_hullsize)
 {
     // Find out if the mine owner and player are on the same team
-    $fm_owner = $defences[0]['ship_id'];
+    $fm_owner = $defenses[0]['ship_id'];
     $result2 = $db->Execute("SELECT * FROM {$db->prefix}ships WHERE ship_id = ?;", array($fm_owner));
     Tki\Db::LogDbErrors($pdo_db, $result2, __LINE__, __FILE__);
 
@@ -166,7 +166,7 @@
                     {
                         $rating = round($playerinfo['rating'] / 2);
                         echo $langvars['l_chm_luckescapepod'] . "<br><br>";
-                        $resx = $db->Execute("UPDATE {$db->prefix}ships SET hull=0, engines=0, power=0, sensors=0, computer=0, beams=0, torp_launchers=0, torps=0, armor=0, armor_pts=100, cloak=0, shields=0, sector=0, ship_organics=0, ship_ore=0, ship_goods=0, ship_energy=?, ship_colonists=0, ship_fighters=100, dev_warpedit=0, dev_genesis=0, dev_beacon=0, dev_emerwarp=0, dev_escapepod='N', dev_fuelscoop='N', dev_minedeflector=0, on_planet='N', rating=?, cleared_defences=' ', dev_lssd='N' WHERE ship_id=?", array($tkireg->start_energy, $rating, $playerinfo['ship_id']));
+                        $resx = $db->Execute("UPDATE {$db->prefix}ships SET hull=0, engines=0, power=0, sensors=0, computer=0, beams=0, torp_launchers=0, torps=0, armor=0, armor_pts=100, cloak=0, shields=0, sector=0, ship_organics=0, ship_ore=0, ship_goods=0, ship_energy=?, ship_colonists=0, ship_fighters=100, dev_warpedit=0, dev_genesis=0, dev_beacon=0, dev_emerwarp=0, dev_escapepod='N', dev_fuelscoop='N', dev_minedeflector=0, on_planet='N', rating=?, cleared_defenses=' ', dev_lssd='N' WHERE ship_id=?", array($tkireg->start_energy, $rating, $playerinfo['ship_id']));
                         Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
                         Tki\Bounty::cancel($pdo_db, $db, $playerinfo['ship_id']);
                     }
diff --git a/classes/Character.php b/classes/Character.php
index fe66a57e0..d7473e0a3 100644
--- a/classes/Character.php
+++ b/classes/Character.php
@@ -23,7 +23,7 @@ class Character
 {
     public static function kill(\PDO $pdo_db, $db, $ship_id, $langvars, Reg $tkireg, $remove_planets = false)
     {
-        $update_ships_res = $db->Execute("UPDATE {$db->prefix}ships SET ship_destroyed='Y', on_planet='N', sector=0, cleared_defences=' ' WHERE ship_id=?", array($ship_id));
+        $update_ships_res = $db->Execute("UPDATE {$db->prefix}ships SET ship_destroyed='Y', on_planet='N', sector=0, cleared_defenses=' ' WHERE ship_id=?", array($ship_id));
         Db::LogDbErrors($pdo_db, $update_ships_res, __LINE__, __FILE__);
 
         $delete_bounty_res = $db->Execute("DELETE FROM {$db->prefix}bounty WHERE placed_by = ?", array($ship_id));
@@ -54,7 +54,7 @@ public static function kill(\PDO $pdo_db, $db, $ship_id, $langvars, Reg $tkireg,
             }
         }
 
-        $rm_def_res = $db->Execute("DELETE FROM {$db->prefix}sector_defence WHERE ship_id=?", array($ship_id));
+        $rm_def_res = $db->Execute("DELETE FROM {$db->prefix}sector_defense WHERE ship_id=?", array($ship_id));
         Db::LogDbErrors($pdo_db, $rm_def_res, __LINE__, __FILE__);
 
         $zone_res = $db->Execute("SELECT zone_id FROM {$db->prefix}zones WHERE team_zone='N' AND owner=?", array($ship_id));
diff --git a/classes/Defense.php b/classes/Defence.php
similarity index 82%
rename from classes/Defense.php
rename to classes/Defence.php
index cf44292b0..041935f4b 100644
--- a/classes/Defense.php
+++ b/classes/Defence.php
@@ -21,9 +21,9 @@
 
 class Defense
 {
-    public static function defenceVsDefence(\PDO $pdo_db, $db, $ship_id, $langvars)
+    public static function defenseVsDefense(\PDO $pdo_db, $db, $ship_id, $langvars)
     {
-        $secdef_result = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE ship_id = ?;", array($ship_id));
+        $secdef_result = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE ship_id = ?;", array($ship_id));
         Db::LogDbErrors($pdo_db, $secdef_result, __LINE__, __FILE__);
 
         if ($secdef_result instanceof \adodb\ADORecordSet)
@@ -31,32 +31,32 @@ public static function defenceVsDefence(\PDO $pdo_db, $db, $ship_id, $langvars)
             while (!$secdef_result->EOF)
             {
                 $row = $secdef_result->fields;
-                $deftype = $row['defence_type'] == 'F' ? 'Fighters' : 'Mines';
+                $deftype = $row['defense_type'] == 'F' ? 'Fighters' : 'Mines';
                 $qty = $row['quantity'];
-                $other_secdef_res = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? AND ship_id <> ? ORDER BY quantity DESC", array($row['sector_id'], $ship_id));
+                $other_secdef_res = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? AND ship_id <> ? ORDER BY quantity DESC", array($row['sector_id'], $ship_id));
                 Db::LogDbErrors($pdo_db, $other_secdef_res, __LINE__, __FILE__);
                 if ($other_secdef_res instanceof \adodb\ADORecordSet)
                 {
                     while (!$other_secdef_res->EOF && $qty > 0)
                     {
                         $cur = $other_secdef_res->fields;
-                        $targetdeftype = $cur['defence_type'] == 'F' ? $langvars['l_fighters'] : $langvars['l_mines'];
+                        $targetdeftype = $cur['defense_type'] == 'F' ? $langvars['l_fighters'] : $langvars['l_mines'];
                         if ($qty > $cur['quantity'])
                         {
-                            $del_secdef_res = $db->Execute("DELETE FROM {$db->prefix}sector_defence WHERE defence_id = ?", array($cur['defence_id']));
+                            $del_secdef_res = $db->Execute("DELETE FROM {$db->prefix}sector_defense WHERE defense_id = ?", array($cur['defense_id']));
                             Db::LogDbErrors($pdo_db, $del_secdef_res, __LINE__, __FILE__);
                             $qty -= $cur['quantity'];
-                            $up_secdef_res = $db->Execute("UPDATE {$db->prefix}sector_defence SET quantity = ? WHERE defence_id = ?", array($qty, $row['defence_id']));
+                            $up_secdef_res = $db->Execute("UPDATE {$db->prefix}sector_defense SET quantity = ? WHERE defense_id = ?", array($qty, $row['defense_id']));
                             Db::LogDbErrors($pdo_db, $up_secdef_res, __LINE__, __FILE__);
                             PlayerLog::WriteLog($pdo_db, $cur['ship_id'], LOG_DEFS_DESTROYED, $cur['quantity'] .'|'. $targetdeftype .'|'. $row['sector_id']);
                             PlayerLog::WriteLog($pdo_db, $row['ship_id'], LOG_DEFS_DESTROYED, $cur['quantity'] .'|'. $deftype .'|'. $row['sector_id']);
                         }
                         else
                         {
-                            $del_secdef_res2 = $db->Execute("DELETE FROM {$db->prefix}sector_defence WHERE defence_id = ?", array($row['defence_id']));
+                            $del_secdef_res2 = $db->Execute("DELETE FROM {$db->prefix}sector_defense WHERE defense_id = ?", array($row['defense_id']));
                             Db::LogDbErrors($pdo_db, $del_secdef_res2, __LINE__, __FILE__);
 
-                            $up_secdef_res2 = $db->Execute("UPDATE {$db->prefix}sector_defence SET quantity=quantity - ? WHERE defence_id = ?", array($qty, $cur['defence_id']));
+                            $up_secdef_res2 = $db->Execute("UPDATE {$db->prefix}sector_defense SET quantity=quantity - ? WHERE defense_id = ?", array($qty, $cur['defense_id']));
                             Db::LogDbErrors($pdo_db, $up_secdef_res2, __LINE__, __FILE__);
                             PlayerLog::WriteLog($pdo_db, $cur['ship_id'], LOG_DEFS_DESTROYED, $qty .'|'. $targetdeftype .'|'. $row['sector_id']);
                             PlayerLog::WriteLog($pdo_db, $row['ship_id'], LOG_DEFS_DESTROYED, $qty .'|'. $deftype .'|'. $row['sector_id']);
@@ -67,7 +67,7 @@ public static function defenceVsDefence(\PDO $pdo_db, $db, $ship_id, $langvars)
                 }
                 $secdef_result->MoveNext();
             }
-            $del_secdef_res3 = $db->Execute("DELETE FROM {$db->prefix}sector_defence WHERE quantity <= 0");
+            $del_secdef_res3 = $db->Execute("DELETE FROM {$db->prefix}sector_defense WHERE quantity <= 0");
             Db::LogDbErrors($pdo_db, $del_secdef_res3, __LINE__, __FILE__);
         }
     }
diff --git a/classes/Fighters.php b/classes/Fighters.php
index 11a8fe56e..0f1229f41 100644
--- a/classes/Fighters.php
+++ b/classes/Fighters.php
@@ -23,32 +23,32 @@ class Fighters
 {
     public static function destroy(\PDO $pdo_db, int $sector, $num_fighters)
     {
-        $sql = "SELECT * FROM {$pdo_db->prefix}sector_defence WHERE sector_id=:sector_id AND defence_type ='F' ORDER BY quantity ASC";
+        $sql = "SELECT * FROM {$pdo_db->prefix}sector_defense WHERE sector_id=:sector_id AND defense_type ='F' ORDER BY quantity ASC";
         $stmt = $pdo_db->prepare($sql);
         $stmt->bindParam(':sector_id', $sector);
         $stmt->execute();
-        $defence_present = $stmt->fetch(PDO::FETCH_ASSOC);
+        $defense_present = $stmt->fetch(PDO::FETCH_ASSOC);
 
-        if ($defence_present !== null && $num_fighters > 0)
+        if ($defense_present !== null && $num_fighters > 0)
         {
-            foreach ($defence_present as $tmp_defence)
+            foreach ($defense_present as $tmp_defense)
             {
-                if ($tmp_defence['quantity'] > $num_fighters)
+                if ($tmp_defense['quantity'] > $num_fighters)
                 {
-                    $sql = "UPDATE {$pdo_db->prefix}sector_defence SET quantity = :quantity - ? WHERE defence_id = :defence_id";
+                    $sql = "UPDATE {$pdo_db->prefix}sector_defense SET quantity = :quantity - ? WHERE defense_id = :defense_id";
                     $stmt = $pdo_db->prepare($sql);
                     $stmt->bindParam(':quantity', $quantity);
-                    $stmt->bindParam(':defence_id', $tmp_defence['defence_id']);
+                    $stmt->bindParam(':defense_id', $tmp_defense['defense_id']);
                     $stmt->execute();
                     $num_fighters = 0;
                 }
                 else
                 {
-                    $sql = "DELETE FROM {$pdo_db->prefix}sector_defence WHERE defence_id = :defence_id";
+                    $sql = "DELETE FROM {$pdo_db->prefix}sector_defense WHERE defense_id = :defense_id";
                     $stmt = $pdo_db->prepare($sql);
-                    $stmt->bindParam(':defence_id', $tmp_defence['defence_id']);
+                    $stmt->bindParam(':defense_id', $tmp_defense['defense_id']);
                     $stmt->execute();
-                    $num_fighters -= $tmp_defence['quantity'];
+                    $num_fighters -= $tmp_defense['quantity'];
                 }
             }
         }
diff --git a/classes/Log.php b/classes/Log.php
index cb80547e6..489530c00 100644
--- a/classes/Log.php
+++ b/classes/Log.php
@@ -262,7 +262,7 @@ public static function logParse($langvars, $entry) : array
                 $retvalue['title'] = $titletemp;
                 break;
 
-            case LOG_DEFENCE_DEGRADE: //data args are : [sector] [degrade]
+            case LOG_DEFENSE_DEGRADE: //data args are : [sector] [degrade]
                 list ($sector, $degrade) = explode("|", $entry['data']);
                 $retvalue['text'] = str_replace("[sector]", "<font color=white><strong>$sector</strong></font>", $texttemp);
                 $retvalue['text'] = str_replace("[degrade]", "<font color=white><strong>$degrade</strong></font>", $retvalue['text']);
diff --git a/classes/Mines.php b/classes/Mines.php
index febbeb827..9eb60cce5 100644
--- a/classes/Mines.php
+++ b/classes/Mines.php
@@ -23,34 +23,34 @@ class Mines
 {
     public static function explode(\PDO $pdo_db, $sector, $num_mines)
     {
-        $sql = "SELECT * FROM {$pdo_db->prefix}sector_defence WHERE sector_id=:sector_id AND defence_type ='M' ORDER BY QUANTITY ASC";
+        $sql = "SELECT * FROM {$pdo_db->prefix}sector_defense WHERE sector_id=:sector_id AND defense_type ='M' ORDER BY QUANTITY ASC";
         $stmt = $pdo_db->prepare($sql);
         $stmt->bindParam(':sector_id', $sector);
         $stmt->execute();
-        $defence_present = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        if ($defence_present !== null)
+        $defense_present = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        if ($defense_present !== null)
         {
-            foreach ($defence_present as $tmp_defence)
+            foreach ($defense_present as $tmp_defense)
             {
                 if ($num_mines > 0)
                 {
-                    // Put the defence information into the array "defenceinfo"
-                    if ($tmp_defence['quantity'] > $num_mines)
+                    // Put the defense information into the array "defenseinfo"
+                    if ($tmp_defense['quantity'] > $num_mines)
                     {
-                        $sql = "UPDATE {$pdo_db->prefix}sector_defence SET quantity = quantity - :num_mines WHERE defence_id=:defence_id";
+                        $sql = "UPDATE {$pdo_db->prefix}sector_defense SET quantity = quantity - :num_mines WHERE defense_id=:defense_id";
                         $stmt = $pdo_db->prepare($sql);
                         $stmt->bindParam(':num_mines', $num_mines);
-                        $stmt->bindParam(':defence_id', $tmp_defence['defence_id']);
+                        $stmt->bindParam(':defense_id', $tmp_defense['defense_id']);
                         $stmt->execute();
                         $num_mines = 0;
                     }
                     else
                     {
-                        $sql = "DELETE FROM {$pdo_db->prefix}sector_defence WHERE defence_id=:defence_id";
+                        $sql = "DELETE FROM {$pdo_db->prefix}sector_defense WHERE defense_id=:defense_id";
                         $stmt = $pdo_db->prepare($sql);
-                        $stmt->bindParam(':defence_id', $tmp_defence['defence_id']);
+                        $stmt->bindParam(':defense_id', $tmp_defense['defense_id']);
                         $stmt->execute();
-                        $num_mines -= $tmp_defence['quantity'];
+                        $num_mines -= $tmp_defense['quantity'];
                     }
                 }
             }
diff --git a/classes/Planet.php b/classes/Planet.php
index d33b28dc1..2a40c0add 100644
--- a/classes/Planet.php
+++ b/classes/Planet.php
@@ -617,7 +617,7 @@ public static function planetCombat(\PDO $pdo_db, $db, $lang, $langvars, Reg $tk
 
     public static function shipToShip(\PDO $pdo_db, $db, $langvars, $ship_id, Reg $tkireg, $playerinfo, $attackerbeams, $attackerfighters, $attackershields, $attackertorps, $attackerarmor, $attackertorpdamage)
     {
-        $resx = $db->Execute("LOCK TABLES {$db->prefix}ships WRITE, {$db->prefix}planets WRITE, {$db->prefix}sector_defence WRITE, {$db->prefix}universe WRITE, {$db->prefix}adodb_logsql WRITE, {$db->prefix}logs WRITE, {$db->prefix}bounty WRITE, {$db->prefix}news WRITE, {$db->prefix}zones READ");
+        $resx = $db->Execute("LOCK TABLES {$db->prefix}ships WRITE, {$db->prefix}planets WRITE, {$db->prefix}sector_defense WRITE, {$db->prefix}universe WRITE, {$db->prefix}adodb_logsql WRITE, {$db->prefix}logs WRITE, {$db->prefix}bounty WRITE, {$db->prefix}news WRITE, {$db->prefix}zones READ");
         \Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
 
         $result2 = $db->Execute("SELECT * FROM {$db->prefix}ships WHERE ship_id = ?", array($ship_id));
diff --git a/classes/PlanetReportCE.php b/classes/PlanetReportCE.php
index aac38606f..b629ec98a 100644
--- a/classes/PlanetReportCE.php
+++ b/classes/PlanetReportCE.php
@@ -525,7 +525,7 @@ public static function realSpaceMove(\PDO $pdo_db, $db, $langvars, $destination,
             $langvars['l_rs_movetime'] = str_replace("[triptime]", number_format($triptime, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']), $langvars['l_rs_movetime']);
             echo $langvars['l_rs_movetime'] . "<br><br>";
             echo $langvars['l_rs_noturns'];
-            $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defences=' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
+            $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defenses=' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
             \Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
 
             $retval = "BREAK-TURNS";
@@ -535,7 +535,7 @@ public static function realSpaceMove(\PDO $pdo_db, $db, $langvars, $destination,
             // Modified from traderoute.php - sector defense check
             $hostile = 0;
 
-            $result99 = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? AND ship_id <> ?;", array($destination, $playerinfo['ship_id']));
+            $result99 = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? AND ship_id <> ?;", array($destination, $playerinfo['ship_id']));
             \Tki\Db::LogDbErrors($pdo_db, $result99, __LINE__, __FILE__);
             if (!$result99->EOF)
             {
@@ -549,7 +549,7 @@ public static function realSpaceMove(\PDO $pdo_db, $db, $langvars, $destination,
                 }
             }
 
-            $result98 = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? AND ship_id <> ?;", array($destination, $playerinfo['ship_id']));
+            $result98 = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? AND ship_id <> ?;", array($destination, $playerinfo['ship_id']));
             \Tki\Db::LogDbErrors($pdo_db, $result98, __LINE__, __FILE__);
             if (!$result98->EOF)
             {
diff --git a/classes/Score.php b/classes/Score.php
index 173694566..a58c28e19 100644
--- a/classes/Score.php
+++ b/classes/Score.php
@@ -64,10 +64,10 @@ public static function updateScore(\PDO $pdo_db, $ship_id, Reg $tkireg, $playeri
 
         $calc_planet_goods      = "SUM({$pdo_db->prefix}planets.organics) * $tkireg->organics_price + SUM({$pdo_db->prefix}planets.ore) * $tkireg->ore_price + SUM({$pdo_db->prefix}planets.goods) * $tkireg->goods_price + SUM({$pdo_db->prefix}planets.energy) * $tkireg->energy_price";
         $calc_planet_colonists  = "SUM({$pdo_db->prefix}planets.colonists) * $tkireg->colonist_price";
-        $calc_planet_defence    = "SUM({$pdo_db->prefix}planets.fighters) * $tkireg->fighter_price + IF({$pdo_db->prefix}planets.base='Y', $tkireg->base_credits + SUM({$pdo_db->prefix}planets.torps) * $tkireg->torpedo_price, 0)";
+        $calc_planet_defense    = "SUM({$pdo_db->prefix}planets.fighters) * $tkireg->fighter_price + IF({$pdo_db->prefix}planets.base='Y', $tkireg->base_credits + SUM({$pdo_db->prefix}planets.torps) * $tkireg->torpedo_price, 0)";
         $calc_planet_credits    = "SUM({$pdo_db->prefix}planets.credits)";
 
-        $sql = "SELECT IF(COUNT(*)>0, $calc_planet_goods + $calc_planet_colonists + $calc_planet_defence + $calc_planet_credits, 0) AS planet_score " .
+        $sql = "SELECT IF(COUNT(*)>0, $calc_planet_goods + $calc_planet_colonists + $calc_planet_defense + $calc_planet_credits, 0) AS planet_score " .
                                      "FROM {$pdo_db->prefix}planets WHERE owner=:ship_id";
         $stmt = $pdo_db->prepare($sql);
         $stmt->bindParam(':ship_id', $ship_id);
diff --git a/classes/SectorDefense.php b/classes/SectorDefense.php
index 450cecc3c..7f6648835 100644
--- a/classes/SectorDefense.php
+++ b/classes/SectorDefense.php
@@ -23,16 +23,16 @@ class SectorDefense
 {
     public static function messageDefenseOwner(\PDO $pdo_db, int $sector, $message)
     {
-        $sql = "SELECT ship_id FROM {$pdo_db->prefix}sector_defence WHERE sector_id=:sector_id";
+        $sql = "SELECT ship_id FROM {$pdo_db->prefix}sector_defense WHERE sector_id=:sector_id";
         $stmt = $pdo_db->prepare($sql);
         $stmt->bindParam(':sector_id', $sector);
         $stmt->execute();
-        $defence_present = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        if ($defence_present !== null)
+        $defense_present = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        if ($defense_present !== null)
         {
-            foreach ($defence_present as $tmp_defence)
+            foreach ($defense_present as $tmp_defense)
             {
-                PlayerLog::WriteLog($pdo_db, $tmp_defence['ship_id'], LOG_RAW, $message);
+                PlayerLog::WriteLog($pdo_db, $tmp_defense['ship_id'], LOG_RAW, $message);
             }
         }
     }
diff --git a/classes/Toll.php b/classes/Toll.php
index be6d587a9..2d549c768 100644
--- a/classes/Toll.php
+++ b/classes/Toll.php
@@ -23,22 +23,22 @@ class Toll
 {
     public static function distribute(\PDO $pdo_db, int $sector, $toll, $total_fighters)
     {
-        $sql = "SELECT * FROM {$pdo_db->prefix}sector_defence WHERE sector_id=:sector_id AND defence_type='F'";
+        $sql = "SELECT * FROM {$pdo_db->prefix}sector_defense WHERE sector_id=:sector_id AND defense_type='F'";
         $stmt = $pdo_db->prepare($sql);
         $stmt->bindParam(':sector_id', $sector);
         $stmt->execute();
-        $defence_present = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        if ($defence_present !== null)
+        $defense_present = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        if ($defense_present !== null)
         {
-            foreach ($defence_present as $tmp_defence)
+            foreach ($defense_present as $tmp_defense)
             {
-                $toll_amount = round(($tmp_defence['quantity'] / $total_fighters) * $toll);
+                $toll_amount = round(($tmp_defense['quantity'] / $total_fighters) * $toll);
                 $sql = "UPDATE {$pdo_db->prefix}ships SET credits=credits + :toll_amount WHERE ship_id = :ship_id";
                 $stmt = $pdo_db->prepare($sql);
                 $stmt->bindParam(':toll_amount', $toll_amount);
-                $stmt->bindParam(':ship_id', $tmp_defence['ship_id']);
+                $stmt->bindParam(':ship_id', $tmp_defense['ship_id']);
                 $stmt->execute();
-                PlayerLog::WriteLog($pdo_db, $tmp_defence['ship_id'], LOG_TOLL_RECV, "$toll_amount|$sector");
+                PlayerLog::WriteLog($pdo_db, $tmp_defense['ship_id'], LOG_TOLL_RECV, "$toll_amount|$sector");
             }
         }
     }
diff --git a/classes/Traderoute.php b/classes/Traderoute.php
index 3b4cb36f8..f575c2a30 100644
--- a/classes/Traderoute.php
+++ b/classes/Traderoute.php
@@ -245,7 +245,7 @@ public static function traderouteEngage($db, \PDO $pdo_db, $lang, $j, $langvars,
         // Sector Defense Check
         $hostile = 0;
 
-        $result99 = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? AND ship_id <> ?", array($source['sector_id'], $playerinfo['ship_id']));
+        $result99 = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? AND ship_id <> ?", array($source['sector_id'], $playerinfo['ship_id']));
         \Tki\Db::LogDbErrors($pdo_db, $result99, __LINE__, __FILE__);
         if (!$result99->EOF)
         {
@@ -262,7 +262,7 @@ public static function traderouteEngage($db, \PDO $pdo_db, $lang, $j, $langvars,
             }
         }
 
-        $result98 = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? AND ship_id <> ?", array($dest['sector_id'], $playerinfo['ship_id']));
+        $result98 = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? AND ship_id <> ?", array($dest['sector_id'], $playerinfo['ship_id']));
         \Tki\Db::LogDbErrors($pdo_db, $result98, __LINE__, __FILE__);
         if (!$result98->EOF)
         {
diff --git a/classes/Xenobe.php b/classes/Xenobe.php
index 6e1067fa1..f61e32c3a 100644
--- a/classes/Xenobe.php
+++ b/classes/Xenobe.php
@@ -494,7 +494,7 @@ public static function xenobeToPlanet(\PDO $pdo_db, $db, $planet_id, Reg $tkireg
             $resi = $db->Execute("UPDATE {$db->prefix}planets SET energy = ?, fighters = fighters - ?, torps = torps - ?, ore = ore + ?, goods = goods + ?, organics = organics + ?, credits = credits + ? WHERE planet_id = ?;", array($planetinfo['energy'], $fighters_lost, $targettorps, $free_ore, $free_goods, $free_organics, $ship_salvage, $planetinfo['planet_id']));
             \Tki\Db::LogDbErrors($pdo_db, $resi, __LINE__, __FILE__);
         }
-        else  // Must have made it past planet defences
+        else  // Must have made it past planet defenses
         {
             $armor_lost = $playerinfo['armor_pts'] - $attackerarmor;
             $fighters_lost = $playerinfo['ship_fighters'] - $attackerfighters;
@@ -1037,23 +1037,23 @@ public static function xenobeToSecDef(\PDO $pdo_db, $db, $langvars, $playerinfo,
         // Check for sector defenses
         if ($targetlink > 0)
         {
-            $resultf = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? and defence_type = 'F' ORDER BY quantity DESC", array($targetlink));
+            $resultf = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? and defense_type = 'F' ORDER BY quantity DESC", array($targetlink));
             \Tki\Db::LogDbErrors($pdo_db, $resultf, __LINE__, __FILE__);
             $i = 0;
             $total_sector_fighters = 0;
-            $defences = array();
+            $defenses = array();
             if ($resultf instanceof \adodb\ADORecordSet)
             {
                 while (!$resultf->EOF)
                 {
-                    $defences[$i] = $resultf->fields;
-                    $total_sector_fighters += $defences[$i]['quantity'];
+                    $defenses[$i] = $resultf->fields;
+                    $total_sector_fighters += $defenses[$i]['quantity'];
                     $i++;
                     $resultf->MoveNext();
                 }
             }
 
-            $resultm = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? and defence_type = 'M'", array($targetlink));
+            $resultm = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? and defense_type = 'M'", array($targetlink));
             \Tki\Db::LogDbErrors($pdo_db, $resultm, __LINE__, __FILE__);
             $i = 0;
             $total_sector_mines = 0;
@@ -1061,8 +1061,8 @@ public static function xenobeToSecDef(\PDO $pdo_db, $db, $langvars, $playerinfo,
             {
                 while (!$resultm->EOF)
                 {
-                    $defences[$i] = $resultm->fields;
-                    $total_sector_mines += $defences[$i]['quantity'];
+                    $defenses[$i] = $resultm->fields;
+                    $total_sector_mines += $defenses[$i]['quantity'];
                     $i++;
                     $resultm->MoveNext();
                 }
@@ -1070,7 +1070,7 @@ public static function xenobeToSecDef(\PDO $pdo_db, $db, $langvars, $playerinfo,
 
             if ($total_sector_fighters > 0 || $total_sector_mines > 0 || ($total_sector_fighters > 0 && $total_sector_mines > 0)) // Dest link has defenses so lets attack them
             {
-                \Tki\PlayerLog::WriteLog($pdo_db, $playerinfo['ship_id'], LOG_RAW, "ATTACKING SECTOR DEFENCES $total_sector_fighters fighters and $total_sector_mines mines.");
+                \Tki\PlayerLog::WriteLog($pdo_db, $playerinfo['ship_id'], LOG_RAW, "ATTACKING SECTOR DEFENSES $total_sector_fighters fighters and $total_sector_mines mines.");
                 $targetfighters = $total_sector_fighters;
                 $playerbeams = \Tki\CalcLevels::beams($playerinfo['beams'], $tkireg);
                 if ($playerbeams > $playerinfo['ship_energy'])
@@ -1173,7 +1173,7 @@ public static function xenobeToSecDef(\PDO $pdo_db, $db, $langvars, $playerinfo,
                 $fighterslost = $total_sector_fighters - $targetfighters;
                 \Tki\Fighters::destroy($pdo_db, $targetlink, $fighterslost);
 
-                // Message the defence owner with what happened
+                // Message the defense owner with what happened
                 $langvars['l_sf_sendlog'] = str_replace("[player]", "Xenobe $playerinfo[character_name]", $langvars['l_sf_sendlog']);
                 $langvars['l_sf_sendlog'] = str_replace("[lost]", $fighterslost, $langvars['l_sf_sendlog']);
                 $langvars['l_sf_sendlog'] = str_replace("[sector]", $targetlink, $langvars['l_sf_sendlog']);
@@ -1246,7 +1246,7 @@ public static function xenobeToSecDef(\PDO $pdo_db, $db, $langvars, $playerinfo,
             }
             else
             {
-                // This was called without any sector defences to attack
+                // This was called without any sector defenses to attack
                 return;
             }
         }
@@ -1315,23 +1315,23 @@ public static function xenobeMove(\PDO $pdo_db, $db, $playerinfo, $targetlink, $
 
         if ($targetlink > 0) // Check for sector defenses
         {
-            $resultf = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? and defence_type = 'F' ORDER BY quantity DESC", array($targetlink));
+            $resultf = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? and defense_type = 'F' ORDER BY quantity DESC", array($targetlink));
             \Tki\Db::LogDbErrors($pdo_db, $resultf, __LINE__, __FILE__);
             $i = 0;
             $total_sector_fighters = 0;
-            $defences = array();
+            $defenses = array();
             if ($resultf instanceof \adodb\ADORecordSet)
             {
                 while (!$resultf->EOF)
                 {
-                    $defences[$i] = $resultf->fields;
-                    $total_sector_fighters += $defences[$i]['quantity'];
+                    $defenses[$i] = $resultf->fields;
+                    $total_sector_fighters += $defenses[$i]['quantity'];
                     $i++;
                     $resultf->MoveNext();
                 }
             }
 
-            $resultm = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? and defence_type = 'M'", array($targetlink));
+            $resultm = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? and defense_type = 'M'", array($targetlink));
             \Tki\Db::LogDbErrors($pdo_db, $resultm, __LINE__, __FILE__);
             $i = 0;
             $total_sector_mines = 0;
@@ -1339,18 +1339,18 @@ public static function xenobeMove(\PDO $pdo_db, $db, $playerinfo, $targetlink, $
             {
                 while (!$resultm->EOF)
                 {
-                    $defences[$i] = $resultm->fields;
-                    $total_sector_mines += $defences[$i]['quantity'];
+                    $defenses[$i] = $resultm->fields;
+                    $total_sector_mines += $defenses[$i]['quantity'];
                     $i++;
                     $resultm->MoveNext();
                 }
             }
 
-            if ($total_sector_fighters > 0 || $total_sector_mines > 0 || ($total_sector_fighters > 0 && $total_sector_mines > 0)) // If destination link has defences
+            if ($total_sector_fighters > 0 || $total_sector_mines > 0 || ($total_sector_fighters > 0 && $total_sector_mines > 0)) // If destination link has defenses
             {
                 if ($playerinfo['aggression'] == 2 || $playerinfo['aggression'] == 1)
                 {
-                    self::xenobeToSecDef($pdo_db, $db, $langvars, $playerinfo, $targetlink, $tkireg); // Attack sector defences
+                    self::xenobeToSecDef($pdo_db, $db, $langvars, $playerinfo, $targetlink, $tkireg); // Attack sector defenses
 
                     return;
                 }
@@ -1442,24 +1442,24 @@ public static function xenobeHunter(\PDO $pdo_db, $db, $playerinfo, $xenobeisdea
                 return;
             }
 
-            // Check for sector defences
-            $resultf = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? AND defence_type = 'F' ORDER BY quantity DESC", array($targetinfo['sector']));
+            // Check for sector defenses
+            $resultf = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? AND defense_type = 'F' ORDER BY quantity DESC", array($targetinfo['sector']));
             \Tki\Db::LogDbErrors($pdo_db, $resultf, __LINE__, __FILE__);
             $i = 0;
             $total_sector_fighters = 0;
-            $defences = array();
+            $defenses = array();
             if ($resultf instanceof \adodb\ADORecordSet)
             {
                 while (!$resultf->EOF)
                 {
-                    $defences[$i] = $resultf->fields;
-                    $total_sector_fighters += $defences[$i]['quantity'];
+                    $defenses[$i] = $resultf->fields;
+                    $total_sector_fighters += $defenses[$i]['quantity'];
                     $i++;
                     $resultf->MoveNext();
                 }
             }
 
-            $resultm = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE sector_id = ? AND defence_type = 'M'", array($targetinfo['sector']));
+            $resultm = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE sector_id = ? AND defense_type = 'M'", array($targetinfo['sector']));
             \Tki\Db::LogDbErrors($pdo_db, $resultm, __LINE__, __FILE__);
             $i = 0;
             $total_sector_mines = 0;
@@ -1467,16 +1467,16 @@ public static function xenobeHunter(\PDO $pdo_db, $db, $playerinfo, $xenobeisdea
             {
                 while (!$resultm->EOF)
                 {
-                    $defences[$i] = $resultm->fields;
-                    $total_sector_mines += $defences[$i]['quantity'];
+                    $defenses[$i] = $resultm->fields;
+                    $total_sector_mines += $defenses[$i]['quantity'];
                     $i++;
                     $resultm->MoveNext();
                 }
             }
 
-            if ($total_sector_fighters > 0 || $total_sector_mines > 0 || ($total_sector_fighters > 0 && $total_sector_mines > 0)) // Destination link has defences
+            if ($total_sector_fighters > 0 || $total_sector_mines > 0 || ($total_sector_fighters > 0 && $total_sector_mines > 0)) // Destination link has defenses
             {
-                // Attack sector defences
+                // Attack sector defenses
                 $targetlink = $targetinfo['sector'];
                 self::xenobeToSecDef($pdo_db, $db, $langvars, $playerinfo, $targetlink, $tkireg);
             }
diff --git a/config/classic_config.ini.php b/config/classic_config.ini.php
index 28ccb75df..4c7b81648 100644
--- a/config/classic_config.ini.php
+++ b/config/classic_config.ini.php
@@ -207,7 +207,7 @@
 default_lang               = 'english';                        // The default language the game displays in until a player chooses a language
 team_planet_transfers      = false;                            // If transferring credits to/from team planets is allowed.
 min_value_capture          = 0;                                // Percantage of planet's value a ship must be worth to be able to capture it. 0=disable
-defence_degrade_rate       = '0.05';                           // The percentage rate at which defenses fits, mines degrade during scheduler runs
+defense_degrade_rate       = '0.05';                           // The percentage rate at which defenses fits, mines degrade during scheduler runs
 energy_per_fighter         = '0.10';                           // The amount of energy needed from planets in sector to maintain a fighter during scheduler runs
 space_plague_kills         = '0.20';                           // Percentage of colonists killed by space plague
 max_credits_without_base   = 10000000;                         // Max amount of credits allowed on a planet without a base
diff --git a/defence_report.php b/defence_report.php
index 272a396be..65c48b85e 100644
--- a/defence_report.php
+++ b/defence_report.php
@@ -15,14 +15,14 @@
 //  You should have received a copy of the GNU Affero General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-// File: defence_report.php
+// File: defense_report.php
 
 require_once './common.php';
 
 Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
-$langvars = Tki\Translate::load($pdo_db, $lang, array('defence_report', 'planet_report', 'main', 'device', 'port', 'modify_defences', 'common', 'global_includes', 'global_funcs', 'combat', 'footer', 'news', 'regional'));
+$langvars = Tki\Translate::load($pdo_db, $lang, array('defense_report', 'planet_report', 'main', 'device', 'port', 'modify_defenses', 'common', 'global_includes', 'global_funcs', 'combat', 'footer', 'news', 'regional'));
 $title = $langvars['l_sdf_title'];
 Tki\Header::display($pdo_db, $lang, $template, $title);
 
@@ -35,7 +35,7 @@
 $stmt->execute();
 $playerinfo = $stmt->fetch(PDO::FETCH_ASSOC);
 
-$query = "SELECT * FROM {$db->prefix}sector_defence WHERE ship_id = ?";
+$query = "SELECT * FROM {$db->prefix}sector_defense WHERE ship_id = ?";
 if ($sort !== null)
 {
     $query .= " ORDER BY";
@@ -49,7 +49,7 @@
     }
     elseif ($sort == "type")
     {
-        $query .= " defence_type ASC";
+        $query .= " defense_type ASC";
     }
     else
     {
@@ -81,10 +81,10 @@
     echo $langvars['l_pr_clicktosort'] . "<br><br>";
     echo "<table width=\"100%\" border=0 cellspacing=0 cellpadding=2>";
     echo "<tr bgcolor=\"$tkireg->color_header\">";
-    echo "<td><strong><a href=defence_report.php?sort=sector>" . $langvars['l_sector'] . "</a></strong></td>";
-    echo "<td><strong><a href=defence_report.php?sort=quantity>" . $langvars['l_qty'] . "</a></strong></td>";
-    echo "<td><strong><a href=defence_report.php?sort=type>" . $langvars['l_sdf_type'] . "</a></strong></td>";
-    echo "<td><strong><a href=defence_report.php?sort=mode>" . $langvars['l_sdf_mode'] . "</a></strong></td>";
+    echo "<td><strong><a href=defense_report.php?sort=sector>" . $langvars['l_sector'] . "</a></strong></td>";
+    echo "<td><strong><a href=defense_report.php?sort=quantity>" . $langvars['l_qty'] . "</a></strong></td>";
+    echo "<td><strong><a href=defense_report.php?sort=type>" . $langvars['l_sdf_type'] . "</a></strong></td>";
+    echo "<td><strong><a href=defense_report.php?sort=mode>" . $langvars['l_sdf_mode'] . "</a></strong></td>";
     echo "</tr>";
     $color = $tkireg->color_line1;
     for ($i = 0; $i < $num_sectors; $i++)
@@ -92,9 +92,9 @@
         echo "<tr bgcolor=\"$color\">";
         echo "<td><a href=rsmove.php?engage=1&destination=". $sector[$i]['sector_id'] . ">". $sector[$i]['sector_id'] . "</a></td>";
         echo "<td>" . number_format($sector[$i]['quantity'], 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']) . "</td>";
-        $defence_type = $sector[$i]['defence_type'] == 'F' ? $langvars['l_fighters'] : $langvars['l_mines'];
-        echo "<td> $defence_type </td>";
-        $mode = $sector[$i]['defence_type'] == 'F' ? $sector[$i]['fm_setting'] : $langvars['l_n_a'];
+        $defense_type = $sector[$i]['defense_type'] == 'F' ? $langvars['l_fighters'] : $langvars['l_mines'];
+        echo "<td> $defense_type </td>";
+        $mode = $sector[$i]['defense_type'] == 'F' ? $sector[$i]['fm_setting'] : $langvars['l_n_a'];
         if ($mode == 'attack')
         {
             $mode = $langvars['l_md_attack'];
diff --git a/global_defines.php b/global_defines.php
index 1a3ec565f..b374b4835 100644
--- a/global_defines.php
+++ b/global_defines.php
@@ -62,7 +62,7 @@
 define('LOG_TEAM_NOT_LEAVE', 42);           // Sent to leader on leave
 define('LOG_ADMIN_HARAKIRI', 43);           // Sent to admin on self-destruct
 define('LOG_ADMIN_PLANETDEL', 44);          // Sent to admin on planet destruction instead of capture
-define('LOG_DEFENCE_DEGRADE', 45);          // Sent sector fighters have no supporting planet
+define('LOG_DEFENSE_DEGRADE', 45);          // Sent sector fighters have no supporting planet
 define('LOG_PLANET_CAPTURED', 46);          // Sent to player when he captures a planet
 define('LOG_BOUNTY_CLAIMED', 47);           // Sent to player when they claim a bounty
 define('LOG_BOUNTY_PAID', 48);              // Sent to player when their bounty on someone is paid
diff --git a/index.php b/index.php
index ff2a3e0f3..29a1101e8 100644
--- a/index.php
+++ b/index.php
@@ -32,7 +32,7 @@
 // Database driven language entries
 //$langvars = Tki\Translate::load($pdo_db, $lang, array('main', 'login', 'logout', 'index', 'common','regional', 'footer','global_includes'));
 
-$langvars = Tki\Translate::load($pdo_db, $lang, array('regional', 'admin', 'attack', 'beacon', 'bounty', 'check_fighters', 'check_mines', 'combat', 'common', 'team', 'create_universe', 'defence_report', 'device', 'dump', 'emerwarp', 'error', 'faq', 'feedback', 'footer', 'galaxy', 'genesis', 'ibank', 'index', 'log', 'login', 'logout', 'lrscan', 'mail', 'mailto', 'main', 'mines', 'modify_defences', 'move', 'navcomp', 'new', 'new_player_guide', 'news', 'option2', 'options', 'planet', 'planet_report', 'port', 'presets', 'pwreset', 'ranking', 'readmail', 'report', 'rsmove', 'scan', 'scheduler', 'sector_fighters', 'self_destruct', 'settings', 'setup_info', 'ship', 'team_planets', 'teams', 'traderoutes', 'warpedit', 'xenobe_control', 'zoneedit', 'zoneinfo', 'global_includes'));
+$langvars = Tki\Translate::load($pdo_db, $lang, array('regional', 'admin', 'attack', 'beacon', 'bounty', 'check_fighters', 'check_mines', 'combat', 'common', 'team', 'create_universe', 'defense_report', 'device', 'dump', 'emerwarp', 'error', 'faq', 'feedback', 'footer', 'galaxy', 'genesis', 'ibank', 'index', 'log', 'login', 'logout', 'lrscan', 'mail', 'mailto', 'main', 'mines', 'modify_defenses', 'move', 'navcomp', 'new', 'new_player_guide', 'news', 'option2', 'options', 'planet', 'planet_report', 'port', 'presets', 'pwreset', 'ranking', 'readmail', 'report', 'rsmove', 'scan', 'scheduler', 'sector_fighters', 'self_destruct', 'settings', 'setup_info', 'ship', 'team_planets', 'teams', 'traderoutes', 'warpedit', 'xenobe_control', 'zoneedit', 'zoneinfo', 'global_includes'));
 
 $variables = null;
 $variables['lang'] = $lang;
diff --git a/languages/english.ini.php b/languages/english.ini.php
index df8c51020..186b86e7f 100644
--- a/languages/english.ini.php
+++ b/languages/english.ini.php
@@ -236,7 +236,7 @@
 l_cmb_attackingplanet                   = "Attacking planet in sector";
 l_cmb_youfireyourbeams                  = "You fire your beams";
 l_cmb_defenselost                       = "Planetary defense lost [cmb_planetfighters] fighters to your beams";
-l_cmb_defenselost2                      = "Planetary Defense lost [cmb_attackerbeams] fighters, but there are more coming!";
+l_cmb_defenselost2                      = "Planetary defense lost [cmb_attackerbeams] fighters, but there are more coming!";
 l_cmb_planetarybeams                    = "Planetary beams destroy [cmb_temp] of your fighters";
 l_cmb_planetarybeams2                   = "Planetary beams destroy [cmb_planetbeams] of your fighters";
 l_cmb_youdestroyedplanetshields         = "Your beams have destroyed the planetary shields";
@@ -491,7 +491,7 @@
 l_cu_port_regen                         = "Ports will regenerate every [sched] minutes";
 l_cu_tow_sched                          = "Ships will be towed from fed sectors every [sched] minutes";
 l_cu_ranking_sched                      = "Rankings will be generated every [sched] minutes";
-l_cu_sector_degrade                     = "Sector defences will degrade every [sched] minutes";
+l_cu_sector_degrade                     = "Sector defenses will degrade every [sched] minutes";
 l_cu_apoc_sched                         = "The planetary apocalypse will occur every [sched] minutes";
 l_cu_governor_sched                     = "The Governor will run every [sched] minutes";
 l_cu_insert_news                        = "Inserting first news item";
@@ -523,9 +523,9 @@
 l_cu_update_maxsector                   = "Saving max sector setting to the database";
 l_cu_choose_lang                        = "Choose the language to use during create universe:";
 
-[defence_report]
-l_sdf_title                             = "Sector Defence Report";
-l_sdf_none                              = "You have no sector defences deployed.";
+[defense_report]
+l_sdf_title                             = "Sector Defense Report";
+l_sdf_none                              = "You have no sector defenses deployed.";
 l_sdf_type                              = "Type";
 l_sdf_mode                              = "Mode";
 
@@ -867,8 +867,8 @@
 l_log_title_LOG_ADMIN_ILLEGVALUE        = "Illegal ship value";
 l_log_text_LOG_ADMIN_PLANETDEL          = "[attacker] has attempted to capture [defender]'s planet in sector [sector]. Planet was destroyed instead.";
 l_log_title_LOG_ADMIN_PLANETDEL         = "Planet destroyed";
-l_log_text_LOG_DEFENCE_DEGRADE          = "Sector Defences Fighters in sector [sector] degraded by [degrade] percent due to insufficient energy.";
-l_log_title_LOG_DEFENCE_DEGRADE         = "Sector Defences degraded.";
+l_log_text_LOG_DEFENSE_DEGRADE          = "Sector Defenses Fighters in sector [sector] degraded by [degrade] percent due to insufficient energy.";
+l_log_title_LOG_DEFENSE_DEGRADE         = "Sector Defenses degraded.";
 l_log_text_LOG_PLANET_CAPTURED          = "You captured a planet belonging to [owner]. It had [cols] colonists and [credits] credits on it.";
 l_log_title_LOG_PLANET_CAPTURED         = "Planet captured!";
 l_log_text_LOG_PLANET_BOMBED            = "Your planet [planet_name] in sector [sector] was bombed by [name]. You used [beams] energy and [torps] torpedoes in your defense.  You lost [figs] fighters.";
@@ -1000,7 +1000,7 @@
 l_planets                               = "Planets";
 l_ibank                                 = "IBANK";
 l_log                                   = "Log";
-l_sector_def                            = "Sector Defences";
+l_sector_def                            = "Sector Defenses";
 l_defense                               = "Defenses";
 l_read_msg                              = "Read Messages";
 l_send_msg                              = "Send Messages";
@@ -1028,7 +1028,7 @@
 
 [mines]
 l_mines_title                           = "Deploy Sector Mines &amp; Fighters";
-l_mines_noturn                          = "You need at least one turn to deploy sector defences.";
+l_mines_noturn                          = "You need at least one turn to deploy sector defenses.";
 l_mines_nopermit                        = "Deploying Mines and Fighters in this sector is not permitted.";
 l_mines_nodeploy                        = "Can not deploy here. Another Ship or Team has mines or fighters in this sector.";
 l_mines_info1                           = "You are presently in sector [sector]. There are [mines] mines and [fighters] fighters here.";
@@ -1041,27 +1041,27 @@
 l_mines_dmines                          = "Deployed [mines] mines.";
 l_mines_dfighter                        = "Deployed [fighters] fighters in [mode] mode.";
 
-[modify_defences]
-l_md_title                              = "Sector Defences";
-l_md_invalid                            = "Invalid Sector Defence";
-l_md_nolonger                           = "The sector defence selected is no longer there.";
+[modify_defenses]
+l_md_title                              = "Sector Defenses";
+l_md_invalid                            = "Invalid Sector Defense";
+l_md_nolonger                           = "The sector defense selected is no longer there.";
 l_md_you                                = "you";
 l_md_bmines                             = "Your beams destroyed";
 l_md_msgdownerb                         = "[name] destroyed [mines] mines in sector [sector].";
 l_md_retr                               = "You retrieved";
 l_md_mode                               = "The fighters selected have been set to [mode] mode.";
-l_md_consist                            = "This sector defence consists of [qty] [type] owned by [owner].";
+l_md_consist                            = "This sector defense consists of [qty] [type] owned by [owner].";
 l_md_youcan                             = "You can";
 l_md_retrieve                           = "Retrieve";
 l_md_change                             = "Change Fighter settings";
 l_md_cmode                              = "Fighter mode";
 l_md_attack                             = "Attack";
 l_md_toll                               = "Toll";
-l_md_attdef                             = "Attack the Sector Defences. All sector fighters will retaliate.";
+l_md_attdef                             = "Attack the Sector Defenses. All sector fighters will retaliate.";
 l_md_noturn                             = "You need at least one turn.";
-l_md_nothere                            = "You need to be in the same sector as the sector defences.";
-l_md_notyours                           = "Action not permitted. Those sector defences do not belong to you.";
-l_md_yours                              = "You can not attack your own sector defences.";
+l_md_nothere                            = "You need to be in the same sector as the sector defenses.";
+l_md_notyours                           = "Action not permitted. Those sector defenses do not belong to you.";
+l_md_yours                              = "You can not attack your own sector defenses.";
 
 [move]
 l_move_title                            = "Move";
@@ -1122,7 +1122,7 @@
 l_news_p_text5                          = "The rising empire of [name] now has five planets, the BNN will watch the actions of [name] more closely in the future!";
 l_news_p_text10                         = "The aspiring empire of [name] now controls ten planets, Reports of BNN say that further expansion of [name] might lead to war!";
 l_news_p_text25                         = "The large empire of [name] colonized 25 planets already, in an interview, [name] announced that he might consider slowing down his expansion in the future!";
-l_news_p_text50                         = "The enormous vast empire of [name], represented by 50 planets in the whole galaxy is getting a threatening strength. One of the BNN reporters found out that [name] is upgrading his ship planning a major war. In an interview [name] announced that is done on defence purpose only!";
+l_news_p_text50                         = "The enormous vast empire of [name], represented by 50 planets in the whole galaxy is getting a threatening strength. One of the BNN reporters found out that [name] is upgrading his ship planning a major war. In an interview [name] announced that is done on defense purpose only!";
 l_news_p_text100                        = "The astounding empire of [name], now spanning 100 planets across the galaxy is truly a dominating force. Other empires are looking to emulate this success.";
 l_news_p_text250                        = "The overwhelming might of the [name] empire now encroaches on the borders of several other empires. With 250 planets, can they be stopped?";
 l_news_p_text500                        = "The staggering empire of [name], now governing 500 planets, seems to be beyond normal laws of civilization. Scientists have been dispatched to discover the secret to their efficiency.";
@@ -1396,7 +1396,7 @@
 l_sys_update                            = "System update";
 
 [sector_fighters]
-l_sf_attacking                          = "Sector defence fighters are attacking you!";
+l_sf_attacking                          = "Sector defense fighters are attacking you!";
 l_sf_destfight                          = "Your beams destroyed [lost] fighters";
 l_sf_destfightb                         = "Your beams destroyed [lost] fighters";
 l_sf_torphit                            = "Torpedoes hit:";
@@ -1408,10 +1408,10 @@
 l_sf_lostfight2                         = "You lost [lost] fighters.";
 l_sf_armorbreach                        = "Your armor is breached!";
 l_sf_armorbreach2                       = "Your armor is hit for [lost] damage.";
-l_sf_sendlog                            = "[player] destroyed [lost] sector defence fighters in sector [sector].";
+l_sf_sendlog                            = "[player] destroyed [lost] sector defense fighters in sector [sector].";
 l_sf_lreport                            = "You lost [armor] armor points, [fighters] fighters, and used [torps] torpedoes.";
 l_sf_shipdestroyed                      = "Your ship has been destroyed!";
-l_sf_sendlog2                           = "Sector defence fighters destroyed [player] in sector [sector].";
+l_sf_sendlog2                           = "Sector defense fighters destroyed [player] in sector [sector].";
 l_sf_escape                             = "Luckily you have an escape pod!";
 
 [self_destruct]
@@ -1488,7 +1488,7 @@
 l_set_sched_port_regen                  = "Ports will regenerate x [port_regenrate] every ";
 l_set_sched_fed_tow                     = "Ships will be towed from fed sectors every ";
 l_set_sched_ranking                     = "Rankings will be generated every ";
-l_set_sched_def_degrade                 = "Sector Defences will degrade every ";
+l_set_sched_def_degrade                 = "Sector Defenses will degrade every ";
 l_set_sched_apoc                        = "The planetary apocalypse will occur every ";
 l_set_minutes                           = " minutes";
 
@@ -1649,7 +1649,7 @@
 l_tdr_invaliddplanet                    = "Destination planet doesn't seem to be a valid planet!";
 l_tdr_invaliddsector                    = "Destination sector does not seem to be valid!";
 l_tdr_moreturnsneeded                   = "This trade route requires [tdr_dist_triptime] turns to complete. You only have [tdr_playerinfo_turns] left.";
-l_tdr_hostdef                           = "You can not use trade routes between sectors with hostile defences. You must defeat the defences first.";
+l_tdr_hostdef                           = "You can not use trade routes between sectors with hostile defenses. You must defeat the defenses first.";
 l_tdr_globalsetbuynothing               = "Your global settings are set to buy nothing! You would only waste turns doing this route!";
 l_tdr_nosrcporttrade                    = "Trading from source port is not allowed.";
 l_tdr_tradesrcportoutsider              = "Trading at source port is not allowed for outsiders";
diff --git a/log.php b/log.php
index f767bbd76..a068198d2 100644
--- a/log.php
+++ b/log.php
@@ -27,7 +27,7 @@
         'LOG_SHIP_DESTROYED_MINES', 'LOG_PLANET_DEFEATED_D', 'LOG_PLANET_DEFEATED', 'LOG_PLANET_NOT_DEFEATED', 'LOG_RAW', 'LOG_TOLL_RECV', 'LOG_DEFS_DESTROYED', 'LOG_PLANET_EJECT', 'LOG_BADLOGIN', 'LOG_PLANET_SCAN',
         'LOG_PLANET_SCAN_FAIL', 'LOG_PLANET_CAPTURE', 'LOG_SHIP_SCAN', 'LOG_SHIP_SCAN_FAIL', 'LOG_XENOBE_ATTACK', 'LOG_STARVATION', 'LOG_TOW', 'LOG_DEFS_DESTROYED_F', 'LOG_DEFS_KABOOM', 'LOG_HARAKIRI',
         'LOG_TEAM_REJECT', 'LOG_TEAM_RENAME', 'LOG_TEAM_M_RENAME', 'LOG_TEAM_KICK', 'LOG_TEAM_CREATE', 'LOG_TEAM_LEAVE', 'LOG_TEAM_NEWLEAD', 'LOG_TEAM_LEAD', 'LOG_TEAM_JOIN', 'LOG_TEAM_NEWMEMBER',
-        'LOG_TEAM_INVITE', 'LOG_TEAM_NOT_LEAVE', 'LOG_ADMIN_HARAKIRI', 'LOG_ADMIN_PLANETDEL', 'LOG_DEFENCE_DEGRADE', 'LOG_PLANET_CAPTURED', 'LOG_BOUNTY_CLAIMED', 'LOG_BOUNTY_PAID', 'LOG_BOUNTY_CANCELLED', 'LOG_SPACE_PLAGUE',
+        'LOG_TEAM_INVITE', 'LOG_TEAM_NOT_LEAVE', 'LOG_ADMIN_HARAKIRI', 'LOG_ADMIN_PLANETDEL', 'LOG_DEFENSE_DEGRADE', 'LOG_PLANET_CAPTURED', 'LOG_BOUNTY_CLAIMED', 'LOG_BOUNTY_PAID', 'LOG_BOUNTY_CANCELLED', 'LOG_SPACE_PLAGUE',
         'LOG_PLASMA_STORM', 'LOG_BOUNTY_FEDBOUNTY', 'LOG_PLANET_BOMBED', 'LOG_ADMIN_ILLEGVALUE'
                 );
 
diff --git a/lrscan.php b/lrscan.php
index bbcd8d4c9..fe04297b7 100644
--- a/lrscan.php
+++ b/lrscan.php
@@ -127,9 +127,9 @@
         // Get port type and discover the presence of a planet in scanned sector
         $result3 = $db->Execute("SELECT planet_id FROM {$db->prefix}planets WHERE sector_id = ?;", array($row['link_dest']));
         Tki\Db::LogDbErrors($pdo_db, $result3, __LINE__, __FILE__);
-        $resultSDa = $db->Execute("SELECT SUM(quantity) as mines from {$db->prefix}sector_defence WHERE sector_id = ? and defence_type = 'M';", array($row['link_dest']));
+        $resultSDa = $db->Execute("SELECT SUM(quantity) as mines from {$db->prefix}sector_defense WHERE sector_id = ? and defense_type = 'M';", array($row['link_dest']));
         Tki\Db::LogDbErrors($pdo_db, $resultSDa, __LINE__, __FILE__);
-        $resultSDb = $db->Execute("SELECT SUM(quantity) as fighters from {$db->prefix}sector_defence WHERE sector_id = ? and defence_type = 'F';", array($row['link_dest']));
+        $resultSDb = $db->Execute("SELECT SUM(quantity) as fighters from {$db->prefix}sector_defense WHERE sector_id = ? and defense_type = 'F';", array($row['link_dest']));
         Tki\Db::LogDbErrors($pdo_db, $resultSDb, __LINE__, __FILE__);
 
         $defM = $resultSDa->fields;
@@ -379,9 +379,9 @@
         $query->MoveNext();
     }
 
-    $resultSDa = $db->Execute("SELECT SUM(quantity) as mines from {$db->prefix}sector_defence WHERE sector_id = ? and defence_type = 'M';", array($sector));
+    $resultSDa = $db->Execute("SELECT SUM(quantity) as mines from {$db->prefix}sector_defense WHERE sector_id = ? and defense_type = 'M';", array($sector));
     Tki\Db::LogDbErrors($pdo_db, $resultSDa, __LINE__, __FILE__);
-    $resultSDb = $db->Execute("SELECT SUM(quantity) as fighters from {$db->prefix}sector_defence WHERE sector_id = ? and defence_type = 'F';", array($sector));
+    $resultSDb = $db->Execute("SELECT SUM(quantity) as fighters from {$db->prefix}sector_defense WHERE sector_id = ? and defense_type = 'F';", array($sector));
     Tki\Db::LogDbErrors($pdo_db, $resultSDb, __LINE__, __FILE__);
     $defM = $resultSDa->fields;
     $defF = $resultSDb->fields;
diff --git a/main.php b/main.php
index 505cd8288..cce0cdf4e 100644
--- a/main.php
+++ b/main.php
@@ -22,7 +22,7 @@
 Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
-$langvars = Tki\Translate::load($pdo_db, $lang, array('combat', 'common', 'main', 'modify_defences', 'admin','footer','global_includes', 'regional'));
+$langvars = Tki\Translate::load($pdo_db, $lang, array('combat', 'common', 'main', 'modify_defenses', 'admin','footer','global_includes', 'regional'));
 $title = $langvars['l_main_title'];
 Tki\Header::display($pdo_db, $lang, $template, $title);
 
@@ -46,10 +46,10 @@
     $playerinfo['score'] = Tki\Score::updateScore($pdo_db, $playerinfo['ship_id'], $tkireg, $playerinfo);
 }
 
-if ($playerinfo['cleared_defences'] > ' ')
+if ($playerinfo['cleared_defenses'] > ' ')
 {
     echo $langvars['l_incompletemove'] . " <br>";
-    echo "<a href=$playerinfo[cleared_defences]>" . $langvars['l_clicktocontinue'] . "</a>";
+    echo "<a href=$playerinfo[cleared_defenses]>" . $langvars['l_clicktocontinue'] . "</a>";
     die();
 }
 
@@ -111,20 +111,20 @@
 $num_planets = $i;
 
 $i = 0;
-$sql = "SELECT * FROM {$pdo_db->prefix}sector_defence, {$pdo_db->prefix}ships WHERE {$pdo_db->prefix}sector_defence.sector_id=:sector_id AND {$pdo_db->prefix}ships.ship_id = {$pdo_db->prefix}sector_defence.ship_id";
+$sql = "SELECT * FROM {$pdo_db->prefix}sector_defense, {$pdo_db->prefix}ships WHERE {$pdo_db->prefix}sector_defense.sector_id=:sector_id AND {$pdo_db->prefix}ships.ship_id = {$pdo_db->prefix}sector_defense.ship_id";
 $stmt = $pdo_db->prepare($sql);
 $stmt->bindParam(':sector_id', $playerinfo['sector']);
 $stmt->execute();
-$defence_present = $stmt->fetchAll(PDO::FETCH_ASSOC);
-if ($defence_present !== null)
+$defense_present = $stmt->fetchAll(PDO::FETCH_ASSOC);
+if ($defense_present !== null)
 {
-    foreach ($defence_present as $tmp_defence)
+    foreach ($defense_present as $tmp_defense)
     {
-        $defences[$i] = $tmp_defence;
+        $defenses[$i] = $tmp_defense;
         $i++;
     }
 }
-$num_defences = $i;
+$num_defenses = $i;
 
 // Grab zoneinfo from database
 $sql = "SELECT zone_id,zone_name FROM {$pdo_db->prefix}zones WHERE zone_id=:zone_id";
@@ -253,7 +253,7 @@
 echo "      <div style='padding-left:4px; text-align:left;'><a class='mnu' href='planet_report.php'>{$langvars['l_planets']}</a></div>\n";
 echo "      <div style='padding-left:4px; text-align:left;'><a class='mnu' href='ibank.php'>{$langvars['l_ibank']}</a></div>\n";
 echo "      <div style='padding-left:4px; text-align:left;'><a class='mnu' href='log.php'>{$langvars['l_log']}</a></div>\n";
-echo "      <div style='padding-left:4px; text-align:left;'><a class='mnu' href='defence_report.php'>{$langvars['l_sector_def']}</a></div>\n";
+echo "      <div style='padding-left:4px; text-align:left;'><a class='mnu' href='defense_report.php'>{$langvars['l_sector_def']}</a></div>\n";
 echo "      <div style='padding-left:4px; text-align:left;'><a class='mnu' href='readmail.php'>{$langvars['l_read_msg']}</a></div>\n";
 echo "      <div style='padding-left:4px; text-align:left;'><a class='mnu' href='mailto.php'>{$langvars['l_send_msg']}</a></div>\n";
 echo "      <div style='padding-left:4px; text-align:left;'><a class='mnu' href='ranking.php'>{$langvars['l_rankings']}</a></div>\n";
@@ -318,7 +318,7 @@
     $tr_result->MoveNext();
 }
 
-// Sector Defense Trade route query - this is still under developement
+// Sector defense trade route query - this is still under developement
 $sd_tr_result = $db->Execute("SELECT * FROM {$pdo_db->prefix}traderoutes WHERE source_type='D' AND source_id = ? AND owner = ? ORDER BY dest_id ASC;", array($playerinfo['sector'], $playerinfo['ship_id']));
 Tki\Db::LogDbErrors($pdo_db, $sd_tr_result, __LINE__, __FILE__);
 while (!$sd_tr_result->EOF)
@@ -675,27 +675,27 @@
 }
 echo "</div>";
 
-if ($num_defences>0)
+if ($num_defenses>0)
 {
             echo "<div style='padding-top:4px; padding-bottom:4px; width:500px; margin:auto; background-color:#303030; text-align:center;'>" . $langvars['l_sector_def'] . "</div>\n";
             echo "<div style='width:498px; margin:auto; overflow:auto; height:125px; scrollbar-base-color: #303030; scrollbar-arrow-color: #fff; padding:0px; text-align:center;'>\n";
 }
 echo "<table><tr>";
 
-if ($num_defences > 0)
+if ($num_defenses > 0)
 {
     $totalcount = 0;
     $curcount = 0;
     $i = 0;
-    while ($i < $num_defences)
+    while ($i < $num_defenses)
     {
-        $defence_id = $defences[$i]['defence_id'];
+        $defense_id = $defenses[$i]['defense_id'];
         echo "<td style='vertical-align:top; background: URL(" . $template->getVariables('template_dir') . "/images/bg_alpha.png) repeat;'><div style=' width:160px; font-size:12px; '>";
-        if ($defences[$i]['defence_type'] == 'F')
+        if ($defenses[$i]['defense_type'] == 'F')
         {
-            echo "<a class='new_link' href='modify_defences.php?defence_id=$defence_id'><img class='mnu' src=\"" . $template->getVariables('template_dir') . "/images/fighters.png\" style='border:0px; width:80px; height:60px' alt='Fighters'></a>\n";
+            echo "<a class='new_link' href='modify_defenses.php?defense_id=$defense_id'><img class='mnu' src=\"" . $template->getVariables('template_dir') . "/images/fighters.png\" style='border:0px; width:80px; height:60px' alt='Fighters'></a>\n";
             $def_type = $langvars['l_fighters'];
-            $mode = $defences[$i]['fm_setting'];
+            $mode = $defenses[$i]['fm_setting'];
             if ($mode == 'attack')
             {
                 $mode = $langvars['l_md_attack'];
@@ -706,14 +706,14 @@
             }
             $def_type .= $mode;
         }
-        elseif ($defences[$i]['defence_type'] == 'M')
+        elseif ($defenses[$i]['defense_type'] == 'M')
         {
-            echo "<div><a href='modify_defences.php?defence_id=$defence_id'><img src=\"" . $template->getVariables('template_dir') . "/images/mines.png\" style='border:0px; width:80px; height:60px' alt='Mines'></a></div>\n";
+            echo "<div><a href='modify_defenses.php?defense_id=$defense_id'><img src=\"" . $template->getVariables('template_dir') . "/images/mines.png\" style='border:0px; width:80px; height:60px' alt='Mines'></a></div>\n";
             $def_type = $langvars['l_mines'];
         }
 
-        $char_name = $defences[$i]['character_name'];
-        $qty = $defences[$i]['quantity'];
+        $char_name = $defenses[$i]['character_name'];
+        $qty = $defenses[$i]['quantity'];
         echo "<div style='font-size:1em; color:#fff;'>$char_name<br>( $qty $def_type )</div>\n";
         echo "</div></td>";
 
diff --git a/mines.php b/mines.php
index b83619e12..7a3de7eb1 100644
--- a/mines.php
+++ b/mines.php
@@ -51,7 +51,7 @@
 $sectorinfo = $stmt->fetch(PDO::FETCH_ASSOC);
 
 $i = 0;
-$sql = "SELECT * FROM {$pdo_db->prefix}sector_defence WHERE sector_id=:sector_id";
+$sql = "SELECT * FROM {$pdo_db->prefix}sector_defense WHERE sector_id=:sector_id";
 $stmt = $pdo_db->prepare($sql);
 $stmt->bindParam(':sector_id', $playerinfo['sector']);
 $stmt->execute();
@@ -66,7 +66,7 @@
 }
 $num_links = $i;
 
-// Put the defence information into the array "defenceinfo"
+// Put the defense information into the array "defenseinfo"
 $i = 0;
 $total_sector_fighters = 0;
 $total_sector_mines = 0;
@@ -77,30 +77,30 @@
 $set_toll = null;
 
 // Do we have a valid recordset?
-if ($defence_present)
+if ($defense_present)
 {
-    foreach ($defence_present as $tmp_defence)
+    foreach ($defense_present as $tmp_defense)
     {
-        $defences[$i] = $tmp_defence;
-        if ($defences[$i]['defence_type'] == 'F')
+        $defenses[$i] = $tmp_defense;
+        if ($defenses[$i]['defense_type'] == 'F')
         {
-            $total_sector_fighters += $defences[$i]['quantity'];
+            $total_sector_fighters += $defenses[$i]['quantity'];
         }
         else
         {
-            $total_sector_mines += $defences[$i]['quantity'];
+            $total_sector_mines += $defenses[$i]['quantity'];
         }
 
-        if ($defences[$i]['ship_id'] != $playerinfo['ship_id'])
+        if ($defenses[$i]['ship_id'] != $playerinfo['ship_id'])
         {
             $owns_all = false;
         }
         else
         {
-            if ($defences[$i]['defence_type'] == 'F')
+            if ($defenses[$i]['defense_type'] == 'F')
             {
-                $fighter_id = $defences[$i]['defence_id'];
-                if ($defences[$i]['fm_setting'] == 'attack')
+                $fighter_id = $defenses[$i]['defense_id'];
+                if ($defenses[$i]['fm_setting'] == 'attack')
                 {
                     $set_attack = 'CHECKED';
                     $set_toll = null;
@@ -113,14 +113,14 @@
             }
             else
             {
-                $mine_id = $defences[$i]['defence_id'];
+                $mine_id = $defenses[$i]['defense_id'];
             }
         }
         $i++;
     }
 }
 
-$num_defences = $i;
+$num_defenses = $i;
 echo "<h1>" . $title . "</h1>\n";
 if ($playerinfo['turns'] < 1)
 {
@@ -140,15 +140,15 @@
 }
 else
 {
-    if ($num_defences > 0)
+    if ($num_defenses > 0)
     {
         if (!$owns_all)
         {
-            $defence_owner = $defences[0]['ship_id'];
+            $defense_owner = $defenses[0]['ship_id'];
 
             $sql = "SELECT * FROM {$pdo_db->prefix}ships WHERE ship_id=:ship_id LIMIT 1";
             $stmt = $pdo_db->prepare($sql);
-            $stmt->bindParam(':ship_id', $defence_owner);
+            $stmt->bindParam(':ship_id', $defense_owner);
             $stmt->execute();
             $fighters_owner = $stmt->fetch(PDO::FETCH_ASSOC);
 
@@ -252,12 +252,12 @@
         {
             if ($fighter_id != 0)
             {
-                $update = $db->Execute("UPDATE {$db->prefix}sector_defence SET quantity = quantity + ? ,fm_setting = ? WHERE defence_id = ?;", array($numfighters, $mode, $fighter_id));
+                $update = $db->Execute("UPDATE {$db->prefix}sector_defense SET quantity = quantity + ? ,fm_setting = ? WHERE defense_id = ?;", array($numfighters, $mode, $fighter_id));
                 Tki\Db::LogDbErrors($pdo_db, $update, __LINE__, __FILE__);
             }
             else
             {
-                $update = $db->Execute("INSERT INTO {$db->prefix}sector_defence (ship_id, sector_id, defence_type, quantity, fm_setting) values (?, ?, ?, ?, ?);", array($playerinfo['ship_id'], $playerinfo['sector'], 'F', $numfighters, $mode));
+                $update = $db->Execute("INSERT INTO {$db->prefix}sector_defense (ship_id, sector_id, defense_type, quantity, fm_setting) values (?, ?, ?, ?, ?);", array($playerinfo['ship_id'], $playerinfo['sector'], 'F', $numfighters, $mode));
                 Tki\Db::LogDbErrors($pdo_db, $update, __LINE__, __FILE__);
                 echo $db->ErrorMsg();
             }
@@ -267,12 +267,12 @@
         {
             if ($mine_id != 0)
             {
-                $update = $db->Execute("UPDATE {$db->prefix}sector_defence SET quantity = quantity + ?, fm_setting = ? WHERE defence_id = ?;", array($nummines, $mode, $mine_id));
+                $update = $db->Execute("UPDATE {$db->prefix}sector_defense SET quantity = quantity + ?, fm_setting = ? WHERE defense_id = ?;", array($nummines, $mode, $mine_id));
                 Tki\Db::LogDbErrors($pdo_db, $update, __LINE__, __FILE__);
             }
             else
             {
-                $update = $db->Execute("INSERT INTO {$db->prefix}sector_defence (ship_id, sector_id, defence_type, quantity, fm_setting) values (?, ?, ?, ?, ?);", array($playerinfo['ship_id'], $playerinfo['sector'], 'M', $nummines, $mode));
+                $update = $db->Execute("INSERT INTO {$db->prefix}sector_defense (ship_id, sector_id, defense_type, quantity, fm_setting) values (?, ?, ?, ?, ?);", array($playerinfo['ship_id'], $playerinfo['sector'], 'M', $nummines, $mode));
                 Tki\Db::LogDbErrors($pdo_db, $update, __LINE__, __FILE__);
             }
         }
diff --git a/modify_defences.php b/modify_defences.php
index 66dea1925..9d07a4429 100644
--- a/modify_defences.php
+++ b/modify_defences.php
@@ -15,7 +15,7 @@
 //  You should have received a copy of the GNU Affero General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
-// File: modify_defences.php
+// File: modify_defenses.php
 
 require_once './common.php';
 
@@ -25,9 +25,9 @@
 Tki\Header::display($pdo_db, $lang, $template, $title);
 
 // Database driven language entries
-$langvars = Tki\Translate::load($pdo_db, $lang, array('modify_defences', 'common', 'global_includes', 'global_funcs', 'footer', 'news'));
+$langvars = Tki\Translate::load($pdo_db, $lang, array('modify_defenses', 'common', 'global_includes', 'global_funcs', 'footer', 'news'));
 
-if (!isset($defence_id))
+if (!isset($defense_id))
 {
     echo $langvars['l_md_invalid'] . "<br><br>";
     Tki\Text::gotomain($pdo_db, $lang);
@@ -64,20 +64,20 @@
     die ();
 }
 
-$sql = "SELECT * FROM {$pdo_db->prefix}sector_defence WHERE defence_id=:defence_id";
+$sql = "SELECT * FROM {$pdo_db->prefix}sector_defense WHERE defense_id=:defense_id";
 $stmt = $pdo_db->prepare($sql);
-$stmt->bindParam(':defence_id', $defence_id);
+$stmt->bindParam(':defense_id', $defense_id);
 $stmt->execute();
-$defenceinfo = $stmt->fetchAll(PDO::FETCH_ASSOC); // Put the defence information into the array "defenceinfo"
+$defenseinfo = $stmt->fetchAll(PDO::FETCH_ASSOC); // Put the defense information into the array "defenseinfo"
 
-if (!$defenceinfo)  // Not too sure, may need more checks on this.
+if (!$defenseinfo)  // Not too sure, may need more checks on this.
 {
     echo $langvars['l_md_nolonger'] . "<br>";
     Tki\Text::gotomain($pdo_db, $lang);
     die();
 }
 
-if ($defenceinfo['sector_id'] != $playerinfo['sector'])
+if ($defenseinfo['sector_id'] != $playerinfo['sector'])
 {
     echo $langvars['l_md_nothere'] . "<br><br>";
     Tki\Text::gotomain($pdo_db, $lang);
@@ -85,21 +85,21 @@
     die();
 }
 
-if ($defenceinfo['ship_id'] == $playerinfo['ship_id'])
+if ($defenseinfo['ship_id'] == $playerinfo['ship_id'])
 {
-    $defence_owner = $langvars['l_md_you'];
+    $defense_owner = $langvars['l_md_you'];
 }
 else
 {
-    $defence_ship_id = $defenceinfo['ship_id'];
-    $resulta = $db->Execute("SELECT * FROM {$db->prefix}ships WHERE ship_id = ?;", array($defence_ship_id));
+    $defense_ship_id = $defenseinfo['ship_id'];
+    $resulta = $db->Execute("SELECT * FROM {$db->prefix}ships WHERE ship_id = ?;", array($defense_ship_id));
     $ownerinfo = $resulta->fields;
-    $defence_owner = $ownerinfo['character_name'];
+    $defense_owner = $ownerinfo['character_name'];
 }
 
-$defence_type = $defenceinfo['defence_type'] == 'F' ? $langvars['l_fighters'] : $langvars['l_mines'];
-$qty = $defenceinfo['quantity'];
-if ($defenceinfo['fm_setting'] == 'attack')
+$defense_type = $defenseinfo['defense_type'] == 'F' ? $langvars['l_fighters'] : $langvars['l_mines'];
+$qty = $defenseinfo['quantity'];
+if ($defenseinfo['fm_setting'] == 'attack')
 {
     $set_attack = 'CHECKED';
     $set_toll = null;
@@ -114,7 +114,7 @@
 {
     case 'fight':
         echo "<h1>" . $title . "</h1>\n";
-        if ($defenceinfo['ship_id'] == $playerinfo['ship_id'])
+        if ($defenseinfo['ship_id'] == $playerinfo['ship_id'])
         {
             echo $langvars['l_md_yours'] . "<br><br>";
             Tki\Text::gotomain($pdo_db, $lang);
@@ -123,18 +123,18 @@
         }
 
         $sector = $playerinfo['sector'] ;
-        if ($defenceinfo['defence_type'] == 'F')
+        if ($defenseinfo['defense_type'] == 'F')
         {
-            $countres = $db->Execute("SELECT SUM(quantity) AS totalfighters FROM {$db->prefix}sector_defence WHERE sector_id = ? AND defence_type = 'F';", array($sector));
+            $countres = $db->Execute("SELECT SUM(quantity) AS totalfighters FROM {$db->prefix}sector_defense WHERE sector_id = ? AND defense_type = 'F';", array($sector));
             $ttl = $countres->fields;
             $total_sector_fighters = $ttl['totalfighters'];
-            $calledfrom = "modify_defences.php";
+            $calledfrom = "modify_defenses.php";
             include_once './sector_fighters.php';
         }
         else
         {
             // Attack mines goes here
-            $countres = $db->Execute("SELECT SUM(quantity) AS totalmines FROM {$db->prefix}sector_defence WHERE sector_id = ? AND defence_type = 'M';", array($sector));
+            $countres = $db->Execute("SELECT SUM(quantity) AS totalmines FROM {$db->prefix}sector_defense WHERE sector_id = ? AND defense_type = 'M';", array($sector));
             $ttl = $countres->fields;
             $total_sector_mines = $ttl['totalmines'];
             $playerbeams = Tki\CalcLevels::beams($playerinfo['beams'], $tkireg);
@@ -153,14 +153,14 @@
             $langvars['l_md_msgdownerb'] = str_replace("[sector]", $sector, $langvars['l_md_msgdownerb']);
             $langvars['l_md_msgdownerb'] = str_replace("[mines]", $playerbeams, $langvars['l_md_msgdownerb']);
             $langvars['l_md_msgdownerb'] = str_replace("[name]", $char_name, $langvars['l_md_msgdownerb']);
-            Tki\SectorDefense::messageDefenseOwner($pdo_db, $sector, $langvars['l_md_msgdownerb']);
+            Tki\Sectordefense::messagedefenseOwner($pdo_db, $sector, $langvars['l_md_msgdownerb']);
             Tki\Text::gotomain($pdo_db, $lang);
             die();
         }
         break;
 
     case 'retrieve':
-        if ($defenceinfo['ship_id'] != $playerinfo['ship_id'])
+        if ($defenseinfo['ship_id'] != $playerinfo['ship_id'])
         {
              echo $langvars['l_md_notyours'] . "<br><br>";
              Tki\Text::gotomain($pdo_db, $lang);
@@ -173,14 +173,14 @@
             $quantity = 0;
         }
 
-        if ($quantity > $defenceinfo['quantity'])
+        if ($quantity > $defenseinfo['quantity'])
         {
-            $quantity = $defenceinfo['quantity'];
+            $quantity = $defenseinfo['quantity'];
         }
 
         $torpedo_max = Tki\CalcLevels::torpedoes($playerinfo['torp_launchers'], $tkireg) - $playerinfo['torps'];
         $fighter_max = Tki\CalcLevels::fighters($playerinfo['computer'], $tkireg) - $playerinfo['ship_fighters'];
-        if ($defenceinfo['defence_type'] == 'F')
+        if ($defenseinfo['defense_type'] == 'F')
         {
             if ($quantity > $fighter_max)
             {
@@ -188,7 +188,7 @@
             }
         }
 
-        if ($defenceinfo['defence_type'] == 'M')
+        if ($defenseinfo['defense_type'] == 'M')
         {
             if ($quantity > $torpedo_max)
             {
@@ -197,8 +197,8 @@
         }
         if ($quantity > 0)
         {
-            $db->Execute("UPDATE {$db->prefix}sector_defence SET quantity=quantity - ? WHERE defence_id = ?", array($quantity, $defence_id));
-            if ($defenceinfo['defence_type'] == 'M')
+            $db->Execute("UPDATE {$db->prefix}sector_defense SET quantity=quantity - ? WHERE defense_id = ?", array($quantity, $defense_id));
+            if ($defenseinfo['defense_type'] == 'M')
             {
                 $db->Execute("UPDATE {$db->prefix}ships SET torps=torps + ? WHERE ship_id = ?", array($quantity, $playerinfo['ship_id']));
             }
@@ -206,19 +206,19 @@
             {
                 $db->Execute("UPDATE {$db->prefix}ships SET ship_fighters = ship_fighters + ? WHERE ship_id = ?", array($quantity, $playerinfo['ship_id']));
             }
-            $db->Execute("DELETE FROM {$db->prefix}sector_defence WHERE quantity <= 0");
+            $db->Execute("DELETE FROM {$db->prefix}sector_defense WHERE quantity <= 0");
         }
         $stamp = date("Y-m-d H:i:s");
 
         $db->Execute("UPDATE {$db->prefix}ships SET last_login = ?,turns = turns - 1, turns_used = turns_used + 1, sector = ? WHERE ship_id = ?;", array($stamp, $playerinfo['sector'], $playerinfo['ship_id']));
         echo "<h1>" . $title . "</h1>\n";
-        echo $langvars['l_md_retr'] . " " . $quantity . " " . $defence_type . ".<br>";
+        echo $langvars['l_md_retr'] . " " . $quantity . " " . $defense_type . ".<br>";
         Tki\Text::gotomain($pdo_db, $lang);
         die();
 
     case 'change':
         echo "<h1>" . $title . "</h1>\n";
-        if ($defenceinfo['ship_id'] != $playerinfo['ship_id'])
+        if ($defenseinfo['ship_id'] != $playerinfo['ship_id'])
         {
             echo $langvars['l_md_notyours'] . "<br><br>";
             Tki\Text::gotomain($pdo_db, $lang);
@@ -226,7 +226,7 @@
             die();
         }
 
-        $db->Execute("UPDATE {$db->prefix}sector_defence SET fm_setting = ? WHERE defence_id = ?", array($mode, $defence_id));
+        $db->Execute("UPDATE {$db->prefix}sector_defense SET fm_setting = ? WHERE defense_id = ?", array($mode, $defense_id));
         $stamp = date("Y-m-d H:i:s");
         $db->Execute("UPDATE {$db->prefix}ships SET last_login = ?, turns = turns - 1, turns_used = turns_used + 1, sector = ? WHERE ship_id = ?;", array($stamp, $playerinfo['sector'], $playerinfo['ship_id']));
         if ($mode == 'attack')
@@ -246,43 +246,43 @@
     default:
         echo "<h1>" . $title . "</h1>\n";
         $langvars['l_md_consist'] = str_replace("[qty]", $qty, $langvars['l_md_consist']);
-        $langvars['l_md_consist'] = str_replace("[type]", $defence_type, $langvars['l_md_consist']);
-        $langvars['l_md_consist'] = str_replace("[owner]", $defence_owner, $langvars['l_md_consist']);
+        $langvars['l_md_consist'] = str_replace("[type]", $defense_type, $langvars['l_md_consist']);
+        $langvars['l_md_consist'] = str_replace("[owner]", $defense_owner, $langvars['l_md_consist']);
         echo $langvars['l_md_consist'] . "<br>";
 
-        if ($defenceinfo['ship_id'] == $playerinfo['ship_id'])
+        if ($defenseinfo['ship_id'] == $playerinfo['ship_id'])
         {
             echo $langvars['l_md_youcan'] . ":<br>";
-            echo "<form accept-charset='utf-8' action=modify_defences.php method=post>";
-            echo $langvars['l_md_retrieve'] . " <input type=test name=quantity size=10 maxlength=10 value=0></input> $defence_type<br>";
+            echo "<form accept-charset='utf-8' action=modify_defenses.php method=post>";
+            echo $langvars['l_md_retrieve'] . " <input type=test name=quantity size=10 maxlength=10 value=0></input> $defense_type<br>";
             echo "<input type=hidden name=response value=retrieve>";
-            echo "<input type=hidden name=defence_id value=$defence_id>";
+            echo "<input type=hidden name=defense_id value=$defense_id>";
             echo "<input type=submit value=" . $langvars['l_submit'] . "><br><br>";
             echo "</form>";
-            if ($defenceinfo['defence_type'] == 'F')
+            if ($defenseinfo['defense_type'] == 'F')
             {
                 echo $langvars['l_md_change'] . ":<br>";
-                echo "<form accept-charset='utf-8' action=modify_defences.php method=post>";
+                echo "<form accept-charset='utf-8' action=modify_defenses.php method=post>";
                 echo $langvars['l_md_cmode'] . " <input type=radio name=mode $set_attack value=attack>" . $langvars['l_md_attack'] . "</input>";
                 echo "<input type=radio name=mode $set_toll value=toll>" . $langvars['l_md_toll'] . "</input><br>";
                 echo "<input type=submit value=" . $langvars['l_submit'] . "><br><br>";
                 echo "<input type=hidden name=response value=change>";
-                echo "<input type=hidden name=defence_id value=$defence_id>";
+                echo "<input type=hidden name=defense_id value=$defense_id>";
                 echo "</form>";
             }
         }
         else
         {
-            $result2 = $db->Execute("SELECT * FROM {$db->prefix}ships WHERE ship_id = ?;", array($defenceinfo['ship_id']));
+            $result2 = $db->Execute("SELECT * FROM {$db->prefix}ships WHERE ship_id = ?;", array($defenseinfo['ship_id']));
             $fighters_owner = $result2->fields;
 
             if ($fighters_owner['team'] != $playerinfo['team'] || $playerinfo['team'] == 0)
             {
                 echo $langvars['l_md_youcan'] . ":<br>";
-                echo "<form accept-charset='utf-8' action=modify_defences.php method=post>";
+                echo "<form accept-charset='utf-8' action=modify_defenses.php method=post>";
                 echo $langvars['l_md_attdef'] . "<br><input type=submit value=" . $langvars['l_md_attack'] . "></input><br>";
                 echo "<input type=hidden name=response value=fight>";
-                echo "<input type=hidden name=defence_id value=$defence_id>";
+                echo "<input type=hidden name=defense_id value=$defense_id>";
                 echo "</form>";
             }
         }
diff --git a/move.php b/move.php
index aaaa469ad..fc573ff28 100644
--- a/move.php
+++ b/move.php
@@ -103,7 +103,7 @@
 else
 {
     echo $langvars['l_move_failed'] . '<br><br>';
-    $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defences=' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
+    $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defenses=' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
     Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
     Tki\Text::gotomain($pdo_db, $lang);
 }
diff --git a/new2.php b/new2.php
index 6370ad3d3..767310088 100644
--- a/new2.php
+++ b/new2.php
@@ -138,7 +138,7 @@
     // Hash the password.  $hashed_pass will be a 60-character string.
     $hashed_pass = password_hash($filtered_post_password, PASSWORD_DEFAULT); // PASSWORD_DEFAULT is the strongest algorithm available to PHP at the current time - today, it is BCRYPT.
 
-    $result2 = $db->Execute("INSERT INTO {$db->prefix}ships (ship_name, ship_destroyed, character_name, password, email, armor_pts, credits, ship_energy, ship_fighters, turns, on_planet, dev_warpedit, dev_genesis, dev_beacon, dev_emerwarp, dev_escapepod, dev_fuelscoop, dev_minedeflector, last_login, ip_address, trade_colonists, trade_fighters, trade_torps, trade_energy, cleared_defences, lang, dev_lssd)
+    $result2 = $db->Execute("INSERT INTO {$db->prefix}ships (ship_name, ship_destroyed, character_name, password, email, armor_pts, credits, ship_energy, ship_fighters, turns, on_planet, dev_warpedit, dev_genesis, dev_beacon, dev_emerwarp, dev_escapepod, dev_fuelscoop, dev_minedeflector, last_login, ip_address, trade_colonists, trade_fighters, trade_torps, trade_energy, cleared_defenses, lang, dev_lssd)
                              VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);", array($shipname, 'N', $character, $hashed_pass, $username, $tkireg->start_armor, $tkireg->start_credits, $tkireg->start_energy, $tkireg->start_fighters, $mturns, 'N', $tkireg->start_editors, $tkireg->start_genesis, $tkireg->start_beacon, $tkireg->start_emerwarp, $tkireg->start_escape_pod, $tkireg->start_scoop, $tkireg->start_minedeflectors, $stamp, $_SERVER['REMOTE_ADDR'], 'Y', 'N', 'N', 'Y', NULL, $lang, $tkireg->start_lssd));
     Tki\Db::LogDbErrors($pdo_db, $result2, __LINE__, __FILE__);
 
diff --git a/rsmove.php b/rsmove.php
index b3ac7328a..fbfab55c0 100644
--- a/rsmove.php
+++ b/rsmove.php
@@ -52,7 +52,7 @@
     // Invalid destination
 
     echo $langvars['l_rs_invalid'] . ".<br><br>";
-    $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defences=' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
+    $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defenses=' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
     Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
 }
 else
@@ -165,7 +165,7 @@
                 $langvars['l_rs_movetime'] = str_replace("[triptime]", number_format($triptime, 0, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']), $langvars['l_rs_movetime']);
                 echo $langvars['l_rs_movetime'] . "<br><br>";
                 echo $langvars['l_rs_noturns'] . "<br><br>";
-                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defences=' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
+                $resx = $db->Execute("UPDATE {$db->prefix}ships SET cleared_defenses=' ' WHERE ship_id = ?;", array($playerinfo['ship_id']));
                 Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
             }
             else
diff --git a/scheduler/sched_degrade.php b/scheduler/sched_degrade.php
index 32d3ba476..d06b88c14 100644
--- a/scheduler/sched_degrade.php
+++ b/scheduler/sched_degrade.php
@@ -23,7 +23,7 @@
 }
 
 echo "<strong>Degrading Sector Fighters with no friendly base</strong><br><br>";
-$res = $db->Execute("SELECT * FROM {$db->prefix}sector_defence WHERE defence_type = 'F'");
+$res = $db->Execute("SELECT * FROM {$db->prefix}sector_defense WHERE defense_type = 'F'");
 Tki\Db::LogDbErrors($pdo_db, $res, __LINE__, __FILE__);
 
 while (!$res->EOF)
@@ -36,10 +36,10 @@
     Tki\Db::LogDbErrors($pdo_db, $res2, __LINE__, __FILE__);
     if ($res2->EOF)
     {
-        $resa = $db->Execute("UPDATE {$db->prefix}sector_defence SET quantity = quantity - GREATEST(ROUND(quantity * ?),1) WHERE defence_id = ? AND quantity > 0;", array($defence_degrade_rate, $row['defence_id']));
+        $resa = $db->Execute("UPDATE {$db->prefix}sector_defense SET quantity = quantity - GREATEST(ROUND(quantity * ?),1) WHERE defense_id = ? AND quantity > 0;", array($defense_degrade_rate, $row['defense_id']));
         Tki\Db::LogDbErrors($pdo_db, $resa, __LINE__, __FILE__);
-        $degrade_rate = $defence_degrade_rate * 100;
-        Tki\PlayerLog::WriteLog($pdo_db, $row['ship_id'], LOG_DEFENCE_DEGRADE, $row['sector_id'] ."|". $degrade_rate);
+        $degrade_rate = $defense_degrade_rate * 100;
+        Tki\PlayerLog::WriteLog($pdo_db, $row['ship_id'], LOG_DEFENSE_DEGRADE, $row['sector_id'] ."|". $degrade_rate);
     }
     else
     {
@@ -61,13 +61,13 @@
         }
         else
         {
-            $resc = $db->Execute("UPDATE {$db->prefix}sector_defence SET quantity = quantity - GREATEST(ROUND(quantity * ?),1) WHERE defence_id = ?;", array($defence_degrade_rate, $row['defence_id']));
+            $resc = $db->Execute("UPDATE {$db->prefix}sector_defense SET quantity = quantity - GREATEST(ROUND(quantity * ?),1) WHERE defense_id = ?;", array($defense_degrade_rate, $row['defense_id']));
             Tki\Db::LogDbErrors($pdo_db, $resc, __LINE__, __FILE__);
-            $degrade_rate = $defence_degrade_rate * 100;
-            Tki\PlayerLog::WriteLog($pdo_db, $row['ship_id'], LOG_DEFENCE_DEGRADE, $row['sector_id'] ."|". $degrade_rate);
+            $degrade_rate = $defense_degrade_rate * 100;
+            Tki\PlayerLog::WriteLog($pdo_db, $row['ship_id'], LOG_DEFENSE_DEGRADE, $row['sector_id'] ."|". $degrade_rate);
         }
     }
     $res->MoveNext();
 }
-$resx = $db->Execute("DELETE FROM {$db->prefix}sector_defence WHERE quantity <= 0");
+$resx = $db->Execute("DELETE FROM {$db->prefix}sector_defense WHERE quantity <= 0");
 Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
diff --git a/scheduler/sched_tow.php b/scheduler/sched_tow.php
index 572db10f5..f7a6eda88 100644
--- a/scheduler/sched_tow.php
+++ b/scheduler/sched_tow.php
@@ -39,7 +39,7 @@
             echo "...towing $row[character_name] out of $row[sector] ...";
             $newsector = random_int(0, (int) $max_sectors - 1);
             echo " to sector $newsector.<br>";
-            $query = $db->Execute("UPDATE {$db->prefix}ships SET sector = ?, cleared_defences=' ' WHERE ship_id=?", array($newsector, $row['ship_id']));
+            $query = $db->Execute("UPDATE {$db->prefix}ships SET sector = ?, cleared_defenses=' ' WHERE ship_id=?", array($newsector, $row['ship_id']));
             Tki\Db::LogDbErrors($pdo_db, $query, __LINE__, __FILE__);
             Tki\PlayerLog::WriteLog($pdo_db, $row['ship_id'], LOG_TOW, "$row[sector]|$newsector|$row[max_hull]");
             Tki\LogMove::writeLog($pdo_db, $row['ship_id'], $newsector);
diff --git a/schema/mysqli/sector_defence.sql b/schema/mysqli/sector_defence.sql
index b9fed756f..6eb2a69c3 100644
--- a/schema/mysqli/sector_defence.sql
+++ b/schema/mysqli/sector_defence.sql
@@ -1,11 +1,11 @@
-CREATE TABLE IF NOT EXISTS tki_sector_defence (
-  defence_id int(10) unsigned NOT NULL AUTO_INCREMENT,
+CREATE TABLE IF NOT EXISTS tki_sector_defense (
+  defense_id int(10) unsigned NOT NULL AUTO_INCREMENT,
   ship_id int(11) NOT NULL DEFAULT '0',
   sector_id int(10) unsigned NOT NULL DEFAULT '0',
-  defence_type varchar(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'M',
+  defense_type varchar(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'M',
   quantity int(20) NOT NULL DEFAULT '0',
   fm_setting varchar(6) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'toll',
-  PRIMARY KEY (defence_id),
+  PRIMARY KEY (defense_id),
   KEY tki_sector_id_key (sector_id),
   KEY tki_ship_id_key (ship_id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1 ;
diff --git a/schema/mysqli/ships.sql b/schema/mysqli/ships.sql
index 0c19a6ed8..03da492a6 100644
--- a/schema/mysqli/ships.sql
+++ b/schema/mysqli/ships.sql
@@ -48,7 +48,7 @@ CREATE TABLE IF NOT EXISTS tki_ships (
   trade_fighters varchar(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N',
   trade_torps varchar(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'N',
   trade_energy varchar(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Y',
-  cleared_defences varchar(99) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  cleared_defenses varchar(99) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   lang varchar(30) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'english.inc',
   dev_lssd varchar(1) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'Y',
   PRIMARY KEY (ship_id),
diff --git a/schema/postgres9/alter/sector_defence-seq-alter.sql b/schema/postgres9/alter/sector_defence-seq-alter.sql
index 472c72e58..10983b9e8 100644
--- a/schema/postgres9/alter/sector_defence-seq-alter.sql
+++ b/schema/postgres9/alter/sector_defence-seq-alter.sql
@@ -1 +1 @@
-ALTER SEQUENCE tki_sector_defence_defence_id_seq OWNED BY tki_sector_defence.defence_id;
+ALTER SEQUENCE tki_sector_defense_defense_id_seq OWNED BY tki_sector_defense.defense_id;
diff --git a/schema/postgres9/sector_defence.sql b/schema/postgres9/sector_defence.sql
index 8fdd90297..23d219383 100644
--- a/schema/postgres9/sector_defence.sql
+++ b/schema/postgres9/sector_defence.sql
@@ -1,9 +1,9 @@
-CREATE TABLE IF NOT EXISTS tki_sector_defence (
-  defence_id integer NOT NULL DEFAULT nextval('tki_sector_defence_defence_id_seq'),
+CREATE TABLE IF NOT EXISTS tki_sector_defense (
+  defense_id integer NOT NULL DEFAULT nextval('tki_sector_defense_defense_id_seq'),
   ship_id integer NOT NULL DEFAULT '0',
   sector_id integer NOT NULL DEFAULT '0',
-  defence_type varchar(1) NOT NULL DEFAULT 'M',
+  defense_type varchar(1) NOT NULL DEFAULT 'M',
   quantity integer NOT NULL DEFAULT '0',
   fm_setting varchar(6) NOT NULL DEFAULT 'toll',
-  PRIMARY KEY (defence_id)
+  PRIMARY KEY (defense_id)
 );
diff --git a/schema/postgres9/seq/sector_defence_defence_id_seq.sql b/schema/postgres9/seq/sector_defence_defence_id_seq.sql
index 839890d64..92ec1ac82 100644
--- a/schema/postgres9/seq/sector_defence_defence_id_seq.sql
+++ b/schema/postgres9/seq/sector_defence_defence_id_seq.sql
@@ -1 +1 @@
-CREATE SEQUENCE tki_sector_defence_defence_id_seq;
+CREATE SEQUENCE tki_sector_defense_defense_id_seq;
diff --git a/schema/postgres9/ships.sql b/schema/postgres9/ships.sql
index 214e95b77..b978f263b 100644
--- a/schema/postgres9/ships.sql
+++ b/schema/postgres9/ships.sql
@@ -48,7 +48,7 @@ CREATE TABLE IF NOT EXISTS tki_ships (
   trade_fighters character varying(1) NOT NULL DEFAULT 'N',
   trade_torps character varying(1) NOT NULL DEFAULT 'N',
   trade_energy character varying(1) NOT NULL DEFAULT 'Y',
-  cleared_defences character varying(99) DEFAULT NULL,
+  cleared_defenses character varying(99) DEFAULT NULL,
   lang character varying(30) NOT NULL DEFAULT 'english.inc',
   dev_lssd character varying(1) NOT NULL DEFAULT 'Y',
   PRIMARY KEY (ship_id)
diff --git a/sector_fighters.php b/sector_fighters.php
index 4370b8340..c06ab4d3d 100644
--- a/sector_fighters.php
+++ b/sector_fighters.php
@@ -149,7 +149,7 @@
 $langvars['l_sf_sendlog'] = str_replace("[lost]", $fighterslost, $langvars['l_sf_sendlog']);
 $langvars['l_sf_sendlog'] = str_replace("[sector]", $sector, $langvars['l_sf_sendlog']);
 
-Tki\SectorDefense::messageDefenseOwner($pdo_db, $sector, $langvars['l_sf_sendlog']);
+Tki\Sectordefense::messagedefenseOwner($pdo_db, $sector, $langvars['l_sf_sendlog']);
 Tki\PlayerLog::WriteLog($pdo_db, $playerinfo['ship_id'], LOG_DEFS_DESTROYED_F, "$fighterslost|$sector");
 $armor_lost = $playerinfo['armor_pts'] - $playerarmor;
 $fighters_lost = $playerinfo['ship_fighters'] - $playerfighters;
@@ -166,12 +166,12 @@
     Tki\PlayerLog::WriteLog($pdo_db, $playerinfo['ship_id'], LOG_DEFS_KABOOM, "$sector|$playerinfo[dev_escapepod]");
     $langvars['l_sf_sendlog2'] = str_replace("[player]", $playerinfo['character_name'], $langvars['l_sf_sendlog2']);
     $langvars['l_sf_sendlog2'] = str_replace("[sector]", $sector, $langvars['l_sf_sendlog2']);
-    Tki\SectorDefense::messageDefenseOwner($pdo_db, $sector, $langvars['l_sf_sendlog2']);
+    Tki\Sectordefense::messagedefenseOwner($pdo_db, $sector, $langvars['l_sf_sendlog2']);
     if ($playerinfo['dev_escapepod'] == 'Y')
     {
         $rating = round($playerinfo['rating'] / 2);
         echo $langvars['l_sf_escape'] . "<br><br>";
-        $resx = $db->Execute("UPDATE {$db->prefix}ships SET hull = 0, engines = 0, power = 0, sensors = 0, computer = 0, beams = 0, torp_launchers = 0, torps = 0, armor = 0, armor_pts = 100, cloak = 0, shields = 0, sector = 0, ship_organics = 0, ship_ore = 0, ship_goods = 0, ship_energy = ?, ship_colonists = 0, ship_fighters = 100, dev_warpedit = 0, dev_genesis = 0, dev_beacon = 0, dev_emerwarp = 0, dev_escapepod = 'N', dev_fuelscoop = 'N', dev_minedeflector = 0, on_planet = 'N', rating = ?, cleared_defences=' ', dev_lssd = 'N' WHERE ship_id = ?;", array($tkireg->start_energy, $rating, $playerinfo['ship_id']));
+        $resx = $db->Execute("UPDATE {$db->prefix}ships SET hull = 0, engines = 0, power = 0, sensors = 0, computer = 0, beams = 0, torp_launchers = 0, torps = 0, armor = 0, armor_pts = 100, cloak = 0, shields = 0, sector = 0, ship_organics = 0, ship_ore = 0, ship_goods = 0, ship_energy = ?, ship_colonists = 0, ship_fighters = 100, dev_warpedit = 0, dev_genesis = 0, dev_beacon = 0, dev_emerwarp = 0, dev_escapepod = 'N', dev_fuelscoop = 'N', dev_minedeflector = 0, on_planet = 'N', rating = ?, cleared_defenses=' ', dev_lssd = 'N' WHERE ship_id = ?;", array($tkireg->start_energy, $rating, $playerinfo['ship_id']));
         Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
         Tki\Bounty::cancel($pdo_db, $db, $playerinfo['ship_id']);
         $ok = 0;
diff --git a/settings.php b/settings.php
index 66bb31f1e..ce2a347c4 100644
--- a/settings.php
+++ b/settings.php
@@ -49,7 +49,7 @@
 $variables['max_traderoutes_player'] = $tkireg->max_traderoutes_player;
 $variables['colonist_production_rate'] = $tkireg->colonist_production_rate;
 $variables['energy_per_fighter'] = $tkireg->energy_per_fighter;
-$variables['defence_degrade_rate'] = $tkireg->defence_degrade_rate * 100;
+$variables['defense_degrade_rate'] = $tkireg->defense_degrade_rate * 100;
 $variables['min_bases_to_own'] = $tkireg->min_bases_to_own;
 $variables['interest_rate'] = number_format(($tkireg->interest_rate - 1) * 100, 3, $langvars['local_number_dec_point'], $langvars['local_number_thousands_sep']);
 $variables['sched_ticks'] = $tkireg->sched_ticks;
diff --git a/teams.php b/teams.php
index 55b15aaef..60fe98cd1 100644
--- a/teams.php
+++ b/teams.php
@@ -189,7 +189,7 @@
                             Tki\Ownership::calc($pdo_db, $db, $sector, $tkireg->min_bases_to_own, $langvars);
                         }
                     }
-                    Tki\Defense::defenceVsDefence($pdo_db, $db, $playerinfo['ship_id'], $langvars);
+                    Tki\defense::defenseVsdefense($pdo_db, $db, $playerinfo['ship_id'], $langvars);
                     Tki\Ship::leavePlanet($pdo_db, $playerinfo['ship_id']);
 
                     $langvars['l_team_onlymember'] = str_replace("[team_name]", "<strong>$team[team_name]</strong>", $langvars['l_team_onlymember']);
@@ -249,7 +249,7 @@
                         }
 
                         echo $langvars['l_team_youveleft'] . " <strong>" . $team['team_name'] . "</strong>.<br><br>";
-                        Tki\Defense::defenceVsDefence($pdo_db, $db, $playerinfo['ship_id'], $langvars);
+                        Tki\defense::defenseVsdefense($pdo_db, $db, $playerinfo['ship_id'], $langvars);
                         Tki\Ship::leavePlanet($pdo_db, $playerinfo['ship_id']);
                         Tki\PlayerLog::WriteLog($pdo_db, $playerinfo['ship_id'], LOG_TEAM_LEAVE, $team['team_name']);
                         Tki\PlayerLog::WriteLog($pdo_db, $team['creator'], LOG_TEAM_NOT_LEAVE, $playerinfo['character_name']);
diff --git a/templates/classic/newplayerguide.tpl b/templates/classic/newplayerguide.tpl
index 4fd300ede..7139c099f 100644
--- a/templates/classic/newplayerguide.tpl
+++ b/templates/classic/newplayerguide.tpl
@@ -96,10 +96,10 @@
         takes the same number of turns, but requires less work from you. Traderoutes can work on either real space or warp links. When you
         first start out, you will want to use warp links, so find sectors that are linked by warp links to trade between. Traderoutes can be one way
         or two ways. A two way traderoute means your ship will buy commodities from port A, sell them at port B, buy from port B then go back to port A and sell.
-        <li> Sector defences consist of mines and fighters. Mines are deployed torpedoes. Mines can only detect an incoming ship with a hull size greater than a certain level. Usually 8.
+        <li> Sector defenses consist of mines and fighters. Mines are deployed torpedoes. Mines can only detect an incoming ship with a hull size greater than a certain level. Usually 8.
         Fighters can be set to one of two modes. Attack or Toll. In attack mode, they will attack any ship that does not belong to their owner or a member of their owners team. In toll mode,
         they will only let you enter the sector safely if you agree to pay a toll. Sector fighters require energy from a friendly planet to remain in the sector. If there is insufficient or no energy, they will slow
-        break down. A defence against mines are mine deflectors. It is a good idea to carry a lot of these. They are cheap anyway. With fighters, you are given the options of fighting, retreating or using your ships cloaking
+        break down. A defense against mines are mine deflectors. It is a good idea to carry a lot of these. They are cheap anyway. With fighters, you are given the options of fighting, retreating or using your ships cloaking
         device to try and sneak in to the sector. Sector fighters require energy from a friendly planet in the same sector, otherwise they begin to degrade. The default amount of energy required is 1 unit of energy per 10 ships. Energy can be taken from any of your planets or from a team planet from your team in that sector.
         <li> Planets can created using a genesis torpedoe. Planets can produce commodoties and credits to fund your ship. The more colonists you have, the more they produce. You can use traderoutes to populate your planets from special ports.
         <li>Now go to the regular <a
diff --git a/templates/classic/settings.tpl b/templates/classic/settings.tpl
index 6d50c3a81..d7fdfef15 100644
--- a/templates/classic/settings.tpl
+++ b/templates/classic/settings.tpl
@@ -54,7 +54,7 @@
     <tr><td>{$langvars['l_set_max_traderoutes']}</td><td style="text-align:right;">{$variables['max_traderoutes_player']}</td></tr>
     <tr><td>{$langvars['l_set_colonist_prod']}</td><td style="text-align:right;">{$variables['colonist_production_rate']}</td></tr>
     <tr><td>{$langvars['l_set_energy_fits']}</td><td style="text-align:right;">{$variables['energy_per_fighter']}</td></tr>
-    <tr><td>{$langvars['l_set_fit_degrade']}</td><td style="text-align:right;">{$variables['defence_degrade_rate']}</td></tr>
+    <tr><td>{$langvars['l_set_fit_degrade']}</td><td style="text-align:right;">{$variables['defense_degrade_rate']}</td></tr>
     <tr><td>{$langvars['l_set_sector_own']}</td><td style="text-align:right;">{$variables['min_bases_to_own']}</td></tr>
     <tr><td>{$langvars['l_set_planet_interest']}</td><td style="text-align:right;">{$variables['interest_rate']}</td></tr>
     <tr><td>{$langvars['l_set_prod_fit']}</td><td style="text-align:right;">{$variables['cols_needed_fit']}</td></tr>
diff --git a/templates/classic/setup_info.tpl b/templates/classic/setup_info.tpl
index d5358eda0..417f813e4 100644
--- a/templates/classic/setup_info.tpl
+++ b/templates/classic/setup_info.tpl
@@ -325,7 +325,7 @@ This information will help us to help you much faster and will help improve our
     </tr>
     <tr>
       <td width="25%" bgcolor="#ccccff" align="left" valign="top"><font color="#000">Scheduler Rate</font></td>
-      <td width="65%" bgcolor="#C0C0C0" align="left" valign="top"><font color="#000">Sector Defences will degrade every</font></td>
+      <td width="65%" bgcolor="#C0C0C0" align="left" valign="top"><font color="#000">Sector Defenses will degrade every</font></td>
       <td width="10%" bgcolor="#ccccff" align="center" valign="top"><font color="#000"><strong>{$variables['sched_degrade']} Minutes</strong></font></td>
     </tr>
     <tr>
diff --git a/vendor/adodb/adodb-php/adodb-lib.inc.php b/vendor/adodb/adodb-php/adodb-lib.inc.php
index 625077dfb..1d540ceee 100644
--- a/vendor/adodb/adodb-php/adodb-lib.inc.php
+++ b/vendor/adodb/adodb-php/adodb-lib.inc.php
@@ -1073,7 +1073,7 @@ function _adodb_column_sql(&$zthis, $action, $type, $fname, $fnameq, $arrFields,
 		    break;
 
 		default:
-			$val = str_replace(array("'"," ","("),"",$arrFields[$fname]); // basic sql injection defence
+			$val = str_replace(array("'"," ","("),"",$arrFields[$fname]); // basic sql injection defense
 			if (empty($val)) $val = '0';
 			break;
 	}
diff --git a/xenobe_control.php b/xenobe_control.php
index 518595a6c..1be5cb572 100644
--- a/xenobe_control.php
+++ b/xenobe_control.php
@@ -585,7 +585,7 @@
                     $stamp = date("Y-m-d H:i:s");
 
                     // Add Xenobe record to ships table ... modify if the ships schema changes
-                    $thesql = "INSERT INTO {$db->prefix}ships ( `ship_id` , `ship_name` , `ship_destroyed` , `character_name` , `password` , `email` , `hull` , `engines` , `power` , `computer` , `sensors` , `beams` , `torp_launchers` , `torps` , `shields` , `armor` , `armor_pts` , `cloak` , `credits` , `sector` , `ship_ore` , `ship_organics` , `ship_goods` , `ship_energy` , `ship_colonists` , `ship_fighters` , `ship_damage` , `turns` , `on_planet` , `dev_warpedit` , `dev_genesis` , `dev_beacon` , `dev_emerwarp` , `dev_escapepod` , `dev_fuelscoop` , `dev_minedeflector` , `turns_used` , `last_login` , `rating` , `score` , `team` , `team_invite` , `interface` , `ip_address` , `planet_id` , `trade_colonists` , `trade_fighters` , `trade_torps` , `trade_energy` , `cleared_defences` , `lang` , `dev_lssd` )
+                    $thesql = "INSERT INTO {$db->prefix}ships ( `ship_id` , `ship_name` , `ship_destroyed` , `character_name` , `password` , `email` , `hull` , `engines` , `power` , `computer` , `sensors` , `beams` , `torp_launchers` , `torps` , `shields` , `armor` , `armor_pts` , `cloak` , `credits` , `sector` , `ship_ore` , `ship_organics` , `ship_goods` , `ship_energy` , `ship_colonists` , `ship_fighters` , `ship_damage` , `turns` , `on_planet` , `dev_warpedit` , `dev_genesis` , `dev_beacon` , `dev_emerwarp` , `dev_escapepod` , `dev_fuelscoop` , `dev_minedeflector` , `turns_used` , `last_login` , `rating` , `score` , `team` , `team_invite` , `interface` , `ip_address` , `planet_id` , `trade_colonists` , `trade_fighters` , `trade_torps` , `trade_energy` , `cleared_defenses` , `lang` , `dev_lssd` )
                                VALUES (NULL,'$shipname','N','$character','$makepass','$emailname',$xenlevel,$xenlevel,$xenlevel,$xenlevel,$xenlevel,$xenlevel,$xenlevel,$maxtorps,$xenlevel,$xenlevel,$maxarmor,$xenlevel,$start_credits,$sector,0,0,0,$maxenergy,0,$maxfighters,0,$start_turns,'N',0,0,0,0,'N','N',0,0, '$stamp',0,0,0,0,'N','127.0.0.1',0,'Y','N','N','Y',NULL,'$default_lang','Y')";
                     $result2 = $db->Execute($thesql);
                     Tki\Db::LogDbErrors($pdo_db, $result2, __LINE__, __FILE__);
diff --git a/zoneinfo.php b/zoneinfo.php
index d1318e14c..1c20a5b77 100644
--- a/zoneinfo.php
+++ b/zoneinfo.php
@@ -22,7 +22,7 @@
 Tki\Login::checkLogin($pdo_db, $lang, $tkireg, $template);
 
 // Database driven language entries
-$langvars = Tki\Translate::load($pdo_db, $lang, array('port', 'main', 'attack', 'zoneinfo', 'report', 'common', 'global_includes', 'global_funcs', 'footer', 'modify_defences'));
+$langvars = Tki\Translate::load($pdo_db, $lang, array('port', 'main', 'attack', 'zoneinfo', 'report', 'common', 'global_includes', 'global_funcs', 'footer', 'modify_defenses'));
 $title = $langvars['l_zi_title'];
 $body_class = 'zoneinfo';
 Tki\Header::display($pdo_db, $lang, $template, $title, $body_class);