diff --git a/__tests__/bin/mastarm.js b/__tests__/bin/mastarm.js
index 4004f0e..f9b2d79 100644
--- a/__tests__/bin/mastarm.js
+++ b/__tests__/bin/mastarm.js
@@ -73,7 +73,7 @@ describe('mastarm cli', () => {
   })
 
   it('should run lint on a project', done => {
-    exec(`node ${mastarm} lint`, (err, stdout, stderr) => {
+    exec(`node ${mastarm}-lint`, (err, stdout, stderr) => {
       expect(err).toBeNull()
       expect(stdout).toBe('')
       expect(stderr).toBe('')
diff --git a/bin/mastarm b/bin/mastarm
index 34876d3..59da7d2 100755
--- a/bin/mastarm
+++ b/bin/mastarm
@@ -9,7 +9,7 @@ commander
   .command('build [entries...]', 'Bundle JavaScript & CSS')
   .command('commit', 'Force intelligent commit messages.')
   .command('deploy', 'Bundle & Deploy JavaScript & CSS')
-  .command('flow [command]', 'Run flow on the current directory.')
+  .command('flow', 'Run flow on the current directory.')
   .command('format [entries...]', 'Format JavaScript')
   .command('lint', 'Lint JavaScript')
   .command(
diff --git a/package.json b/package.json
index 1917954..275e324 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,16 @@
     "npm": "3"
   },
   "bin": {
-    "mastarm": "bin/mastarm"
+    "mastarm": "bin/mastarm",
+    "mastarm-build": "bin/mastarm-build",
+    "mastarm-commit": "bin/mastarm-commit",
+    "mastarm-deploy": "bin/mastarm-deploy",
+    "mastarm-flow": "bin/mastarm-flow",
+    "mastarm-format": "bin/mastarm-format",
+    "mastarm-lint": "bin/mastarm-lint",
+    "mastarm-lint-messages": "bin/mastarm-lint-messages",
+    "mastarm-prepublish": "bin/mastarm-prepublish",
+    "mastarm-test": "bin/mastarm-test"
   },
   "scripts": {
     "cover": "bin/mastarm test --env test --test-environment node --coverage --coverage-paths bin",