diff --git a/README.md b/README.md
index b0ef3b1..f3ef18d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# eventstore-node
+# node-eventstore-client
 A port of the EventStore .Net ClientAPI to Node.js
 
 ## Status
@@ -19,7 +19,7 @@ A port of the EventStore .Net ClientAPI to Node.js
 
 ## Getting started
 
-Install using `npm install eventstore-node`
+Install using `npm install node-eventstore-client`
 
 ### Dependencies
 
@@ -30,11 +30,11 @@ Install using `npm install eventstore-node`
 
 #### Offline
 
-The offline documentation can be found in the module folder `./node_modules/eventstore-node/docs`.
+The offline documentation can be found in the module folder `./node_modules/node-eventstore-client/docs`.
 
 #### Online
 
-The online documentation can be found at [https://dev.nicdex.com/eventstore-node/docs/](https://dev.nicdex.com/eventstore-node/docs/)
+The online documentation can be found at [https://dev.nicdex.com/node-eventstore-client/docs/](https://dev.nicdex.com/node-eventstore-client/docs/)
 
 ### Install & run an Eventstore on localhost
 
@@ -45,7 +45,7 @@ See http://docs.geteventstore.com/introduction/3.9.0/ .
 Save to ```app.js:```
 
 ```javascript
-var esClient = require('eventstore-node');
+var esClient = require('node-eventstore-client');
 var uuid = require('uuid');
 
 var streamName = "testStream";
@@ -88,7 +88,7 @@ Run:
 
 ```json
 npm install uuid
-npm install eventstore-node
+npm install node-eventstore-client
 node app.js
 ```
 
@@ -125,6 +125,6 @@ Any async commands returns a [Promise](https://developer.mozilla.org/en/docs/Web
 
 ## License
 
-Ported code is released under the MIT license, see [LICENSE](https://github.com/nicdex/eventstore-node/blob/master/LICENSE). 
+Ported code is released under the MIT license, see [LICENSE](https://github.com/nicdex/node-eventstore-client/blob/master/LICENSE). 
  
 Original code is released under the EventStore license and can be found at https://github.com/eventstore/eventstore.
diff --git a/index.js b/index.js
index 3997974..9e14a58 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,5 @@
 /**
- * eventstore-node A port of EventStore .Net ClientAPI to Node.js
+ * node-eventstore-client A port of EventStore .Net ClientAPI to Node.js
  * see README.md for more details
  * see LICENSE for license info
  */
diff --git a/package.json b/package.json
index 88b3928..8ced836 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "eventstore-node",
+  "name": "node-eventstore-client",
   "version": "0.1.2",
   "description": "A port of the EventStore .Net ClientAPI to Node.js",
   "main": "index.js",
@@ -27,7 +27,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/nicdex/eventstore-node.git"
+    "url": "git+https://github.com/nicdex/node-eventstore-client.git"
   },
   "keywords": [
     "eventstore",
@@ -37,9 +37,9 @@
   "author": "Nicolas Dextraze",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/nicdex/eventstore-node/issues"
+    "url": "https://github.com/nicdex/node-eventstore-client/issues"
   },
-  "homepage": "https://github.com/nicdex/eventstore-node#readme",
+  "homepage": "https://github.com/nicdex/node-eventstore-client#readme",
   "dependencies": {
     "@types/long": "^3.0.31",
     "@types/node": "^6.0.47",
diff --git a/samples/simple.js b/samples/simple.js
index 629ce4b..53d38f5 100644
--- a/samples/simple.js
+++ b/samples/simple.js
@@ -1,5 +1,5 @@
 const client = require('../src/client')
-// const client = require("eventstore-node")
+// const client = require("node-eventstore-client")
 const uuid = require("uuid")
 
 const settings = {
diff --git a/samples/store-event.js b/samples/store-event.js
index aa0be70..1f573b5 100644
--- a/samples/store-event.js
+++ b/samples/store-event.js
@@ -1,5 +1,5 @@
 const client = require('../src/client')
-// const client = require("eventstore-node")
+// const client = require("node-eventstore-client")
 const uuid = require("uuid")
 
 const settings = {}
diff --git a/samples/subscribe-all-events.js b/samples/subscribe-all-events.js
index f8e9205..c74bd71 100644
--- a/samples/subscribe-all-events.js
+++ b/samples/subscribe-all-events.js
@@ -1,7 +1,7 @@
 // Subscribe to all new events on the $all stream. Filter out any which aren"t about "user" aggregates.
 
 const client = require('../src/client')
-// const client = require("eventstore-node")
+// const client = require("node-eventstore-client")
 
 const resolveLinkTos = false
 
diff --git a/samples/subscribe-catchup-all-events.js b/samples/subscribe-catchup-all-events.js
index 2580ff9..d557438 100644
--- a/samples/subscribe-catchup-all-events.js
+++ b/samples/subscribe-catchup-all-events.js
@@ -2,7 +2,7 @@
 // This could be used for subscribers which populate read models.
 
 const client = require('../src/client')
-// const client = require("eventstore-node")
+// const client = require("node-eventstore-client")
 
 const eventAppeared = (stream, event) =>
   console.log(