diff --git a/README.md b/README.md
index d9584358f6c7..a379c71c5cc8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Electron [![Build Status](https://travis-ci.org/atom/atom-shell.svg?branch=master)](https://travis-ci.org/atom/atom-shell)
 
-The Atom Shell framework lets you write cross-platform desktop applications
+The Electron framework lets you write cross-platform desktop applications
 using JavaScript, HTML and CSS. It is based on [io.js](http://iojs.org) and
 [Chromium](http://www.chromium.org) and is used in the [Atom
 editor](https://github.com/atom/atom).
diff --git a/atom/browser/default_app/default_app.js b/atom/browser/default_app/default_app.js
index ee5e5733e1de..dffe03c628e1 100644
--- a/atom/browser/default_app/default_app.js
+++ b/atom/browser/default_app/default_app.js
@@ -25,10 +25,10 @@ app.on('ready', function() {
   if (process.platform == 'darwin') {
     var template = [
       {
-        label: 'Atom Shell',
+        label: 'Electron',
         submenu: [
           {
-            label: 'About Atom Shell',
+            label: 'About Electron',
             selector: 'orderFrontStandardAboutPanel:'
           },
           {
@@ -42,7 +42,7 @@ app.on('ready', function() {
             type: 'separator'
           },
           {
-            label: 'Hide Atom Shell',
+            label: 'Hide Electron',
             accelerator: 'Command+H',
             selector: 'hide:'
           },
diff --git a/atom/browser/default_app/index.html b/atom/browser/default_app/index.html
index 83b5122782fe..469b57cdad1d 100644
--- a/atom/browser/default_app/index.html
+++ b/atom/browser/default_app/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>Atom Shell</title>
+  <title>Electron</title>
   <style>
     body {
       color: #555;
@@ -72,7 +72,7 @@
     };
   </script>
 
-  <h2 style="-webkit-app-region: drag">Welcome to Atom Shell</h2>
+  <h2 style="-webkit-app-region: drag">Welcome to Electron</h2>
 
   <p>
   To run your app with atom-shell, execute the following command under your
diff --git a/atom/browser/default_app/package.json b/atom/browser/default_app/package.json
index be1749b57781..28305088f3d9 100644
--- a/atom/browser/default_app/package.json
+++ b/atom/browser/default_app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "atom-shell-default-app",
-  "productName": "Atom Shell Default App",
+  "productName": "Electron Default App",
   "version": "0.1.0",
   "main": "main.js"
 }
diff --git a/atom/browser/native_window.cc b/atom/browser/native_window.cc
index bb5928dae77c..d1c699510250 100644
--- a/atom/browser/native_window.cc
+++ b/atom/browser/native_window.cc
@@ -229,7 +229,7 @@ void NativeWindow::InitFromOptions(const mate::Dictionary& options) {
   if (options.Get(switches::kKiosk, &kiosk) && kiosk) {
     SetKiosk(kiosk);
   }
-  std::string title("Atom Shell");
+  std::string title("Electron");
   options.Get(switches::kTitle, &title);
   SetTitle(title);
 
diff --git a/atom/common/node_bindings.cc b/atom/common/node_bindings.cc
index 1ff9c1685c4b..af64e3121071 100644
--- a/atom/common/node_bindings.cc
+++ b/atom/common/node_bindings.cc
@@ -27,7 +27,7 @@ using content::BrowserThread;
 #define REFERENCE_MODULE(name) \
   extern "C" void _register_ ## name(void); \
   void (*fp_register_ ## name)(void) = _register_ ## name
-// Atom Shell's builtin modules.
+// Electron's builtin modules.
 REFERENCE_MODULE(atom_browser_app);
 REFERENCE_MODULE(atom_browser_auto_updater);
 REFERENCE_MODULE(atom_browser_content_tracing);
diff --git a/docs/api/menu.md b/docs/api/menu.md
index 1f60f7446aae..91a92f590521 100644
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -33,10 +33,10 @@ Another example of creating the application menu with the simple template API:
 // main.js
 var template = [
   {
-    label: 'Atom Shell',
+    label: 'Electron',
     submenu: [
       {
-        label: 'About Atom Shell',
+        label: 'About Electron',
         selector: 'orderFrontStandardAboutPanel:'
       },
       {
@@ -50,7 +50,7 @@ var template = [
         type: 'separator'
       },
       {
-        label: 'Hide Atom Shell',
+        label: 'Hide Electron',
         accelerator: 'Command+H',
         selector: 'hide:'
       },
diff --git a/docs/development/build-instructions-windows.md b/docs/development/build-instructions-windows.md
index c6934dac4793..90ac042eb087 100644
--- a/docs/development/build-instructions-windows.md
+++ b/docs/development/build-instructions-windows.md
@@ -11,7 +11,7 @@
 
 If you don't have a Windows installation at the moment,
 [modern.ie](https://www.modern.ie/en-us/virtualization-tools#downloads) has
-timebombed versions of Windows that you can use to build Atom Shell.
+timebombed versions of Windows that you can use to build Electron.
 
 The building of atom-shell is done entirely with command-line scripts, so you
 can use any editor you like to develop atom-shell, but it also means you can
diff --git a/docs/tutorial/debugging-main-process.md b/docs/tutorial/debugging-main-process.md
index fc9dc0dd89ac..f252f22360df 100644
--- a/docs/tutorial/debugging-main-process.md
+++ b/docs/tutorial/debugging-main-process.md
@@ -18,7 +18,7 @@ Like `--debug` but pauses the script on the first line.
 
 ## Use node-inspector for debugging
 
-__Note:__ Atom Shell uses node v0.11.13, which currently doesn't work very well
+__Note:__ Electron uses node v0.11.13, which currently doesn't work very well
 with node-inspector, and the main process would crash if you inspect the
 `process` object under node-inspector's console.
 
diff --git a/spec/api-app-spec.coffee b/spec/api-app-spec.coffee
index b8b6ecf694c6..1894245a0e96 100644
--- a/spec/api-app-spec.coffee
+++ b/spec/api-app-spec.coffee
@@ -15,11 +15,11 @@ describe 'app module', ->
 
   describe 'app.getName()', ->
     it 'returns the name field of package.json', ->
-      assert.equal app.getName(), 'Atom Shell Test App'
+      assert.equal app.getName(), 'Electron Test App'
 
   describe 'app.setName(name)', ->
     it 'overrides the name', ->
-      assert.equal app.getName(), 'Atom Shell Test App'
+      assert.equal app.getName(), 'Electron Test App'
       app.setName 'test-name'
       assert.equal app.getName(), 'test-name'
-      app.setName 'Atom Shell Test App'
+      app.setName 'Electron Test App'
diff --git a/spec/package.json b/spec/package.json
index aacacc2c0deb..9a2dbad3edfa 100644
--- a/spec/package.json
+++ b/spec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "atom-shell-specs",
-  "productName": "Atom Shell Test App",
+  "productName": "Electron Test App",
   "main": "static/main.js",
   "version": "0.1.0",
   "devDependencies": {
