Index: CloudConnect/CloudConnectController.h
===================================================================
diff -u -rb915ccc1a72fcca21908c35140af7ac7df1f1f37 -rcaca75be9a284ac5f98c078ec47c2e826ac5e980
--- CloudConnect/CloudConnectController.h	(.../CloudConnectController.h)	(revision b915ccc1a72fcca21908c35140af7ac7df1f1f37)
+++ CloudConnect/CloudConnectController.h	(.../CloudConnectController.h)	(revision caca75be9a284ac5f98c078ec47c2e826ac5e980)
@@ -22,17 +22,17 @@
 #include <QThread>
 #include <utility>
 
-#include "RtInterface.h"
-#include "RtMessage.h"
+#include "CloudConnectClient.h"
+#include "CloudConnectFrame.h"
 #include "CanInterface.h"
 #include "CanMessage.h"
-#include "RtServer.h"
+#include "CloudConnectServer.h"
 #include "MessageDispatcher.h"
 
 using namespace Can;
 
 /*!
- * \brief   Real-time Cloud Communications controller
+ * \brief   CloudConnect controller
  */
 class CloudConnectController : public QObject
 {
@@ -59,17 +59,17 @@
      * \brief   Send message handling policy for a CAN message.
      */
     enum class MsgAction {
-        Drop,       ///< Discard the message; do not forward to the Agent.
-        SendAlways, ///< Forward unconditionally.
-        SendDelta,  ///< Forward only when the payload has changed since the last send.
+        Drop,
+        SendAlways,
+        SendDelta,
     };
 
     /*!
      * \brief   Message handling entry loaded from message handling INI.
      */
     struct MsgHandling {
         MsgAction action = MsgAction::Drop;
-        RtMessage::MsgId topic = RtMessage::MsgId::ClinicalData;
+        CloudConnectFrame::MsgId topic = CloudConnectFrame::MsgId::ClinicalData;
     };
 
     void loadMsgHandling(const QString &msgHandlingPath);
@@ -80,9 +80,9 @@
     Can::MessageDispatcher _dispatcher;
     QMap<Can::MsgId, std::pair<bool, Can::Message>> _msgCache;
     QHash<Can::MsgId, MsgHandling> _msgHandling;
-    RtInterface _agentInterface;
+    CloudConnectClient _agentInterface;
     QThread _agentThread;
-    RtServer _appServer;     ///< The Luis application connects here.
+    CloudConnectServer _appServer;
     quint16 _txSequence = 0;
 
 private Q_SLOTS: