diff --git a/README.md b/README.md
index 738a30930..dc1e3c4ba 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ By default, installs binaries. On these platforms no external dependencies are n
 Just run:
 
 ```
-npm install mbgl
+npm install mapbox-gl-native
 ```
 
 However, other platforms will fall back to a source compile with `make build`. To compile this module, make sure all submodules are initialized.
@@ -101,7 +101,7 @@ This is a very barebones implementation and you'll probably want a better implem
 A sample implementation that uses [`request`](https://github.com/request/request) to query data from HTTP:
 
 ```js
-var mbgl = require('./');
+var mbgl = require('mapbox-gl-native');
 var request = require('request');
 
 var fileSource = new mbgl.FileSource();
diff --git a/binding.gyp b/binding.gyp
index 263249bc9..05e9347c3 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -10,7 +10,7 @@
       'include_dirs': [ "<!(node -e \"require('nan')\")" ],
 
       'sources': [
-        'src/mbgl.cpp',
+        'src/node_mapbox_gl_native.cpp',
         'src/compress_png.hpp',
         'src/compress_png.cpp',
         'src/node_log.hpp',
diff --git a/package.json b/package.json
index e3884bed2..90f70b63a 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "mbgl",
+  "name": "mapbox-gl-native",
   "version": "0.0.1",
   "description": "Renders map tiles with Mapbox GL",
   "keywords": [
     "mapbox",
     "gl"
   ],
-  "main": "lib/mbgl.node",
+  "main": "lib/mapbox-gl-native.node",
   "repository": {
     "type": "git",
     "url": "git://github.com/mapbox/node-mapbox-gl-native.git"
@@ -38,7 +38,7 @@
   },
   "gypfile": true,
   "binary": {
-    "module_name": "mbgl",
+    "module_name": "mapbox-gl-native",
     "module_path": "./lib/",
     "host": "https://mapbox-node-binary.s3.amazonaws.com",
     "remote_path": "./{name}/v{version}",
diff --git a/scripts/travis_publish.sh b/scripts/travis_publish.sh
index 17f4b1f17..124795757 100755
--- a/scripts/travis_publish.sh
+++ b/scripts/travis_publish.sh
@@ -4,9 +4,9 @@ set -e
 
 # Inspect binary.
 if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
-    ldd ./lib/mbgl.node
+    ldd ./lib/mapbox-gl-native.node
 else
-    otool -L ./lib/mbgl.node
+    otool -L ./lib/mapbox-gl-native.node
 fi
 
 COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n')
diff --git a/src/node_map.hpp b/src/node_map.hpp
index 614eab280..9b52df520 100644
--- a/src/node_map.hpp
+++ b/src/node_map.hpp
@@ -1,5 +1,4 @@
-#ifndef NODE_MBGL_NODE_MAP
-#define NODE_MBGL_NODE_MAP
+#pragma once
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/platform/default/headless_view.hpp>
@@ -11,7 +10,6 @@
 
 namespace node_mbgl {
 
-
 class NodeFileSource;
 
 class NodeMap : public node::ObjectWrap {
@@ -55,6 +53,4 @@ private:
     uv_async_t *async;
 };
 
-} // end ns node_mbgl
-
-#endif
+}
diff --git a/src/mbgl.cpp b/src/node_mapbox_gl_native.cpp
similarity index 96%
rename from src/mbgl.cpp
rename to src/node_mapbox_gl_native.cpp
index f113fcd5a..435c446a6 100644
--- a/src/mbgl.cpp
+++ b/src/node_mapbox_gl_native.cpp
@@ -34,4 +34,4 @@ void RegisterModule(v8::Handle<v8::Object> exports) {
     mbgl::Log::Set<node_mbgl::NodeLogBackend>(exports);
 }
 
-NODE_MODULE(mbgl, RegisterModule)
+NODE_MODULE(mapbox_gl_native, RegisterModule)
diff --git a/travis/travis-resources.template b/travis/travis-resources.template
index ea7f12585..3ba9b9625 100644
--- a/travis/travis-resources.template
+++ b/travis/travis-resources.template
@@ -20,7 +20,7 @@
                                         "s3:PutObjectAcl"
                                     ],
                                     "Resource": [
-                                        "arn:aws:s3:::mapbox-node-binary/mbgl/*"
+                                        "arn:aws:s3:::mapbox-node-binary/mapbox-gl-native/*"
                                     ],
                                     "Effect": "Allow"
                                 }