diff --git a/atom.gyp b/atom.gyp
index 974195570329..f36d586d467a 100644
--- a/atom.gyp
+++ b/atom.gyp
@@ -12,12 +12,12 @@
     'lib_sources': [
       'app/atom_main_delegate.cc',
       'app/atom_main_delegate.h',
+      'browser/api/atom_api_extensions.cc',
+      'browser/api/atom_api_extensions.h',
+      'browser/api/atom_api_window.cc',
+      'browser/api/atom_api_window.h',
       'browser/api/atom_bindings.cc',
       'browser/api/atom_bindings.h',
-      'browser/api/atom_extensions.cc',
-      'browser/api/atom_extensions.h',
-      'browser/api/atom_window.cc',
-      'browser/api/atom_window.h',
       'browser/atom_browser_client.cc',
       'browser/atom_browser_client.h',
       'browser/atom_browser_main_parts.cc',
diff --git a/browser/api/atom_extensions.cc b/browser/api/atom_api_extensions.cc
similarity index 86%
rename from browser/api/atom_extensions.cc
rename to browser/api/atom_api_extensions.cc
index b37b6f11c20a..0f205e30e941 100644
--- a/browser/api/atom_extensions.cc
+++ b/browser/api/atom_api_extensions.cc
@@ -10,6 +10,8 @@
 
 namespace atom {
 
+namespace api {
+
 #undef NODE_EXT_LIST_START
 #undef NODE_EXT_LIST_ITEM
 #undef NODE_EXT_LIST_END
@@ -18,7 +20,7 @@ namespace atom {
 #define NODE_EXT_LIST_ITEM NODE_MODULE_DECL
 #define NODE_EXT_LIST_END
 
-#include "browser/api/atom_extensions.h"
+#include "browser/api/atom_api_extensions.h"
 
 #undef NODE_EXT_LIST_START
 #undef NODE_EXT_LIST_ITEM
@@ -29,12 +31,12 @@ namespace atom {
 #define NODE_EXT_LIST_ITEM NODE_EXT_STRING
 #define NODE_EXT_LIST_END NULL};
 
-#include "browser/api/atom_extensions.h" // NOLINT
+#include "browser/api/atom_api_extensions.h" // NOLINT
 
 node::node_module_struct* get_builtin_module(const char *name) {
   char buf[128];
   node::node_module_struct *cur = NULL;
-  snprintf(buf, sizeof(buf), "atom_%s", name);
+  snprintf(buf, sizeof(buf), "atom_api_%s", name);
   /* TODO: you could look these up in a hash, but there are only
    * a few, and once loaded they are cached. */
   for (int i = 0; node_module_list[i] != NULL; i++) {
@@ -47,4 +49,6 @@ node::node_module_struct* get_builtin_module(const char *name) {
   return NULL;
 }
 
+}  // namespace api
+
 }  // namespace atom
diff --git a/browser/api/atom_extensions.h b/browser/api/atom_api_extensions.h
similarity index 88%
rename from browser/api/atom_extensions.h
rename to browser/api/atom_api_extensions.h
index 52b8f6edceb8..0b059011c49b 100644
--- a/browser/api/atom_extensions.h
+++ b/browser/api/atom_api_extensions.h
@@ -6,6 +6,6 @@
 
 NODE_EXT_LIST_START
 
-NODE_EXT_LIST_ITEM(atom_window)
+NODE_EXT_LIST_ITEM(atom_api_window)
 
 NODE_EXT_LIST_END
diff --git a/browser/api/atom_window.cc b/browser/api/atom_api_window.cc
similarity index 78%
rename from browser/api/atom_window.cc
rename to browser/api/atom_api_window.cc
index 54f406f147f6..8a2dbd21daad 100644
--- a/browser/api/atom_window.cc
+++ b/browser/api/atom_api_window.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "browser/api/atom_window.h"
+#include "browser/api/atom_api_window.h"
 
 namespace atom {
 
@@ -12,4 +12,4 @@ static void Initialize(v8::Handle<v8::Object> target) {
 
 }  // namespace atom
 
-NODE_MODULE(atom_window, atom::Initialize)
+NODE_MODULE(atom_api_window, atom::Initialize)
diff --git a/browser/api/atom_window.h b/browser/api/atom_api_window.h
similarity index 67%
rename from browser/api/atom_window.h
rename to browser/api/atom_api_window.h
index 3ce3d535a1d8..4402e0d9c626 100644
--- a/browser/api/atom_window.h
+++ b/browser/api/atom_api_window.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ATOM_BROWSER_API_ATOM_WINDOW_H_
-#define ATOM_BROWSER_API_ATOM_WINDOW_H_
+#ifndef ATOM_BROWSER_API_ATOM_API_WINDOW_H_
+#define ATOM_BROWSER_API_ATOM_API_WINDOW_H_
 
 #include "vendor/node/src/node.h"
 #include "vendor/node/src/node_object_wrap.h"
@@ -12,4 +12,4 @@ namespace atom {
 
 }  // namespace atom
 
-#endif  // ATOM_BROWSER_API_ATOM_WINDOW_H_
+#endif  // ATOM_BROWSER_API_ATOM_API_WINDOW_H_
diff --git a/browser/api/atom_bindings.cc b/browser/api/atom_bindings.cc
index 2560b99aa459..35e5a944df82 100644
--- a/browser/api/atom_bindings.cc
+++ b/browser/api/atom_bindings.cc
@@ -11,8 +11,10 @@ using node::node_isolate;
 
 namespace atom {
 
-// Defined in atom_extensions.cc.
+// Defined in atom_api_extensions.cc.
+namespace api {
 node::node_module_struct* get_builtin_module(const char *name);
+}
 
 v8::Persistent<v8::Object> AtomBindings::binding_cache_;
 
@@ -49,7 +51,7 @@ v8::Handle<v8::Value> AtomBindings::Binding(const v8::Arguments& args) {
     return scope.Close(exports);
   }
 
-  if ((modp = get_builtin_module(*module_v)) != NULL) {
+  if ((modp = api::get_builtin_module(*module_v)) != NULL) {
     exports = v8::Object::New();
     // Internal bindings don't have a "module" object,
     // only exports.