diff --git a/pkg/cmd/hub/controller.go b/pkg/cmd/hub/controller.go
index 1324bcb9c..6eab63a78 100644
--- a/pkg/cmd/hub/controller.go
+++ b/pkg/cmd/hub/controller.go
@@ -11,7 +11,7 @@ import (
 
 func NewController() *cobra.Command {
 	cmd := controllercmd.
-		NewControllerCommandConfig("controller", version.Get(), hub.RunControllerManager).
+		NewControllerCommandConfig("registration-controller", version.Get(), hub.RunControllerManager).
 		NewCommand()
 	cmd.Use = "controller"
 	cmd.Short = "Start the Cluster Registration Controller"
diff --git a/pkg/cmd/spoke/agent.go b/pkg/cmd/spoke/agent.go
index 578c53d23..040448945 100644
--- a/pkg/cmd/spoke/agent.go
+++ b/pkg/cmd/spoke/agent.go
@@ -12,7 +12,7 @@ import (
 func NewAgent() *cobra.Command {
 	agentOptions := spoke.NewSpokeAgentOptions()
 	cmd := controllercmd.
-		NewControllerCommandConfig("agent", version.Get(), agentOptions.RunSpokeAgent).
+		NewControllerCommandConfig("registration-agent", version.Get(), agentOptions.RunSpokeAgent).
 		NewCommand()
 	cmd.Use = "agent"
 	cmd.Short = "Start the Cluster Registration Agent"