diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 653e49181e..f3a4465c6a 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -19,7 +19,7 @@ endif
 STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
 
 PPU_CFLAGS		+= -I. -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE
-PPU_SRCS		= ps3/salamander/main.c console/rarch_console_exec.c console/rarch_console_libretro_mgmt.c file_path.c compat/compat.c conf/config_file.c
+PPU_SRCS		= frontend/salamander/salamander_ps3.c console/rarch_console_exec.c console/rarch_console_libretro_mgmt.c file_path.c compat/compat.c conf/config_file.c
 
 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER -Iconsole/logger
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 1e479ecf85..b14f4f3be3 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -39,7 +39,7 @@ LIBS := -lfat -lwiiuse -logc -lbte
 
 APP_BOOTER_DIR = wii/app_booter
 
-OBJ = gx/salamander/main.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
+OBJ = frontend/salamander/salamander_gx.o console/rarch_console_exec.o console/rarch_console_libretro_mgmt.o file_path.o compat/compat.o conf/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
diff --git a/gx/salamander/main.c b/frontend/salamander/salamander_gx.c
similarity index 100%
rename from gx/salamander/main.c
rename to frontend/salamander/salamander_gx.c
diff --git a/ps3/salamander/main.c b/frontend/salamander/salamander_ps3.c
similarity index 100%
rename from ps3/salamander/main.c
rename to frontend/salamander/salamander_ps3.c
diff --git a/xdk/salamander/main.c b/frontend/salamander/salamander_xdk.c
similarity index 100%
rename from xdk/salamander/main.c
rename to frontend/salamander/salamander_xdk.c