Renamed the following files for consistency:

broker/BrokerExchange.cpp -> Exchange.cpp
broker/BrokerExchange.h -> Exchange.h
broker/BrokerQueue.cpp -> Queue.cpp
broker/BrokerQueue.h -> Queue.h
client/ClientChannel.cpp -> Channel.cpp
client/ClientChannel.h -> Channel.h
client/ClientConnection.cpp -> Connection.cpp
client/ClientExchange.cpp -> Exchange.cpp
client/ClientExchange.h -> Exchange.h
client/ClientMessage.h -> Message.h
client/ClientQueue.cpp -> Queue.cpp
client/ClientQueue.h -> Queue.h


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@579340 13f79535-47bb-0310-9956-ffa450edef68

53 files changed, 120 insertions, 120 deletions

diff --git a/qpid/cpp/examples/create_queue.cpp b/qpid/cpp/examples/create_queue.cpp
index 7d08873246..7ac18a829a 100644
--- a/qpid/cpp/examples/create_queue.cpp
+++ b/qpid/cpp/examples/create_queue.cpp
@@ -35,11 +35,11 @@
  */
 
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Monitor.h"
 #include <unistd.h>
 #include "qpid/sys/Time.h"
diff --git a/qpid/cpp/examples/topic_listener.cpp b/qpid/cpp/examples/topic_listener.cpp
index 799d564aa2..4d8f7e1e57 100644
--- a/qpid/cpp/examples/topic_listener.cpp
+++ b/qpid/cpp/examples/topic_listener.cpp
@@ -35,11 +35,11 @@
  */
 
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Monitor.h"
 #include <unistd.h>
 #include "qpid/sys/Time.h"
diff --git a/qpid/cpp/examples/topic_publisher.cpp b/qpid/cpp/examples/topic_publisher.cpp
index d3e1ea20b3..03048fc813 100644
--- a/qpid/cpp/examples/topic_publisher.cpp
+++ b/qpid/cpp/examples/topic_publisher.cpp
@@ -35,11 +35,11 @@
  */
 
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Monitor.h"
 #include <unistd.h>
 #include "qpid/sys/Time.h"
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
index e70b4d5a1b..ae3eb4c403 100644
--- a/qpid/cpp/src/Makefile.am
+++ b/qpid/cpp/src/Makefile.am
@@ -140,8 +140,8 @@ libqpidbroker_la_SOURCES = \
   qpid/broker/Broker.cpp \
   qpid/broker/BrokerAdapter.cpp \
   qpid/broker/BrokerSingleton.cpp \
-  qpid/broker/BrokerExchange.cpp \
-  qpid/broker/BrokerQueue.cpp \
+  qpid/broker/Exchange.cpp \
+  qpid/broker/Queue.cpp \
   qpid/broker/Connection.cpp \
   qpid/broker/ConnectionHandler.cpp \
   qpid/broker/ConnectionFactory.cpp \
@@ -191,10 +191,10 @@ libqpidbroker_la_SOURCES = \
 libqpidclient_la_LIBADD = libqpidcommon.la
 libqpidclient_la_SOURCES =			\
   $(rgen_client_cpp) 				\
-  qpid/client/ClientConnection.cpp		\
-  qpid/client/ClientChannel.cpp			\
-  qpid/client/ClientExchange.cpp		\
-  qpid/client/ClientQueue.cpp			\
+  qpid/client/Connection.cpp		\
+  qpid/client/Channel.cpp			\
+  qpid/client/Exchange.cpp		\
+  qpid/client/Queue.cpp			\
   qpid/client/ConnectionImpl.cpp		\
   qpid/client/Connector.cpp			\
   qpid/client/Demux.cpp				\
@@ -225,8 +225,8 @@ nobase_include_HEADERS = \
   qpid/shared_ptr.h \
   qpid/broker/Broker.h \
   qpid/broker/BrokerAdapter.h \
-  qpid/broker/BrokerExchange.h \
-  qpid/broker/BrokerQueue.h \
+  qpid/broker/Exchange.h \
+  qpid/broker/Queue.h \
   qpid/broker/BrokerSingleton.h \
   qpid/broker/Connection.h \
   qpid/broker/ConnectionFactory.h \
