diff --git a/quakespasm/Mac OS X/AppController.h b/quakespasm/MacOSX/AppController.h
similarity index 100%
rename from quakespasm/Mac OS X/AppController.h
rename to quakespasm/MacOSX/AppController.h
diff --git a/quakespasm/Mac OS X/AppController.m b/quakespasm/MacOSX/AppController.m
similarity index 100%
rename from quakespasm/Mac OS X/AppController.m
rename to quakespasm/MacOSX/AppController.m
diff --git a/quakespasm/Mac OS X/English.lproj/InfoPlist.strings b/quakespasm/MacOSX/English.lproj/InfoPlist.strings
similarity index 100%
rename from quakespasm/Mac OS X/English.lproj/InfoPlist.strings
rename to quakespasm/MacOSX/English.lproj/InfoPlist.strings
diff --git a/quakespasm/Mac OS X/English.lproj/Launcher.nib/designable.nib b/quakespasm/MacOSX/English.lproj/Launcher.nib/designable.nib
similarity index 100%
rename from quakespasm/Mac OS X/English.lproj/Launcher.nib/designable.nib
rename to quakespasm/MacOSX/English.lproj/Launcher.nib/designable.nib
diff --git a/quakespasm/Mac OS X/English.lproj/Launcher.nib/keyedobjects.nib b/quakespasm/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib
similarity index 100%
rename from quakespasm/Mac OS X/English.lproj/Launcher.nib/keyedobjects.nib
rename to quakespasm/MacOSX/English.lproj/Launcher.nib/keyedobjects.nib
diff --git a/quakespasm/Mac OS X/Fitzquake.icns b/quakespasm/MacOSX/Fitzquake.icns
similarity index 100%
rename from quakespasm/Mac OS X/Fitzquake.icns
rename to quakespasm/MacOSX/Fitzquake.icns
diff --git a/quakespasm/Mac OS X/Fitzquake.xcodeproj/kristian.pbxuser b/quakespasm/MacOSX/Fitzquake.xcodeproj/kristian.pbxuser
similarity index 100%
rename from quakespasm/Mac OS X/Fitzquake.xcodeproj/kristian.pbxuser
rename to quakespasm/MacOSX/Fitzquake.xcodeproj/kristian.pbxuser
diff --git a/quakespasm/Mac OS X/Fitzquake.xcodeproj/kristian.perspectivev3 b/quakespasm/MacOSX/Fitzquake.xcodeproj/kristian.perspectivev3
similarity index 99%
rename from quakespasm/Mac OS X/Fitzquake.xcodeproj/kristian.perspectivev3
rename to quakespasm/MacOSX/Fitzquake.xcodeproj/kristian.perspectivev3
index a8218914..3192d04d 100644
--- a/quakespasm/Mac OS X/Fitzquake.xcodeproj/kristian.perspectivev3	
+++ b/quakespasm/MacOSX/Fitzquake.xcodeproj/kristian.perspectivev3
@@ -681,7 +681,7 @@
 		<string>4817E0AF0E1FA02000928DE3</string>
 		<string>4817E0B00E1FA02000928DE3</string>
 		<string>4817E0B10E1FA02000928DE3</string>
-		<string>/Users/kristian/Documents/Code/XCode Workspace/Fitzquake/Mac OS X/Fitzquake.xcodeproj</string>
+		<string>/Users/kristian/Documents/Code/XCode Workspace/Fitzquake/MacOSX/Fitzquake.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>0 59 1680 969 0 0 1680 1028 </string>
diff --git a/quakespasm/Mac OS X/Fitzquake.xcodeproj/macmini.mode1v3 b/quakespasm/MacOSX/Fitzquake.xcodeproj/macmini.mode1v3
similarity index 99%
rename from quakespasm/Mac OS X/Fitzquake.xcodeproj/macmini.mode1v3
rename to quakespasm/MacOSX/Fitzquake.xcodeproj/macmini.mode1v3
index a966ec65..814358ac 100644
--- a/quakespasm/Mac OS X/Fitzquake.xcodeproj/macmini.mode1v3	
+++ b/quakespasm/MacOSX/Fitzquake.xcodeproj/macmini.mode1v3
@@ -517,7 +517,7 @@
 	<key>WindowOrderList</key>
 	<array>
 		<string>9ABC4BF80FB733E500F2D53C</string>
