diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp
index 288d42e167f2f8..43c477b879e292 100644
--- a/src/transport/SessionManager.cpp
+++ b/src/transport/SessionManager.cpp
@@ -203,13 +203,10 @@ CHIP_ERROR SessionManager::PrepareMessage(const SessionHandle & sessionHandle, P
         CryptoContext::BuildNonce(nonce, packetHeader.GetSecurityFlags(), packetHeader.GetMessageCounter(), sourceNodeId);
         CHIP_ERROR err = CHIP_NO_ERROR;
         SecureSession * session = sessionHandle->AsSecureSession();
-        if (session == nullptr)
-        {
-            return CHIP_ERROR_NOT_CONNECTED;
-        }
+        VerifyOrReturnError(session == nullptr, CHIP_ERROR_NOT_CONNECTED);
         if (session->GetPeerAddress().GetTransportType() == Transport::Type::kTcp) {
             // support large payloads
-            err = SecureMessageCodec::Encrypt(CryptoContext(keyContext), nonce, payloadHeader, packetHeader, message, kLargePayloadMaxSizeBytes);
+            err = SecureMessageCodec::Encrypt(CryptoContext(keyContext), nonce, payloadHeader, packetHeader, message, kLargePayloadMaxMessageSizeBytes);
         } else {
             err = SecureMessageCodec::Encrypt(CryptoContext(keyContext), nonce, payloadHeader, packetHeader, message, kMaxAppMessageLen);
         }
diff --git a/src/transport/raw/MessageHeader.h b/src/transport/raw/MessageHeader.h
index 8b4165b6bc78ac..d76045e291340a 100644
--- a/src/transport/raw/MessageHeader.h
+++ b/src/transport/raw/MessageHeader.h
@@ -72,7 +72,7 @@ static_assert(detail::kMaxApplicationPayloadAndMICSizeBytes > kMaxTagLen, "Need
 // those in the header sizes.
 static constexpr size_t kMaxAppMessageLen = detail::kMaxApplicationPayloadAndMICSizeBytes - kMaxTagLen;
 // large payload limit
-static constexpr size_t kLargePayloadMaxSizeBytes   = 128000;
+static constexpr size_t kLargePayloadMaxMessageSizeBytes   = 128000;
 
 static constexpr uint16_t kMsgUnicastSessionIdUnsecured = 0x0000;