Index: lib/Comms/include/CloudConnectServer.h
===================================================================
diff -u -rc6a4b63a37f3beb1e8a51702ec3a56a1c32cfe8f -r59b4c22f45a1d098064a886452769204e90cfb4b
--- lib/Comms/include/CloudConnectServer.h	(.../CloudConnectServer.h)	(revision c6a4b63a37f3beb1e8a51702ec3a56a1c32cfe8f)
+++ lib/Comms/include/CloudConnectServer.h	(.../CloudConnectServer.h)	(revision 59b4c22f45a1d098064a886452769204e90cfb4b)
@@ -21,7 +21,7 @@
 #include "CloudConnectFrame.h"
 
 /*!
- * \brief   Server to handle incoming local socket connections to the CloudConnect agent.
+ * \brief   Server to handle incoming local socket connections to CloudConnect.
  */
 class CloudConnectServer : public QObject
 {
@@ -31,18 +31,18 @@
     explicit CloudConnectServer(QObject *parent = nullptr);
 
     bool listen(const QString &socketPath);
-    bool send(CloudConnectFrame::Type type, quint16 sequence, const QByteArray &payload = {});
+    bool send(CloudConnectFrame::Topic topic, quint16 sequence, const QByteArray &payload = {});
     bool isConnected() const;
 
 Q_SIGNALS:
     /*!
      * \brief   didMessageReceive
      * \details Emitted when a complete inbound CloudConnectFrame has been parsed.
-     * \param   type     - message identifier from the frame header
+     * \param   topic    - MQTT topic from the frame header
      * \param   sequence - sequence number from the frame header
      * \param   payload  - decoded payload bytes, empty for zero-length frames
      */
-    void didMessageReceive(CloudConnectFrame::Type type, quint16 sequence, QByteArray payload);
+    void didMessageReceive(CloudConnectFrame::Topic topic, quint16 sequence, QByteArray payload);
 
     /*!
      * \brief   didConnect
@@ -65,5 +65,5 @@
     QLocalServer _server;
     QLocalSocket *_client = nullptr;
     QByteArray _rxBuf;
-    CloudConnectFrame _rxMsg;
+    CloudConnectFrame _rxFrame;
 };