diff --git a/src/lib/deskflow/ClipboardChunk.cpp b/src/lib/deskflow/ClipboardChunk.cpp
index 6f95c751c..1b88e4fa9 100644
--- a/src/lib/deskflow/ClipboardChunk.cpp
+++ b/src/lib/deskflow/ClipboardChunk.cpp
@@ -28,7 +28,7 @@ ClipboardChunk *ClipboardChunk::start(ClipboardID id, uint32_t sequence, const s
 
   chunk[0] = id;
   std::memcpy(&chunk[1], &sequence, 4);
-  chunk[5] = kDataStart;
+  chunk[5] = ChunkType::DataStart;
   memcpy(&chunk[6], size.c_str(), sizeLength);
   chunk[sizeLength + s_clipboardChunkMetaSize - 1] = '\0';
 
@@ -43,7 +43,7 @@ ClipboardChunk *ClipboardChunk::data(ClipboardID id, uint32_t sequence, const st
 
   chunkData[0] = id;
   std::memcpy(&chunkData[1], &sequence, 4);
-  chunkData[5] = kDataChunk;
+  chunkData[5] = ChunkType::DataChunk;
   memcpy(&chunkData[6], data.c_str(), dataSize);
   chunkData[dataSize + s_clipboardChunkMetaSize - 1] = '\0';
 
@@ -57,9 +57,8 @@ ClipboardChunk *ClipboardChunk::end(ClipboardID id, uint32_t sequence)
 
   chunk[0] = id;
   std::memcpy(&chunk[1], &sequence, 4);
-  chunk[5] = kDataEnd;
+  chunk[5] = ChunkType::DataEnd;
   chunk[s_clipboardChunkMetaSize - 1] = '\0';
-
   return end;
 }
 
@@ -74,15 +73,15 @@ ClipboardChunk::assemble(deskflow::IStream *stream, std::string &dataCached, Cli
     return Error;
   }
 
-  if (mark == kDataStart) {
+  if (mark == ChunkType::DataStart) {
     s_expectedSize = deskflow::string::stringToSizeType(data);
     LOG((CLOG_DEBUG "start receiving clipboard data"));
     dataCached.clear();
     return Started;
-  } else if (mark == kDataChunk) {
+  } else if (mark == ChunkType::DataChunk) {
     dataCached.append(data);
-    return InProgress;
-  } else if (mark == kDataEnd) {
+    return TransferState::InProgress;
+  } else if (mark == ChunkType::DataEnd) {
     // validate
     if (id >= kClipboardEnd) {
       return Error;
@@ -111,15 +110,15 @@ void ClipboardChunk::send(deskflow::IStream *stream, void *data)
   std::string dataChunk(&chunk[6], clipboardData->m_dataSize);
 
   switch (mark) {
-  case kDataStart:
+  case ChunkType::DataStart:
     LOG((CLOG_DEBUG2 "sending clipboard chunk start: size=%s", dataChunk.c_str()));
     break;
 
-  case kDataChunk:
+  case ChunkType::DataChunk:
     LOG((CLOG_DEBUG2 "sending clipboard chunk data: size=%i", dataChunk.size()));
     break;
 
-  case kDataEnd:
+  case ChunkType::DataEnd:
     LOG((CLOG_DEBUG2 "sending clipboard finished"));
     break;
   }
diff --git a/src/lib/deskflow/ProtocolTypes.h b/src/lib/deskflow/ProtocolTypes.h
index be187beed..8c4e168b4 100644
--- a/src/lib/deskflow/ProtocolTypes.h
+++ b/src/lib/deskflow/ProtocolTypes.h
@@ -195,17 +195,17 @@ enum EDirectionMask
  *
  * @since Protocol version 1.5
  */
-enum EDataTransfer
+struct ChunkType
 {
-  kDataStart = 1, ///< Start of transfer (contains file size)
-  kDataChunk = 2, ///< Data chunk (contains file content)
-  kDataEnd = 3    ///< End of transfer (transfer complete)
+  inline static const auto DataStart = 1; ///< Start of transfer (contains file size)
+  inline static const auto DataChunk = 2; ///< Data chunk (contains file content)
+  inline static const auto DataEnd = 3;   ///< End of transfer (transfer complete)
 };
 
 /**
- * @brief Data reception status codes
+ * @brief Data reception state codes
  *
- * Used internally to track the status of data reception
+ * Used internally to track the state of data reception
  * during clipboard operations.
  *
  * @since Protocol version 1.5
diff --git a/src/unittests/deskflow/ClipboardChunksTests.cpp b/src/unittests/deskflow/ClipboardChunksTests.cpp
index 212ca62de..c8eab3fad 100644
--- a/src/unittests/deskflow/ClipboardChunksTests.cpp
+++ b/src/unittests/deskflow/ClipboardChunksTests.cpp
@@ -21,7 +21,7 @@ void ClipboardChunksTests::startFormatData()
 
   QCOMPARE(chunk->m_chunk[0], id);
   QCOMPARE(temp_m_chunk, sequence);
-  QCOMPARE(chunk->m_chunk[5], kDataStart);
+  QCOMPARE(chunk->m_chunk[5], ChunkType::DataStart);
   QCOMPARE(chunk->m_chunk[6], '1');
   QCOMPARE(chunk->m_chunk[7], '0');
   QCOMPARE(chunk->m_chunk[8], '\0');
@@ -37,7 +37,7 @@ void ClipboardChunksTests::formatDataChunk()
 
   QCOMPARE(chunk->m_chunk[0], id);
   QCOMPARE((uint32_t)chunk->m_chunk[1], sequence);
-  QCOMPARE(chunk->m_chunk[5], kDataChunk);
+  QCOMPARE(chunk->m_chunk[5], ChunkType::DataChunk);
   QCOMPARE(chunk->m_chunk[6], 'm');
   QCOMPARE(chunk->m_chunk[7], 'o');
   QCOMPARE(chunk->m_chunk[8], 'c');
@@ -60,7 +60,7 @@ void ClipboardChunksTests::endFormatData()
 
   QCOMPARE(chunk->m_chunk[0], id);
   QCOMPARE((uint32_t)chunk->m_chunk[1], sequence);
-  QCOMPARE(chunk->m_chunk[5], kDataEnd);
+  QCOMPARE(chunk->m_chunk[5], ChunkType::DataEnd);
   QCOMPARE(chunk->m_chunk[6], '\0');
 
   delete chunk;