diff --git a/core/commands2/diag.go b/core/commands2/diag.go
index ec18476a9..e5023778d 100644
--- a/core/commands2/diag.go
+++ b/core/commands2/diag.go
@@ -28,9 +28,15 @@ type DiagnosticOutput struct {
 }
 
 var diagCmd = &cmds.Command{
+	Subcommands: map[string]*cmds.Command{
+		"net": diagNetCmd,
+	},
+}
+
+var diagNetCmd = &cmds.Command{
 	// TODO UsageLine: "net-diag",
 	// TODO Short:     "Generate a diagnostics report",
-	Help: `ipfs net-diag - Generate a diagnostics report.
+	Help: `ipfs diag net - 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
diff --git a/core/commands2/root.go b/core/commands2/root.go
index 9cc6a228f..8a8933972 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,
-	"net-diag":  diagCmd,
+	"diag":      diagCmd,
 	"pin":       pinCmd,
 	"version":   versionCmd,
 	"config":    configCmd,