diff --git a/extensions/accounts/pkg/command/root.go b/extensions/accounts/pkg/command/root.go
index aee23e547d..bb68f61678 100644
--- a/extensions/accounts/pkg/command/root.go
+++ b/extensions/accounts/pkg/command/root.go
@@ -34,7 +34,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-accounts command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-accounts",
+		Name:     "accounts",
 		Usage:    "Provide accounts and groups for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/app-registry/pkg/command/root.go b/extensions/app-registry/pkg/command/root.go
index df302358e1..4525aeefc4 100644
--- a/extensions/app-registry/pkg/command/root.go
+++ b/extensions/app-registry/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-app-registry command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-app-registry",
+		Name:     "app-registry",
 		Usage:    "Provide a app registry for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/appprovider/pkg/command/root.go b/extensions/appprovider/pkg/command/root.go
index 6cede536d0..37218bdacb 100644
--- a/extensions/appprovider/pkg/command/root.go
+++ b/extensions/appprovider/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-accounts command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-appprovider",
+		Name:     "appprovider",
 		Usage:    "Provide apps for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/auth-basic/pkg/command/root.go b/extensions/auth-basic/pkg/command/root.go
index 3dff2f589d..735941988a 100644
--- a/extensions/auth-basic/pkg/command/root.go
+++ b/extensions/auth-basic/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-auth-basic command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-auth-basic",
+		Name:     "auth-basic",
 		Usage:    "Provide basic authentication for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/auth-bearer/pkg/command/root.go b/extensions/auth-bearer/pkg/command/root.go
index a4f863ec0f..41431fd498 100644
--- a/extensions/auth-bearer/pkg/command/root.go
+++ b/extensions/auth-bearer/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-auth-bearer command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-auth-bearer",
+		Name:     "auth-bearer",
 		Usage:    "Provide bearer authentication for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/auth-machine/pkg/command/root.go b/extensions/auth-machine/pkg/command/root.go
index 40712fe913..593d455702 100644
--- a/extensions/auth-machine/pkg/command/root.go
+++ b/extensions/auth-machine/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-auth-machine command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-auth-machine",
+		Name:     "auth-machine",
 		Usage:    "Provide machine authentication for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/frontend/pkg/command/root.go b/extensions/frontend/pkg/command/root.go
index afe7fa3ef3..4905363b29 100644
--- a/extensions/frontend/pkg/command/root.go
+++ b/extensions/frontend/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-frontend command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-frontend",
+		Name:     "frontend",
 		Usage:    "Provide various ownCloud apis for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/gateway/pkg/command/root.go b/extensions/gateway/pkg/command/root.go
index d064ab4713..a162c6d3d4 100644
--- a/extensions/gateway/pkg/command/root.go
+++ b/extensions/gateway/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-gateway command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-gateway",
+		Name:     "gateway",
 		Usage:    "Provide a CS3api gateway for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/glauth/pkg/command/root.go b/extensions/glauth/pkg/command/root.go
index 5fbfbf5760..27d48cc8ca 100644
--- a/extensions/glauth/pkg/command/root.go
+++ b/extensions/glauth/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-glauth command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-glauth",
+		Name:     "glauth",
 		Usage:    "Serve GLAuth API for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/graph/pkg/command/root.go b/extensions/graph/pkg/command/root.go
index ecfeb2d15d..be426b0c79 100644
--- a/extensions/graph/pkg/command/root.go
+++ b/extensions/graph/pkg/command/root.go
@@ -29,7 +29,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-graph command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-graph",
+		Name:     "graph",
 		Usage:    "Serve Graph API for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/group/pkg/command/root.go b/extensions/group/pkg/command/root.go
index c9c4da6212..7a392363a4 100644
--- a/extensions/group/pkg/command/root.go
+++ b/extensions/group/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-group command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-group",
+		Name:     "group",
 		Usage:    "Provide groups for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/idm/pkg/command/root.go b/extensions/idm/pkg/command/root.go
index 50f6444346..74866c9ecc 100644
--- a/extensions/idm/pkg/command/root.go
+++ b/extensions/idm/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-idm command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-idm",
+		Name:     "idm",
 		Usage:    "Embedded LDAP service for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/idp/pkg/command/root.go b/extensions/idp/pkg/command/root.go
index 120e847139..8e8394ac1c 100644
--- a/extensions/idp/pkg/command/root.go
+++ b/extensions/idp/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-idp command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-idp",
+		Name:     "idp",
 		Usage:    "Serve IDP API for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/ocdav/pkg/command/root.go b/extensions/ocdav/pkg/command/root.go
