diff --git a/GCDWebServer.podspec b/GCDWebServer.podspec
index a14987e..fc53391 100644
--- a/GCDWebServer.podspec
+++ b/GCDWebServer.podspec
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.default_subspec = 'Core'
   
   s.subspec 'Core' do |cs|
-    cs.source_files = 'CGDWebServer/**/*.{h,m}'
+    cs.source_files = 'GCDWebServer/**/*.{h,m}'
     cs.requires_arc = true
     cs.ios.library = 'z'
     cs.osx.library = 'z'
diff --git a/GCDWebServer.xcodeproj/project.pbxproj b/GCDWebServer.xcodeproj/project.pbxproj
index 4d67692..564b54e 100644
--- a/GCDWebServer.xcodeproj/project.pbxproj
+++ b/GCDWebServer.xcodeproj/project.pbxproj
@@ -183,7 +183,7 @@
 		08FB7794FE84155DC02AAC07 /* LittleCMS */ = {
 			isa = PBXGroup;
 			children = (
-				E28BAE1418F99C810095C089 /* CGDWebServer */,
+				E28BAE1418F99C810095C089 /* GCDWebServer */,
 				E2A0E80718F3432600C580B1 /* GCDWebDAVServer */,
 				E2BE850618E77ECA0061360B /* GCDWebUploader */,
 				E221128D1690B6470048D2B2 /* Mac */,
@@ -247,14 +247,14 @@
 			name = "Mac Frameworks and Libraries";
 			sourceTree = "<group>";
 		};
-		E28BAE1418F99C810095C089 /* CGDWebServer */ = {
+		E28BAE1418F99C810095C089 /* GCDWebServer */ = {
 			isa = PBXGroup;
 			children = (
 				E28BAE1518F99C810095C089 /* Core */,
 				E28BAE2218F99C810095C089 /* Requests */,
 				E28BAE2B18F99C810095C089 /* Responses */,
 			);
-			path = CGDWebServer;
+			path = GCDWebServer;
 			sourceTree = "<group>";
 		};
 		E28BAE1518F99C810095C089 /* Core */ = {
diff --git a/CGDWebServer/Core/GCDWebServer.h b/GCDWebServer/Core/GCDWebServer.h
similarity index 100%
rename from CGDWebServer/Core/GCDWebServer.h
rename to GCDWebServer/Core/GCDWebServer.h
diff --git a/CGDWebServer/Core/GCDWebServer.m b/GCDWebServer/Core/GCDWebServer.m
similarity index 100%
rename from CGDWebServer/Core/GCDWebServer.m
rename to GCDWebServer/Core/GCDWebServer.m
diff --git a/CGDWebServer/Core/GCDWebServerConnection.h b/GCDWebServer/Core/GCDWebServerConnection.h
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerConnection.h
rename to GCDWebServer/Core/GCDWebServerConnection.h
diff --git a/CGDWebServer/Core/GCDWebServerConnection.m b/GCDWebServer/Core/GCDWebServerConnection.m
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerConnection.m
rename to GCDWebServer/Core/GCDWebServerConnection.m
diff --git a/CGDWebServer/Core/GCDWebServerFunctions.h b/GCDWebServer/Core/GCDWebServerFunctions.h
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerFunctions.h
rename to GCDWebServer/Core/GCDWebServerFunctions.h
diff --git a/CGDWebServer/Core/GCDWebServerFunctions.m b/GCDWebServer/Core/GCDWebServerFunctions.m
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerFunctions.m
rename to GCDWebServer/Core/GCDWebServerFunctions.m
diff --git a/CGDWebServer/Core/GCDWebServerHTTPStatusCodes.h b/GCDWebServer/Core/GCDWebServerHTTPStatusCodes.h
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerHTTPStatusCodes.h
rename to GCDWebServer/Core/GCDWebServerHTTPStatusCodes.h
diff --git a/CGDWebServer/Core/GCDWebServerPrivate.h b/GCDWebServer/Core/GCDWebServerPrivate.h
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerPrivate.h
rename to GCDWebServer/Core/GCDWebServerPrivate.h
diff --git a/CGDWebServer/Core/GCDWebServerRequest.h b/GCDWebServer/Core/GCDWebServerRequest.h
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerRequest.h
rename to GCDWebServer/Core/GCDWebServerRequest.h
diff --git a/CGDWebServer/Core/GCDWebServerRequest.m b/GCDWebServer/Core/GCDWebServerRequest.m
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerRequest.m
rename to GCDWebServer/Core/GCDWebServerRequest.m
diff --git a/CGDWebServer/Core/GCDWebServerResponse.h b/GCDWebServer/Core/GCDWebServerResponse.h
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerResponse.h
rename to GCDWebServer/Core/GCDWebServerResponse.h
diff --git a/CGDWebServer/Core/GCDWebServerResponse.m b/GCDWebServer/Core/GCDWebServerResponse.m
similarity index 100%
rename from CGDWebServer/Core/GCDWebServerResponse.m
rename to GCDWebServer/Core/GCDWebServerResponse.m
diff --git a/CGDWebServer/Requests/GCDWebServerDataRequest.h b/GCDWebServer/Requests/GCDWebServerDataRequest.h
similarity index 100%
rename from CGDWebServer/Requests/GCDWebServerDataRequest.h
rename to GCDWebServer/Requests/GCDWebServerDataRequest.h
diff --git a/CGDWebServer/Requests/GCDWebServerDataRequest.m b/GCDWebServer/Requests/GCDWebServerDataRequest.m
similarity index 100%
rename from CGDWebServer/Requests/GCDWebServerDataRequest.m
rename to GCDWebServer/Requests/GCDWebServerDataRequest.m
diff --git a/CGDWebServer/Requests/GCDWebServerFileRequest.h b/GCDWebServer/Requests/GCDWebServerFileRequest.h
similarity index 100%
rename from CGDWebServer/Requests/GCDWebServerFileRequest.h
rename to GCDWebServer/Requests/GCDWebServerFileRequest.h
diff --git a/CGDWebServer/Requests/GCDWebServerFileRequest.m b/GCDWebServer/Requests/GCDWebServerFileRequest.m
similarity index 100%
rename from CGDWebServer/Requests/GCDWebServerFileRequest.m
rename to GCDWebServer/Requests/GCDWebServerFileRequest.m
diff --git a/CGDWebServer/Requests/GCDWebServerMultiPartFormRequest.h b/GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.h
similarity index 100%
rename from CGDWebServer/Requests/GCDWebServerMultiPartFormRequest.h
rename to GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.h
diff --git a/CGDWebServer/Requests/GCDWebServerMultiPartFormRequest.m b/GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.m
similarity index 100%
rename from CGDWebServer/Requests/GCDWebServerMultiPartFormRequest.m
rename to GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.m
diff --git a/CGDWebServer/Requests/GCDWebServerURLEncodedFormRequest.h b/GCDWebServer/Requests/GCDWebServerURLEncodedFormRequest.h
similarity index 100%
rename from CGDWebServer/Requests/GCDWebServerURLEncodedFormRequest.h
rename to GCDWebServer/Requests/GCDWebServerURLEncodedFormRequest.h
diff --git a/CGDWebServer/Requests/GCDWebServerURLEncodedFormRequest.m b/GCDWebServer/Requests/GCDWebServerURLEncodedFormRequest.m
similarity index 100%
rename from CGDWebServer/Requests/GCDWebServerURLEncodedFormRequest.m
rename to GCDWebServer/Requests/GCDWebServerURLEncodedFormRequest.m
diff --git a/CGDWebServer/Responses/GCDWebServerDataResponse.h b/GCDWebServer/Responses/GCDWebServerDataResponse.h
similarity index 100%
rename from CGDWebServer/Responses/GCDWebServerDataResponse.h
rename to GCDWebServer/Responses/GCDWebServerDataResponse.h
diff --git a/CGDWebServer/Responses/GCDWebServerDataResponse.m b/GCDWebServer/Responses/GCDWebServerDataResponse.m
similarity index 100%
rename from CGDWebServer/Responses/GCDWebServerDataResponse.m
rename to GCDWebServer/Responses/GCDWebServerDataResponse.m
diff --git a/CGDWebServer/Responses/GCDWebServerErrorResponse.h b/GCDWebServer/Responses/GCDWebServerErrorResponse.h
similarity index 100%
rename from CGDWebServer/Responses/GCDWebServerErrorResponse.h
rename to GCDWebServer/Responses/GCDWebServerErrorResponse.h
diff --git a/CGDWebServer/Responses/GCDWebServerErrorResponse.m b/GCDWebServer/Responses/GCDWebServerErrorResponse.m
similarity index 100%
rename from CGDWebServer/Responses/GCDWebServerErrorResponse.m
rename to GCDWebServer/Responses/GCDWebServerErrorResponse.m
diff --git a/CGDWebServer/Responses/GCDWebServerFileResponse.h b/GCDWebServer/Responses/GCDWebServerFileResponse.h
similarity index 100%
rename from CGDWebServer/Responses/GCDWebServerFileResponse.h
rename to GCDWebServer/Responses/GCDWebServerFileResponse.h
diff --git a/CGDWebServer/Responses/GCDWebServerFileResponse.m b/GCDWebServer/Responses/GCDWebServerFileResponse.m
similarity index 100%
rename from CGDWebServer/Responses/GCDWebServerFileResponse.m
rename to GCDWebServer/Responses/GCDWebServerFileResponse.m
diff --git a/CGDWebServer/Responses/GCDWebServerStreamingResponse.h b/GCDWebServer/Responses/GCDWebServerStreamingResponse.h
similarity index 100%
rename from CGDWebServer/Responses/GCDWebServerStreamingResponse.h
rename to GCDWebServer/Responses/GCDWebServerStreamingResponse.h
diff --git a/CGDWebServer/Responses/GCDWebServerStreamingResponse.m b/GCDWebServer/Responses/GCDWebServerStreamingResponse.m
similarity index 100%
rename from CGDWebServer/Responses/GCDWebServerStreamingResponse.m
rename to GCDWebServer/Responses/GCDWebServerStreamingResponse.m