diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/RK3588-ACE/mupen64plus.cfg b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/RK3588-ACE/mupen64plus.cfg
index c637c1119..dc55f23be 100644
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/RK3588-ACE/mupen64plus.cfg
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-core/config/RK3588-ACE/mupen64plus.cfg
@@ -110,25 +110,25 @@ Kbd Mapping Frame Advance = 47
 # SDL keysym for pressing the game shark button
 Kbd Mapping Gameshark = 103
 # Joystick event string for stopping the emulator
-Joy Mapping Stop = "J0B8/B9"
+Joy Mapping Stop = "J0B9/B8"
 # Joystick event string for switching between fullscreen/windowed modes
 Joy Mapping Fullscreen = ""
 # Joystick event string for saving the emulator state
-Joy Mapping Save State = "J0B8/B5"
+Joy Mapping Save State = "J0B9/B6"
 # Joystick event string for loading the emulator state
-Joy Mapping Load State = "J0B8/B4"
+Joy Mapping Load State = "J0B9/B5"
 # Joystick event string for advancing the save state slot
 Joy Mapping Increment Slot = ""
 # Joystick event string for resetting the emulator
-Joy Mapping Reset = "J0B8/B0"
+Joy Mapping Reset = "J0B9/B0"
 # Joystick event string for slowing down the emulator
 Joy Mapping Speed Down = ""
 # Joystick event string for speeding up the emulator
 Joy Mapping Speed Up = ""
 # Joystick event string for taking a screenshot
-Joy Mapping Screenshot = "J0B8/B3"
+Joy Mapping Screenshot = "J0B9/B3"
 # Joystick event string for pausing the emulator
-Joy Mapping Pause = "J0B12/B1"
+Joy Mapping Pause = "J0B9/B1"
 # Joystick event string for muting/unmuting the sound
 Joy Mapping Mute = ""
 # Joystick event string for increasing the volume
@@ -172,7 +172,7 @@ mode = 2
 # Specifies which joystick is bound to this controller: -1=No joystick, 0 or more= SDL Joystick number
 device = 0
 # SDL joystick name (or Keyboard)
-name = "rg552_joypad"
+name = "GameForce ACE Gamepad"
 # Specifies whether this controller is 'plugged in' to the simulated N64
 plugged = True
 # Specifies which type of expansion pak is in the controller: 1=None, 2=Mem pak, 4=Transfer pak, 5=Rumble pak
@@ -186,26 +186,25 @@ AnalogDeadzone = "0,0"
 # An absolute value of the SDL joystick axis >= AnalogPeak will saturate the N64 controller axis value (at 80).  For X, Y axes. For each axis, this must be greater than the corresponding AnalogDeadzone value
 AnalogPeak = "32768,32768"
 # Digital button configuration mappings
-DPad R = button(16)
-DPad L = button(15)
-DPad D = button(14)
-DPad U = button(13)
-Start = button(9)
-Z Trig = button(5)
-B Button = button(3)
+DPad R = button(15)
+DPad L = button(14)
+DPad D = button(13)
+DPad U = button(12)
+Start = button(8)
+Z Trig = axis(5-)
+B Button = button(4)
 A Button = button(0)
-C Button R = axis(2+)
-C Button L = axis(2-)
-C Button D = axis(3+)
-C Button U = axis(3-)
-R Trig = button(7)
-L Trig = button(4)
-Mempak switch = 
-Rumblepak switch = 
+C Button R = axis(3+)
+C Button L = axis(3-)
+C Button D = axis(4+)
+C Button U = axis(4-)
+R Trig = button(6)
+L Trig = button(5)
+Mempak switch =
+Rumblepak switch =
 # Analog axis configuration mappings
-X Axis = axis(0-,0+)
-Y Axis = axis(1-,1+)
-
+X Axis = axis(1-,1+)
+Y Axis = axis(0-,0+)
 
 [Input-SDL-Control2]
 
diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3588-ACE/default.ini b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3588-ACE/default.ini
index c062c8c8c..965acd691 100644
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3588-ACE/default.ini
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3588-ACE/default.ini
@@ -1,25 +1,25 @@
-; RG552 Gamepad - default.ini
-[rg552_joypad]
+; GameForce ACE Gamepad - default.ini
+[GameForce ACE Gamepad]
 plugged = True
 mouse = False
 AnalogDeadzone = 0,0
 AnalogPeak = 32768,32768
-DPad R = button(16)
-DPad L = button(15)
-DPad D = button(14)
-DPad U = button(13)
-Start = button(9)
-Z Trig = button(6)
-B Button = button(3)
+DPad R = button(15)
+DPad L = button(14)
+DPad D = button(13)
+DPad U = button(12)
+Start = button(8)
+Z Trig = axis(5-)
+B Button = button(4)
 A Button = button(0)
-C Button R = axis(2+)
-C Button L = axis(2-)
-C Button D = axis(3+)
-C Button U = axis(3-)
-R Trig = button(5)
-L Trig = button(4)
+C Button R = axis(3+)
+C Button L = axis(3-)
+C Button D = axis(4+)
+C Button U = axis(4-)
+R Trig = button(6)
+L Trig = button(5)
 Mempak switch = 
 Rumblepak switch = 
 # Analog axis configuration mappings
-X Axis = axis(0-,0+)
-Y Axis = axis(1-,1+)
+X Axis = axis(1-,1+)
+Y Axis = axis(0-,0+)
diff --git a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3588-ACE/zlswap.ini b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3588-ACE/zlswap.ini
index 6735db0da..a19aabff2 100644
--- a/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3588-ACE/zlswap.ini
+++ b/packages/emulators/standalone/mupen64plus-sa/mupen64plus-sa-input-sdl/config/RK3588-ACE/zlswap.ini
@@ -1,25 +1,25 @@
-; RG552 Gamepad - zlswap.ini
-[rg552_joypad]
+; GameForce ACE Gamepad - default.ini
+[GameForce ACE Gamepad]
 plugged = True
 mouse = False
 AnalogDeadzone = 0,0
 AnalogPeak = 32768,32768
-DPad R = button(16)
-DPad L = button(15)
-DPad D = button(14)
-DPad U = button(13)
-Start = button(9)
-Z Trig = button(4)
-B Button = button(3)
+DPad R = button(15)
+DPad L = button(14)
+DPad D = button(13)
+DPad U = button(12)
+Start = button(8)
+Z Trig = button(5)
+B Button = button(4)
 A Button = button(0)
-C Button R = axis(2+)
-C Button L = axis(2-)
-C Button D = axis(3+)
-C Button U = axis(3-)
-R Trig = button(5)
-L Trig = button(6)
-Mempak switch = 
-Rumblepak switch = 
+C Button R = axis(3+)
+C Button L = axis(3-)
+C Button D = axis(4+)
+C Button U = axis(4-)
+R Trig = button(6)
+L Trig = axis(2-)
+Mempak switch =
+Rumblepak switch =
 # Analog axis configuration mappings
-X Axis = axis(0-,0+)
-Y Axis = axis(1-,1+)
+X Axis = axis(1-,1+)
+Y Axis = axis(0-,0+)