@@ -288,10 +288,10 @@ nobase_include_HEADERS = \
   qpid/client/AckMode.h \
   qpid/client/BlockingQueue.h \
   qpid/client/ChainableFrameHandler.h	\
-  qpid/client/ClientChannel.h \
-  qpid/client/ClientExchange.h \
-  qpid/client/ClientMessage.h \
-  qpid/client/ClientQueue.h \
+  qpid/client/Channel.h \
+  qpid/client/Exchange.h \
+  qpid/client/Message.h \
+  qpid/client/Queue.h \
   qpid/client/Completion.h \
   qpid/client/CompletionTracker.h \
   qpid/client/Connection.h \
diff --git a/qpid/cpp/src/qpid/broker/Deliverable.h b/qpid/cpp/src/qpid/broker/Deliverable.h
index cd1dbaa85d..bdea550159 100644
--- a/qpid/cpp/src/qpid/broker/Deliverable.h
+++ b/qpid/cpp/src/qpid/broker/Deliverable.h
@@ -21,7 +21,7 @@
 #ifndef _Deliverable_
 #define _Deliverable_
 
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/src/qpid/broker/DeliverableMessage.h b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
index 9719d972fc..07bca40461 100644
--- a/qpid/cpp/src/qpid/broker/DeliverableMessage.h
+++ b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
@@ -22,7 +22,7 @@
 #define _DeliverableMessage_
 
 #include "Deliverable.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Message.h"
 
 namespace qpid {
diff --git a/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
index 36e6c22f88..f9218655a4 100644
--- a/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
@@ -21,7 +21,7 @@
 #include "DeliveryRecord.h"
 #include "DeliverableMessage.h"
 #include "SemanticState.h"
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/log/Statement.h"
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/src/qpid/broker/DeliveryRecord.h b/qpid/cpp/src/qpid/broker/DeliveryRecord.h
index 3c833fcaa8..f2c343e27a 100644
--- a/qpid/cpp/src/qpid/broker/DeliveryRecord.h
+++ b/qpid/cpp/src/qpid/broker/DeliveryRecord.h
@@ -26,7 +26,7 @@
 #include <vector>
 #include <ostream>
 #include "qpid/framing/AccumulatedAck.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Consumer.h"
 #include "DeliveryId.h"
 #include "Message.h"
diff --git a/qpid/cpp/src/qpid/broker/DirectExchange.h b/qpid/cpp/src/qpid/broker/DirectExchange.h
index 7b20bd610c..243f51d6a8 100644
--- a/qpid/cpp/src/qpid/broker/DirectExchange.h
+++ b/qpid/cpp/src/qpid/broker/DirectExchange.h
@@ -23,10 +23,10 @@
 
 #include <map>
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/src/qpid/broker/BrokerExchange.cpp b/qpid/cpp/src/qpid/broker/Exchange.cpp
index 4eaf40dbc8..04407eb774 100644
--- a/qpid/cpp/src/qpid/broker/BrokerExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/Exchange.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "ExchangeRegistry.h"
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/src/qpid/broker/BrokerExchange.h b/qpid/cpp/src/qpid/broker/Exchange.h
index c3dd7b998d..5febca0ae9 100644
--- a/qpid/cpp/src/qpid/broker/BrokerExchange.h
+++ b/qpid/cpp/src/qpid/broker/Exchange.h
@@ -1,5 +1,5 @@
-#ifndef _broker_BrokerExchange_h
-#define _broker_BrokerExchange_h
+#ifndef _broker_Exchange_h
+#define _broker_Exchange_h
 
 /*
  *
@@ -24,7 +24,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include "Deliverable.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "MessageStore.h"
 #include "PersistableExchange.h"
 #include "qpid/framing/FieldTable.h"
@@ -80,4 +80,4 @@ namespace qpid {
 }
 
 
-#endif  /*!_broker_BrokerExchange_h*/
+#endif  /*!_broker_Exchange.cpp_h*/
diff --git a/qpid/cpp/src/qpid/broker/ExchangeRegistry.h b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
index 5505a4074a..f7f29ff0ea 100644
--- a/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
@@ -23,7 +23,7 @@
  */
 
 #include <map>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "MessageStore.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
diff --git a/qpid/cpp/src/qpid/broker/FanOutExchange.h b/qpid/cpp/src/qpid/broker/FanOutExchange.h
index 070e438bcc..625afc8cce 100644
--- a/qpid/cpp/src/qpid/broker/FanOutExchange.h
+++ b/qpid/cpp/src/qpid/broker/FanOutExchange.h
@@ -23,10 +23,10 @@
 
 #include <map>
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/src/qpid/broker/HeadersExchange.h b/qpid/cpp/src/qpid/broker/HeadersExchange.h
index 48d115c1ec..f7abf3514b 100644
--- a/qpid/cpp/src/qpid/broker/HeadersExchange.h
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.h
@@ -22,10 +22,10 @@
 #define _HeadersExchange_
 
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/src/qpid/broker/MessageDelivery.cpp b/qpid/cpp/src/qpid/broker/MessageDelivery.cpp
index edacd7a1c1..2eea97ced0 100644
--- a/qpid/cpp/src/qpid/broker/MessageDelivery.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageDelivery.cpp
@@ -22,7 +22,7 @@
 
 #include "DeliveryToken.h"
 #include "Message.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "qpid/framing/FrameHandler.h"
 #include "qpid/framing/BasicDeliverBody.h"
 #include "qpid/framing/BasicGetOkBody.h"
diff --git a/qpid/cpp/src/qpid/broker/MessageStoreModule.h b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
index 271da92b1e..46dbd35ec9 100644
--- a/qpid/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
@@ -22,7 +22,7 @@
 #define _MessageStoreModule_
 
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "RecoveryManager.h"
 #include "qpid/sys/Module.h"
 
diff --git a/qpid/cpp/src/qpid/broker/NullMessageStore.h b/qpid/cpp/src/qpid/broker/NullMessageStore.h
index c27a0ad53a..5698d8a16d 100644
--- a/qpid/cpp/src/qpid/broker/NullMessageStore.h
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.h
@@ -23,7 +23,7 @@
 
 #include <set>
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/src/qpid/broker/BrokerQueue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 74ba4f24ed..95fff2e789 100644
--- a/qpid/cpp/src/qpid/broker/BrokerQueue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -22,8 +22,8 @@
 #include <boost/format.hpp>
 
 #include "qpid/log/Statement.h"
-#include "BrokerQueue.h"
-#include "BrokerExchange.h"
+#include "Queue.h"
+#include "Exchange.h"
 #include "DeliverableMessage.h"
 #include "MessageStore.h"
 #include "qpid/sys/Monitor.h"
diff --git a/qpid/cpp/src/qpid/broker/BrokerQueue.h b/qpid/cpp/src/qpid/broker/Queue.h
index 4b6070d11c..17ace522c3 100644
--- a/qpid/cpp/src/qpid/broker/BrokerQueue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
@@ -1,5 +1,5 @@
-#ifndef _broker_BrokerQueue_h
-#define _broker_BrokerQueue_h
+#ifndef _broker_Queue_h
+#define _broker_Queue_h
 
 /*
  *
@@ -189,4 +189,4 @@ namespace qpid {
 }
 
 
-#endif  /*!_broker_BrokerQueue_h*/
+#endif  /*!_broker_Queue_h*/
diff --git a/qpid/cpp/src/qpid/broker/QueueRegistry.h b/qpid/cpp/src/qpid/broker/QueueRegistry.h
index 22a89d7825..1a766b810a 100644
--- a/qpid/cpp/src/qpid/broker/QueueRegistry.h
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.h
@@ -23,7 +23,7 @@
 
 #include <map>
 #include "qpid/sys/Mutex.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/src/qpid/broker/RecoveredDequeue.h b/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
index 9dcc9d4233..a6d64e6faf 100644
--- a/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
+++ b/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
@@ -27,7 +27,7 @@
 #include "Deliverable.h"
 #include "Message.h"
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "TxOp.h"
 
 namespace qpid {
diff --git a/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
index a571343e93..9ada62e62b 100644
--- a/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
+++ b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
@@ -27,7 +27,7 @@
 #include "Deliverable.h"
 #include "Message.h"
 #include "MessageStore.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "TxOp.h"
 
 namespace qpid {
diff --git a/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
index 45b7c588b6..1e3168137e 100644
--- a/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
+++ b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
@@ -21,7 +21,7 @@
 #include "RecoveryManagerImpl.h"
 
 #include "Message.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "RecoveredEnqueue.h"
 #include "RecoveredDequeue.h"
 
diff --git a/qpid/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp
index 059f99077c..a3858d0989 100644
--- a/qpid/cpp/src/qpid/broker/SemanticState.cpp
+++ b/qpid/cpp/src/qpid/broker/SemanticState.cpp
@@ -21,7 +21,7 @@
 
 #include "SessionState.h"
 #include "BrokerAdapter.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Connection.h"
 #include "DeliverableMessage.h"
 #include "DtxAck.h"
diff --git a/qpid/cpp/src/qpid/broker/TopicExchange.h b/qpid/cpp/src/qpid/broker/TopicExchange.h
index c411fb1965..e2cc1a3535 100644
--- a/qpid/cpp/src/qpid/broker/TopicExchange.h
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.h
@@ -23,10 +23,10 @@
 
 #include <map>
 #include <vector>
-#include "BrokerExchange.h"
+#include "Exchange.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Monitor.h"
-#include "BrokerQueue.h"
+#include "Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/src/qpid/broker/TxPublish.h b/qpid/cpp/src/qpid/broker/TxPublish.h
index 564e021c5a..2e3268010a 100644
--- a/qpid/cpp/src/qpid/broker/TxPublish.h
+++ b/qpid/cpp/src/qpid/broker/TxPublish.h
@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <functional>
 #include <list>
-#include "BrokerQueue.h"
+#include "Queue.h"
 #include "Deliverable.h"
 #include "Message.h"
 #include "MessageStore.h"
diff --git a/qpid/cpp/src/qpid/client/ClientChannel.cpp b/qpid/cpp/src/qpid/client/Channel.cpp
index f5362bf688..cef34630db 100644
--- a/qpid/cpp/src/qpid/client/ClientChannel.cpp
+++ b/qpid/cpp/src/qpid/client/Channel.cpp
@@ -21,9 +21,9 @@
 #include "qpid/log/Statement.h"
 #include <iostream>
 #include <sstream>
-#include "ClientChannel.h"
+#include "Channel.h"
 #include "qpid/sys/Monitor.h"
-#include "ClientMessage.h"
+#include "Message.h"
 #include "qpid/QpidError.h"
 #include "Connection.h"
 #include "Demux.h"
diff --git a/qpid/cpp/src/qpid/client/ClientChannel.h b/qpid/cpp/src/qpid/client/Channel.h
index 527f5d418f..bf0b289077 100644
--- a/qpid/cpp/src/qpid/client/ClientChannel.h
+++ b/qpid/cpp/src/qpid/client/Channel.h
@@ -1,5 +1,5 @@
-#ifndef _client_ClientChannel_h
-#define _client_ClientChannel_h
+#ifndef _client_Channel_h
+#define _client_Channel_h
 
 /*
  *
@@ -25,9 +25,9 @@
 #include <boost/scoped_ptr.hpp>
 #include "qpid/framing/amqp_framing.h"
 #include "qpid/framing/Uuid.h"
-#include "ClientExchange.h"
-#include "ClientMessage.h"
-#include "ClientQueue.h"
+#include "Exchange.h"
+#include "Message.h"
+#include "Queue.h"
 #include "ConnectionImpl.h"
 #include "qpid/client/Session.h"
 #include "qpid/Exception.h"
@@ -313,4 +313,4 @@ class Channel : private sys::Runnable
 
 }}
 
-#endif  /*!_client_ClientChannel_h*/
+#endif  /*!_client_Channel_h*/
diff --git a/qpid/cpp/src/qpid/client/ClientConnection.cpp b/qpid/cpp/src/qpid/client/Connection.cpp
index 8c5f83f9f5..cef076527f 100644
--- a/qpid/cpp/src/qpid/client/ClientConnection.cpp
+++ b/qpid/cpp/src/qpid/client/Connection.cpp
@@ -23,8 +23,8 @@
 #include <boost/bind.hpp>
 
 #include "Connection.h"
-#include "ClientChannel.h"
-#include "ClientMessage.h"
+#include "Channel.h"
+#include "Message.h"
 #include "ScopedAssociation.h"
 #include "qpid/log/Logger.h"
 #include "qpid/log/Options.h"
diff --git a/qpid/cpp/src/qpid/client/Connection.h b/qpid/cpp/src/qpid/client/Connection.h
index e309b5c63e..f5d6a387a9 100644
--- a/qpid/cpp/src/qpid/client/Connection.h
+++ b/qpid/cpp/src/qpid/client/Connection.h
@@ -24,7 +24,7 @@
 #include <map>
 #include <string>
 #include "qpid/QpidError.h"
-#include "ClientChannel.h"
+#include "Channel.h"
 #include "ConnectionImpl.h"
 #include "qpid/client/Session.h"
 #include "qpid/framing/AMQP_HighestVersion.h"
diff --git a/qpid/cpp/src/qpid/client/Dispatcher.cpp b/qpid/cpp/src/qpid/client/Dispatcher.cpp
index 8f3ed8bcbe..fd437725ce 100644
--- a/qpid/cpp/src/qpid/client/Dispatcher.cpp
+++ b/qpid/cpp/src/qpid/client/Dispatcher.cpp
@@ -25,7 +25,7 @@
 #include "qpid/framing/MessageTransferBody.h"
 #include "qpid/log/Statement.h"
 #include "BlockingQueue.h"
-#include "ClientMessage.h"
+#include "Message.h"
 
 using qpid::framing::FrameSet;
 using qpid::framing::MessageTransferBody;
diff --git a/qpid/cpp/src/qpid/client/ClientExchange.cpp b/qpid/cpp/src/qpid/client/Exchange.cpp
index d5914beea2..e7fbdeb47e 100644
--- a/qpid/cpp/src/qpid/client/ClientExchange.cpp
+++ b/qpid/cpp/src/qpid/client/Exchange.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "ClientExchange.h"
+#include "Exchange.h"
 
 qpid::client::Exchange::Exchange(std::string _name, std::string _type) : name(_name), type(_type){}
 const std::string& qpid::client::Exchange::getName() const { return name; }
diff --git a/qpid/cpp/src/qpid/client/ClientExchange.h b/qpid/cpp/src/qpid/client/Exchange.h
index a8ac21fa9b..a8ac21fa9b 100644
--- a/qpid/cpp/src/qpid/client/ClientExchange.h
+++ b/qpid/cpp/src/qpid/client/Exchange.h
diff --git a/qpid/cpp/src/qpid/client/ClientMessage.h b/qpid/cpp/src/qpid/client/Message.h
index a573e17940..dab7f3c8d8 100644
--- a/qpid/cpp/src/qpid/client/ClientMessage.h
+++ b/qpid/cpp/src/qpid/client/Message.h
@@ -1,5 +1,5 @@
-#ifndef _client_ClientMessage_h
-#define _client_ClientMessage_h
+#ifndef _client_Message_h
+#define _client_Message_h
 
 /*
  *
@@ -83,4 +83,4 @@ private:
 
 }}
 
-#endif  /*!_client_ClientMessage_h*/
+#endif  /*!_client_Message_h*/
diff --git a/qpid/cpp/src/qpid/client/MessageListener.h b/qpid/cpp/src/qpid/client/MessageListener.h
index 501862a3ef..86e5dd63dc 100644
--- a/qpid/cpp/src/qpid/client/MessageListener.h
+++ b/qpid/cpp/src/qpid/client/MessageListener.h
@@ -23,7 +23,7 @@
 #ifndef _MessageListener_
 #define _MessageListener_
 
-#include "ClientMessage.h"
+#include "Message.h"
 
 namespace qpid {
 namespace client {
diff --git a/qpid/cpp/src/qpid/client/ClientQueue.cpp b/qpid/cpp/src/qpid/client/Queue.cpp
index 613cf8d288..1752a48a3a 100644
--- a/qpid/cpp/src/qpid/client/ClientQueue.cpp
+++ b/qpid/cpp/src/qpid/client/Queue.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "ClientQueue.h"
+#include "Queue.h"
 
 qpid::client::Queue::Queue() : name(""), autodelete(true), exclusive(true), durable(false){}
 
diff --git a/qpid/cpp/src/qpid/client/ClientQueue.h b/qpid/cpp/src/qpid/client/Queue.h
index b37a44b004..9ab8c70b08 100644
--- a/qpid/cpp/src/qpid/client/ClientQueue.h
+++ b/qpid/cpp/src/qpid/client/Queue.h
@@ -1,5 +1,5 @@
-#ifndef _client_ClientQueue_h
-#define _client_ClientQueue_h
+#ifndef _client_Queue_h
+#define _client_Queue_h
 
 /*
  *
@@ -100,4 +100,4 @@ namespace client {
 }
 }
 
-#endif  /*!_client_ClientQueue_h*/
+#endif  /*!_client_Queue_h*/
diff --git a/qpid/cpp/src/tests/BasicP2PTest.h b/qpid/cpp/src/tests/BasicP2PTest.h
index b80fff1171..3f0a3704f5 100644
--- a/qpid/cpp/src/tests/BasicP2PTest.h
+++ b/qpid/cpp/src/tests/BasicP2PTest.h
@@ -25,8 +25,8 @@
 #include <sstream>
 
 #include "qpid/Exception.h"
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
 #include "SimpleTestCaseBase.h"
diff --git a/qpid/cpp/src/tests/BasicPubSubTest.h b/qpid/cpp/src/tests/BasicPubSubTest.h
index b7ccba1a81..c3f8020b3a 100644
--- a/qpid/cpp/src/tests/BasicPubSubTest.h
+++ b/qpid/cpp/src/tests/BasicPubSubTest.h
@@ -25,8 +25,8 @@
 #include <sstream>
 
 #include "qpid/Exception.h"
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
 #include "SimpleTestCaseBase.h"
diff --git a/qpid/cpp/src/tests/BrokerChannelTest.cpp b/qpid/cpp/src/tests/BrokerChannelTest.cpp
index e975ec1b12..612a9fc8bc 100644
--- a/qpid/cpp/src/tests/BrokerChannelTest.cpp
+++ b/qpid/cpp/src/tests/BrokerChannelTest.cpp
@@ -24,7 +24,7 @@
 // which is no longer exposed on Session (part of SemanticHandler.)
 // 
 #include "qpid/broker/BrokerChannel.h"
-#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/Queue.h"
 #include "qpid/broker/FanOutExchange.h"
 #include "qpid/broker/Message.h"
 #include "qpid/broker/MessageDelivery.h"
diff --git a/qpid/cpp/src/tests/ClientChannelTest.cpp b/qpid/cpp/src/tests/ClientChannelTest.cpp
index 252b419299..9a982508d1 100644
--- a/qpid/cpp/src/tests/ClientChannelTest.cpp
+++ b/qpid/cpp/src/tests/ClientChannelTest.cpp
@@ -21,10 +21,10 @@
 #include <vector>
 #include "qpid_test_plugin.h"
 #include "InProcessBroker.h"
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientMessage.h"
-#include "qpid/client/ClientQueue.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/Queue.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/client/BasicMessageChannel.h"
 #include "qpid/client/MessageMessageChannel.h"
@@ -44,7 +44,7 @@ const size_t FRAME_MAX = 256;
  * The test base defines the tests methods, derived classes
  * instantiate the channel in Basic or Message mode.
  */
-class ClientChannelTestBase : public CppUnit::TestCase  
+class ChannelTestBase : public CppUnit::TestCase  
 {
     struct Listener: public qpid::client::MessageListener {
         vector<Message> messages;
@@ -68,7 +68,7 @@ class ClientChannelTestBase : public CppUnit::TestCase
 
   public:
 
-    ClientChannelTestBase()
+    ChannelTestBase()
         : connection(FRAME_MAX),
           qname("testq"), data("hello"),
           queue(qname, true), exchange("", Exchange::DIRECT_EXCHANGE)
@@ -188,8 +188,8 @@ class ClientChannelTestBase : public CppUnit::TestCase
     }
 };
 
-class BasicClientChannelTest : public ClientChannelTestBase {
-    CPPUNIT_TEST_SUITE(BasicClientChannelTest);
+class BasicChannelTest : public ChannelTestBase {
+    CPPUNIT_TEST_SUITE(BasicChannelTest);
     CPPUNIT_TEST(testPublishGet);
     CPPUNIT_TEST(testGetNoContent);
     CPPUNIT_TEST(testConsumeCancel);
@@ -199,24 +199,24 @@ class BasicClientChannelTest : public ClientChannelTestBase {
     CPPUNIT_TEST_SUITE_END();
 
   public:
-    BasicClientChannelTest(){
+    BasicChannelTest(){
         channel.reset(new Channel(false, 500, Channel::AMQP_08));
     }
 };
 
-class MessageClientChannelTest : public ClientChannelTestBase {
-    CPPUNIT_TEST_SUITE(MessageClientChannelTest);
+class MessageChannelTest : public ChannelTestBase {
+    CPPUNIT_TEST_SUITE(MessageChannelTest);
     CPPUNIT_TEST(testPublishGet);
     CPPUNIT_TEST(testGetNoContent);
     CPPUNIT_TEST(testGetFragmentedMessage);
     CPPUNIT_TEST_SUITE_END();
   public:
-    MessageClientChannelTest() {
+    MessageChannelTest() {
         channel.reset(new Channel(false, 500, Channel::AMQP_09));
     }
 };
 
 // Make this test suite a plugin.
 CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(BasicClientChannelTest);
-CPPUNIT_TEST_SUITE_REGISTRATION(MessageClientChannelTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(BasicChannelTest);
+CPPUNIT_TEST_SUITE_REGISTRATION(MessageChannelTest);
diff --git a/qpid/cpp/src/tests/ExchangeTest.cpp b/qpid/cpp/src/tests/ExchangeTest.cpp
index 59941864e2..35fc5e0bdb 100644
--- a/qpid/cpp/src/tests/ExchangeTest.cpp
+++ b/qpid/cpp/src/tests/ExchangeTest.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "qpid/Exception.h"
-#include "qpid/broker/BrokerExchange.h"
-#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/Exchange.h"
+#include "qpid/broker/Queue.h"
 #include "qpid/broker/DeliverableMessage.h"
 #include "qpid/broker/DirectExchange.h"
 #include "qpid/broker/ExchangeRegistry.h"
diff --git a/qpid/cpp/src/tests/FramingTest.cpp b/qpid/cpp/src/tests/FramingTest.cpp
index 79df8eade2..5ca4e6c216 100644
--- a/qpid/cpp/src/tests/FramingTest.cpp
+++ b/qpid/cpp/src/tests/FramingTest.cpp
@@ -20,8 +20,8 @@
  */
 #include "InProcessBroker.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientExchange.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/Queue.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/Connector.h"
 #include "qpid/framing/AMQP_HighestVersion.h"
diff --git a/qpid/cpp/src/tests/QueueTest.cpp b/qpid/cpp/src/tests/QueueTest.cpp
index 29f0d17cef..f2f1b3bf84 100644
--- a/qpid/cpp/src/tests/QueueTest.cpp
+++ b/qpid/cpp/src/tests/QueueTest.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include "qpid/Exception.h"
-#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/Queue.h"
 #include "qpid/broker/Deliverable.h"
 #include "qpid/broker/ExchangeRegistry.h"
 #include "qpid/broker/QueueRegistry.h"
diff --git a/qpid/cpp/src/tests/SimpleTestCaseBase.h b/qpid/cpp/src/tests/SimpleTestCaseBase.h
index ee1742a7f7..7f94fa7e1c 100644
--- a/qpid/cpp/src/tests/SimpleTestCaseBase.h
+++ b/qpid/cpp/src/tests/SimpleTestCaseBase.h
@@ -25,8 +25,8 @@
 #include <sstream>
 
 #include "qpid/Exception.h"
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
 #include "TestCase.h"
diff --git a/qpid/cpp/src/tests/TestCase.h b/qpid/cpp/src/tests/TestCase.h
index 71e1d1118c..07bdd68933 100644
--- a/qpid/cpp/src/tests/TestCase.h
+++ b/qpid/cpp/src/tests/TestCase.h
@@ -21,7 +21,7 @@
  *
  */
 
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Message.h"
 #include "TestOptions.h"
 
 
diff --git a/qpid/cpp/src/tests/client_test.cpp b/qpid/cpp/src/tests/client_test.cpp
index 4903312cd7..8cf43ce069 100644
--- a/qpid/cpp/src/tests/client_test.cpp
+++ b/qpid/cpp/src/tests/client_test.cpp
@@ -30,9 +30,9 @@
 
 #include "TestOptions.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Message.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/sys/Time.h"
diff --git a/qpid/cpp/src/tests/echo_service.cpp b/qpid/cpp/src/tests/echo_service.cpp
index c4f1f0477a..7989ec8543 100644
--- a/qpid/cpp/src/tests/echo_service.cpp
+++ b/qpid/cpp/src/tests/echo_service.cpp
@@ -28,11 +28,11 @@
  */
 
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Time.h"
 #include <iostream>
 #include <sstream>
diff --git a/qpid/cpp/src/tests/exception_test.cpp b/qpid/cpp/src/tests/exception_test.cpp
index fffae796dd..3feef7e876 100644
--- a/qpid/cpp/src/tests/exception_test.cpp
+++ b/qpid/cpp/src/tests/exception_test.cpp
@@ -23,9 +23,9 @@
 
 #include "TestOptions.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientMessage.h"
+#include "qpid/client/Message.h"
 
 using namespace qpid::client;
 using namespace qpid::sys;
diff --git a/qpid/cpp/src/tests/interop_runner.cpp b/qpid/cpp/src/tests/interop_runner.cpp
index 1b87512857..5bfe88662a 100644
--- a/qpid/cpp/src/tests/interop_runner.cpp
+++ b/qpid/cpp/src/tests/interop_runner.cpp
@@ -22,11 +22,11 @@
 #include "qpid/Options.h"
 #include "qpid/Exception.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Thread.h"
 #include "qpid/sys/Time.h"
 #include <iostream>
diff --git a/qpid/cpp/src/tests/perftest.cpp b/qpid/cpp/src/tests/perftest.cpp
index 38882f19c3..9d5ea593fe 100644
--- a/qpid/cpp/src/tests/perftest.cpp
+++ b/qpid/cpp/src/tests/perftest.cpp
@@ -21,9 +21,9 @@
 
 #include "TestOptions.h"
 
-#include "qpid/client/ClientChannel.h"
-#include "qpid/client/ClientExchange.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Channel.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/Queue.h"
 #include "qpid/client/Connection.h"
 #include "qpid/client/MessageListener.h"
 #include "qpid/QpidError.h"
diff --git a/qpid/cpp/src/tests/topic_listener.cpp b/qpid/cpp/src/tests/topic_listener.cpp
index 38f5c76f54..d19b8f8b19 100644
--- a/qpid/cpp/src/tests/topic_listener.cpp
+++ b/qpid/cpp/src/tests/topic_listener.cpp
@@ -34,11 +34,11 @@
 
 #include "qpid/QpidError.h"
 #include "TestOptions.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Time.h"
 #include <iostream>
 #include <sstream>
diff --git a/qpid/cpp/src/tests/topic_publisher.cpp b/qpid/cpp/src/tests/topic_publisher.cpp
index 5800f9225d..74fcf8b057 100644
--- a/qpid/cpp/src/tests/topic_publisher.cpp
+++ b/qpid/cpp/src/tests/topic_publisher.cpp
@@ -36,11 +36,11 @@
 
 #include "TestOptions.h"
 #include "qpid/QpidError.h"
-#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Channel.h"
 #include "qpid/client/Connection.h"
-#include "qpid/client/ClientExchange.h"
+#include "qpid/client/Exchange.h"
 #include "qpid/client/MessageListener.h"
-#include "qpid/client/ClientQueue.h"
+#include "qpid/client/Queue.h"
 #include "qpid/sys/Monitor.h"
 #include <unistd.h>
 #include "qpid/sys/Time.h"