diff --git a/Mac/AccessToken.m b/Mac/AccessToken.m
index 9282aae..7c75464 100644
--- a/Mac/AccessToken.m
+++ b/Mac/AccessToken.m
@@ -49,7 +49,7 @@
     UInt32 _passwordLength = 0;
     char *_password = nil;
     SecKeychainItemRef item = nil;
-    SecKeychainFindGenericPassword(NULL, 6, "bungloo", 17, "bunglooUserAccount", &_passwordLength, (void **)&_password, &item);
+    SecKeychainFindGenericPassword(NULL, 6, "Bungloo", 17, "BunglooUserAccount", &_passwordLength, (void **)&_password, &item);
     
     OSStatus status;
     void * passwordData = (void*)[_secret cStringUsingEncoding:NSUTF8StringEncoding];
@@ -59,9 +59,9 @@
         status = SecKeychainAddGenericPassword(
                                                NULL,           // default keychain
                                                6,              // length of service name
-                                               "bungloo",         // service name
+                                               "Bungloo",         // service name
                                                17,             // length of account name
-                                               "bunglooUserAccount",    // account name
+                                               "BunglooUserAccount",    // account name
                                                passwordLength,  // length of password
                                                passwordData,        // pointer to password data
                                                NULL             // the item reference
@@ -84,7 +84,7 @@
     UInt32 passwordLength = 0;
     char *password = nil;
     SecKeychainItemRef item = nil;
-    SecKeychainFindGenericPassword(NULL, 6, "bungloo", 17, "bunglooUserAccount", &passwordLength, (void **)&password, &item);
+    SecKeychainFindGenericPassword(NULL, 6, "Bungloo", 17, "BunglooUserAccount", &passwordLength, (void **)&password, &item);
     
     if (!item) {
         return nil;
diff --git a/Mac/Bungloo.xcodeproj/project.pbxproj b/Mac/Bungloo.xcodeproj/project.pbxproj
index e6c4060..b83b54a 100644
--- a/Mac/Bungloo.xcodeproj/project.pbxproj
+++ b/Mac/Bungloo.xcodeproj/project.pbxproj
@@ -87,7 +87,6 @@
 		1FFA36D41177D879006C8562 /* ViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewDelegate.h; sourceTree = "<group>"; };
 		1FFA36D51177D879006C8562 /* ViewDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewDelegate.m; sourceTree = "<group>"; };
 		1FFA37061177DAF4006C8562 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
-		2564AD2C0F5327BB00F57823 /* Bungloo_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = Bungloo_Prefix.pch; sourceTree = "<group>"; };
 		2A37F4ACFDCFA73011CA2CEA /* NewMessageWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = NewMessageWindow.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		2A37F4AEFDCFA73011CA2CEA /* NewMessageWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = NewMessageWindow.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		2A37F4B0FDCFA73011CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = main.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
@@ -193,7 +192,6 @@
 		2A37F4AFFDCFA73011CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
-				2564AD2C0F5327BB00F57823 /* Bungloo_Prefix.pch */,
 				1F55BA1216C852FB009F0306 /* Bungloo_Prefix.pch */,
 				2A37F4B0FDCFA73011CA2CEA /* main.m */,
 			);
diff --git a/Mac/Bungloo.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate b/Mac/Bungloo.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate
index a38376e..652a936 100644
Binary files a/Mac/Bungloo.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate and b/Mac/Bungloo.xcodeproj/project.xcworkspace/xcuserdata/jeena.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/Tentia.xcscheme b/Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/Bungloo.xcscheme
similarity index 93%
rename from Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/Tentia.xcscheme
rename to Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/Bungloo.xcscheme
index 9f3077c..c8d35d9 100644
--- a/Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/Tentia.xcscheme
+++ b/Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/Bungloo.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0460"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "8D15AC270486D014006FF6A4"
-               BuildableName = "bungloo.app"
+               BuildableName = "Bungloo.app"
                BlueprintName = "Bungloo"
                ReferencedContainer = "container:Bungloo.xcodeproj">
             </BuildableReference>
@@ -33,7 +33,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8D15AC270486D014006FF6A4"
-            BuildableName = "bungloo.app"
+            BuildableName = "Bungloo.app"
             BlueprintName = "Bungloo"
             ReferencedContainer = "container:Bungloo.xcodeproj">
          </BuildableReference>
@@ -52,7 +52,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8D15AC270486D014006FF6A4"
-            BuildableName = "bungloo.app"
+            BuildableName = "Bungloo.app"
             BlueprintName = "Bungloo"
             ReferencedContainer = "container:Bungloo.xcodeproj">
          </BuildableReference>
@@ -70,7 +70,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "8D15AC270486D014006FF6A4"
-            BuildableName = "bungloo.app"
+            BuildableName = "Bungloo.app"
             BlueprintName = "Bungloo"
             ReferencedContainer = "container:Bungloo.xcodeproj">
          </BuildableReference>
diff --git a/Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/xcschememanagement.plist b/Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/xcschememanagement.plist
index 775c66a..20fd17d 100644
--- a/Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Mac/Bungloo.xcodeproj/xcuserdata/jeena.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,7 +4,7 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>Tentia.xcscheme</key>
+		<key>Bungloo.xcscheme</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>1</integer>
diff --git a/Mac/Controller.m b/Mac/Controller.m
index feb0f8f..897c248 100644
--- a/Mac/Controller.m
+++ b/Mac/Controller.m
@@ -360,7 +360,7 @@
 - (NSString *)pluginURL
 {
 	NSFileManager *fileManager = [NSFileManager defaultManager];
-	NSString *pathToPlugin = [@"~/Library/Application Support/bungloo/Plugin.js" stringByExpandingTildeInPath];
+	NSString *pathToPlugin = [@"~/Library/Application Support/Bungloo/Plugin.js" stringByExpandingTildeInPath];
 	
     if([fileManager fileExistsAtPath:pathToPlugin])
     {
diff --git a/Mac/ViewDelegate.m b/Mac/ViewDelegate.m
index 38f6321..663507a 100644
--- a/Mac/ViewDelegate.m
+++ b/Mac/ViewDelegate.m
@@ -125,7 +125,7 @@
 - (NSString *)pluginURL
 {
 	NSFileManager *fileManager = [NSFileManager defaultManager];
-	NSString *pathToPlugin = [@"~/Library/Application Support/bungloo/Plugin.js" stringByExpandingTildeInPath];
+	NSString *pathToPlugin = [@"~/Library/Application Support/Bungloo/Plugin.js" stringByExpandingTildeInPath];
 	
     if([fileManager fileExistsAtPath:pathToPlugin])
     {
diff --git a/README.markdown b/README.markdown
index b827277..de18705 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,12 +1,12 @@
-bungloo
+Bungloo
 =======
 
-bungloo is a slim Tent client for OS X and Linux written in mostly JavaScript.
+Bungloo is a slim Tent client for OS X and Linux written in mostly JavaScript.
 
 For more info check out the Wiki page: https://github.com/jeena/bungloo/wiki
 
 
-Thanks everyone in the Open Source community! bungloo is using:
+Thanks everyone in the Open Source community! Bungloo is using:
 
 - RequireJS - http://requirejs.org
 - URI.js - http://medialize.github.com/URI.js/