diff --git a/src/cli/commands/bitswap.js b/src/cli/commands/bitswap.js
index c262ffc77b..b03e5b3623 100644
--- a/src/cli/commands/bitswap.js
+++ b/src/cli/commands/bitswap.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'bitswap',
+  command: 'bitswap <command>',
 
   description: 'Interact with the bitswap agent.',
 
@@ -10,6 +10,5 @@ module.exports = {
   },
 
   handler (argv) {
-    console.log('Type `jsipfs bitswap --help` for more information about this command')
   }
 }
diff --git a/src/cli/commands/block.js b/src/cli/commands/block.js
index 599e202b7a..e843a00cb9 100644
--- a/src/cli/commands/block.js
+++ b/src/cli/commands/block.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'block',
+  command: 'block <command>',
 
   description: 'Manipulate raw IPFS blocks.',
 
diff --git a/src/cli/commands/bootstrap.js b/src/cli/commands/bootstrap.js
index 0e2ad80d85..8c3324e466 100644
--- a/src/cli/commands/bootstrap.js
+++ b/src/cli/commands/bootstrap.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'bootstrap',
+  command: 'bootstrap <command>',
 
   description: 'Show or edit the list of bootstrap peers.',
 
diff --git a/src/cli/commands/dag.js b/src/cli/commands/dag.js
index d3653920fc..3f15156884 100644
--- a/src/cli/commands/dag.js
+++ b/src/cli/commands/dag.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'dag',
+  command: 'dag <command>',
 
   description: 'Interact with ipld dag objects.',
 
diff --git a/src/cli/commands/file.js b/src/cli/commands/file.js
index 5bc4dcf93f..0c178f0cd2 100644
--- a/src/cli/commands/file.js
+++ b/src/cli/commands/file.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'file',
+  command: 'file <command>',
 
   description: 'Interact with IPFS objects representing Unix filesystems.',
 
diff --git a/src/cli/commands/files.js b/src/cli/commands/files.js
index b72d78534f..09ca4de380 100644
--- a/src/cli/commands/files.js
+++ b/src/cli/commands/files.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'files',
+  command: 'files <command>',
 
   description: 'Operations over files (add, cat, get, ls, etc)',
 
diff --git a/src/cli/commands/object.js b/src/cli/commands/object.js
index 9f29944eff..753e934e07 100644
--- a/src/cli/commands/object.js
+++ b/src/cli/commands/object.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'object',
+  command: 'object <command>',
 
   description: 'Interact with ipfs objects.',
 
diff --git a/src/cli/commands/pubsub.js b/src/cli/commands/pubsub.js
index dac25c7690..aa282c323f 100644
--- a/src/cli/commands/pubsub.js
+++ b/src/cli/commands/pubsub.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'pubsub',
+  command: 'pubsub <command>',
 
   description: 'pubsub commands',
 
diff --git a/src/cli/commands/repo.js b/src/cli/commands/repo.js
index e67ebfa3e7..18873a7f44 100644
--- a/src/cli/commands/repo.js
+++ b/src/cli/commands/repo.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'repo',
+  command: 'repo <command>',
 
   description: 'Manipulate the IPFS repo.',
 
diff --git a/src/cli/commands/swarm.js b/src/cli/commands/swarm.js
index dc7cd291d1..ea5d2d5080 100644
--- a/src/cli/commands/swarm.js
+++ b/src/cli/commands/swarm.js
@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  command: 'swarm',
+  command: 'swarm <command>',
 
   description: 'Swarm inspection tool.',