diff --git a/atom.gyp b/atom.gyp
index 0ed0ea98e80..ae24c3ccc88 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -31,10 +31,10 @@
       'browser/api/atom_api_window.h',
       'browser/api/atom_browser_bindings.cc',
       'browser/api/atom_browser_bindings.h',
-      'browser/atom_application.h',
-      'browser/atom_application.mm',
-      'browser/atom_application_delegate.h',
-      'browser/atom_application_delegate.mm',
+      'browser/atom_application_mac.h',
+      'browser/atom_application_mac.mm',
+      'browser/atom_application_delegate_mac.h',
+      'browser/atom_application_delegate_mac.mm',
       'browser/atom_browser_client.cc',
       'browser/atom_browser_client.h',
       'browser/atom_browser_context.cc',
diff --git a/browser/atom_application_delegate.h b/browser/atom_application_delegate_mac.h
similarity index 100%
rename from browser/atom_application_delegate.h
rename to browser/atom_application_delegate_mac.h
diff --git a/browser/atom_application_delegate.mm b/browser/atom_application_delegate_mac.mm
similarity index 88%
rename from browser/atom_application_delegate.mm
rename to browser/atom_application_delegate_mac.mm
index b26199dbef4..87de8b957b6 100644
--- a/browser/atom_application_delegate.mm
+++ b/browser/atom_application_delegate_mac.mm
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "browser/atom_application_delegate.h"
+#import "browser/atom_application_delegate_mac.h"
 
-#import "browser/atom_application.h"
+#import "browser/atom_application_mac.h"
 
 @implementation AtomApplicationDelegate
 
diff --git a/browser/atom_application.h b/browser/atom_application_mac.h
similarity index 100%
rename from browser/atom_application.h
rename to browser/atom_application_mac.h
diff --git a/browser/atom_application.mm b/browser/atom_application_mac.mm
similarity index 95%
rename from browser/atom_application.mm
rename to browser/atom_application_mac.mm
index d52e835db60..dbc13a79e59 100644
--- a/browser/atom_application.mm
+++ b/browser/atom_application_mac.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "browser/atom_application.h"
+#import "browser/atom_application_mac.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
diff --git a/browser/atom_browser_main_parts_mac.mm b/browser/atom_browser_main_parts_mac.mm
index 2f452e03fd0..1bdbe05284d 100644
--- a/browser/atom_browser_main_parts_mac.mm
+++ b/browser/atom_browser_main_parts_mac.mm
@@ -5,8 +5,8 @@
 #include "browser/atom_browser_main_parts.h"
 
 #import "base/mac/bundle_locations.h"
-#import "browser/atom_application.h"
-#import "browser/atom_application_delegate.h"
+#import "browser/atom_application_mac.h"
+#import "browser/atom_application_delegate_mac.h"
 
 namespace atom {