diff --git a/package-lock.json b/package-lock.json
index 8a3a25a..3eb1e42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "oauth2-server",
+  "name": "@node-oauth/oauth2-server",
   "version": "4.0.0",
   "lockfileVersion": 1,
   "requires": true,
diff --git a/package.json b/package.json
index f695832..07ddd23 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "oauth2-server",
+  "name": "@node-oauth/oauth2-server",
   "description": "Complete, framework-agnostic, compliant and well tested module for implementing an OAuth2 Server in node.js",
   "version": "4.0.0",
   "keywords": [
@@ -7,35 +7,14 @@
     "oauth2"
   ],
   "contributors": [
-    {
-      "name": "Thom Seddon",
-      "email": "thom@seddonmedia.co.uk"
-    },
-    {
-      "name": "Lars F. Karlström",
-      "email": "lars@lfk.io"
-    },
-    {
-      "name": "Rui Marinho",
-      "email": "ruipmarinho@gmail.com"
-    },
-    {
-      "name": "Tiago Ribeiro",
-      "email": "tiago.ribeiro@gmail.com"
-    },
-    {
-      "name": "Michael Salinger",
-      "email": "mjsalinger@gmail.com"
-    },
-    {
-      "name": "Nuno Sousa"
-    },
-    {
-      "name": "Max Truxa"
-    },
-    {
-      "name": "Daniel Reguero"
-    }
+    "Thom Seddon <thom@seddonmedia.co.uk>",
+    "Lars F. Karlström <lars@lfk.io>",
+    "Rui Marinho <ruipmarinho@gmail.com>",
+    "Tiago Ribeiro <tiago.ribeiro@gmail.com>",
+    "Michael Salinger <mjsalinger@gmail.com>",
+    "Nuno Sousa",
+    "Max Truxa",
+    "Daniel Reguero"
   ],
   "main": "index.js",
   "dependencies": {
@@ -57,12 +36,22 @@
     "node": ">=4.0"
   },
   "scripts": {
-    "pretest": "./node_modules/.bin/jshint --config ./.jshintrc lib test",
+    "pretest": "jshint --config ./.jshintrc lib test",
     "test": "NODE_ENV=test ./node_modules/.bin/mocha 'test/**/*_test.js'",
     "test-debug": "NODE_ENV=test ./node_modules/.bin/mocha  --inspect --debug-brk 'test/**/*_test.js'"
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/node-oauth/node-oauth2-server.git"
-  }
+    "url": "git+https://github.com/node-oauth/node-oauth2-server.git"
+  },
+  "bugs": {
+    "url": "https://github.com/node-oauth/node-oauth2-server/issues"
+  },
+  "homepage": "https://github.com/node-oauth/node-oauth2-server#readme",
+  "directories": {
+    "doc": "docs",
+    "lib": "lib",
+    "test": "test"
+  },
+  "author": ""
 }