diff --git a/app/atom_main_delegate_mac.mm b/app/atom_main_delegate_mac.mm
index e2073df5caff..e304582ee9ca 100644
--- a/app/atom_main_delegate_mac.mm
+++ b/app/atom_main_delegate_mac.mm
@@ -34,7 +34,7 @@ base::FilePath AtomMainDelegate::GetResourcesPakFilePath() {
 
 void AtomMainDelegate::OverrideFrameworkBundlePath() {
   base::mac::SetOverrideFrameworkBundlePath(
-      GetFrameworksPath().Append("Atom.framework"));
+      GetFrameworksPath().Append("Atom Framework.framework"));
 }
 
 void AtomMainDelegate::OverrideChildProcessPath() {
diff --git a/atom.gyp b/atom.gyp
index d0aaefa1f5e3..3aa932eeb46b 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -2,6 +2,7 @@
   'variables': {
     'project_name': 'atom',
     'product_name': 'Atom',
+    'framework_name': 'Atom Framework',
     'app_sources': [
       'app/atom_main.cc',
       'app/atom_main.h',
@@ -253,7 +254,7 @@
               'destination': '<(PRODUCT_DIR)/<(product_name).app/Contents/Frameworks',
               'files': [
                 '<(PRODUCT_DIR)/<(product_name) Helper.app',
-                '<(PRODUCT_DIR)/<(product_name).framework',
+                '<(PRODUCT_DIR)/<(framework_name).framework',
                 'frameworks/Sparkle.framework',
               ],
             },
@@ -435,7 +436,7 @@
       'targets': [
         {
           'target_name': '<(project_name)_framework',
-          'product_name': '<(product_name)',
+          'product_name': '<(framework_name)',
           'type': 'shared_library',
           'dependencies': [
             '<(project_name)_lib',
@@ -466,7 +467,7 @@
             'LIBRARY_SEARCH_PATHS': [
               '<(libchromiumcontent_library_dir)',
             ],
-            'LD_DYLIB_INSTALL_NAME': '@rpath/<(product_name).framework/<(product_name)',
+            'LD_DYLIB_INSTALL_NAME': '@rpath/<(framework_name).framework/<(framework_name)',
             'LD_RUNPATH_SEARCH_PATHS': [
               '@loader_path/Libraries',
             ],
@@ -476,14 +477,14 @@
           },
           'copies': [
             {
-              'destination': '<(PRODUCT_DIR)/<(product_name).framework/Versions/A/Libraries',
+              'destination': '<(PRODUCT_DIR)/<(framework_name).framework/Versions/A/Libraries',
               'files': [
                 '<(libchromiumcontent_library_dir)/ffmpegsumo.so',
                 '<(libchromiumcontent_library_dir)/libchromiumcontent.dylib',
               ],
             },
             {
-              'destination': '<(PRODUCT_DIR)/<(product_name).framework/Versions/A/Resources',
+              'destination': '<(PRODUCT_DIR)/<(framework_name).framework/Versions/A/Resources',
               'files': [
                 '<(PRODUCT_DIR)/Inspector',
                 '<(PRODUCT_DIR)/crash_report_sender.app',
@@ -501,7 +502,7 @@
               'postbuild_name': 'Add symlinks for framework subdirectories',
               'action': [
                 'tools/mac/create-framework-subdir-symlinks.sh',
-                '<(product_name)',
+                '<(framework_name)',
                 'Libraries',
                 'Frameworks',
               ],
diff --git a/browser/atom_browser_main_parts_mac.mm b/browser/atom_browser_main_parts_mac.mm
index cf2b0c7a4c15..4b2c7ab99372 100644
--- a/browser/atom_browser_main_parts_mac.mm
+++ b/browser/atom_browser_main_parts_mac.mm
@@ -20,7 +20,9 @@ void AtomBrowserMainParts::PreMainMessageLoopStart() {
   [NSApp setDelegate:delegate];
 
   base::FilePath frameworkPath = brightray::MainApplicationBundlePath()
-      .Append("Contents").Append("Frameworks").Append("Atom.framework");
+      .Append("Contents")
+      .Append("Frameworks")
+      .Append("Atom Framework.framework");
   NSBundle* frameworkBundle = [NSBundle
        bundleWithPath:base::mac::FilePathToNSString(frameworkPath)];
   NSNib* mainNib = [[NSNib alloc] initWithNibNamed:@"MainMenu"