diff --git a/src/input_buttons.h b/src/input_buttons.h
index eb2731f1e0..2d9b420af9 100644
--- a/src/input_buttons.h
+++ b/src/input_buttons.h
@@ -81,8 +81,8 @@ namespace Input {
 		MOUSE_MIDDLE,
 		SCROLL_UP,
 		SCROLL_DOWN,
-		FAST_FORWARD,
-		FAST_FORWARD_PLUS,
+		FAST_FORWARD_A,
+		FAST_FORWARD_B,
 		TOGGLE_FULLSCREEN,
 		TOGGLE_ZOOM,
 		BUTTON_COUNT
@@ -189,8 +189,8 @@ namespace Input {
 			case TAKE_SCREENSHOT:
 			case SHOW_LOG:
 			case TOGGLE_ZOOM:
-			case FAST_FORWARD:
-			case FAST_FORWARD_PLUS:
+			case FAST_FORWARD_A:
+			case FAST_FORWARD_B:
 				return true;
 			default:
 				return false;
diff --git a/src/input_buttons_desktop.cpp b/src/input_buttons_desktop.cpp
index 5a917b1010..fbba83534a 100644
--- a/src/input_buttons_desktop.cpp
+++ b/src/input_buttons_desktop.cpp
@@ -99,8 +99,8 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 		{PAGE_UP, Keys::PGUP},
 		{PAGE_DOWN, Keys::PGDN},
 		{RESET, Keys::F12},
-		{FAST_FORWARD, Keys::F},
-		{FAST_FORWARD_PLUS, Keys::G},
+		{FAST_FORWARD_A, Keys::F},
+		{FAST_FORWARD_B, Keys::G},
 
 #if defined(USE_MOUSE) && defined(SUPPORT_MOUSE)
 		{MOUSE_LEFT, Keys::MOUSE_LEFT},
@@ -155,8 +155,8 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 		{N7, Keys::JOY_RSTICK_UP_LEFT},
 		{N8, Keys::JOY_RSTICK_UP},
 		{N9, Keys::JOY_RSTICK_UP_RIGHT},
-		{FAST_FORWARD, Keys::JOY_RTRIGGER_SOFT},
-		{FAST_FORWARD_PLUS, Keys::JOY_RTRIGGER_FULL},
+		{FAST_FORWARD_A, Keys::JOY_RTRIGGER_SOFT},
+		{FAST_FORWARD_B, Keys::JOY_RTRIGGER_FULL},
 		{DEBUG_THROUGH, Keys::JOY_LTRIGGER_SOFT},
 		{DEBUG_MENU, Keys::JOY_LTRIGGER_FULL},
 #endif
diff --git a/src/platform/3ds/input_buttons.cpp b/src/platform/3ds/input_buttons.cpp
index 71aea52801..d7f17a731a 100644
--- a/src/platform/3ds/input_buttons.cpp
+++ b/src/platform/3ds/input_buttons.cpp
@@ -31,7 +31,7 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 		{CANCEL, Keys::JOY_X},
 		{SHIFT, Keys::JOY_Y},
 		{TOGGLE_FPS, Keys::JOY_SHOULDER_LEFT},
-		{FAST_FORWARD, Keys::JOY_SHOULDER_RIGHT},
+		{FAST_FORWARD_A, Keys::JOY_SHOULDER_RIGHT},
 		{SETTINGS_MENU, Keys::JOY_START},
 		{RESET, Keys::JOY_BACK},
 		// Touchscreen
diff --git a/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp b/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp
index 6f36af8d65..6809bca55a 100644
--- a/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp
+++ b/src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp
@@ -43,7 +43,7 @@ JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_endG
 JNIEXPORT void JNICALL Java_org_easyrpg_player_player_EasyRpgPlayerActivity_setFastForwardMultiplier
   (JNIEnv *, jclass, jint ji)
 {
-	Player::speed_modifier = ji;
+	Player::speed_modifier_a = ji;
 }
 
 JNIEXPORT void JNICALL
diff --git a/src/platform/libretro/input_buttons.cpp b/src/platform/libretro/input_buttons.cpp
index 4e97a7181f..f7604ff05a 100644
--- a/src/platform/libretro/input_buttons.cpp
+++ b/src/platform/libretro/input_buttons.cpp
@@ -55,8 +55,8 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 		{N7, Keys::JOY_RSTICK_UP_LEFT},
 		{N8, Keys::JOY_RSTICK_UP},
 		{N9, Keys::JOY_RSTICK_UP_RIGHT},
-		{FAST_FORWARD, Keys::JOY_RTRIGGER_SOFT},
-		{FAST_FORWARD_PLUS, Keys::JOY_RTRIGGER_FULL},
+		{FAST_FORWARD_A, Keys::JOY_RTRIGGER_SOFT},
+		{FAST_FORWARD_B, Keys::JOY_RTRIGGER_FULL},
 		{DEBUG_THROUGH, Keys::JOY_LTRIGGER_SOFT},
 		{DEBUG_MENU, Keys::JOY_LTRIGGER_FULL},
 #endif
diff --git a/src/platform/psp/psp_input_buttons.cpp b/src/platform/psp/psp_input_buttons.cpp
index ee7127489e..f2e657a9ec 100644
--- a/src/platform/psp/psp_input_buttons.cpp
+++ b/src/platform/psp/psp_input_buttons.cpp
@@ -25,7 +25,7 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 	return {
 		{CANCEL, Keys::JOY_A}, // Cross
 		{DECISION, Keys::JOY_B}, // Circle
-		{FAST_FORWARD, Keys::JOY_X}, // Square
+		{FAST_FORWARD_A, Keys::JOY_X}, // Square
 		{SHIFT, Keys::JOY_Y}, // Triangle
 
 		{N1, Keys::JOY_SHOULDER_LEFT}, // Left trigger
diff --git a/src/platform/psvita/input_buttons.cpp b/src/platform/psvita/input_buttons.cpp
index c499aaf9cd..f5611dffaf 100644
--- a/src/platform/psvita/input_buttons.cpp
+++ b/src/platform/psvita/input_buttons.cpp
@@ -32,7 +32,7 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 		{CANCEL, Keys::JOY_X},
 		{SHIFT, Keys::JOY_Y},
 		{TOGGLE_FPS, Keys::JOY_SHOULDER_LEFT},
-		{FAST_FORWARD, Keys::JOY_SHOULDER_RIGHT},
+		{FAST_FORWARD_A, Keys::JOY_SHOULDER_RIGHT},
 		{SETTINGS_MENU, Keys::JOY_START},
 		{RESET, Keys::JOY_BACK},
 #endif
diff --git a/src/platform/switch/input_buttons.cpp b/src/platform/switch/input_buttons.cpp
index f29646e90f..dbbf0f7071 100644
--- a/src/platform/switch/input_buttons.cpp
+++ b/src/platform/switch/input_buttons.cpp
@@ -37,7 +37,7 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 		{TOGGLE_FPS, Keys::JOY_SHOULDER_RIGHT},
 		{SETTINGS_MENU, Keys::JOY_START},
 		{RESET, Keys::JOY_BACK},
-		{FAST_FORWARD, Keys::JOY_RTRIGGER_FULL},
+		{FAST_FORWARD_A, Keys::JOY_RTRIGGER_FULL},
 		{DEBUG_MENU, Keys::JOY_LTRIGGER_FULL},
 #endif
 		// Touchscreen
diff --git a/src/platform/wii/input_buttons.cpp b/src/platform/wii/input_buttons.cpp
index b2306794ed..be179df0a2 100644
--- a/src/platform/wii/input_buttons.cpp
+++ b/src/platform/wii/input_buttons.cpp
@@ -29,7 +29,7 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 		{CANCEL, Keys::JOY_OTHER_2}, // 1
 		{DECISION, Keys::JOY_OTHER_3}, // 2
 		{RESET, Keys::JOY_OTHER_4}, // -, shared with CC
-		{FAST_FORWARD, Keys::JOY_OTHER_5}, // +, shared with CC
+		{FAST_FORWARD_A, Keys::JOY_OTHER_5}, // +, shared with CC
 		{SETTINGS_MENU, Keys::JOY_OTHER_6}, // Home, shared with CC
 
 		// Nunchuck
@@ -40,7 +40,7 @@ Input::ButtonMappingArray Input::GetDefaultButtonMappings() {
 		{SHIFT, Keys::JOY_OTHER_9}, // X
 		{CANCEL, Keys::JOY_OTHER_10}, // Y
 		{N0, Keys::JOY_OTHER_11}, // L
-		{FAST_FORWARD_PLUS, Keys::JOY_OTHER_12}, // R
+		{FAST_FORWARD_B, Keys::JOY_OTHER_12}, // R
 		{N5, Keys::JOY_OTHER_13}, // ZL
 		{TOGGLE_FPS, Keys::JOY_OTHER_14}, // ZR
 
diff --git a/src/player.cpp b/src/player.cpp
index e86930e007..058b305b37 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -302,10 +302,10 @@ void Player::UpdateInput() {
 		DisplayUi->ToggleZoom();
 	}
 	float speed = 1.0;
-	if (Input::IsSystemPressed(Input::FAST_FORWARD)) {
+	if (Input::IsSystemPressed(Input::FAST_FORWARD_A)) {
 		speed = speed_modifier_a;
 	}
-	if (Input::IsSystemPressed(Input::FAST_FORWARD_PLUS)) {
+	if (Input::IsSystemPressed(Input::FAST_FORWARD_B)) {
 		speed = speed_modifier_b;
 	}
 	Game_Clock::SetGameSpeedFactor(speed);
diff --git a/src/window_settings.cpp b/src/window_settings.cpp
index dcd0e6de36..0543f2414b 100644
--- a/src/window_settings.cpp
+++ b/src/window_settings.cpp
@@ -414,7 +414,7 @@ void Window_Settings::RefreshButtonList() {
 			break;
 		case 1:
 			buttons = {Input::SETTINGS_MENU, Input::TOGGLE_FPS, Input::TOGGLE_FULLSCREEN, Input::TOGGLE_ZOOM,
-				Input::TAKE_SCREENSHOT, Input::RESET, Input::FAST_FORWARD, Input::FAST_FORWARD_PLUS,
+				Input::TAKE_SCREENSHOT, Input::RESET, Input::FAST_FORWARD_A, Input::FAST_FORWARD_B,
 				Input::PAGE_UP, Input::PAGE_DOWN };
 			break;
 		case 2:
@@ -478,10 +478,10 @@ void Window_Settings::RefreshButtonList() {
 		}
 
 		switch(button){
-			case Input::FAST_FORWARD:
+			case Input::FAST_FORWARD_A:
 				help = GetFastForwardDescription(0);
 				break;
-			case Input::FAST_FORWARD_PLUS:
+			case Input::FAST_FORWARD_B:
 				help = GetFastForwardDescription(1);
 				break;
 			default: