diff --git a/debian/cloudstack-agent.install b/debian/cloudstack-agent.install
index 02501855354..a3cc86964dd 100644
--- a/debian/cloudstack-agent.install
+++ b/debian/cloudstack-agent.install
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,7 +20,7 @@
 /etc/cloudstack/agent/log4j-cloud.xml
 /etc/init.d/cloudstack-agent
 /usr/bin/cloudstack-setup-agent
-/usr/bin/cloud-ssh
+/usr/bin/cloudstack-ssh
 /var/log/cloudstack/agent
 /usr/share/cloudstack-agent/lib/*
 /usr/share/cloudstack-agent/plugins
diff --git a/debian/cloudstack-common.install b/debian/cloudstack-common.install
index 021474e1b65..7e01adadedf 100644
--- a/debian/cloudstack-common.install
+++ b/debian/cloudstack-common.install
@@ -5,9 +5,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,6 +27,6 @@
 /usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh
 /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/*
 /usr/share/cloudstack-common/lib/*
-/usr/bin/cloud-set-guest-password
-/usr/bin/cloud-set-guest-sshkey
+/usr/bin/cloudstack-set-guest-password
+/usr/bin/cloudstack-set-guest-sshkey
 /usr/lib/python2.?/*-packages/*
diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
index 6d87748c757..ed7744b2afb 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -25,8 +25,8 @@
 /var/log/cloudstack/management
 /var/lib/cloudstack/mnt
 /var/lib/cloudstack/management
-/usr/bin/cloud-update-xenserver-licenses
-/usr/bin/cloud-setup-management
-/usr/bin/cloud-setup-databases
-/usr/bin/cloud-migrate-databases
+/usr/bin/cloudstack-update-xenserver-licenses
+/usr/bin/cloudstack-setup-management
+/usr/bin/cloudstack-setup-databases
+/usr/bin/cloudstack-migrate-databases
 /usr/share/cloudstack-management/*
diff --git a/debian/rules b/debian/rules
index f05277ed5d1..c50214a30a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -69,7 +69,7 @@ install:
 	install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/
 	install -D packaging/debian/init/cloud-agent $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent
 	install -D agent/bindir/cloud-setup-agent.in $(DESTDIR)/usr/bin/cloudstack-setup-agent
-	install -D agent/bindir/cloud-ssh.in $(DESTDIR)/usr/bin/cloud-ssh
+	install -D agent/bindir/cloud-ssh.in $(DESTDIR)/usr/bin/cloudstack-ssh
 	install -D agent/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent
 
 	# cloudstack-management
@@ -100,7 +100,7 @@ install:
 	ln -s tomcat6-nonssl.conf $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
 	ln -s server-nonssl.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/server.xml
 	install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
-	install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloud-update-xenserver-licenses
+	install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloudstack-update-xenserver-licenses
 	ln -s /usr/share/tomcat6/bin $(DESTDIR)/usr/share/$(PACKAGE)-management/bin
 	# Remove configuration in /ur/share/cloudstack-management/webapps/client/WEB-INF
 	# This should all be in /etc/cloudstack/management
@@ -121,11 +121,11 @@ install:
 	cp -r scripts/storage $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
 	cp -r scripts/util $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
 	cp -r scripts/vm $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
-	install -D client/target/utilities/bin/cloud-migrate-databases $(DESTDIR)/usr/bin
-	install -D client/target/utilities/bin/cloud-set-guest-password $(DESTDIR)/usr/bin
-	install -D client/target/utilities/bin/cloud-set-guest-sshkey $(DESTDIR)/usr/bin
-	install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin
-	install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin
+	install -D client/target/utilities/bin/cloud-migrate-databases $(DESTDIR)/usr/bin/cloudstack-migrate-databases
+	install -D client/target/utilities/bin/cloud-set-guest-password $(DESTDIR)/usr/bin/cloudstack-set-guest-password
+	install -D client/target/utilities/bin/cloud-set-guest-sshkey $(DESTDIR)/usr/bin/cloudstack-set-guest-sshkey
+	install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin/cloudstack-setup-databases
+	install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin/cloudstack-setup-management
 	install -D services/console-proxy/server/dist/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso
 	# We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack to get it into the right place
 	install -D agent/target/dependencies/jasypt-1.9.0.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib