diff --git a/aa b/aa
index efd982392..767657198 100755
--- a/aa
+++ b/aa
@@ -1,2 +1,2 @@
-coffee -c -o /Applications/Atom.app/Contents/Resources/app/src/ src/main.coffee src/atom-application.coffee src/atom-window.coffee src/application-menu.coffee &&
+coffee -c -o /Applications/Atom.app/Contents/Resources/app/src/ src/main.coffee src/atom-application.coffee src/atom-window.coffee src/atom-menu.coffee &&
 /Applications/Atom.app/Contents/MacOS/Atom --resource-path=$(pwd) --executed-from=$(pwd) $@
diff --git a/src/atom-application.coffee b/src/atom-application.coffee
index cbca5628c..51f72427b 100644
--- a/src/atom-application.coffee
+++ b/src/atom-application.coffee
@@ -1,5 +1,5 @@
 AtomWindow = require './atom-window'
-ApplicationMenu = require './application-menu'
+AtomMenu = require './atom-menu'
 BrowserWindow = require 'browser-window'
 Menu = require 'menu'
 autoUpdater = require 'auto-updater'
@@ -49,7 +49,7 @@ class AtomApplication
     @pathsToOpen ?= []
     @windows = []
 
-    @applicationMenu = new ApplicationMenu(@version, devMode)
+    @applicationMenu = new AtomMenu(@version, devMode)
 
     @listenForArgumentsFromNewProcess()
     @setupJavaScriptArguments()
diff --git a/src/application-menu.coffee b/src/atom-menu.coffee
similarity index 99%
rename from src/application-menu.coffee
rename to src/atom-menu.coffee
index ce481df89..76fee6f5c 100644
--- a/src/application-menu.coffee
+++ b/src/atom-menu.coffee
@@ -3,7 +3,7 @@ Menu = require 'menu'
 _ = require 'underscore'
 
 module.exports =
-class ApplicationMenu
+class AtomMenu
   keyBindingsByCommand: null
   version: null
   devMode: null