diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
index 6e587e8f1..ce2355aa6 100644
--- a/src/browser/atom-application.coffee
+++ b/src/browser/atom-application.coffee
@@ -392,12 +392,12 @@ class AtomApplication
     else
       if devMode
         try
-          bootstrapScript = require.resolve(path.join(@devResourcePath, 'src', 'window-bootstrap'))
+          windowInitializationScript = require.resolve(path.join(@devResourcePath, 'src', 'initialize-application-window'))
           resourcePath = @devResourcePath
 
-      bootstrapScript ?= require.resolve('../window-bootstrap')
+      windowInitializationScript ?= require.resolve('../initialize-application-window')
       resourcePath ?= @resourcePath
-      openedWindow = new AtomWindow({locationsToOpen, bootstrapScript, resourcePath, devMode, safeMode, windowDimensions, profileStartup})
+      openedWindow = new AtomWindow({locationsToOpen, windowInitializationScript, resourcePath, devMode, safeMode, windowDimensions, profileStartup})
 
     if pidToKillWhenClosed?
       @pidsToOpenWindows[pidToKillWhenClosed] = openedWindow
@@ -472,9 +472,9 @@ class AtomApplication
     if pack?
       if pack.urlMain
         packagePath = @packages.resolvePackagePath(packageName)
-        bootstrapScript = path.resolve(packagePath, pack.urlMain)
+        windowInitializationScript = path.resolve(packagePath, pack.urlMain)
         windowDimensions = @focusedWindow()?.getDimensions()
-        new AtomWindow({bootstrapScript, @resourcePath, devMode, safeMode, urlToOpen, windowDimensions})
+        new AtomWindow({windowInitializationScript, @resourcePath, devMode, safeMode, urlToOpen, windowDimensions})
       else
         console.log "Package '#{pack.name}' does not have a url main: #{urlToOpen}"
     else
@@ -494,14 +494,14 @@ class AtomApplication
       resourcePath = @resourcePath
 
     try
-      bootstrapScript = require.resolve(path.resolve(@devResourcePath, 'spec', 'spec-bootstrap'))
+      windowInitializationScript = require.resolve(path.resolve(@devResourcePath, 'src', 'initialize-test-window'))
     catch error
-      bootstrapScript = require.resolve(path.resolve(__dirname, '..', '..', 'spec', 'spec-bootstrap'))
+      windowInitializationScript = require.resolve(path.resolve(__dirname, '..', '..', 'src', 'initialize-test-window'))
 
     isSpec = true
     devMode = true
     safeMode ?= false
-    new AtomWindow({bootstrapScript, resourcePath, headless, isSpec, devMode, specDirectory, logFile, safeMode})
+    new AtomWindow({windowInitializationScript, resourcePath, headless, isSpec, devMode, specDirectory, logFile, safeMode})
 
   locationForPathToOpen: (pathToOpen, executedFrom='') ->
     return {pathToOpen} unless pathToOpen
diff --git a/src/window-bootstrap.coffee b/src/initialize-application-window.coffee
similarity index 100%
rename from src/window-bootstrap.coffee
rename to src/initialize-application-window.coffee
diff --git a/spec/spec-bootstrap.coffee b/src/initialize-test-window.coffee
similarity index 95%
rename from spec/spec-bootstrap.coffee
rename to src/initialize-test-window.coffee
index 0bf691d05..77461667c 100644
--- a/spec/spec-bootstrap.coffee
+++ b/src/initialize-test-window.coffee
@@ -19,7 +19,7 @@ try
 
   document.title = "Spec Suite"
 
-  testRunner = require('./jasmine-test-runner')
+  testRunner = require('../spec/jasmine-test-runner')
   testRunner({
     logFile: atom.getLoadSettings().logFile
     headless: atom.getLoadSettings().headless
diff --git a/static/index.js b/static/index.js
index 11527e963..5f90591f0 100644
--- a/static/index.js
+++ b/static/index.js
@@ -76,7 +76,7 @@
     setupVmCompatibility()
     setupCsonCache(CompileCache.getCacheDirectory())
 
-    require(loadSettings.bootstrapScript)
+    require(loadSettings.windowInitializationScript)
     require('ipc').sendChannel('window-command', 'window:loaded')
   }