diff --git a/processor/CommandManager.go b/processor/CommandManager.go
index c567a91..a5c488b 100644
--- a/processor/CommandManager.go
+++ b/processor/CommandManager.go
@@ -61,15 +61,15 @@ func GetToolsCommandManager() ToolsCommandManager {
 			name:        "channels_repos",
 			description: "Manage channels and repositories",
 			tools: []ToolCmd{
-				externalToolCommand("spacewalk-clone-by-date", "Clone channels based on a date",
+				externalToolCommand("clone-by-date", "Clone channels based on a date",
 					"/usr/bin/spacewalk-clone-by-date", "spacewalk-utils"),
-				externalToolCommand("spacewalk-common-channels", "",
+				externalToolCommand("common-channels", "",
 					"/usr/bin/spacewalk-common-channels", "spacewalk-utils"),
-				externalToolCommand("spacewalk-manage-channel-lifecycle", "",
+				externalToolCommand("manage-channel-lifecycle", "",
 					"/usr/bin/spacewalk-manage-channel-lifecycle", "spacewalk-utils"),
-				externalToolCommand("spacewalk-remove-channel", "",
+				externalToolCommand("remove-channel", "",
 					"/usr/bin/spacewalk-remove-channel", "spacewalk-backend-tools"),
-				externalToolCommand("spacewalk-repo-sync", "",
+				externalToolCommand("repo-sync", "",
 					"/usr/bin/spacewalk-repo-sync", "spacewalk-backend-tools"),
 				externalToolCommand("mgr-sync", "",
 					"/usr/sbin/mgr-sync", "susemanager-tools"),
@@ -80,17 +80,17 @@ func GetToolsCommandManager() ToolsCommandManager {
 				// --- next 3 command are the same. symbolic link between them (/usr/bin/mgrpush -> rhnpush) (/usr/bin/rhnpush -> rhnpush-3.6)
 				externalToolCommand("mgrpush", "",
 					"/usr/bin/mgrpush", "mgr-push"),
-				externalToolCommand("rhnpush", "",
-					"/usr/bin/rhnpush", "mgr-push"),
-				externalToolCommand("rhnpush-3.6", "",
-					"/usr/bin/rhnpush-3.6", "python3-mgr-push"),
+				//externalToolCommand("rhnpush", "",
+				//	"/usr/bin/rhnpush", "mgr-push"),
+				//externalToolCommand("rhnpush-3.6", "",
+				//	"/usr/bin/rhnpush-3.6", "python3-mgr-push"),
 				externalToolCommand("mgr-sign-metadata", "",
 					"/usr/bin/mgr-sign-metadata", "spacewalk-backend-tools"),
 				externalToolCommand("mgr-sign-metadata-ctl", "",
 					"/usr/bin/mgr-sign-metadata-ctl", "spacewalk-backend-tools"),
-				externalToolCommand("spacewalk-export-channels", "",
+				externalToolCommand("export-channels", "",
 					"/usr/bin/spacewalk-export-channels", "spacewalk-utils-extras"),
-				externalToolCommand("spacewalk-watch-channel-sync.sh", "",
+				externalToolCommand("watch-channel-sync", "",
 					"/usr/bin/spacewalk-watch-channel-sync.sh", "spacewalk-utils-extras"),
 			},
 		},
@@ -106,15 +106,15 @@ func GetToolsCommandManager() ToolsCommandManager {
 			name:        "serverManagement",
 			description: "Server Management",
 			tools: []ToolCmd{
-				externalToolCommand("spacewalk-hostname-rename", "",
+				externalToolCommand("hostname-rename", "",
 					"/usr/bin/spacewalk-hostname-rename", "spacewalk-utils"),
-				externalToolCommand("spacewalk-make-mount-points", "",
+				externalToolCommand("make-mount-points", "",
 					"/usr/bin/spacewalk-make-mount-points", "spacewalk-setup"),
-				externalToolCommand("spacewalk-service", "",
+				externalToolCommand("service", "",
 					"/usr/sbin/spacewalk-service", "spacewalk-admin"),
-				externalToolCommand("spacewalk-update-signatures", "",
+				externalToolCommand("update-signatures", "",
 					"/usr/bin/spacewalk-update-signatures", "spacewalk-backend-tools"),
-				externalToolCommand("rhn-sat-restart-silent", "",
+				externalToolCommand("restart-silent", "",
 					"/usr/sbin/rhn-sat-restart-silent", "spacewalk-admin"),
 			},
 		},
@@ -122,15 +122,15 @@ func GetToolsCommandManager() ToolsCommandManager {
 			name:        "database",
 			description: "Database Management",
 			tools: []ToolCmd{
-				externalToolCommand("spacewalk-schema-upgrade", "",
+				externalToolCommand("schema-upgrade", "",
 					"/usr/bin/spacewalk-schema-upgrade", "susemanager-schema"),
-				externalToolCommand("rhn-schema-stats", "",
+				externalToolCommand("schema-stats", "",
 					"/usr/bin/rhn-schema-stats", "spacewalk-backend-tools"),
-				externalToolCommand("rhn-schema-version", "",
+				externalToolCommand("schema-version", "",
 					"/usr/bin/rhn-schema-version", "spacewalk-backend-tools"),
-				externalToolCommand("rhn-db-stats", "",
+				externalToolCommand("db-stats", "",
 					"/usr/bin/rhn-db-stats", "spacewalk-backend-tools"),
-				externalToolCommand("rhn-config-schema.pl", "",
+				externalToolCommand("config-schema", "",
 					"/usr/bin/rhn-config-schema.pl", "spacewalk-admin"),
 			},
 		},
@@ -139,7 +139,7 @@ func GetToolsCommandManager() ToolsCommandManager {
 			description: "Util",
 			tools: []ToolCmd{externalToolCommand("spacecmd", "",
 				"/usr/bin/spacecmd", "spacecmd"),
-				externalToolCommand("spacewalk-sql", "",
+				externalToolCommand("sql", "",
 					"/usr/bin/spacewalk-sql", "susemanager-schema"),
 				externalToolCommand("satpasswd", "",
 					"/usr/bin/satpasswd", "spacewalk-backend-tools"),
@@ -147,7 +147,7 @@ func GetToolsCommandManager() ToolsCommandManager {
 					"/usr/bin/satwho", "spacewalk-backend-tools"),
 				externalToolCommand("taskotop", "",
 					"/usr/bin/taskotop", "spacewalk-utils-extras"),
-				externalToolCommand("rhn-search", "",
+				externalToolCommand("search", "",
 					"/usr/sbin/rhn-search", "spacewalk-search"),
 				externalToolCommand("mgr-libmod", "",
 					"/usr/bin/mgr-libmod", "mgr-libmod"),
@@ -157,15 +157,15 @@ func GetToolsCommandManager() ToolsCommandManager {
 					"/usr/bin/delete-old-systems-interactive", "spacewalk-utils-extras"),
 				externalToolCommand("migrate-system-profile", "",
 					"/usr/bin/migrate-system-profile", "spacewalk-utils-extras"),
-				externalToolCommand("spacewalk-api", "",
+				externalToolCommand("api", "",
 					"/usr/bin/spacewalk-api", "spacewalk-utils-extras"),
-				externalToolCommand("spacewalk-manage-snapshots", "",
+				externalToolCommand("manage-snapshots", "",
 					"/usr/bin/spacewalk-manage-snapshots", "spacewalk-utils-extras"),
-				externalToolCommand("sw-system-snapshot", "",
+				externalToolCommand("system-snapshot", "",
 					"/usr/bin/sw-system-snapshot", "spacewalk-utils-extras"),
-				externalToolCommand("sw-ldap-user-sync", "",
+				externalToolCommand("ldap-user-sync", "",
 					"/usr/bin/sw-ldap-user-sync", "spacewalk-utils-extras"),
-				externalToolCommand("rhn-charsets", "",
+				externalToolCommand("charsets", "",
 					"/usr/bin/rhn-charsets", "spacewalk-backend-tools"),
 			},
 		},
@@ -173,23 +173,23 @@ func GetToolsCommandManager() ToolsCommandManager {
 			name:        "serverSetup",
 			description: "Server Setup",
 			tools: []ToolCmd{
-				externalToolCommand("spacewalk-setup", "",
+				externalToolCommand("setup", "",
 					"/usr/bin/spacewalk-setup", "spacewalk-setup"),
-				externalToolCommand("spacewalk-setup-cobbler", "",
+				externalToolCommand("setup-cobbler", "",
 					"/usr/bin/spacewalk-setup-cobbler", "spacewalk-setup"),
-				externalToolCommand("spacewalk-setup-db-ssl-certificates", "",
+				externalToolCommand("setup-db-ssl-certificates", "",
 					"/usr/bin/spacewalk-setup-db-ssl-certificates", "spacewalk-setup"),
-				externalToolCommand("spacewalk-setup-httpd", "",
+				externalToolCommand("setup-httpd", "",
 					"/usr/bin/spacewalk-setup-httpd", "spacewalk-setup"),
-				externalToolCommand("spacewalk-setup-ipa-authentication", "",
+				externalToolCommand("setup-ipa-authentication", "",
 					"/usr/bin/spacewalk-setup-ipa-authentication", "spacewalk-setup"),
-				externalToolCommand("spacewalk-setup-jabberd", "",
+				externalToolCommand("setup-jabberd", "",
 					"/usr/bin/spacewalk-setup-jabberd", "spacewalk-setup-jabberd"),
-				externalToolCommand("spacewalk-setup-sudoers", "",
+				externalToolCommand("setup-sudoers", "",
 					"/usr/bin/spacewalk-setup-sudoers", "spacewalk-setup"),
-				externalToolCommand("spacewalk-setup-tomcat", "",
+				externalToolCommand("setup-tomcat", "",
 					"/usr/bin/spacewalk-setup-tomcat", "spacewalk-setup"),
-				externalToolCommand("rhn-config-satellite.pl", "",
+				externalToolCommand("config-satellite", "",
 					"/usr/bin/rhn-config-satellite.pl", "spacewalk-admin"),
 			},
 		},
@@ -199,7 +199,7 @@ func GetToolsCommandManager() ToolsCommandManager {
 			tools: []ToolCmd{
 				externalToolCommand("mgr-exporter", "",
 					"/usr/bin/mgr-exporter", "spacewalk-backend-tools"),
-				externalToolCommand("rhn-satellite-exporter", "",
+				externalToolCommand("satellite-exporter", "",
 					"/usr/bin/rhn-satellite-exporter", "spacewalk-backend-tools"),
 				externalToolCommand("spacewalk-export", "",
 					"/usr/bin/spacewalk-export", "spacewalk-utils-extras"),
@@ -209,11 +209,11 @@ func GetToolsCommandManager() ToolsCommandManager {
 			name:        "cleanup",
 			description: "Cleanup",
 			tools: []ToolCmd{
-				externalToolCommand("spacewalk-data-fsck", "",
+				externalToolCommand("data-fsck", "",
 					"/usr/bin/spacewalk-data-fsck", "spacewalk-backend-tools"),
-				externalToolCommand("spacewalk-diskcheck", "",
+				externalToolCommand("diskcheck", "",
 					"/usr/bin/spacewalk-diskcheck", "spacewalk-backend-tools"),
-				externalToolCommand("spacewalk-debug", "Produce debug information",
+				externalToolCommand("debug", "Produce debug information",
 					"/usr/bin/spacewalk-debug", "spacewalk-backend-tools"),
 			},
 		},
@@ -221,11 +221,11 @@ func GetToolsCommandManager() ToolsCommandManager {
 			name:        "certification",
 			description: "certification and report",
 			tools: []ToolCmd{
-				externalToolCommand("spacewalk-fips-tool", "",
+				externalToolCommand("fips-tool", "",
 					"/usr/bin/spacewalk-fips-tool", "spacewalk-backend-tools"),
-				externalToolCommand("spacewalk-report", "",
+				externalToolCommand("report", "",
 					"/usr/bin/spacewalk-report", "spacewalk-reports"),
-				externalToolCommand("mgr-monitoring-ctl", "",
+				externalToolCommand("monitoring-ctl", "",
 					"/usr/sbin/mgr-monitoring-ctl", "spacewalk-admin"),
 			},
 		},
@@ -234,23 +234,23 @@ func GetToolsCommandManager() ToolsCommandManager {
 			description: "Bootstrap",
 			tools: []ToolCmd{
 				// --- next 2 command are the same. symbolic link between them (/usr/sbin/mgr-push-register -> spacewalk-push-register)
-				externalToolCommand("spacewalk-push-register", "",
+				externalToolCommand("push-register", "",
 					"/usr/sbin/spacewalk-push-register", "spacewalk-certs-tools"),
-				externalToolCommand("mgr-push-register", "",
-					"/usr/sbin/mgr-push-register", "spacewalk-certs-tools"),
+				//externalToolCommand("mgr-push-register", "",
+				//	"/usr/sbin/mgr-push-register", "spacewalk-certs-tools"),
 				// --- next 2 command are the same. symbolic link between them (/usr/sbin/mgr-ssh-push-init -> spacewalk-ssh-push-init)
-				externalToolCommand("mgr-ssh-push-init", "Setup a client to be managed via SSH push",
+				externalToolCommand("ssh-push-init", "Setup a client to be managed via SSH push",
 					"/usr/sbin/mgr-ssh-push-init", "spacewalk-certs-tools"),
-				externalToolCommand("spacewalk-ssh-push-init", "Setup a client to be managed via SSH push",
-					"/usr/sbin/spacewalk-ssh-push-init", "spacewalk-certs-tools"),
+				//externalToolCommand("spacewalk-ssh-push-init", "Setup a client to be managed via SSH push",
+				//	"/usr/sbin/spacewalk-ssh-push-init", "spacewalk-certs-tools"),
 				// --- next 3 command are the same. symbolic link between them (/usr/bin/mgr-bootstrap -> rhn-bootstrap) (/usr/bin/rhn-bootstrap -> rhn-bootstrap-3.6)
-				externalToolCommand("mgr-bootstrap", "",
+				externalToolCommand("bootstrap", "",
 					"/usr/bin/mgr-bootstrap", "spacewalk-certs-tools"),
-				externalToolCommand("rhn-bootstrap", "",
-					"/usr/bin/rhn-bootstrap", "spacewalk-certs-tools"),
-				externalToolCommand("rhn-bootstrap-3.6", "",
-					"/usr/bin/rhn-bootstrap-3.6", "python3-spacewalk-certs-tools"),
-				externalToolCommand("mgr-create-bootstrap-repo", "",
+				//externalToolCommand("rhn-bootstrap", "",
+				//	"/usr/bin/rhn-bootstrap", "spacewalk-certs-tools"),
+				//externalToolCommand("rhn-bootstrap-3.6", "",
+				//	"/usr/bin/rhn-bootstrap-3.6", "python3-spacewalk-certs-tools"),
+				externalToolCommand("create-bootstrap-repo", "",
 					"/usr/sbin/mgr-create-bootstrap-repo", "susemanager-tools"),
 			},
 		},
@@ -259,24 +259,24 @@ func GetToolsCommandManager() ToolsCommandManager {
 			description: "SSL Management",
 			tools: []ToolCmd{
 				// --- next 3 command are the same. symbolic link between them (//usr/bin/mgr-ssl-tool -> rhn-ssl-tool) (/usr/bin/rhn-ssl-tool -> rhn-ssl-tool-3.6)
-				externalToolCommand("mgr-ssl-tool", "",
+				externalToolCommand("ssl-tool", "",
 					"/usr/bin/mgr-ssl-tool", "spacewalk-certs-tools"),
-				externalToolCommand("rhn-ssl-tool", "",
-					"/usr/bin/rhn-ssl-tool", "spacewalk-certs-tools"),
-				externalToolCommand("rhn-ssl-tool-3.6", "",
-					"/usr/bin/rhn-ssl-tool-3.6", "python3-spacewalk-certs-tools"),
+				//externalToolCommand("rhn-ssl-tool", "",
+				//	"/usr/bin/rhn-ssl-tool", "spacewalk-certs-tools"),
+				//externalToolCommand("rhn-ssl-tool-3.6", "",
+				//	"/usr/bin/rhn-ssl-tool-3.6", "python3-spacewalk-certs-tools"),
 				// --- next 2 command are the same. symbolic link between them (/usr/bin/mgr-sudo-ssl-tool -> rhn-sudo-ssl-tool)
-				externalToolCommand("mgr-sudo-ssl-tool", "",
+				externalToolCommand("sudo-ssl-tool", "",
 					"/usr/bin/mgr-sudo-ssl-tool", "spacewalk-certs-tools"),
-				externalToolCommand("rhn-sudo-ssl-tool", "",
-					"/usr/bin/rhn-sudo-ssl-tool", "spacewalk-certs-tools"),
-				externalToolCommand("rhn-install-ssl-cert.pl", "",
+				//externalToolCommand("rhn-sudo-ssl-tool", "",
+				//	"/usr/bin/rhn-sudo-ssl-tool", "spacewalk-certs-tools"),
+				externalToolCommand("install-ssl-cert", "",
 					"/usr/bin/rhn-install-ssl-cert.pl", "spacewalk-admin"),
-				externalToolCommand("rhn-ssl-dbstore", "",
+				externalToolCommand("ssl-dbstore", "",
 					"/usr/bin/rhn-ssl-dbstore", "spacewalk-backend-tools"),
-				externalToolCommand("rhn-deploy-ca-cert.pl", "",
+				externalToolCommand("deploy-ca-cert", "",
 					"/usr/bin/rhn-deploy-ca-cert.pl", "spacewalk-admin"),
-				externalToolCommand("rhn-generate-pem.pl", "",
+				externalToolCommand("generate-pem", "",
 					"/usr/bin/rhn-generate-pem.pl", "spacewalk-admin"),
 			},
 		},
@@ -285,38 +285,38 @@ func GetToolsCommandManager() ToolsCommandManager {
 			description: "Proxy",
 			tools: []ToolCmd{
 				//	// --- next 2 command are the same. symbolic link between them (/usr/sbin/rhn-profile-sync -> rhn-profile-sync-3.6)
-				externalToolCommand("rhn-profile-sync", "",
+				externalToolCommand("profile-sync", "",
 					"/usr/sbin/rhn-profile-sync", "spacewalk-client-tools"),
-				externalToolCommand("rhn-profile-sync-3.6", "",
-					"/usr/sbin/rhn-profile-sync-3.6", "python3-spacewalk-client-tools"),
+				//externalToolCommand("rhn-profile-sync-3.6", "",
+				//	"/usr/sbin/rhn-profile-sync-3.6", "python3-spacewalk-client-tools"),
 			},
 		},
 		{
 			name:        "iss",
 			description: "Inter Server Sync",
 			tools: []ToolCmd{
-				externalToolCommand("spacewalk-sync-setup", "",
+				externalToolCommand("sync-setup", "",
 					"/usr/bin/spacewalk-sync-setup", "spacewalk-utils"),
 				// --- next 2 command are the same. symbolic link between them (/usr/bin/mgr-inter-sync -> satellite-sync)
-				externalToolCommand("satellite-sync", "",
+				externalToolCommand("sync", "",
 					"/usr/bin/satellite-sync", "spacewalk-backend-tools"),
-				externalToolCommand("mgr-inter-sync", "",
-					"/usr/bin/mgr-inter-sync", "spacewalk-backend-tools"),
+				//externalToolCommand("mgr-inter-sync", "",
+				//	"/usr/bin/mgr-inter-sync", "spacewalk-backend-tools"),
 			},
 		},
 		{
 			name:        "others",
 			description: "others",
 			tools: []ToolCmd{
-				externalToolCommand("spacewalk-cfg-get", "",
+				externalToolCommand("cfg-get", "",
 					"/usr/bin/spacewalk-cfg-get", "spacewalk-backend"),
-				externalToolCommand("spacewalk-startup-helper", "",
+				externalToolCommand("startup-helper", "",
 					"/usr/sbin/spacewalk-startup-helper",
 					"spacewalk-admin"),
-				externalToolCommand("satcon-build-dictionary.pl", "",
+				externalToolCommand("satcon-build-dictionary", "",
 					"/usr/bin/satcon-build-dictionary.pl",
 					"perl-Satcon-4.1.1-411.2.22.devel41.noarch"),
-				externalToolCommand("satcon-deploy-tree.pl", "",
+				externalToolCommand("satcon-deploy-tree", "",
 					"/usr/bin/satcon-deploy-tree.pl", "perl-Satcon"),
 				externalToolCommand("rhn-satellite", "",
 					"/usr/sbin/rhn-satellite", "spacewalk-admin"),