diff --git a/bin/clear_rabbit_queues b/bin/nova-clear-rabbit-queues
similarity index 100%
rename from bin/clear_rabbit_queues
rename to bin/nova-clear-rabbit-queues
diff --git a/bin/instance-usage-audit b/bin/nova-instance-usage-audit
similarity index 100%
rename from bin/instance-usage-audit
rename to bin/nova-instance-usage-audit
diff --git a/bin/volume-usage-audit b/bin/nova-volume-usage-audit
similarity index 100%
rename from bin/volume-usage-audit
rename to bin/nova-volume-usage-audit
diff --git a/setup.py b/setup.py
index 929223f25e6c..f71312dfc783 100644
--- a/setup.py
+++ b/setup.py
@@ -72,26 +72,26 @@ setuptools.setup(name='nova',
       packages=setuptools.find_packages(exclude=['bin', 'smoketests']),
       include_package_data=True,
       test_suite='nose.collector',
-      scripts=['bin/clear_rabbit_queues',
-               'bin/instance-usage-audit',
-               'bin/nova-all',
+      scripts=['bin/nova-all',
                'bin/nova-api',
                'bin/nova-api-ec2',
                'bin/nova-api-metadata',
                'bin/nova-api-os-compute',
                'bin/nova-api-os-volume',
                'bin/nova-cert',
+               'bin/nova-clear-rabbit-queues',
                'bin/nova-compute',
                'bin/nova-console',
                'bin/nova-consoleauth',
                'bin/nova-dhcpbridge',
+               'bin/nova-instance-usage-audit',
                'bin/nova-manage',
                'bin/nova-network',
                'bin/nova-objectstore',
                'bin/nova-rootwrap',
                'bin/nova-scheduler',
                'bin/nova-volume',
+               'bin/nova-volume-usage-audit',
                'bin/nova-xvpvncproxy',
-               'bin/volume-usage-audit',
               ],
         py_modules=[])