-		<string>/Users/macmini/Desktop/MacEngine/fitzquake_sdl_20090510_src_beta_1/fitzquake_sdl_20090510/Mac OS X/Fitzquake.xcodeproj</string>
+		<string>/Users/macmini/Desktop/MacEngine/fitzquake_sdl_20090510_src_beta_1/fitzquake_sdl_20090510/MacOSX/Fitzquake.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>432 185 1052 510 0 0 1600 878 </string>
diff --git a/quakespasm/Mac OS X/Fitzquake.xcodeproj/macmini.pbxuser b/quakespasm/MacOSX/Fitzquake.xcodeproj/macmini.pbxuser
similarity index 100%
rename from quakespasm/Mac OS X/Fitzquake.xcodeproj/macmini.pbxuser
rename to quakespasm/MacOSX/Fitzquake.xcodeproj/macmini.pbxuser
diff --git a/quakespasm/Mac OS X/Fitzquake.xcodeproj/project.pbxproj b/quakespasm/MacOSX/Fitzquake.xcodeproj/project.pbxproj
similarity index 99%
rename from quakespasm/Mac OS X/Fitzquake.xcodeproj/project.pbxproj
rename to quakespasm/MacOSX/Fitzquake.xcodeproj/project.pbxproj
index 99c59627..143d9eb9 100644
--- a/quakespasm/Mac OS X/Fitzquake.xcodeproj/project.pbxproj	
+++ b/quakespasm/MacOSX/Fitzquake.xcodeproj/project.pbxproj
@@ -293,7 +293,7 @@
 		29B97314FDCFA39411CA2CEA /* Fitzquake */ = {
 			isa = PBXGroup;
 			children = (
-				48243B060D33ED0A00C29F8F /* Mac OS X */,
+				48243B060D33ED0A00C29F8F /* MacOSX */,
 				483A77D80D2EE8C500CB2E4C /* Quake */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
@@ -324,7 +324,7 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		48243B060D33ED0A00C29F8F /* Mac OS X */ = {
+		48243B060D33ED0A00C29F8F /* MacOSX */ = {
 			isa = PBXGroup;
 			children = (
 				48B9E7A50D340BEA0001CACF /* AppController.h */,
@@ -341,7 +341,7 @@
 				48C85E390D3AD10E00797678 /* QuakeArgument.h */,
 				48C85E3A0D3AD10E00797678 /* QuakeArgument.m */,
 			);
-			name = "Mac OS X";
+			name = "MacOSX";
 			sourceTree = "<group>";
 		};
 		483A77D80D2EE8C500CB2E4C /* Quake */ = {
diff --git a/quakespasm/Mac OS X/Fitzquake_Prefix.pch b/quakespasm/MacOSX/Fitzquake_Prefix.pch
similarity index 100%
rename from quakespasm/Mac OS X/Fitzquake_Prefix.pch
rename to quakespasm/MacOSX/Fitzquake_Prefix.pch
diff --git a/quakespasm/Mac OS X/Info.plist b/quakespasm/MacOSX/Info.plist
similarity index 100%
rename from quakespasm/Mac OS X/Info.plist
rename to quakespasm/MacOSX/Info.plist
diff --git a/quakespasm/Mac OS X/Launcher-Info.plist b/quakespasm/MacOSX/Launcher-Info.plist
similarity index 100%
rename from quakespasm/Mac OS X/Launcher-Info.plist
rename to quakespasm/MacOSX/Launcher-Info.plist
diff --git a/quakespasm/Mac OS X/QuakeArgument.h b/quakespasm/MacOSX/QuakeArgument.h
similarity index 100%
rename from quakespasm/Mac OS X/QuakeArgument.h
rename to quakespasm/MacOSX/QuakeArgument.h
diff --git a/quakespasm/Mac OS X/QuakeArgument.m b/quakespasm/MacOSX/QuakeArgument.m
similarity index 100%
rename from quakespasm/Mac OS X/QuakeArgument.m
rename to quakespasm/MacOSX/QuakeArgument.m
diff --git a/quakespasm/Mac OS X/QuakeArguments.h b/quakespasm/MacOSX/QuakeArguments.h
similarity index 100%
rename from quakespasm/Mac OS X/QuakeArguments.h
rename to quakespasm/MacOSX/QuakeArguments.h
diff --git a/quakespasm/Mac OS X/QuakeArguments.m b/quakespasm/MacOSX/QuakeArguments.m
similarity index 100%
rename from quakespasm/Mac OS X/QuakeArguments.m
rename to quakespasm/MacOSX/QuakeArguments.m
diff --git a/quakespasm/Mac OS X/SDLApplication.h b/quakespasm/MacOSX/SDLApplication.h
similarity index 100%
rename from quakespasm/Mac OS X/SDLApplication.h
rename to quakespasm/MacOSX/SDLApplication.h
diff --git a/quakespasm/Mac OS X/SDLApplication.m b/quakespasm/MacOSX/SDLApplication.m
similarity index 100%
rename from quakespasm/Mac OS X/SDLApplication.m
rename to quakespasm/MacOSX/SDLApplication.m
diff --git a/quakespasm/Mac OS X/SDLMain.h b/quakespasm/MacOSX/SDLMain.h
similarity index 100%
rename from quakespasm/Mac OS X/SDLMain.h
rename to quakespasm/MacOSX/SDLMain.h
diff --git a/quakespasm/Mac OS X/SDLMain.m b/quakespasm/MacOSX/SDLMain.m
similarity index 100%
rename from quakespasm/Mac OS X/SDLMain.m
rename to quakespasm/MacOSX/SDLMain.m
diff --git a/quakespasm/Mac OS X/ScreenInfo.h b/quakespasm/MacOSX/ScreenInfo.h
similarity index 100%
rename from quakespasm/Mac OS X/ScreenInfo.h
rename to quakespasm/MacOSX/ScreenInfo.h
diff --git a/quakespasm/Mac OS X/ScreenInfo.m b/quakespasm/MacOSX/ScreenInfo.m
similarity index 100%
rename from quakespasm/Mac OS X/ScreenInfo.m
rename to quakespasm/MacOSX/ScreenInfo.m