diff --git a/atom.gyp b/atom.gyp
index 01fc0c14ad33..a92929612138 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -11,10 +11,10 @@
     'coffee_sources': [
       'browser/api/lib/app.coffee',
       'browser/api/lib/atom_delegate.coffee',
+      'browser/api/lib/browser_window.coffee',
       'browser/api/lib/dialog.coffee',
       'browser/api/lib/ipc.coffee',
       'browser/api/lib/menu.coffee',
-      'browser/api/lib/window.coffee',
       'browser/atom/atom.coffee',
       'browser/atom/objects_registry.coffee',
       'browser/atom/rpc_server.coffee',
diff --git a/browser/api/atom_api_window.cc b/browser/api/atom_api_window.cc
index 88d886c294bf..755a8e7fadb6 100644
--- a/browser/api/atom_api_window.cc
+++ b/browser/api/atom_api_window.cc
@@ -586,7 +586,7 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
 
   v8::Local<v8::FunctionTemplate> t = v8::FunctionTemplate::New(Window::New);
   t->InstanceTemplate()->SetInternalFieldCount(1);
-  t->SetClassName(v8::String::NewSymbol("Window"));
+  t->SetClassName(v8::String::NewSymbol("BrowserWindow"));
 
   NODE_SET_PROTOTYPE_METHOD(t, "destroy", Destroy);
   NODE_SET_PROTOTYPE_METHOD(t, "close", Close);
@@ -639,7 +639,7 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
   NODE_SET_PROTOTYPE_METHOD(t, "reload", Reload);
   NODE_SET_PROTOTYPE_METHOD(t, "reloadIgnoringCache", ReloadIgnoringCache);
 
-  target->Set(v8::String::NewSymbol("Window"), t->GetFunction());
+  target->Set(v8::String::NewSymbol("BrowserWindow"), t->GetFunction());
 }
 
 }  // namespace api
diff --git a/browser/api/lib/browser_window.coffee b/browser/api/lib/browser_window.coffee
new file mode 100644
index 000000000000..8467d848ee92
--- /dev/null
+++ b/browser/api/lib/browser_window.coffee
@@ -0,0 +1,6 @@
+EventEmitter = require('events').EventEmitter
+
+BrowserWindow = process.atomBinding('window').BrowserWindow
+BrowserWindow.prototype.__proto__ = EventEmitter.prototype
+
+module.exports = BrowserWindow
diff --git a/browser/api/lib/dialog.coffee b/browser/api/lib/dialog.coffee
index a5b2ecf85437..71692df08a13 100644
--- a/browser/api/lib/dialog.coffee
+++ b/browser/api/lib/dialog.coffee
@@ -1,8 +1,8 @@
 binding = process.atomBinding 'dialog'
+BrowserWindow = require 'browser_window'
 CallbacksRegistry = require 'callbacks_registry'
 EventEmitter = require('events').EventEmitter
 ipc = require 'ipc'
-Window = require 'window'
 
 FileDialog = binding.FileDialog
 FileDialog.prototype.__proto__ = EventEmitter.prototype
@@ -34,7 +34,7 @@ validateOptions = (options) ->
   true
 
 selectFileWrap = (window, options, callback, type, title) ->
-  throw new TypeError('Need Window object') unless window.constructor is Window
+  throw new TypeError('Need BrowserWindow object') unless window.constructor is BrowserWindow
 
   options = {} unless options?
   options.type = type
diff --git a/browser/api/lib/menu.coffee b/browser/api/lib/menu.coffee
index 2d753da3e6fd..f24cc1699204 100644
--- a/browser/api/lib/menu.coffee
+++ b/browser/api/lib/menu.coffee
@@ -1,12 +1,12 @@
 EventEmitter = require('events').EventEmitter
-Window = require 'window'
+BrowserWindow = require 'browser_window'
 
 Menu = process.atomBinding('menu').Menu
 Menu::__proto__ = EventEmitter.prototype
 
 popup = Menu::popup
 Menu::popup = (window) ->
-  throw new TypeError('Invalid window') unless window?.constructor is Window
+  throw new TypeError('Invalid window') unless window?.constructor is BrowserWindow
 
   popup.call this, window
 
diff --git a/browser/api/lib/window.coffee b/browser/api/lib/window.coffee
deleted file mode 100644
index 1f63f7d0ec87..000000000000
--- a/browser/api/lib/window.coffee
+++ /dev/null
@@ -1,6 +0,0 @@
-EventEmitter = require('events').EventEmitter
-
-Window = process.atomBinding('window').Window
-Window.prototype.__proto__ = EventEmitter.prototype
-
-module.exports = Window
diff --git a/browser/default_app/main.js b/browser/default_app/main.js
index 15ac5840604d..2a93e294a314 100644
--- a/browser/default_app/main.js
+++ b/browser/default_app/main.js
@@ -2,7 +2,7 @@ var app = require('app');
 var delegate = require('atom_delegate');
 var ipc = require('ipc');
 var Menu = require('menu');
-var Window = require('window');
+var BrowserWindow = require('browser_window');
 
 var mainWindow = null;
 var menu = null;
@@ -13,7 +13,7 @@ app.on('window-all-closed', function() {
 });
 
 delegate.browserMainParts.preMainMessageLoopRun = function() {
-  mainWindow = new Window({ width: 800, height: 600 });
+  mainWindow = new BrowserWindow({ width: 800, height: 600 });
   mainWindow.loadUrl('file://' + __dirname + '/index.html');
 
   mainWindow.on('page-title-updated', function(event, title) {