diff --git a/src/include/platform/NFCOnboardingPayloadManager.h b/src/include/platform/NFCOnboardingPayloadManager.h
index 71a720be1838a2..66a1fda6222537 100644
--- a/src/include/platform/NFCOnboardingPayloadManager.h
+++ b/src/include/platform/NFCOnboardingPayloadManager.h
@@ -32,7 +32,7 @@ namespace DeviceLayer {
 class NFCOnboardingPayloadManagerImpl;
 
 /**
- * @brief Defines an abstract interface for programming onboarding data in an NFC Tag.
+ * @brief Defines an abstract interface for programming an NFC Tag with onboarding payload.
  *
  * NFC Tag can be used in Project CHIP to share onboarding information such
  * as the device discriminator and PIN code with a commissioner. This class
diff --git a/src/include/platform/internal/GenericPlatformManagerImpl.ipp b/src/include/platform/internal/GenericPlatformManagerImpl.ipp
index b955fd27417cca..f714bb413a9201 100644
--- a/src/include/platform/internal/GenericPlatformManagerImpl.ipp
+++ b/src/include/platform/internal/GenericPlatformManagerImpl.ipp
@@ -119,7 +119,7 @@ CHIP_ERROR GenericPlatformManagerImpl<ImplClass>::_InitChipStack()
     }
     SuccessOrExit(err);
 
-    // Initialize the CHIP NFC manager for NFC Onboarding
+    // Initialize the NFC onboarding payload manager
 #if CHIP_DEVICE_CONFIG_ENABLE_NFC_ONBOARDING_PAYLOAD
     err = NFCOnboardingPayloadMgr().Init();
     VerifyOrExit(err == CHIP_NO_ERROR,