diff --git a/src/app/icd/ICDHandler.cpp b/src/app/icd/ICDHandler.cpp
index e70bb57e1c38ec..7ae11d996afd48 100644
--- a/src/app/icd/ICDHandler.cpp
+++ b/src/app/icd/ICDHandler.cpp
@@ -52,7 +52,7 @@ CHIP_ERROR CheckInMessageHandler::Init(Messaging::ExchangeManager * exchangeMana
 {
     VerifyOrReturnError(exchangeManager != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     mExchangeManager = exchangeManager;
-    ReturnErrorOnFailure(exchangeManager->RegisterUnsolicitedMessageHandlerForType(MsgType::ICD_CheckInRx, this));
+    ReturnErrorOnFailure(exchangeManager->RegisterUnsolicitedMessageHandlerForType(Protocols::CheckIn::MsgType::ICD_CheckInRx, this));
 
     return CHIP_NO_ERROR;
 }
@@ -62,14 +62,14 @@ void CheckInMessageHandler::Shutdown()
     // All timers(if used) need to be cleared here
     if (mExchangeManager)
     {
-        mExchangeManager->UnregisterUnsolicitedMessageHandlerForType(MsgType::ICD_CheckInRx);
+        mExchangeManager->UnregisterUnsolicitedMessageHandlerForType(Protocols::CheckIn::MsgType::ICD_CheckInRx);
         mExchangeManager = NULL;
     }
 }
 CHIP_ERROR CheckInMessageHandler::OnUnsolicitedMessageReceived(const PayloadHeader & payloadHeader, ExchangeDelegate *& newDelegate)
 {
     // Return error for wrong message type
-    if (!payloadHeader.HasMessageType(MsgType::ICD_CheckInRx))
+    if (!payloadHeader.HasMessageType(Protocols::CheckIn::MsgType::ICD_CheckInRx))
     {
         return CHIP_ERROR_INVALID_ARGUMENT;
     }