diff --git a/src/sdl12/MakeCYG.cfg b/src/sdl12/MakeCYG.cfg
index 5907579c1..b55d9dc50 100644
--- a/src/sdl12/MakeCYG.cfg
+++ b/src/sdl12/MakeCYG.cfg
@@ -1,5 +1,5 @@
 #
-# sdl/makeCYG.cfg for SRB2/Cygwin
+# sdl12/makeCYG.cfg for SRB2/Cygwin
 #
 
 #
diff --git a/src/sdl12/MakeNIX.cfg b/src/sdl12/MakeNIX.cfg
index 457f52301..1278aaf06 100644
--- a/src/sdl12/MakeNIX.cfg
+++ b/src/sdl12/MakeNIX.cfg
@@ -1,5 +1,5 @@
 #
-# sdl/makeNIX.cfg for SRB2/?nix
+# sdl12/makeNIX.cfg for SRB2/?nix
 #
 
 #Valgrind support
diff --git a/src/sdl12/Makefile.cfg b/src/sdl12/Makefile.cfg
index 1d404c4c9..8d9ebc35c 100644
--- a/src/sdl12/Makefile.cfg
+++ b/src/sdl12/Makefile.cfg
@@ -1,5 +1,5 @@
 #
-# sdl/makefile.cfg for SRB2/SDL
+# sdl12/makefile.cfg for SRB2/SDL
 #
 
 #
@@ -7,35 +7,35 @@
 #
 
 ifdef UNIXCOMMON
-include sdl/MakeNIX.cfg
+include sdl12/MakeNIX.cfg
 endif
 
 ifdef PANDORA
-include sdl/SRB2Pandora/Makefile.cfg
+include sdl12/SRB2Pandora/Makefile.cfg
 endif #ifdef PANDORA
 
 ifdef DC
-include sdl/SRB2DC/Makefile.cfg
+include sdl12/SRB2DC/Makefile.cfg
 endif #ifdef DC
 
 ifdef PS3N
-include sdl/SRB2PS3/Makefile.cfg
+include sdl12/SRB2PS3/Makefile.cfg
 endif #ifdef PS3N
 
 ifdef PSP
-include sdl/SRB2PSP/Makefile.cfg
+include sdl12/SRB2PSP/Makefile.cfg
 endif #ifdef PSP
 
 ifdef XBOX
-include sdl/SRB2XBOX/Makefile.cfg
+include sdl12/SRB2XBOX/Makefile.cfg
 endif #ifdef XBOX
 
 ifdef WINCE
-include sdl/SRB2CE/Makefile.cfg
+include sdl12/SRB2CE/Makefile.cfg
 endif #ifef WINCE
 
 ifdef CYGWIN32
-include sdl/MakeCYG.cfg
+include sdl12/MakeCYG.cfg
 endif #ifdef CYGWIN32
 
 ifdef SDL_PKGCONFIG
@@ -151,7 +151,7 @@ endif
 
 # FIXME: DevkitPPC and ready-compiled SDL Wii require these things to be in a silly order
 ifdef WII
-include sdl/SRB2WII/Makefile.cfg
+include sdl12/SRB2WII/Makefile.cfg
 endif #ifdef WII
 
 CFLAGS+=$(SDL_CFLAGS)
diff --git a/src/sdl12/SRB2PS3/Makefile.cfg b/src/sdl12/SRB2PS3/Makefile.cfg
index a4a01714a..80f8db7bc 100644
--- a/src/sdl12/SRB2PS3/Makefile.cfg
+++ b/src/sdl12/SRB2PS3/Makefile.cfg
@@ -27,10 +27,10 @@ PKGNAME?=SRB2PS3.pkg
 endif
 DGBNAME?=$(EXENAME).debug
 
-SRB2PS3DIR=sdl/SRB2PS3
+SRB2PS3DIR=sdl12/SRB2PS3
 ICON0?=$(SRB2PS3DIR)/ICON0.png
 SFOXML?=sfo.xml
-SRB2TTF?=sdl/srb2.ttf
+SRB2TTF?=sdl12/srb2.ttf
 
 TITLE=Sonic Robo Blast 2 v2.0.6
 APPID=SRB2-PS3
