Index: lib/Comms/include/CloudConnectClient.h
===================================================================
diff -u -rc6a4b63a37f3beb1e8a51702ec3a56a1c32cfe8f -r59b4c22f45a1d098064a886452769204e90cfb4b
--- lib/Comms/include/CloudConnectClient.h	(.../CloudConnectClient.h)	(revision c6a4b63a37f3beb1e8a51702ec3a56a1c32cfe8f)
+++ lib/Comms/include/CloudConnectClient.h	(.../CloudConnectClient.h)	(revision 59b4c22f45a1d098064a886452769204e90cfb4b)
@@ -22,11 +22,10 @@
 #include "CloudConnectFrame.h"
 
 /*!
- * \brief   UDS interface to the Connectivity Agent
- * \details Manages the QLocalSocket connection to the Connectivity Agent
+ * \brief   Local socket interface to CloudConnect
+ * \details Manages the QLocalSocket connection to CloudConnect
  *          including automatic reconnection on disconnect or error.
- *          Outbound: call send() to write a CloudConnectFrame to the socket.
- *          Inbound: emits didMessageReceive() for each complete parsed frame.
+ *          Uses CloudConnectFrame to send data between the client and CloudConnect.
  */
 class CloudConnectClient : public QObject
 {
@@ -37,7 +36,7 @@
 
     bool init(const QString &socketPath, int reconnectIntervalMs);
     bool init(const QString &socketPath, int reconnectIntervalMs, QThread &thread);
-    bool send(CloudConnectFrame::Type type, quint16 sequence, const QByteArray &payload = {});
+    bool send(CloudConnectFrame::Topic topic, quint16 sequence, const QByteArray &payload = {});
 
 public Q_SLOTS:
     void quit();
@@ -46,11 +45,11 @@
     /*!
      * \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