diff --git a/source/client/core/KeyboardHandler.cpp b/source/client/core/KeyboardHandler.cpp
index da8f281a8..e160dc7de 100644
--- a/source/client/core/KeyboardHandler.cpp
+++ b/source/client/core/KeyboardHandler.cpp
@@ -37,8 +37,8 @@
 KeyboardHandler::KeyboardHandler() {
 	addKey(GameKey::Left,            "Left",            SDLK_a);
 	addKey(GameKey::Right,           "Right",           SDLK_d);
-	addKey(GameKey::Up,              "Up",              SDLK_w);
-	addKey(GameKey::Down,            "Down",            SDLK_s);
+	addKey(GameKey::Forward,         "Forward",         SDLK_w);
+	addKey(GameKey::Back,            "Back",            SDLK_s);
 
 	addKey(GameKey::Jump,            "Jump",            SDLK_SPACE);
 	addKey(GameKey::Fly,             "Fly",             SDLK_x);
diff --git a/source/client/world/ClientPlayer.cpp b/source/client/world/ClientPlayer.cpp
index 667423fba..453762fdc 100644
--- a/source/client/world/ClientPlayer.cpp
+++ b/source/client/world/ClientPlayer.cpp
@@ -93,16 +93,16 @@ void ClientPlayer::processInputs() {
 		m_velocity.z = -0.1;
 	}
 
-	if(gk::GamePad::isKeyPressed(GameKey::Up))        move(0.0f);
-	else if(gk::GamePad::isKeyPressed(GameKey::Down)) move(180.0f);
+	if(gk::GamePad::isKeyPressed(GameKey::Forward))    move(0.0f);
+	else if(gk::GamePad::isKeyPressed(GameKey::Back))  move(180.0f);
 
 	if(gk::GamePad::isKeyPressed(GameKey::Left))       move(90.0f);
 	else if(gk::GamePad::isKeyPressed(GameKey::Right)) move(-90.0f);
 
-	if (gk::GamePad::isKeyPressed(GameKey::Left)  && gk::GamePad::isKeyPressed(GameKey::Up))   move(45.0f);
-	if (gk::GamePad::isKeyPressed(GameKey::Right) && gk::GamePad::isKeyPressed(GameKey::Up))   move(-45.0f);
-	if (gk::GamePad::isKeyPressed(GameKey::Left)  && gk::GamePad::isKeyPressed(GameKey::Down)) move(135.0f);
-	if (gk::GamePad::isKeyPressed(GameKey::Right) && gk::GamePad::isKeyPressed(GameKey::Down)) move(-135.0f);
+	if (gk::GamePad::isKeyPressed(GameKey::Left)  && gk::GamePad::isKeyPressed(GameKey::Forward)) move(45.0f);
+	if (gk::GamePad::isKeyPressed(GameKey::Right) && gk::GamePad::isKeyPressed(GameKey::Forward)) move(-45.0f);
+	if (gk::GamePad::isKeyPressed(GameKey::Left)  && gk::GamePad::isKeyPressed(GameKey::Back))    move(135.0f);
+	if (gk::GamePad::isKeyPressed(GameKey::Right) && gk::GamePad::isKeyPressed(GameKey::Back))    move(-135.0f);
 
 	if (gk::GamePad::isKeyPressed(GameKey::Sprint)) {
 		m_velocity.x *= 1.5f;
diff --git a/source/common/core/input/GameKey.hpp b/source/common/core/input/GameKey.hpp
index 4f4ddf36e..e206e3ed5 100644
--- a/source/common/core/input/GameKey.hpp
+++ b/source/common/core/input/GameKey.hpp
@@ -24,8 +24,8 @@
  *
  * =====================================================================================
  */
-#ifndef GK_GAMEKEY_HPP_
-#define GK_GAMEKEY_HPP_
+#ifndef GAMEKEY_HPP_
+#define GAMEKEY_HPP_
 
 namespace GameKey {
 	enum {
@@ -33,8 +33,8 @@ namespace GameKey {
 
 		Left,
 		Right,
-		Up,
-		Down,
+		Forward,
+		Back,
 
 		Jump,
 		Fly,
@@ -50,4 +50,4 @@ namespace GameKey {
 	};
 }
 
-#endif // GK_GAMEKEY_HPP_
+#endif // GAMEKEY_HPP_
diff --git a/source/server/network/ServerCommandHandler.hpp b/source/server/network/ServerCommandHandler.hpp
index e9491fc8b..b40d05b2b 100644
--- a/source/server/network/ServerCommandHandler.hpp
+++ b/source/server/network/ServerCommandHandler.hpp
@@ -93,7 +93,7 @@ class ServerCommandHandler {
 
 		Registry &m_registry;
 
-		gk::Vector3d m_spawnPosition{14.5, 14.5, 18.};
+		gk::Vector3d m_spawnPosition{19.5, 14.5, 19.};
 
 		ChatCommandHandler m_chatCommandHandler{*this, m_worldController};
 };