diff --git a/code/fgame/Entities.h b/code/fgame/Entities.h
index c26f3f93..bbb454a3 100644
--- a/code/fgame/Entities.h
+++ b/code/fgame/Entities.h
@@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "animate.h"
 
 typedef enum {
-    CONTROLLER_ALLIES,
     CONTROLLER_AXIS,
+    CONTROLLER_ALLIES,
     CONTROLLER_DRAW
 } eController;
 
diff --git a/code/fgame/Tow_Entities.cpp b/code/fgame/Tow_Entities.cpp
index d4b1921b..b59c2ec7 100644
--- a/code/fgame/Tow_Entities.cpp
+++ b/code/fgame/Tow_Entities.cpp
@@ -269,13 +269,13 @@ void TOWObjective::TakeOver(Event *ev)
 
     switch (controller) {
     case CONTROLLER_ALLIES:
-        gi.cvar_set(m_sAxisObjName.c_str(), "1");
-        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
-        break;
-    case CONTROLLER_AXIS:
         gi.cvar_set(m_sAxisObjName.c_str(), "0");
         gi.cvar_set(m_sAlliesObjName.c_str(), "1");
         break;
+    case CONTROLLER_AXIS:
+        gi.cvar_set(m_sAxisObjName.c_str(), "1");
+        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
+        break;
     default:
         break;
     }
@@ -308,13 +308,13 @@ void TOWObjective::OnInitialize(Event *ev)
 
     switch (m_eController) {
     case CONTROLLER_ALLIES:
-        gi.cvar_set(m_sAxisObjName.c_str(), "1");
-        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
-        break;
-    case CONTROLLER_AXIS:
         gi.cvar_set(m_sAxisObjName.c_str(), "0");
         gi.cvar_set(m_sAlliesObjName.c_str(), "1");
         break;
+    case CONTROLLER_AXIS:
+        gi.cvar_set(m_sAxisObjName.c_str(), "1");
+        gi.cvar_set(m_sAlliesObjName.c_str(), "0");
+        break;
     case CONTROLLER_DRAW:
         gi.cvar_set(m_sAxisObjName.c_str(), "0");
         gi.cvar_set(m_sAlliesObjName.c_str(), "0");
diff --git a/code/fgame/Tow_Entities.h b/code/fgame/Tow_Entities.h
index eee8cd6f..dca59a86 100644
--- a/code/fgame/Tow_Entities.h
+++ b/code/fgame/Tow_Entities.h
@@ -59,8 +59,8 @@ class TOWObjectiveMan
 {
 private:
     Container<TOWObjective *> m_towObjectives;
-    int                       m_iNumAxisObjectives;
     int                       m_iNumAlliesObjectives;
+    int                       m_iNumAxisObjectives;
 
 public:
     TOWObjectiveMan();
diff --git a/code/fgame/dm_manager.cpp b/code/fgame/dm_manager.cpp
index c6d3ab50..bfd8f321 100644
--- a/code/fgame/dm_manager.cpp
+++ b/code/fgame/dm_manager.cpp
@@ -1720,10 +1720,10 @@ void DM_Manager::SetBombsPlanted(int num)
 
 void DM_Manager::StopTeamRespawn(eController controller)
 {
-    if (controller == CONTROLLER_AXIS) {
-        m_bAllowAxisRespawn = false;
-    } else if (controller == CONTROLLER_ALLIES) {
+    if (controller == CONTROLLER_ALLIES) {
         m_bAllowAlliedRespawn = false;
+    } else if (controller == CONTROLLER_AXIS) {
+        m_bAllowAxisRespawn = false;
     }
 }
 
diff --git a/code/fgame/dm_manager.h b/code/fgame/dm_manager.h
index 55a72e28..087ea5b0 100644
--- a/code/fgame/dm_manager.h
+++ b/code/fgame/dm_manager.h
@@ -179,8 +179,8 @@ private:
     int m_iNumBombsPlanted;
     int m_iTotalMapTime;
 
-    bool m_bAllowAxisRespawn;
     bool m_bAllowAlliedRespawn;
+    bool m_bAllowAxisRespawn;
     bool m_bRoundActive;
 
     // scoreboard data