diff --git a/core/commands2/diag.go b/core/commands2/diag.go
index b63486979e3a0ddbcfb6ff926c8e8c159a566c85..ec18476a9d4f5ea0ef730551cdd613312304283f 100644
--- a/core/commands2/diag.go
+++ b/core/commands2/diag.go
@@ -28,6 +28,14 @@ type DiagnosticOutput struct {
 }
 
 var diagCmd = &cmds.Command{
+	// TODO UsageLine: "net-diag",
+	// TODO Short:     "Generate a diagnostics report",
+	Help: `ipfs net-diag - Generate a diagnostics report.
+
+	Sends out a message to each node in the network recursively
+	requesting a listing of data about them including number of
+	connected peers and latencies between them.
+`,
 	Run: func(res cmds.Response, req cmds.Request) {
 		n := req.Context().Node
 
diff --git a/core/commands2/root.go b/core/commands2/root.go
index fed8c3f43465864241263a03b6695aa41d328ba9..9417b9b7af5737f7acf7a6205f73f78e691ce0be 100644
--- a/core/commands2/root.go
+++ b/core/commands2/root.go
@@ -62,7 +62,7 @@ var rootSubcommands = map[string]*cmds.Command{
 	"name":      nameCmd,
 	"add":       addCmd,
 	"log":       logCmd,
-	"diag":      diagCmd,
+	"net-diag":  diagCmd,
 	"pin":       pinCmd,
 	"unpin":     unpinCmd,
 	"version":   versionCmd,