diff --git a/README.md b/README.md
index e18f0e4..fc4accd 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,15 @@ $ npm link .
 </pre>
 
 <pre>
-$ couchapp help
-couchapp -- utility for creating couchapps
+$ couchappjs help
+couchappjs -- utility for creating couchapps
 
 Usage - old style with single app.js:
-  couchapp &lt;command> app.js http://localhost:5984/dbname [opts]
+  couchappjs &lt;command> app.js http://localhost:5984/dbname [opts]
 
 Usage - new style with multiple app files:
   directory based config specified by switch - multiple app files and pre- and post-processing capability)
-  couchapp -dc &lt;<command> &lt;appconfigdirectory> http://localhost:5984/dbname
+  couchappjs -dc &lt;<command> &lt;appconfigdirectory> http://localhost:5984/dbname
 
 Commands:
   push   : Push app once to server.
@@ -117,9 +117,9 @@ Local development server example.
 
 Start the server:
 
-    couchapp serve app.js http://localhost:5984/example_db -p 3000 -l -d attachments
+    couchappjs serve app.js http://localhost:5984/example_db -p 3000 -l -d attachments
 
 Now you can access your couchapp at http://localhost:3000/ . Code, hack and when you are
 happy with the result simply do:
 
-    couchapp push app.js http://localhost:5984/example_db
+    couchappjs push app.js http://localhost:5984/example_db
diff --git a/boiler/app.js b/boiler/app.js
index 8d38b04..9a53692 100644
--- a/boiler/app.js
+++ b/boiler/app.js
@@ -1,4 +1,4 @@
- var couchapp = require('couchapp')
+ var couchapp = require('couchappjs')
   , path = require('path')
   ;
 
diff --git a/package.json b/package.json
index 21a0d81..a2787e3 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "couchapp",
+  "name": "couchappjs",
   "description": "Utilities for building CouchDB applications.",
   "tags": [
     "couchdb",
@@ -21,6 +21,6 @@
     "coffee-script": "*"
   },
   "bin": {
-    "couchapp": "./bin.js"
+    "couchappjs": "./bin.js"
   }
 }