diff --git a/source/player.cpp b/source/player.cpp
index 5a60484..8eec7c6 100644
--- a/source/player.cpp
+++ b/source/player.cpp
@@ -134,10 +134,10 @@ void Player::setInputEnteringName(Input::Action action) {
         case Input::Action::FIRE_CENTER:
             enter_name_->removeLastCharacter();
             break;
-        case Input::Action::UP:
+        case Input::Action::RIGHT:
             enter_name_->incIndex();
             break;
-        case Input::Action::DOWN:
+        case Input::Action::LEFT:
             enter_name_->decIndex();
             break;
         case Input::Action::START:
diff --git a/source/sections/game.cpp b/source/sections/game.cpp
index 98c8f8a..09e5cd3 100644
--- a/source/sections/game.cpp
+++ b/source/sections/game.cpp
@@ -1451,14 +1451,14 @@ void Game::handleNameInput(const std::shared_ptr<Player>& player) {
         return;
     }
 
-    if (input_->checkAction(Input::Action::UP, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
-        player->setInput(Input::Action::UP);
+    if (input_->checkAction(Input::Action::LEFT, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
+        player->setInput(Input::Action::LEFT);
         playSound("service_menu_move.wav");
         return;
     }
 
-    if (input_->checkAction(Input::Action::DOWN, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
-        player->setInput(Input::Action::DOWN);
+    if (input_->checkAction(Input::Action::RIGHT, Input::DO_NOT_ALLOW_REPEAT, player->getUsesKeyboard(), player->getGamepad())) {
+        player->setInput(Input::Action::RIGHT);
         playSound("service_menu_move.wav");
         return;
     }