diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp
index e11b81cd..ba939024 100644
--- a/desktop_version/src/Game.cpp
+++ b/desktop_version/src/Game.cpp
@@ -1332,7 +1332,7 @@ void Game::updatestate()
             if(graphics.fademode == 1)	state++;
             break;
         case 81:
-            gamestate = 1;
+            gamestate = TITLEMODE;
             graphics.fademode = 4;
             music.play(6);
             graphics.backgrounddrawn = false;
@@ -1389,7 +1389,7 @@ void Game::updatestate()
             break;
         case 84:
             graphics.flipmode = false;
-            gamestate = 1;
+            gamestate = TITLEMODE;
             graphics.fademode = 4;
             graphics.backgrounddrawn = true;
             map.tdrawback = true;
@@ -1469,7 +1469,7 @@ void Game::updatestate()
             if(graphics.fademode == 1)	state++;
             break;
         case 97:
-            gamestate = 0;
+            gamestate = GAMEMODE;
             graphics.fademode = 4;
             startscript = true;
             newscript="returntolab";
@@ -3049,7 +3049,7 @@ void Game::updatestate()
             break;
         case 3101:
             graphics.flipmode = false;
-            gamestate = 1;
+            gamestate = TITLEMODE;
             graphics.fademode = 4;
             graphics.backgrounddrawn = true;
             map.tdrawback = true;
@@ -3376,7 +3376,7 @@ void Game::updatestate()
             break;
         case 3522:
             graphics.flipmode = false;
-            gamestate = 1;
+            gamestate = TITLEMODE;
             graphics.fademode = 4;
             graphics.backgrounddrawn = true;
             map.tdrawback = true;
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
index 73ab482b..92f10b9a 100644
--- a/desktop_version/src/Input.cpp
+++ b/desktop_version/src/Input.cpp
@@ -1484,7 +1484,7 @@ void gameinput()
                             else if (game.companion == 0)
                             {
                                 //Alright, normal teleporting
-                                game.gamestate = 5;
+                                game.gamestate = TELEPORTERMODE;
                                 graphics.menuoffset = 240; //actually this should count the roomname
                                 if (map.extrarow) graphics.menuoffset -= 10;
 
diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index cf150b5b..7aa05ab4 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -69,7 +69,7 @@ void gamecompletelogic()
         graphics.showcutscenebars = false;
         graphics.cutscenebarspos = 0;
         //Return to game
-        game.gamestate = 7;
+        game.gamestate = GAMECOMPLETE2;
         graphics.fademode = 4;
     }
 }
@@ -106,7 +106,7 @@ void gamecompletelogic2()
         music.currentsong=tmp;
         //Return to game
         map.colstate = 10;
-        game.gamestate = 1;
+        game.gamestate = TITLEMODE;
         graphics.fademode = 4;
         music.playef(18);
         game.createmenu(Menu::gamecompletecontinue);
diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp
index 66bd00cd..c8e219cd 100644
--- a/desktop_version/src/Script.cpp
+++ b/desktop_version/src/Script.cpp
@@ -1266,7 +1266,7 @@ void scriptclass::run()
 				if (words[1] == "teleporter")
 				{
 					//TODO this draw the teleporter screen. This is a problem. :(
-					game.gamestate = 5;
+					game.gamestate = TELEPORTERMODE;
 					graphics.menuoffset = 240; //actually this should count the roomname
 					if (map.extrarow) graphics.menuoffset -= 10;
 
@@ -1502,7 +1502,7 @@ void scriptclass::run()
 			}
 			else if (words[0] == "rollcredits")
 			{
-				game.gamestate = 6;
+				game.gamestate = GAMECOMPLETE;
 				graphics.fademode = 4;
 				game.creditposition = 0;
 			}
diff --git a/desktop_version/src/editor.cpp b/desktop_version/src/editor.cpp
index aa4c46c6..d43e4b34 100644
--- a/desktop_version/src/editor.cpp
+++ b/desktop_version/src/editor.cpp
@@ -3448,7 +3448,7 @@ void editorlogic()
         //Return to game
         map.nexttowercolour();
         map.colstate = 10;
-        game.gamestate = 1;
+        game.gamestate = TITLEMODE;
         graphics.fademode = 4;
         music.haltdasmusik();
         music.play(6);