Index: lib/Comms/src/CloudConnectServer.cpp
===================================================================
diff -u -rcaca75be9a284ac5f98c078ec47c2e826ac5e980 -rc6a4b63a37f3beb1e8a51702ec3a56a1c32cfe8f
--- lib/Comms/src/CloudConnectServer.cpp	(.../CloudConnectServer.cpp)	(revision caca75be9a284ac5f98c078ec47c2e826ac5e980)
+++ lib/Comms/src/CloudConnectServer.cpp	(.../CloudConnectServer.cpp)	(revision c6a4b63a37f3beb1e8a51702ec3a56a1c32cfe8f)
@@ -45,17 +45,17 @@
 /*!
  * \brief   CloudConnectServer::send
  * \details Builds a CloudConnectFrame and writes it to the connected client.
- * \param   msgId     Message identifier for the frame header.
+ * \param   type      Message identifier for the frame header.
  * \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 no client is connected.
  */
-bool CloudConnectServer::send(CloudConnectFrame::MsgId msgId, quint16 sequence, const QByteArray &payload)
+bool CloudConnectServer::send(CloudConnectFrame::Type type, quint16 sequence, const QByteArray &payload)
 {
     if (_client == nullptr || _client->state() != QLocalSocket::ConnectedState) {
         return false;
     }
-    const QByteArray frame = CloudConnectFrame::build(msgId, sequence, payload);
+    const QByteArray frame = CloudConnectFrame::build(type, sequence, payload);
     _client->write(frame);
     _client->flush();
     return true;
@@ -119,22 +119,22 @@
 {
     _rxBuf.append(_client->readAll());
 
-    CloudConnectFrame::FeedResult result;
+    CloudConnectFrame::ReadState state;
     do {
-        result = _rxMsg.feed(_rxBuf);
-        switch (result) {
-            case CloudConnectFrame::FeedResult::Complete:
-                emit didMessageReceive(_rxMsg.msgId(), _rxMsg.sequence(), _rxMsg.payload());
+        state = _rxMsg.read(_rxBuf);
+        switch (state) {
+            case CloudConnectFrame::ReadState::Complete:
+                emit didMessageReceive(_rxMsg.type(), _rxMsg.sequence(), _rxMsg.payload());
                 _rxMsg.reset();
                 break;
-            case CloudConnectFrame::FeedResult::HeaderError:
+            case CloudConnectFrame::ReadState::HeaderError:
                 qWarning().noquote() << metaObject()->className() << ": header CRC error — frame dropped";
                 break;
-            case CloudConnectFrame::FeedResult::PayloadError:
+            case CloudConnectFrame::ReadState::PayloadError:
                 qWarning().noquote() << metaObject()->className() << ": payload CRC error — frame dropped";
                 break;
-            case CloudConnectFrame::FeedResult::Incomplete:
+            case CloudConnectFrame::ReadState::Incomplete:
                 break;
         }
-    } while (result == CloudConnectFrame::FeedResult::Complete && !_rxBuf.isEmpty());
+    } while (state == CloudConnectFrame::ReadState::Complete && !_rxBuf.isEmpty());
 }