Index: CloudConnect/CloudConnectController.cpp
===================================================================
diff -u -rb915ccc1a72fcca21908c35140af7ac7df1f1f37 -rcaca75be9a284ac5f98c078ec47c2e826ac5e980
--- CloudConnect/CloudConnectController.cpp	(.../CloudConnectController.cpp)	(revision b915ccc1a72fcca21908c35140af7ac7df1f1f37)
+++ CloudConnect/CloudConnectController.cpp	(.../CloudConnectController.cpp)	(revision caca75be9a284ac5f98c078ec47c2e826ac5e980)
@@ -37,7 +37,7 @@
     _canInterface.init(_canThread);
     connect(&_canInterface, &Can::CanInterface::didFrameReceive, this, &CloudConnectController::onFrameReceive);
     connect(&_dispatcher, &Can::MessageDispatcher::didActionReceive, this, &CloudConnectController::onMessageReceive);
-    connect(&_agentInterface, &RtInterface::didDisconnect, this, &CloudConnectController::onAgentDisconnect);
+    connect(&_agentInterface, &CloudConnectClient::didDisconnect, this, &CloudConnectController::onAgentDisconnect);
 }
 
 /*!
@@ -55,12 +55,12 @@
 
 /*!
  * \brief   CloudConnectController::connectToAgent
- * \details Initialises the RtInterface using the socket path and reconnect
+ * \details Initialises the CloudConnectClient using the socket path and reconnect
  *          interval from the settings file.
  */
 void CloudConnectController::connectToAgent()
 {
-    const QString socketPath = _settings.value("Socket/LocalSocketName", "/tmp/leahi_rt.sock").toString();
+    const QString socketPath = _settings.value("Socket/AgentSocketName", "/tmp/cloudconnect_agent.sock").toString();
     const int reconnectIntervalMs = _settings.value("Socket/ReconnectIntervalMs", 5000).toInt();
     _agentInterface.init(socketPath, reconnectIntervalMs, _agentThread);
 }
@@ -73,7 +73,7 @@
  */
 bool CloudConnectController::listenForApp()
 {
-    const QString appSocketPath = _settings.value("Socket/AppSocketName", "/tmp/leahi_app.sock").toString();
+    const QString appSocketPath = _settings.value("Socket/AppSocketName", "/tmp/cloudconnect_app.sock").toString();
     return _appServer.listen(appSocketPath);
 }
 
@@ -90,15 +90,15 @@
         { QStringLiteral("send_delta"),  MsgAction::SendDelta  },
         { QStringLiteral("drop"),        MsgAction::Drop       },
     };
-    static const QHash<QString, RtMessage::MsgId> topicMap = {
-        { QStringLiteral("ClinicalData"),      RtMessage::MsgId::ClinicalData      },
-        { QStringLiteral("Diagnostic"),        RtMessage::MsgId::Diagnostic        },
-        { QStringLiteral("Ack"),               RtMessage::MsgId::Ack               },
-        { QStringLiteral("Alarms"),            RtMessage::MsgId::Alarms            },
-        { QStringLiteral("Audit"),             RtMessage::MsgId::Audit             },
-        { QStringLiteral("DeviceLogFile"),     RtMessage::MsgId::DeviceLogFile     },
-        { QStringLiteral("TreatmentLogFile"),  RtMessage::MsgId::TreatmentLogFile  },
-        { QStringLiteral("CloudSyncLogFile"),  RtMessage::MsgId::CloudSyncLogFile  },
+    static const QHash<QString, CloudConnectFrame::MsgId> topicMap = {
+        { QStringLiteral("ClinicalData"),      CloudConnectFrame::MsgId::ClinicalData      },
+        { QStringLiteral("Diagnostic"),        CloudConnectFrame::MsgId::Diagnostic        },
+        { QStringLiteral("Ack"),               CloudConnectFrame::MsgId::Ack               },
+        { QStringLiteral("Alarms"),            CloudConnectFrame::MsgId::Alarms            },
+        { QStringLiteral("Audit"),             CloudConnectFrame::MsgId::Audit             },
+        { QStringLiteral("DeviceLogFile"),     CloudConnectFrame::MsgId::DeviceLogFile     },
+        { QStringLiteral("TreatmentLogFile"),  CloudConnectFrame::MsgId::TreatmentLogFile  },
+        { QStringLiteral("CloudSyncLogFile"),  CloudConnectFrame::MsgId::CloudSyncLogFile  },
     };
 
     QSettings msgHandlingIni(msgHandlingPath, QSettings::IniFormat);
@@ -122,7 +122,7 @@
 
         MsgHandling msgHandling;
         msgHandling.action  = actionMap.value(actionStr, MsgAction::Drop);
-        msgHandling.topic   = topicMap.value(topicStr, RtMessage::MsgId::ClinicalData);
+        msgHandling.topic   = topicMap.value(topicStr, CloudConnectFrame::MsgId::ClinicalData);
 
         if (!actionMap.contains(actionStr)) {
             qWarning().noquote() << QString("CloudConnect: unknown message action \"%1\" for msgId=0x%2 — defaulting to drop")
@@ -150,7 +150,7 @@
  * \brief   CloudConnectController::onMessageReceive
  * \details Applies the message handling policy from LeahiMsgHandling.ini: drops,
  *          forwards unconditionally, or forwards only on payload change. Uses the
- *          section's topic to set the RtMessage frame msg_id.
+ *          section's topic to set the CloudConnectFrame frame msg_id.
  * \param   msg - the reassembled message
  */
 void CloudConnectController::onMessageReceive(const Can::Message &msg)