diff --git a/src/sdl12/SRB2PSP/Makefile.cfg b/src/sdl12/SRB2PSP/Makefile.cfg
index f9ec6416b..5e4c0ba2f 100644
--- a/src/sdl12/SRB2PSP/Makefile.cfg
+++ b/src/sdl12/SRB2PSP/Makefile.cfg
@@ -36,14 +36,14 @@ endif
 
 	PSP_EBOOT_TITLE=SRB2-PSP vME
 	PSP_EBOOT_SFO=$(BIN)/PARAM.SFO
-	PSP_EBOOT_ICON=sdl/SRB2PSP/ICON0.png
+	PSP_EBOOT_ICON=sdl12/SRB2PSP/ICON0.png
 	PSP_EBOOT_ICON1=NULL
 	PSP_EBOOT_UNKPNG=NULL
-	PSP_EBOOT_PIC1=sdl/SRB2PSP/PIC1.png
+	PSP_EBOOT_PIC1=sdl12/SRB2PSP/PIC1.png
 	PSP_EBOOT_SND0=NULL
 	PSP_EBOOT_PSAR=NULL
 
-	SIGNER?=sdl/SRB2PSP/psp-prxsign/psp-prxsign
+	SIGNER?=sdl12/SRB2PSP/psp-prxsign/psp-prxsign
 
 	SDL=1
 	PREFIX=psp
@@ -100,8 +100,8 @@ kxploit: $(BIN)/$(EXENAME) $(PSP_EBOOT_SFO)
 		$(PSP_EBOOT_ICON1) $(PSP_EBOOT_UNKPNG) $(PSP_EBOOT_PIC1)  \
 		$(PSP_EBOOT_SND0) NULL $(PSP_EBOOT_PSAR)
 
-sdl/SRB2PSP/psp-prxsign/psp-prxsign:
-	-$(MAKE) -C sdl/SRB2PSP/psp-prxsign CFLAGS=-pipe CC="$(HOSTCC)"
+sdl12/SRB2PSP/psp-prxsign/psp-prxsign:
+	-$(MAKE) -C sdl12/SRB2PSP/psp-prxsign CFLAGS=-pipe CC="$(HOSTCC)"
 
 fix-up: $(BIN)/$(EXENAME)
 	@echo Running psp-fixup-imports on $(EXENAME)
diff --git a/src/sdl12/SRB2Pandora/Makefile.cfg b/src/sdl12/SRB2Pandora/Makefile.cfg
index c7f0f8449..1f057a212 100644
--- a/src/sdl12/SRB2Pandora/Makefile.cfg
+++ b/src/sdl12/SRB2Pandora/Makefile.cfg
@@ -2,8 +2,8 @@
 
 PNDNAME=SRB2.pnd
 PNDDIR=$(BIN)/pnd
-ICON=sdl/SRB2Pandora/icon.png
-PXML=sdl/SRB2Pandora/PXML.xml
+ICON=sdl12/SRB2Pandora/icon.png
+PXML=sdl12/SRB2Pandora/PXML.xml
 
 SED=sed
 CAT=cat
diff --git a/src/sdl12/SRB2WII/Makefile.cfg b/src/sdl12/SRB2WII/Makefile.cfg
index 1b1863042..778d2c3d6 100644
--- a/src/sdl12/SRB2WII/Makefile.cfg
+++ b/src/sdl12/SRB2WII/Makefile.cfg
@@ -16,8 +16,8 @@ EXENAME?=$(SRB2NAME).elf
 DBGNAME?=$(SRB2NAME).elf.debug
 DOLNAME?=$(SRB2NAME).dol
 
-ICONPNG?=sdl/SRB2WII/icon.png
-METAXML?=sdl/SRB2WII/meta.xml
+ICONPNG?=sdl12/SRB2WII/icon.png
+METAXML?=sdl12/SRB2WII/meta.xml
 
 APPDIR=apps/$(SRB2NAME)
 ZIPNAME=$(SRB2NAME).zip