diff --git a/atom/browser/resources/mac/Info.plist b/atom/browser/resources/mac/Info.plist
index f7bd068e8f..e2afa33f7d 100644
--- a/atom/browser/resources/mac/Info.plist
+++ b/atom/browser/resources/mac/Info.plist
@@ -15,7 +15,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleIconFile</key>
-  <string>atom.icns</string>
+  <string>electron.icns</string>
   <key>CFBundleVersion</key>
   <string>0.37.3</string>
   <key>CFBundleShortVersionString</key>
diff --git a/atom/browser/resources/mac/atom.icns b/atom/browser/resources/mac/electron.icns
similarity index 100%
rename from atom/browser/resources/mac/atom.icns
rename to atom/browser/resources/mac/electron.icns
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index b0b4148c7b..ce3b9a7081 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -161,7 +161,7 @@ node::Environment* NodeBindings::CreateEnvironment(
       FILE_PATH_LITERAL("browser") : FILE_PATH_LITERAL("renderer");
   base::FilePath resources_path = GetResourcesPath(is_browser_);
   base::FilePath script_path =
-      resources_path.Append(FILE_PATH_LITERAL("atom.asar"))
+      resources_path.Append(FILE_PATH_LITERAL("electron.asar"))
                     .Append(process_type)
                     .Append(FILE_PATH_LITERAL("init.js"));
   std::string script_path_str = script_path.AsUTF8Unsafe();
diff --git a/atom.gyp b/electron.gyp
similarity index 99%
rename from atom.gyp
rename to electron.gyp
index 501cc3ab77..9652bd662c 100644
--- a/atom.gyp
+++ b/electron.gyp
@@ -87,7 +87,7 @@
             },
               # The application doesn't have real localizations, it just has
               # empty .lproj directories, which is enough to convince Cocoa
-              # atom-shell supports those languages.
+              # that Electron supports those languages.
             {
               'postbuild_name': 'Make Empty Localizations',
               'variables': {
@@ -353,7 +353,7 @@
             '<@(js_sources)',
           ],
           'outputs': [
-            '<(resources_path)/atom.asar',
+            '<(resources_path)/electron.asar',
           ],
           'action': [
             'python',
diff --git a/filenames.gypi b/filenames.gypi
index 97c2c0e6c5..2c39a8dcce 100644
--- a/filenames.gypi
+++ b/filenames.gypi
@@ -5,7 +5,7 @@
       'atom/app/atom_main.h',
     ],
     'bundle_sources': [
-      'atom/browser/resources/mac/atom.icns',
+      'atom/browser/resources/mac/electron.icns',
     ],
     'js_sources': [
       'lib/browser/api/app.js',
diff --git a/lib/common/api/callbacks-registry.js b/lib/common/api/callbacks-registry.js
index 3e71899df2..7a9bf534f7 100644
--- a/lib/common/api/callbacks-registry.js
+++ b/lib/common/api/callbacks-registry.js
@@ -26,7 +26,7 @@ class CallbacksRegistry {
       if (location.indexOf('(native)') !== -1) {
         continue
       }
-      if (location.indexOf('atom.asar') !== -1) {
+      if (location.indexOf('electron.asar') !== -1) {
         continue
       }
       ref = /([^\/^\)]*)\)?$/gi.exec(location)
diff --git a/script/bump-version.py b/script/bump-version.py
index e2c22e8cd9..5c70d4494e 100755
--- a/script/bump-version.py
+++ b/script/bump-version.py
@@ -44,13 +44,13 @@ def increase_version(versions, index):
 
 def update_atom_gyp(version):
   pattern = re.compile(" *'version%' *: *'[0-9.]+'")
-  with open('atom.gyp', 'r') as f:
+  with open('electron.gyp', 'r') as f:
     lines = f.readlines()
 
   for i in range(0, len(lines)):
     if pattern.match(lines[i]):
       lines[i] = "    'version%': '{0}',\n".format(version)
-      with open('atom.gyp', 'w') as f:
+      with open('electron.gyp', 'w') as f:
         f.write(''.join(lines))
       return
 
diff --git a/script/lib/util.py b/script/lib/util.py
index fc52d316d3..4e5fb90988 100644
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -180,7 +180,7 @@ def execute_stdout(argv, env=os.environ):
 
 def atom_gyp():
   SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
-  gyp = os.path.join(SOURCE_ROOT, 'atom.gyp')
+  gyp = os.path.join(SOURCE_ROOT, 'electron.gyp')
   with open(gyp) as f:
     obj = eval(f.read());
     return obj['variables']
diff --git a/script/update.py b/script/update.py
index e91e8401cb..33a4cff50f 100755
--- a/script/update.py
+++ b/script/update.py
@@ -68,7 +68,7 @@ def run_gyp(target_arch, component):
     '-Dmas_build={0}'.format(mas_build),
   ]
   return subprocess.call([python, gyp, '-f', 'ninja', '--depth', '.',
-                          'atom.gyp', '-Icommon.gypi'] + defines, env=env)
+                          'electron.gyp', '-Icommon.gypi'] + defines, env=env)
 
 
 if __name__ == '__main__':
diff --git a/spec/asar-spec.js b/spec/asar-spec.js
index 45c4c119ca..a0cb7b4aab 100644
--- a/spec/asar-spec.js
+++ b/spec/asar-spec.js
@@ -17,7 +17,7 @@ describe('asar package', function () {
       it('does not leak fd', function () {
         var readCalls = 1
         while (readCalls <= 10000) {
-          fs.readFileSync(path.join(process.resourcesPath, 'atom.asar', 'renderer', 'api', 'ipc.js'))
+          fs.readFileSync(path.join(process.resourcesPath, 'electron.asar', 'renderer', 'api', 'ipc.js'))
           readCalls++
         }
       })