diff --git a/atom.gyp b/atom.gyp
index 1331e1813..608d81b82 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -44,6 +44,10 @@
       'sources': [
         '<@(includes_common)',
         '<@(includes_wrapper)',
+        'atom/main_mac.mm',
+        'atom/atom_mac.h',
+        'atom/atom_mac.mm',
+        'atom/client_handler_mac.mm',
         'atom/client_handler.cpp',
         'atom/client_handler.h',
         'atom/util.h',
@@ -168,10 +172,6 @@
             ],
           },
           'sources': [
-            'atom/main_mac.mm',
-            'atom/cefclient_mac.h',
-            'atom/cefclient_mac.mm',
-            'atom/client_handler_mac.mm',
             'cef/include/cef_application_mac.h',
             'cef/include/internal/cef_mac.h',
             'cef/include/internal/cef_types_mac.h',
diff --git a/atom/cefclient_gtk.cpp b/atom/atom_gtk.cpp
similarity index 100%
rename from atom/cefclient_gtk.cpp
rename to atom/atom_gtk.cpp
diff --git a/atom/cefclient_mac.h b/atom/atom_mac.h
similarity index 66%
rename from atom/cefclient_mac.h
rename to atom/atom_mac.h
index a70b06856..115c9921c 100644
--- a/atom/cefclient_mac.h
+++ b/atom/atom_mac.h
@@ -1,6 +1,6 @@
 #include "include/cef_app.h"
 
-@interface ClientApplication : NSApplication <CefAppProtocol, NSWindowDelegate, NSApplicationDelegate> {
+@interface Atom : NSApplication <CefAppProtocol, NSWindowDelegate, NSApplicationDelegate> {
 @private
   BOOL handlingSendEvent_;
 }
diff --git a/atom/cefclient_mac.mm b/atom/atom_mac.mm
similarity index 98%
rename from atom/cefclient_mac.mm
rename to atom/atom_mac.mm
index 14a3cfb59..c2b90a294 100644
--- a/atom/cefclient_mac.mm
+++ b/atom/atom_mac.mm
@@ -1,11 +1,11 @@
 #import "include/cef_application_mac.h"
 #import "atom/client_handler.h"
-#import "atom/cefclient_mac.h"
+#import "atom/atom_mac.h"
 
 // The global ClientHandler reference.
 extern CefRefPtr<ClientHandler> g_handler;
 
-@implementation ClientApplication
+@implementation Atom
 
 + (id)sharedApplication {
   id atomApp = [super sharedApplication];
diff --git a/atom/cefclient_win.cpp b/atom/atom_win.cpp
similarity index 100%
rename from atom/cefclient_win.cpp
rename to atom/atom_win.cpp
diff --git a/atom/mac/English.lproj/InfoPlist.strings b/atom/mac/English.lproj/InfoPlist.strings
deleted file mode 100644
index fe2abe11b..000000000
--- a/atom/mac/English.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,3 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-NSHumanReadableCopyright = "© Chromium Embedded Framework Authors, 2010";
diff --git a/atom/mac/Info.plist b/atom/mac/Info.plist
index 3b3a3280c..9dd8973e8 100644
--- a/atom/mac/Info.plist
+++ b/atom/mac/Info.plist
@@ -23,6 +23,6 @@
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
-	<string>ClientApplicatoin</string>
+	<string>AtomApp</string>
 </dict>
 </plist>
diff --git a/atom/main_mac.mm b/atom/main_mac.mm
index f8871fd98..878e7afbc 100644
--- a/atom/main_mac.mm
+++ b/atom/main_mac.mm
@@ -1,5 +1,5 @@
 #import "include/cef_application_mac.h"
-#import "atom/cefclient_mac.h"
+#import "atom/atom_mac.h"
 
 int main(int argc, char* argv[]) {
   @autoreleasepool {
@@ -12,7 +12,7 @@ int main(int argc, char* argv[]) {
 		}
 
 		NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
-		ClientApplication *application = (ClientApplication *)[ClientApplication sharedApplication];
+		Atom *application = (Atom *)[Atom sharedApplication];
 		
 		NSString *mainNibName = [infoDictionary objectForKey:@"NSMainNibFile"];
 		NSNib *mainNib = [[NSNib alloc] initWithNibNamed:mainNibName bundle:[NSBundle mainBundle]];
diff --git a/atom/res/cefclient.ico b/atom/res/cefclient.ico
deleted file mode 100644
index d551aa3aa..000000000
Binary files a/atom/res/cefclient.ico and /dev/null differ
diff --git a/atom/res/small.ico b/atom/res/small.ico
deleted file mode 100644
index d551aa3aa..000000000
Binary files a/atom/res/small.ico and /dev/null differ