Index: lib/Comms/src/CloudConnectClient.cpp
===================================================================
diff -u -rcaca75be9a284ac5f98c078ec47c2e826ac5e980 -rc6a4b63a37f3beb1e8a51702ec3a56a1c32cfe8f
--- lib/Comms/src/CloudConnectClient.cpp	(.../CloudConnectClient.cpp)	(revision caca75be9a284ac5f98c078ec47c2e826ac5e980)
+++ lib/Comms/src/CloudConnectClient.cpp	(.../CloudConnectClient.cpp)	(revision c6a4b63a37f3beb1e8a51702ec3a56a1c32cfe8f)
@@ -16,7 +16,7 @@
 #include <QDebug>
 #include <QThread>
 
-static void qRegister() { qRegisterMetaType<CloudConnectFrame::MsgId>("CloudConnectFrame::MsgId"); }
+static void qRegister() { qRegisterMetaType<CloudConnectFrame::Type>("CloudConnectFrame::Type"); }
 Q_COREAPP_STARTUP_FUNCTION(qRegister)
 
 /*!
@@ -77,17 +77,17 @@
 /*!
  * \brief   CloudConnectClient::send
  * \details Builds a CloudConnectFrame and writes it to the socket.
- * \param   msgId    - message identifier for Agent MQTT topic
+ * \param   type     - message identifier for Agent MQTT topic
  * \param   sequence - caller-managed sequence number
  * \param   payload  - message payload; pass empty for zero-length frames
  * \return  true if written to the socket, false if not connected
  */
-bool CloudConnectClient::send(CloudConnectFrame::MsgId msgId, quint16 sequence, const QByteArray &payload)
+bool CloudConnectClient::send(CloudConnectFrame::Type type, quint16 sequence, const QByteArray &payload)
 {
     if (_socket.state() != QLocalSocket::ConnectedState) {
         return false;
     }
-    const QByteArray frame = CloudConnectFrame::build(msgId, sequence, payload);
+    const QByteArray frame = CloudConnectFrame::build(type, sequence, payload);
     _socket.write(frame);
     _socket.flush();
     return true;
@@ -178,14 +178,14 @@
 {
     _rxBuf.append(_socket.readAll());
 
-    CloudConnectFrame::FeedResult result;
+    CloudConnectFrame::ReadState state;
     do {
-        result = _rxMsg.feed(_rxBuf);
-        if (result == CloudConnectFrame::FeedResult::Complete) {
-            emit didMessageReceive(_rxMsg.msgId(), _rxMsg.sequence(), _rxMsg.payload());
+        state = _rxMsg.read(_rxBuf);
+        if (state == CloudConnectFrame::ReadState::Complete) {
+            emit didMessageReceive(_rxMsg.type(), _rxMsg.sequence(), _rxMsg.payload());
             _rxMsg.reset();
         }
-    } while (result == CloudConnectFrame::FeedResult::Complete && !_rxBuf.isEmpty());
+    } while (state == CloudConnectFrame::ReadState::Complete && !_rxBuf.isEmpty());
 }
 
 /*!