diff --git a/Linux/Fitzquake.cbp b/Linux/QuakeSpasm.cbp
similarity index 99%
rename from Linux/Fitzquake.cbp
rename to Linux/QuakeSpasm.cbp
index 7bf8162c..7e12bd4a 100644
--- a/Linux/Fitzquake.cbp
+++ b/Linux/QuakeSpasm.cbp
@@ -2,7 +2,7 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="Fitzquake" />
+		<Option title="QuakeSpasm" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
diff --git a/Linux/Fitzquake.layout b/Linux/QuakeSpasm.layout
similarity index 100%
rename from Linux/Fitzquake.layout
rename to Linux/QuakeSpasm.layout
diff --git a/Linux/Fitzquake.workspace b/Linux/QuakeSpasm.workspace
similarity index 75%
rename from Linux/Fitzquake.workspace
rename to Linux/QuakeSpasm.workspace
index 5a4ed4a9..4b9d3d91 100644
--- a/Linux/Fitzquake.workspace
+++ b/Linux/QuakeSpasm.workspace
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="Workspace">
-		<Project filename="Fitzquake.cbp" active="1" />
+		<Project filename="QuakeSpasm.cbp" active="1" />
 	</Workspace>
 </CodeBlocks_workspace_file>
diff --git a/MacOSX/English.lproj/Launcher.nib/designable.nib b/MacOSX/English.lproj/Launcher.nib/designable.nib
index 4b04d874..4ccbb665 100644
--- a/MacOSX/English.lproj/Launcher.nib/designable.nib
+++ b/MacOSX/English.lproj/Launcher.nib/designable.nib
@@ -758,7 +758,7 @@
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{772, 548}, {516, 280}}</string>
 				<int key="NSWTFlags">1954022400</int>
-				<string key="NSWindowTitle">Fitzquake</string>
+				<string key="NSWindowTitle">QuakeSpasm</string>
 				<string key="NSWindowClass" id="565021071">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<object class="NSView" key="NSWindowView" id="439893737">
@@ -2848,7 +2848,7 @@
 			</object>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../../Fitzquake.xcodeproj</string>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../../QuakeSpasm.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableData" key="IBDocument.RunnableNib">
 			<bytes key="NS.bytes">YnBsaXN0MDDUAAEAAgADAAQABQAGAAkAClgkdmVyc2lvblQkdG9wWSRhcmNoaXZlclgkb2JqZWN0cxIA
diff --git a/MacOSX/Fitzquake.xcodeproj/kristian.pbxuser b/MacOSX/Fitzquake.xcodeproj/kristian.pbxuser
index 1b159e0d..9805acae 100644
--- a/MacOSX/Fitzquake.xcodeproj/kristian.pbxuser
+++ b/MacOSX/Fitzquake.xcodeproj/kristian.pbxuser
@@ -26,16 +26,16 @@
 	29B97313FDCFA39411CA2CEA /* Project object */ = {
 		activeArchitecture = i386;
 		activeBuildConfigurationName = Release;
-		activeExecutable = 4802D72D0D2EE86A00DD8D4F /* Fitzquake */;
-		activeTarget = 8D1107260486CEB800E47090 /* Fitzquake */;
+		activeExecutable = 4802D72D0D2EE86A00DD8D4F /* QuakeSpasm */;
+		activeTarget = 8D1107260486CEB800E47090 /* QuakeSpasm */;
 		addToTargets = (
-			8D1107260486CEB800E47090 /* Fitzquake */,
+			8D1107260486CEB800E47090 /* QuakeSpasm */,
 		);
 		breakpoints = (
 		);
 		codeSenseManager = 4802D7440D2EE86D00DD8D4F /* Code sense */;
 		executables = (
-			4802D72D0D2EE86A00DD8D4F /* Fitzquake */,
+			4802D72D0D2EE86A00DD8D4F /* QuakeSpasm */,
 		);
 		perUserDictionary = {
 			"PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = {
@@ -190,7 +190,7 @@
 		userBuildSettings = {
 		};
 	};
-	32CA4F630368D1EE00C91783 /* Fitzquake_Prefix.pch */ = {
+	32CA4F630368D1EE00C91783 /* QuakeSpasm_Prefix.pch */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1359, 471}}";
 			sepNavSelRange = "{724, 0}";
