diff --git a/bin/cnpm-install b/bin/unpm-install
similarity index 90%
rename from bin/cnpm-install
rename to bin/unpm-install
index f7db96476c..59e907747f 100755
--- a/bin/cnpm-install
+++ b/bin/unpm-install
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-var debug = require('debug')('cnpm:install')
+var debug = require('debug')('unpm:install')
 var dirname = require('path').dirname
 var join = require('path').join
 
@@ -10,8 +10,8 @@ var Promise = require('../lib/promise')
 
 const cli = require('meow')([
   'Usage:',
-  '  $ cnpm install',
-  '  $ cnpm install <name>',
+  '  $ unpm install',
+  '  $ unpm install <name>',
   '',
   'Options:',
   '  -S, --save            save into package.json under dependencies',
@@ -50,7 +50,7 @@ if (!module.parent) {
   var ctx = {}
 
   getPath()
-    .then(_ => updateContext(_))
+    .then(path => updateContext(path))
     .then(_ => mkdirp(ctx.modules))
     .then(_ => installMultiple(ctx, cli.input, cli.flags))
     .catch(require('../lib/err'))
diff --git a/lib/fetch.js b/lib/fetch.js
index c5a679a8a4..e199610bc8 100644
--- a/lib/fetch.js
+++ b/lib/fetch.js
@@ -1,4 +1,4 @@
-var debug = require('debug')('cnpm:fetch')
+var debug = require('debug')('unpm:fetch')
 var got = require('./got')
 
 /*
diff --git a/lib/get_path.js b/lib/get_path.js
index e1313627c7..1a371c9175 100644
--- a/lib/get_path.js
+++ b/lib/get_path.js
@@ -1,4 +1,4 @@
-var debug = require('debug')('cnpm:get_path')
+var debug = require('debug')('unpm:get_path')
 var dirname = require('path').dirname
 var readPkgUp = require('read-pkg-up')
 
diff --git a/lib/got.js b/lib/got.js
index a471e715c7..2eab76fad4 100644
--- a/lib/got.js
+++ b/lib/got.js
@@ -1,4 +1,4 @@
-var debug = require('debug')('cnpm:http')
+var debug = require('debug')('unpm:http')
 
 /*
  * Interface for 'got' with debug logging
diff --git a/lib/install.js b/lib/install.js
index efd82839f3..c616720ed9 100644
--- a/lib/install.js
+++ b/lib/install.js
@@ -1,5 +1,5 @@
 var Promise = require('./promise')
-var debug = require('debug')('cnpm:install')
+var debug = require('debug')('unpm:install')
 var config = require('./config')
 var join = require('path').join
 var mkdirp = require('./mkdirp')
diff --git a/lib/mkdirp.js b/lib/mkdirp.js
index 084b1fde83..5aa4cb25b8 100644
--- a/lib/mkdirp.js
+++ b/lib/mkdirp.js
@@ -1,4 +1,4 @@
-var debug = require('debug')('cnpm:mkdirp')
+var debug = require('debug')('unpm:mkdirp')
 
 /*
  * mkdir -p as a promise.
diff --git a/lib/resolve.js b/lib/resolve.js
index 626684d58d..bc0f7f0916 100644
--- a/lib/resolve.js
+++ b/lib/resolve.js
@@ -22,9 +22,9 @@ var config = require('./config')
 module.exports = function resolve (pkgSpec) {
   // { raw: 'rimraf@2', scope: null, name: 'rimraf', rawSpec: '2' || '' }
   return Promise.resolve()
-  .then(function () { return toUri(npa(pkgSpec)) })
-  .then(got)
-  .then(function (res) { return JSON.parse(res.body) })
+    .then(_ => toUri(npa(pkgSpec)))
+    .then(url => got(url))
+    .then(res => JSON.parse(res.body))
 }
 
 /**
diff --git a/notes.txt b/notes.txt
index 324b7570ec..2e74a6b475 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1,6 +1,6 @@
 how it should look like:
 
-    $ cnpm install rimraf@2
+    $ unpm install rimraf@2
 
       rimraf                              2.5.1  52% 328kb / 769kb
       glob@^6.0.1                         6.0.1  34% 1.2mb / 4.8mb
diff --git a/package.json b/package.json
index d02f8bdbb8..362570f7ad 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "cnpm",
+  "name": "unpm",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -20,7 +20,7 @@
     "semver": "5.1.0"
   },
   "bin": {
-    "cnpm-install": "bin/cnpm-install"
+    "unpm-install": "bin/unpm-install"
   },
   "devDependencies": {
     "debug": "2.2.0",