diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 962ccc4..01a608b 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -329,7 +329,7 @@
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 			</object>
 			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">gui_ocamlmsgAppDelegate</string>
+				<string key="NSClassName">hopOsxAppDelegate</string>
 			</object>
 			<object class="NSCustomObject" id="755631768">
 				<string key="NSClassName">NSFontManager</string>
@@ -837,7 +837,7 @@
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
-					<string key="className">gui_ocamlmsgAppDelegate</string>
+					<string key="className">hopOsxAppDelegate</string>
 					<string key="superclassName">NSObject</string>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -873,7 +873,7 @@
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">gui_ocamlmsgAppDelegate.h</string>
+						<string key="minorKey">hopOsxAppDelegate.h</string>
 					</object>
 				</object>
 			</object>
@@ -1436,7 +1436,7 @@
 			<integer value="3000" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<string key="IBDocument.LastKnownRelativeProjectPath">../gui-ocamlmsg.xcodeproj</string>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../hopOsx.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
 			<bool key="EncodedWithXMLCoder">YES</bool>
diff --git a/gui_ocamlmsg_Prefix.pch b/gui_ocamlmsg_Prefix.pch
deleted file mode 100644
index ccd8686..0000000
--- a/gui_ocamlmsg_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'gui-ocamlmsg' target in the 'gui-ocamlmsg' project
-//
-
-#ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
-#endif
diff --git a/gui_ocamlmsg-Info.plist b/hopOsx-Info.plist
similarity index 100%
rename from gui_ocamlmsg-Info.plist
rename to hopOsx-Info.plist
diff --git a/gui-ocamlmsg.xcodeproj/project.pbxproj b/hopOsx.xcodeproj/project.pbxproj
similarity index 85%
rename from gui-ocamlmsg.xcodeproj/project.pbxproj
rename to hopOsx.xcodeproj/project.pbxproj
index 0514071..baf7cf2 100644
--- a/gui-ocamlmsg.xcodeproj/project.pbxproj
+++ b/hopOsx.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
-		256AC3DA0F4B6AC300CF3369 /* gui_ocamlmsgAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* gui_ocamlmsgAppDelegate.m */; };
+		256AC3DA0F4B6AC300CF3369 /* hopOsxAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* hopOsxAppDelegate.m */; };
 		8A3AD61B1550596B0083025A /* Hop.icns in Resources */ = {isa = PBXBuildFile; fileRef = 8A3AD61A1550596B0083025A /* Hop.icns */; };
 		8AC89E371550397E00BACB4E /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8AC89E361550397E00BACB4E /* WebKit.framework */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
@@ -21,15 +21,15 @@
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
 		1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
-		256AC3D80F4B6AC300CF3369 /* gui_ocamlmsgAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui_ocamlmsgAppDelegate.h; sourceTree = "<group>"; };
-		256AC3D90F4B6AC300CF3369 /* gui_ocamlmsgAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = gui_ocamlmsgAppDelegate.m; sourceTree = "<group>"; };
-		256AC3F00F4B6AF500CF3369 /* gui_ocamlmsg_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui_ocamlmsg_Prefix.pch; sourceTree = "<group>"; };
+		256AC3D80F4B6AC300CF3369 /* hopOsxAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hopOsxAppDelegate.h; sourceTree = "<group>"; };
+		256AC3D90F4B6AC300CF3369 /* hopOsxAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = hopOsxAppDelegate.m; sourceTree = "<group>"; };
+		256AC3F00F4B6AF500CF3369 /* hopOsx_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hopOsx_Prefix.pch; sourceTree = "<group>"; };
 		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		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>"; };
 		8A3AD61A1550596B0083025A /* Hop.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Hop.icns; sourceTree = "<group>"; };
 		8AC89E361550397E00BACB4E /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
-		8D1107310486CEB800E47090 /* gui_ocamlmsg-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "gui_ocamlmsg-Info.plist"; sourceTree = "<group>"; };
+		8D1107310486CEB800E47090 /* hopOsx-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "hopOsx-Info.plist"; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* Hop Server.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Hop Server.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -49,8 +49,8 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				256AC3D80F4B6AC300CF3369 /* gui_ocamlmsgAppDelegate.h */,
-				256AC3D90F4B6AC300CF3369 /* gui_ocamlmsgAppDelegate.m */,
+				256AC3D80F4B6AC300CF3369 /* hopOsxAppDelegate.h */,
+				256AC3D90F4B6AC300CF3369 /* hopOsxAppDelegate.m */,
 			);
 			name = Classes;
 			sourceTree = "<group>";
@@ -82,7 +82,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		29B97314FDCFA39411CA2CEA /* gui-ocamlmsg */ = {
+		29B97314FDCFA39411CA2CEA /* hopOsx */ = {
 			isa = PBXGroup;
 			children = (
 				080E96DDFE201D6D7F000001 /* Classes */,
@@ -91,13 +91,13 @@
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 			);
-			name = "gui-ocamlmsg";
+			name = "hopOsx";
 			sourceTree = "<group>";
 		};
 		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
-				256AC3F00F4B6AF500CF3369 /* gui_ocamlmsg_Prefix.pch */,
+				256AC3F00F4B6AF500CF3369 /* hopOsx_Prefix.pch */,
 				29B97316FDCFA39411CA2CEA /* main.m */,
 				8A3AD61A1550596B0083025A /* Hop.icns */,
 			);
