3 files changed, 8 insertions, 8 deletions
diff --git a/cpp/tests/echo_service.cpp b/cpp/tests/echo_service.cpp
index 6159aafca0..c6685476a3 100644
--- a/cpp/tests/echo_service.cpp
+++ b/cpp/tests/echo_service.cpp
@@ -82,7 +82,7 @@ int main(int argc, char** argv){
             Queue response;
             channel.declareQueue(response);
             qpid::framing::FieldTable emptyArgs;
-            channel.bind(Exchange::DEFAULT_DIRECT_EXCHANGE, response, response.getName(), emptyArgs);
+            channel.bind(Exchange::STANDARD_DIRECT_EXCHANGE, response, response.getName(), emptyArgs);
 
             //Consume from the response queue, logging all echoed message to console:
             LoggingListener listener;
@@ -100,7 +100,7 @@ int main(int argc, char** argv){
                 Message msg;
                 msg.getHeaders().setString("RESPONSE_QUEUE", response.getName());
                 msg.setData(text);
-                channel.publish(msg, Exchange::DEFAULT_DIRECT_EXCHANGE, echo_service);
+                channel.publish(msg, Exchange::STANDARD_DIRECT_EXCHANGE, echo_service);
                 
                 std::cout << "Enter text to send:" << std::endl;
             }
@@ -121,7 +121,7 @@ int main(int argc, char** argv){
             Queue request("request");
             channel.declareQueue(request);
             qpid::framing::FieldTable emptyArgs;
-            channel.bind(Exchange::DEFAULT_DIRECT_EXCHANGE, request, echo_service, emptyArgs);
+            channel.bind(Exchange::STANDARD_DIRECT_EXCHANGE, request, echo_service, emptyArgs);
 
             //Consume from the request queue, echoing back all messages received to the client that sent them
             EchoServer server(&channel);
@@ -152,7 +152,7 @@ void EchoServer::received(Message& message)
         std::cout << "Echoing " << message.getData() << " back to " << name << std::endl;
         
         //'echo' the message back:
-        channel->publish(message, Exchange::DEFAULT_DIRECT_EXCHANGE, name);
+        channel->publish(message, Exchange::STANDARD_DIRECT_EXCHANGE, name);
     }
 }
 
diff --git a/cpp/tests/topic_listener.cpp b/cpp/tests/topic_listener.cpp
index 9e9b480df3..73ca243f35 100644
--- a/cpp/tests/topic_listener.cpp
+++ b/cpp/tests/topic_listener.cpp
@@ -88,7 +88,7 @@ int main(int argc, char** argv){
             Queue control;
             channel.declareQueue(control);
             qpid::framing::FieldTable bindArgs;
-            channel.bind(Exchange::DEFAULT_TOPIC_EXCHANGE, control, "topic_control", bindArgs);
+            channel.bind(Exchange::STANDARD_TOPIC_EXCHANGE, control, "topic_control", bindArgs);
             //set up listener
             Listener listener(&channel, response.getName(), args.getTransactional());
             std::string tag;
diff --git a/cpp/tests/topic_publisher.cpp b/cpp/tests/topic_publisher.cpp
index cde3f6ee79..86dae8e172 100644
--- a/cpp/tests/topic_publisher.cpp
+++ b/cpp/tests/topic_publisher.cpp
@@ -159,12 +159,12 @@ int64_t Publisher::publish(int msgs, int listeners, int size){
     {
         Monitor::ScopedLock l(monitor);
         for(int i = 0; i < msgs; i++){
-            channel->publish(msg, Exchange::DEFAULT_TOPIC_EXCHANGE, controlTopic);
+            channel->publish(msg, Exchange::STANDARD_TOPIC_EXCHANGE, controlTopic);
         }
         //send report request
         Message reportRequest;
         reportRequest.getHeaders().setString("TYPE", "REPORT_REQUEST");
-        channel->publish(reportRequest, Exchange::DEFAULT_TOPIC_EXCHANGE, controlTopic);
+        channel->publish(reportRequest, Exchange::STANDARD_TOPIC_EXCHANGE, controlTopic);
         if(transactional){
             channel->commit();
         }
@@ -188,7 +188,7 @@ void Publisher::terminate(){
     //send termination request
     Message terminationRequest;
     terminationRequest.getHeaders().setString("TYPE", "TERMINATION_REQUEST");
-    channel->publish(terminationRequest, Exchange::DEFAULT_TOPIC_EXCHANGE, controlTopic);
+    channel->publish(terminationRequest, Exchange::STANDARD_TOPIC_EXCHANGE, controlTopic);
     if(transactional){
         channel->commit();
     }