diff --git a/atom.gyp b/atom.gyp
index ee92b68aa8c..a5b1d9f2d0b 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -7,7 +7,7 @@
     ],
     'coffee_sources': [
       'browser/api/lib/app.coffee',
-      'browser/api/lib/atom.coffee',
+      'browser/api/lib/atom_delegate.coffee',
       'browser/api/lib/dialog.coffee',
       'browser/api/lib/ipc.coffee',
       'browser/api/lib/window.coffee',
diff --git a/browser/api/lib/atom.coffee b/browser/api/lib/atom_delegate.coffee
similarity index 100%
rename from browser/api/lib/atom.coffee
rename to browser/api/lib/atom_delegate.coffee
diff --git a/browser/default_app/main.js b/browser/default_app/main.js
index 50807df33c5..e19921fa94b 100644
--- a/browser/default_app/main.js
+++ b/browser/default_app/main.js
@@ -1,5 +1,5 @@
 var app = require('app');
-var atom = require('atom');
+var delegate = require('atom_delegate');
 var ipc = require('ipc');
 var Window = require('window');
 
@@ -19,7 +19,7 @@ ipc.on('sync-message', function(event, process_id, routing_id) {
   event.result = arguments;
 });
 
-atom.browserMainParts.preMainMessageLoopRun = function() {
+delegate.browserMainParts.preMainMessageLoopRun = function() {
   mainWindow = new Window({ width: 800, height: 600 });
   mainWindow.loadUrl('file://' + __dirname + '/index.html');