@@ -107,7 +107,7 @@
 		29B97317FDCFA39411CA2CEA /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				8D1107310486CEB800E47090 /* gui_ocamlmsg-Info.plist */,
+				8D1107310486CEB800E47090 /* hopOsx-Info.plist */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 				1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
 			);
@@ -152,7 +152,7 @@
 			attributes = {
 				ORGANIZATIONNAME = "Tony Garnock-Jones";
 			};
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "gui-ocamlmsg" */;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "hopOsx" */;
 			compatibilityVersion = "Xcode 3.1";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -162,7 +162,7 @@
 				French,
 				German,
 			);
-			mainGroup = 29B97314FDCFA39411CA2CEA /* gui-ocamlmsg */;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* hopOsx */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
@@ -190,7 +190,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D11072D0486CEB800E47090 /* main.m in Sources */,
-				256AC3DA0F4B6AC300CF3369 /* gui_ocamlmsgAppDelegate.m in Sources */,
+				256AC3DA0F4B6AC300CF3369 /* hopOsxAppDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -226,8 +226,8 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = gui_ocamlmsg_Prefix.pch;
-				INFOPLIST_FILE = "gui_ocamlmsg-Info.plist";
+				GCC_PREFIX_HEADER = hopOsx_Prefix.pch;
+				INFOPLIST_FILE = "hopOsx-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRODUCT_NAME = "Hop Server";
 			};
@@ -240,8 +240,8 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = gui_ocamlmsg_Prefix.pch;
-				INFOPLIST_FILE = "gui_ocamlmsg-Info.plist";
+				GCC_PREFIX_HEADER = hopOsx_Prefix.pch;
+				INFOPLIST_FILE = "hopOsx-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRODUCT_NAME = "Hop Server";
 			};
@@ -285,7 +285,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "gui-ocamlmsg" */ = {
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "hopOsx" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				C01FCF4F08A954540054247B /* Debug */,
diff --git a/gui_ocamlmsgAppDelegate.h b/hopOsxAppDelegate.h
similarity index 72%
rename from gui_ocamlmsgAppDelegate.h
rename to hopOsxAppDelegate.h
index 256c834..e4664cf 100644
--- a/gui_ocamlmsgAppDelegate.h
+++ b/hopOsxAppDelegate.h
@@ -1,6 +1,6 @@
 //
-//  gui_ocamlmsgAppDelegate.h
-//  gui-ocamlmsg
+//  hopOsxAppDelegate.h
+//  hopOsx
 //
 //  Created by Tony Garnock-Jones on 2012-05-01.
 //  Copyright 2012 n/a. All rights reserved.
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import <WebKit/WebKit.h>
 
-@interface gui_ocamlmsgAppDelegate : NSObject <NSApplicationDelegate> {
+@interface hopOsxAppDelegate : NSObject <NSApplicationDelegate> {
     NSWindow *window;
 	WebView *webview;
 	
diff --git a/gui_ocamlmsgAppDelegate.m b/hopOsxAppDelegate.m
similarity index 94%
rename from gui_ocamlmsgAppDelegate.m
rename to hopOsxAppDelegate.m
index fdb0a7c..bdc0dac 100644
--- a/gui_ocamlmsgAppDelegate.m
+++ b/hopOsxAppDelegate.m
@@ -1,17 +1,17 @@
 //
-//  gui_ocamlmsgAppDelegate.m
-//  gui-ocamlmsg
+//  hopOsxAppDelegate.m
+//  hopOsx
 //
 //  Created by Tony Garnock-Jones on 2012-05-01.
 //  Copyright 2012 n/a. All rights reserved.
 //
 
-#import "gui_ocamlmsgAppDelegate.h"
+#import "hopOsxAppDelegate.h"
 #include <sys/stat.h>
 
 #define HOP_STARTUP_DEADLINE_SECONDS 30
 
-@implementation gui_ocamlmsgAppDelegate
+@implementation hopOsxAppDelegate
 
 @synthesize window;
 @synthesize webview;
diff --git a/hopOsx_Prefix.pch b/hopOsx_Prefix.pch
new file mode 100644
index 0000000..b3f006f
--- /dev/null
+++ b/hopOsx_Prefix.pch
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'hopOsx' target in the 'hopOsx' project
+//
+
+#ifdef __OBJC__
+    #import <Cocoa/Cocoa.h>
+#endif
diff --git a/main.m b/main.m
index aae0246..bdcff02 100644
--- a/main.m
+++ b/main.m
@@ -1,6 +1,6 @@
 //
 //  main.m
-//  gui-ocamlmsg
+//  hopOsx
 //
 //  Created by Tony Garnock-Jones on 2012-05-01.
 //  Copyright 2012 n/a. All rights reserved.