index e022dd0fec..c37fdd6852 100644
--- a/extensions/ocdav/pkg/command/root.go
+++ b/extensions/ocdav/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-ocdav command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-ocdav",
+		Name:     "ocdav",
 		Usage:    "Provide a WebDav API for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/ocs/pkg/command/root.go b/extensions/ocs/pkg/command/root.go
index 61b65c7486..446db14b92 100644
--- a/extensions/ocs/pkg/command/root.go
+++ b/extensions/ocs/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-ocs command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-ocs",
+		Name:     "ocs",
 		Usage:    "Serve OCS API for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/proxy/pkg/command/root.go b/extensions/proxy/pkg/command/root.go
index bcd4fcaec0..98a47d7571 100644
--- a/extensions/proxy/pkg/command/root.go
+++ b/extensions/proxy/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-proxy command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-proxy",
+		Name:     "proxy",
 		Usage:    "proxy for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/search/pkg/command/root.go b/extensions/search/pkg/command/root.go
index a43261631f..41dc43f558 100644
--- a/extensions/search/pkg/command/root.go
+++ b/extensions/search/pkg/command/root.go
@@ -30,7 +30,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-search command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-search",
+		Name:     "search",
 		Usage:    "Serve search API for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/settings/pkg/command/root.go b/extensions/settings/pkg/command/root.go
index 5ad6a4bff4..81a01cc32d 100644
--- a/extensions/settings/pkg/command/root.go
+++ b/extensions/settings/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-settings command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-settings",
+		Name:     "settings",
 		Usage:    "Provide settings and permissions for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/sharing/pkg/command/root.go b/extensions/sharing/pkg/command/root.go
index 30e24793fa..b5c634002b 100644
--- a/extensions/sharing/pkg/command/root.go
+++ b/extensions/sharing/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-sharing command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-sharing",
+		Name:     "sharing",
 		Usage:    "Provide sharing for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/storage-metadata/pkg/command/root.go b/extensions/storage-metadata/pkg/command/root.go
index 8515d544ee..c64d6dcc0f 100644
--- a/extensions/storage-metadata/pkg/command/root.go
+++ b/extensions/storage-metadata/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-storage-metadata command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-storage-metadata",
+		Name:     "storage-metadata",
 		Usage:    "Provide apps for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/storage-publiclink/pkg/command/root.go b/extensions/storage-publiclink/pkg/command/root.go
index 1b89e3d262..0d1081585b 100644
--- a/extensions/storage-publiclink/pkg/command/root.go
+++ b/extensions/storage-publiclink/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-accounts command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-appprovider",
+		Name:     "appprovider",
 		Usage:    "Provide apps for oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/storage-shares/pkg/command/root.go b/extensions/storage-shares/pkg/command/root.go
index f055516f66..bafe1a336b 100644
--- a/extensions/storage-shares/pkg/command/root.go
+++ b/extensions/storage-shares/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the storage-shares command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-storage-shares",
+		Name:     "storage-shares",
 		Usage:    "Provide a virtual storage for shares in oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/storage-users/pkg/command/root.go b/extensions/storage-users/pkg/command/root.go
index 1d98daeab8..49304eebe2 100644
--- a/extensions/storage-users/pkg/command/root.go
+++ b/extensions/storage-users/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-storage-users command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-storage-users",
+		Name:     "storage-users",
 		Usage:    "Provide storage for users and projects in oCIS",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/store/pkg/command/root.go b/extensions/store/pkg/command/root.go
index 9dc06b0e74..4ab42c4465 100644
--- a/extensions/store/pkg/command/root.go
+++ b/extensions/store/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-store command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-store",
+		Name:     "store",
 		Usage:    "Service to store values for ocis extensions",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/thumbnails/pkg/command/root.go b/extensions/thumbnails/pkg/command/root.go
index 44d4948dbe..07fca1eae4 100644
--- a/extensions/thumbnails/pkg/command/root.go
+++ b/extensions/thumbnails/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-thumbnails command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-thumbnails",
+		Name:     "thumbnails",
 		Usage:    "Example usage",
 		Commands: GetCommands(cfg),
 	})
diff --git a/extensions/user/pkg/command/root.go b/extensions/user/pkg/command/root.go
index 23e45a2602..2f4c83aca6 100644
--- a/extensions/user/pkg/command/root.go
+++ b/extensions/user/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 // Execute is the entry point for the ocis-user command.
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
-		Name:     "ocis-user",
+		Name:     "user",
 		Usage:    "Provide users for oCIS",
 		Commands: GetCommands(cfg),
 	})