diff --git a/Menu/GameShell/20_Retro Games/GBA/action.config b/Menu/GameShell/20_Retro Games/MGBA/action.config
similarity index 80%
rename from Menu/GameShell/20_Retro Games/GBA/action.config
rename to Menu/GameShell/20_Retro Games/MGBA/action.config
index a91e7df..8dc8d79 100644
--- a/Menu/GameShell/20_Retro Games/GBA/action.config	
+++ b/Menu/GameShell/20_Retro Games/MGBA/action.config	
@@ -1,6 +1,6 @@
-ROM=/home/cpi/games/GBX
+ROM=/home/cpi/games/MGBA
 ROM_SO=/home/cpi/apps/emulators/mgba_libretro.so
 EXT=gba,gbx
 LAUNCHER=retroarch -L
-TITLE=GBA Roms
+TITLE=MGBA Roms
 SO_URL=http://buildbot.libretro.com/nightly/linux/armhf/latest/mgba_libretro.so.zip
diff --git a/Menu/GameShell/20_Retro Games/NES/action.config b/Menu/GameShell/20_Retro Games/NESTOPIA/action.config
similarity index 77%
rename from Menu/GameShell/20_Retro Games/NES/action.config
rename to Menu/GameShell/20_Retro Games/NESTOPIA/action.config
index 96146a7..3513174 100644
--- a/Menu/GameShell/20_Retro Games/NES/action.config	
+++ b/Menu/GameShell/20_Retro Games/NESTOPIA/action.config	
@@ -1,7 +1,7 @@
-ROM=/home/cpi/games/NES
+ROM=/home/cpi/games/NESTOPIA
 ROM_SO=/home/cpi/apps/emulators/nestopia_libretro.so
 EXT=zip
 LAUNCHER=retroarch -L
-TITLE=NES Roms
+TITLE=NESTOPIA Roms
 SO_URL=http://buildbot.libretro.com/nightly/linux/armhf/latest/nestopia_libretro.so.zip
 
diff --git a/skin/default/Menu/GameShell/20_Retro Games/GBA.png b/skin/default/Menu/GameShell/20_Retro Games/MGBA.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_Retro Games/GBA.png
rename to skin/default/Menu/GameShell/20_Retro Games/MGBA.png
diff --git a/skin/default/Menu/GameShell/20_Retro Games/NES.png b/skin/default/Menu/GameShell/20_Retro Games/NESTOPIA.png
similarity index 100%
rename from skin/default/Menu/GameShell/20_Retro Games/NES.png
rename to skin/default/Menu/GameShell/20_Retro Games/NESTOPIA.png