diff --git a/hooks/quantum_hooks.py b/hooks/quantum_hooks.py
index 67e30bcc..98defe20 100755
--- a/hooks/quantum_hooks.py
+++ b/hooks/quantum_hooks.py
@@ -33,8 +33,6 @@ from quantum_utils import (
     get_packages,
     get_early_packages,
     valid_plugin,
-    RABBIT_USER,
-    RABBIT_VHOST,
     DB_USER, QUANTUM_DB,
     NOVA_DB_USER, NOVA_DB,
     configure_ovs,
diff --git a/templates/nova.conf b/templates/nova.conf
index b4bc69a8..e58cfb32 100644
--- a/templates/nova.conf
+++ b/templates/nova.conf
@@ -11,10 +11,10 @@ sql_connection=mysql://{{ nova_user }}:{{ nova_password }}@{{ database_host }}/{
 quantum_metadata_proxy_shared_secret={{ shared_secret }}
 service_quantum_metadata_proxy=True
 # Access to message bus
-rabbit_userid={{ rabbit_userid }}
-rabbit_virtual_host={{ rabbit_virtual_host }}
-rabbit_host={{ rabbit_host }}
-rabbit_password={{ rabbit_password }}
+rabbit_userid={{ rabbitmq_user }}
+rabbit_virtual_host={{ rabbitmq_virtual_host }}
+rabbit_host={{ rabbitmq_host }}
+rabbit_password={{ rabbitmq_password }}
 # Access to quantum API services
 network_api_class=nova.network.quantumv2.api.API
 quantum_auth_strategy=keystone