@@ -198,7 +198,7 @@
 			sepNavWindowFrame = "{{-1402, -252}, {642, 847}}";
 		};
 	};
-	4802D72D0D2EE86A00DD8D4F /* Fitzquake */ = {
+	4802D72D0D2EE86A00DD8D4F /* QuakeSpasm */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
 			YES,
@@ -226,7 +226,7 @@
 		executableSystemSymbolLevel = 0;
 		executableUserSymbolLevel = 0;
 		libgmallocEnabled = 0;
-		name = Fitzquake;
+		name = QuakeSpasm;
 		savedGlobals = {
 		};
 		sourceDirectories = (
@@ -1373,10 +1373,10 @@
 			sepNavWindowFrame = "{{328, 73}, {642, 805}}";
 		};
 	};
-	8D1107260486CEB800E47090 /* Fitzquake */ = {
+	8D1107260486CEB800E47090 /* QuakeSpasm */ = {
 		activeExec = 0;
 		executables = (
-			4802D72D0D2EE86A00DD8D4F /* Fitzquake */,
+			4802D72D0D2EE86A00DD8D4F /* QuakeSpasm */,
 		);
 	};
 	8D1107310486CEB800E47090 /* Info.plist */ = {
diff --git a/MacOSX/Fitzquake.xcodeproj/kristian.perspectivev3 b/MacOSX/Fitzquake.xcodeproj/kristian.perspectivev3
index 3192d04d..fe756283 100644
--- a/MacOSX/Fitzquake.xcodeproj/kristian.perspectivev3
+++ b/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/MacOSX/Fitzquake.xcodeproj</string>
+		<string>/Users/kristian/Documents/Code/XCode Workspace/quakespasm_svn/MacOSX/QuakeSpasm.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>0 59 1680 969 0 0 1680 1028 </string>
diff --git a/MacOSX/Fitzquake.xcodeproj/macmini.mode1v3 b/MacOSX/Fitzquake.xcodeproj/macmini.mode1v3
index 814358ac..1ee11056 100644
--- a/MacOSX/Fitzquake.xcodeproj/macmini.mode1v3
+++ b/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/MacOSX/Fitzquake.xcodeproj</string>
+		<string>/Users/macmini/Desktop/MacEngine/quakespasm_svn/MacOSX/QuakeSpasm.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
 	<string>432 185 1052 510 0 0 1600 878 </string>
diff --git a/MacOSX/Fitzquake.xcodeproj/macmini.pbxuser b/MacOSX/Fitzquake.xcodeproj/macmini.pbxuser
index e1f7be56..a2637574 100644
--- a/MacOSX/Fitzquake.xcodeproj/macmini.pbxuser
+++ b/MacOSX/Fitzquake.xcodeproj/macmini.pbxuser
@@ -3,11 +3,11 @@
 	29B97313FDCFA39411CA2CEA /* Project object */ = {
 		activeArchitecture = i386;
 		activeBuildConfigurationName = Release;
-		activeExecutable = 9ABC4B480FB729A900F2D53C /* Fitzquake */;
-		activeTarget = 8D1107260486CEB800E47090 /* Fitzquake */;
+		activeExecutable = 9ABC4B480FB729A900F2D53C /* QuakeSpasm */;
+		activeTarget = 8D1107260486CEB800E47090 /* QuakeSpasm */;
 		codeSenseManager = 9ABC4B5A0FB729C800F2D53C /* Code sense */;
 		executables = (
-			9ABC4B480FB729A900F2D53C /* Fitzquake */,
+			9ABC4B480FB729A900F2D53C /* QuakeSpasm */,
 		);
 		perUserDictionary = {
 			PBXConfiguration.PBXFileTableDataSource3.PBXErrorsWarningsDataSource = {
@@ -105,13 +105,13 @@
 			sepNavWindowFrame = "{{61, 273}, {750, 558}}";
 		};
 	};
-	8D1107260486CEB800E47090 /* Fitzquake */ = {
+	8D1107260486CEB800E47090 /* QuakeSpasm */ = {
 		activeExec = 0;
 		executables = (
-			9ABC4B480FB729A900F2D53C /* Fitzquake */,
+			9ABC4B480FB729A900F2D53C /* QuakeSpasm */,
 		);
 	};
-	9ABC4B480FB729A900F2D53C /* Fitzquake */ = {
+	9ABC4B480FB729A900F2D53C /* QuakeSpasm */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
 		);
@@ -131,7 +131,7 @@
 		executableSystemSymbolLevel = 0;
 		executableUserSymbolLevel = 0;
 		libgmallocEnabled = 0;
-		name = Fitzquake;
+		name = QuakeSpasm;
 		sourceDirectories = (
 		);
 	};
diff --git a/MacOSX/Fitzquake.xcodeproj/project.pbxproj b/MacOSX/Fitzquake.xcodeproj/project.pbxproj
index 143d9eb9..e668a9ee 100644
--- a/MacOSX/Fitzquake.xcodeproj/project.pbxproj
+++ b/MacOSX/Fitzquake.xcodeproj/project.pbxproj
@@ -72,7 +72,7 @@
 		483A787F0D2EEAF000CB2E4C /* r_part.c in Sources */ = {isa = PBXBuildFile; fileRef = 483A786B0D2EEAF000CB2E4C /* r_part.c */; };
 		483A78800D2EEAF000CB2E4C /* r_sprite.c in Sources */ = {isa = PBXBuildFile; fileRef = 483A786C0D2EEAF000CB2E4C /* r_sprite.c */; };
 		483A78810D2EEAF000CB2E4C /* r_world.c in Sources */ = {isa = PBXBuildFile; fileRef = 483A786D0D2EEAF000CB2E4C /* r_world.c */; };
-		484AA4B40D3FF6C0005D917A /* Fitzquake.icns in Resources */ = {isa = PBXBuildFile; fileRef = 484AA4B30D3FF6C0005D917A /* Fitzquake.icns */; };
+		484AA4B40D3FF6C0005D917A /* QuakeSpasm.icns in Resources */ = {isa = PBXBuildFile; fileRef = 484AA4B30D3FF6C0005D917A /* QuakeSpasm.icns */; };
 		486577CB0D31A22A00E7920A /* snd_dma.c in Sources */ = {isa = PBXBuildFile; fileRef = 486577C80D31A22A00E7920A /* snd_dma.c */; };
 		486577CC0D31A22A00E7920A /* snd_mem.c in Sources */ = {isa = PBXBuildFile; fileRef = 486577C90D31A22A00E7920A /* snd_mem.c */; };
 		486577CD0D31A22A00E7920A /* snd_mix.c in Sources */ = {isa = PBXBuildFile; fileRef = 486577CA0D31A22A00E7920A /* snd_mix.c */; };
@@ -116,7 +116,7 @@
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		32CA4F630368D1EE00C91783 /* Fitzquake_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Fitzquake_Prefix.pch; sourceTree = "<group>"; };
+		32CA4F630368D1EE00C91783 /* QuakeSpasm_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuakeSpasm_Prefix.pch; sourceTree = "<group>"; };
 		48243B130D33F01A00C29F8F /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../Quake/main.c; sourceTree = SOURCE_ROOT; };
 		48305B530D8AF8EC00A29C24 /* net_udp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net_udp.h; path = ../Quake/net_udp.h; sourceTree = SOURCE_ROOT; };
 		48305B540D8AF90600A29C24 /* net_udp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = net_udp.c; path = ../Quake/net_udp.c; sourceTree = SOURCE_ROOT; };
@@ -218,7 +218,7 @@
 		483A786C0D2EEAF000CB2E4C /* r_sprite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = r_sprite.c; path = ../Quake/r_sprite.c; sourceTree = SOURCE_ROOT; };
 		483A786D0D2EEAF000CB2E4C /* r_world.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = r_world.c; path = ../Quake/r_world.c; sourceTree = SOURCE_ROOT; };
 		4846EB500D329BEB00A108DE /* platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = platform.h; path = ../Quake/platform.h; sourceTree = SOURCE_ROOT; };
-		484AA4B30D3FF6C0005D917A /* Fitzquake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Fitzquake.icns; sourceTree = "<group>"; };
+		484AA4B30D3FF6C0005D917A /* QuakeSpasm.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = QuakeSpasm.icns; sourceTree = "<group>"; };
 		486577C80D31A22A00E7920A /* snd_dma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_dma.c; path = ../Quake/snd_dma.c; sourceTree = SOURCE_ROOT; };
 		486577C90D31A22A00E7920A /* snd_mem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mem.c; path = ../Quake/snd_mem.c; sourceTree = SOURCE_ROOT; };
 		486577CA0D31A22A00E7920A /* snd_mix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mix.c; path = ../Quake/snd_mix.c; sourceTree = SOURCE_ROOT; };
@@ -242,7 +242,7 @@
 		48FE58590D3A82C8006BB491 /* QuakeArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuakeArguments.h; sourceTree = "<group>"; };
 		48FE585A0D3A82C8006BB491 /* QuakeArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuakeArguments.m; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-		8D1107320486CEB800E47090 /* Fitzquake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Fitzquake.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		8D1107320486CEB800E47090 /* QuakeSpasm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuakeSpasm.app; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -285,12 +285,12 @@
 		19C28FACFE9D520D11CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				8D1107320486CEB800E47090 /* Fitzquake.app */,
+				8D1107320486CEB800E47090 /* QuakeSpasm.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		29B97314FDCFA39411CA2CEA /* Fitzquake */ = {
+		29B97314FDCFA39411CA2CEA /* QuakeSpasm */ = {
 			isa = PBXGroup;
 			children = (
 				48243B060D33ED0A00C29F8F /* MacOSX */,
@@ -301,13 +301,13 @@
 				4830B79D0D464CAE00EF4498 /* Changelog.txt */,
 				4830B79E0D464CAE00EF4498 /* Todo.txt */,
 			);
-			name = Fitzquake;
+			name = QuakeSpasm;
 			sourceTree = "<group>";
 		};
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				484AA4B30D3FF6C0005D917A /* Fitzquake.icns */,
+				484AA4B30D3FF6C0005D917A /* QuakeSpasm.icns */,
 				48B9E7860D340B1E0001CACF /* Launcher.nib */,
 				8D1107310486CEB800E47090 /* Info.plist */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
@@ -329,7 +329,7 @@
 			children = (
 				48B9E7A50D340BEA0001CACF /* AppController.h */,
 				48B9E7A60D340BEA0001CACF /* AppController.m */,
-				32CA4F630368D1EE00C91783 /* Fitzquake_Prefix.pch */,
+				32CA4F630368D1EE00C91783 /* QuakeSpasm_Prefix.pch */,
 				48FE58590D3A82C8006BB491 /* QuakeArguments.h */,
 				48FE585A0D3A82C8006BB491 /* QuakeArguments.m */,
 				489D8D2D0D3A630D00AA4471 /* ScreenInfo.h */,
@@ -543,9 +543,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		8D1107260486CEB800E47090 /* Fitzquake */ = {
+		8D1107260486CEB800E47090 /* QuakeSpasm */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Fitzquake" */;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "QuakeSpasm" */;
 			buildPhases = (
 				8D1107290486CEB800E47090 /* Resources */,
 				8D11072C0486CEB800E47090 /* Sources */,
@@ -556,10 +556,10 @@
 			);
 			dependencies = (
 			);
-			name = Fitzquake;
+			name = QuakeSpasm;
 			productInstallPath = "$(HOME)/Applications";
-			productName = Fitzquake;
-			productReference = 8D1107320486CEB800E47090 /* Fitzquake.app */;
+			productName = QuakeSpasm;
+			productReference = 8D1107320486CEB800E47090 /* QuakeSpasm.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -567,14 +567,14 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Fitzquake" */;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "QuakeSpasm" */;
 			compatibilityVersion = "Xcode 2.4";
 			hasScannedForEncodings = 1;
-			mainGroup = 29B97314FDCFA39411CA2CEA /* Fitzquake */;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* QuakeSpasm */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				8D1107260486CEB800E47090 /* Fitzquake */,
+				8D1107260486CEB800E47090 /* QuakeSpasm */,
 			);
 		};
 /* End PBXProject section */
@@ -587,7 +587,7 @@
 				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
 				483A780F0D2EEA0F00CB2E4C /* progdefs.q1 in Resources */,
 				48B9E7880D340B1E0001CACF /* Launcher.nib in Resources */,
-				484AA4B40D3FF6C0005D917A /* Fitzquake.icns in Resources */,
+				484AA4B40D3FF6C0005D917A /* QuakeSpasm.icns in Resources */,
 				4830B79F0D464CAE00EF4498 /* Changelog.txt in Resources */,
 				4830B7A00D464CAE00EF4498 /* Todo.txt in Resources */,
 			);
@@ -704,7 +704,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				PRODUCT_NAME = Fitzquake;
+				PRODUCT_NAME = QuakeSpasm;
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = YES;
 			};
@@ -721,7 +721,7 @@
 				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				PRODUCT_NAME = Fitzquake;
+				PRODUCT_NAME = QuakeSpasm;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@@ -769,7 +769,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Fitzquake" */ = {
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "QuakeSpasm" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4B08A954540054247B /* Debug */,
@@ -778,7 +778,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Fitzquake" */ = {
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "QuakeSpasm" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
diff --git a/MacOSX/Info.plist b/MacOSX/Info.plist
index 7f76fd1b..f4949ab5 100644
--- a/MacOSX/Info.plist
+++ b/MacOSX/Info.plist
@@ -7,9 +7,9 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string>Fitzquake</string>
+	<string>QuakeSpasm</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.celephais.Fitzquake</string>
+	<string>net.sf.quakespasm.QuakeSpasm</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/Quake/Makefile.w32 b/Quake/Makefile.w32
index e0d1b6bd..5a0224f0 100644
--- a/Quake/Makefile.w32
+++ b/Quake/Makefile.w32
@@ -85,7 +85,7 @@ cl_parse.o  gl_mesh.o    gl_texmgr.o  mathlib.o   pr_edict.o    snd_mem.o   wad.
 cl_tent.o   gl_model.o   gl_vidsdl.o  menu.o      pr_exec.o     snd_mix.o   world.o \
 cmd.o       gl_refrag.o  gl_warp.o    net_dgrm.o  r_alias.o     snd_sdl.o   zone.o \
 common.o    gl_rlight.o  host_cmd.o   net_loop.o  r_brush.o     sv_main.o   conback.o \
-Fitzquake.res
+QuakeSpasm.res
 
 # ------------------------
 # build rules for mingw :
diff --git a/Quake/Makefile.w64 b/Quake/Makefile.w64
index b5cdb9e9..ece7e61c 100644
--- a/Quake/Makefile.w64
+++ b/Quake/Makefile.w64
@@ -85,7 +85,7 @@ cl_parse.o  gl_mesh.o    gl_texmgr.o  mathlib.o   pr_edict.o    snd_mem.o   wad.
 cl_tent.o   gl_model.o   gl_vidsdl.o  menu.o      pr_exec.o     snd_mix.o   world.o \
 cmd.o       gl_refrag.o  gl_warp.o    net_dgrm.o  r_alias.o     snd_sdl.o   zone.o \
 common.o    gl_rlight.o  host_cmd.o   net_loop.o  r_brush.o     sv_main.o   conback.o \
-Fitzquake.res
+QuakeSpasm.res
 
 # ------------------------
 # build rules for mingw-w64 :
diff --git a/Windows/Fitzquake.cbp b/Windows/QuakeSpasm.cbp
similarity index 99%
rename from Windows/Fitzquake.cbp
rename to Windows/QuakeSpasm.cbp
index b4bc6900..f620596a 100644
--- a/Windows/Fitzquake.cbp
+++ b/Windows/QuakeSpasm.cbp
@@ -2,7 +2,7 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="Fitzquake" />
+		<Option title="QuakeSpasm" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
@@ -279,7 +279,7 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="..\Quake\zone.h" />
-		<Unit filename="Fitzquake.rc">
+		<Unit filename="QuakeSpasm.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
 		<Extensions>
diff --git a/Windows/Fitzquake.layout b/Windows/QuakeSpasm.layout
similarity index 100%
rename from Windows/Fitzquake.layout
rename to Windows/QuakeSpasm.layout
diff --git a/Windows/Fitzquake.rc b/Windows/QuakeSpasm.rc
similarity index 100%
rename from Windows/Fitzquake.rc
rename to Windows/QuakeSpasm.rc
diff --git a/Windows/Fitzquake.workspace b/Windows/QuakeSpasm.workspace
similarity index 75%
rename from Windows/Fitzquake.workspace
rename to Windows/QuakeSpasm.workspace
index 5a4ed4a9..4b9d3d91 100644
--- a/Windows/Fitzquake.workspace
+++ b/Windows/QuakeSpasm.workspace
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="Workspace">
-		<Project filename="Fitzquake.cbp" active="1" />
+		<Project filename="QuakeSpasm.cbp" active="1" />
 	</Workspace>
 </CodeBlocks_workspace_file>