diff --git a/etc/trove/trove-conductor.conf.sample b/etc/trove/trove-conductor.conf.sample
index 9d5236c699..aaab8966b5 100644
--- a/etc/trove/trove-conductor.conf.sample
+++ b/etc/trove/trove-conductor.conf.sample
@@ -1,7 +1,6 @@
 [DEFAULT]
 verbose = True
 debug = True
-control_exchange = trove
 trove_auth_url = http://0.0.0.0:5000/v2.0
 sql_connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
 
@@ -18,7 +17,7 @@ sql_connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
 
 # The default exchange under which topics are scoped. May be
 # overridden by an exchange name specified in the 'transport_url option.
-#control_exchange=openstack
+control_exchange = trove
 
 # ================ RabbitMQ Configuration ===============================
 
diff --git a/etc/trove/trove-guestagent.conf.sample b/etc/trove/trove-guestagent.conf.sample
index 55be22a011..d85991741c 100644
--- a/etc/trove/trove-guestagent.conf.sample
+++ b/etc/trove/trove-guestagent.conf.sample
@@ -13,7 +13,7 @@
 
 # The default exchange under which topics are scoped. May be
 # overridden by an exchange name specified in the 'transport_url option.
-#control_exchange=openstack
+control_exchange = trove
 
 # ========== Sample RabbitMQ Configuration ==========
 
@@ -93,12 +93,6 @@ root_grant_option = True
 # backup_chunk_size = 65536
 # backup_segment_max_size = 2147483648
 
-# ========== Configuration for communication with trove-conductor ==========
-
-# Control Exchange used to communicate with trove-conductor
-control_exchange = trove
-
-
 # ========== Sample Logging Configuration ==========
 
 # Show more verbose log output (sets INFO log level output)
diff --git a/etc/trove/trove-taskmanager.conf.sample b/etc/trove/trove-taskmanager.conf.sample
index 1296b3b87c..038251f276 100644
--- a/etc/trove/trove-taskmanager.conf.sample
+++ b/etc/trove/trove-taskmanager.conf.sample
@@ -24,7 +24,7 @@ update_status_on_fail = True
 
 # The default exchange under which topics are scoped. May be
 # overridden by an exchange name specified in the 'transport_url option.
-#control_exchange=openstack
+control_exchange = trove
 
 # ================ RabbitMQ Configuration ===========================
 
@@ -174,8 +174,6 @@ template_path = /etc/trove/templates/
 # Topics used for OpenStack notifications, list value. Default is 'notifications'.
 # notification_topics=['notifications', ]
 
-control_exchange=trove
-
 # ============ Logging information =============================
 #log_dir = /integration/report
 #log_file = trove-taskmanager.log
diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample
index 6355328f37..dcfa5dbad6 100644
--- a/etc/trove/trove.conf.sample
+++ b/etc/trove/trove.conf.sample
@@ -28,7 +28,7 @@ bind_port = 8779
 
 # The default exchange under which topics are scoped. May be
 # overridden by an exchange name specified in the 'transport_url option.
-#control_exchange=openstack
+control_exchange = trove
 
 # ==================== RabbitMQ Configuration =======================
 
@@ -183,8 +183,6 @@ api_paste_config = api-paste.ini
 # Topics used for OpenStack notifications, list value. Default is 'notifications'.
 # notification_topics=['notifications', ]
 
-control_exchange = trove
-
 # ============ Logging information =============================
 #log_dir = /integration/report
 #log_file = trove-api.log