diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
index 34828eed7d..050e43a337 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDriver.c
@@ -137,7 +137,7 @@ InitializeTcg2VersionInfo (
     }
   } else {
     //
-    // EFI variable doesn't exist.
+    // EFI variable doesn't exist or variable size is not expected.
     //
 
     //
@@ -182,7 +182,7 @@ InitializeTcg2VersionInfo (
   //
   // Get the PCD value again.
   // If the PCD value is not equal to the value in variable,
-  // the PCD is not DynamicHii type and maps to the setup option.
+  // the PCD is not DynamicHii type and does not map to the setup option.
   //
   PcdTcg2PpiVersion = 0;
   CopyMem (
@@ -191,7 +191,7 @@ InitializeTcg2VersionInfo (
     AsciiStrSize ((CHAR8 *) PcdGetPtr (PcdTcgPhysicalPresenceInterfaceVer))
     );
   if (PcdTcg2PpiVersion != Tcg2Version.PpiVersion) {
-    DEBUG ((DEBUG_WARN, "WARNING: PcdTcgPhysicalPresenceInterfaceVer is not DynamicHii type and maps to TCG2_VERSION.PpiVersion\n"));
+    DEBUG ((DEBUG_WARN, "WARNING: PcdTcgPhysicalPresenceInterfaceVer is not DynamicHii type and does not map to TCG2_VERSION.PpiVersion\n"));
     DEBUG ((DEBUG_WARN, "WARNING: The TCG2 PPI version configuring from setup page will not work\n"));
   }
 
diff --git a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
index 4432daea81..f4a07c6420 100644
--- a/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
+++ b/SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigImpl.c
@@ -489,7 +489,7 @@ Tcg2VersionInfoCallback (
     // Get the PCD value after EFI_BROWSER_ACTION_SUBMITTED,
     // the SetVariable to TCG2_VERSION_NAME should have been done.
     // If the PCD value is not equal to the value set to variable,
-    // the PCD is not DynamicHii type and maps to the setup option.
+    // the PCD is not DynamicHii type and does not map to the setup option.
     //
     PcdTcg2PpiVersion = 0;
     CopyMem (
@@ -501,7 +501,7 @@ Tcg2VersionInfoCallback (
       CreatePopUp (
         EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
         &Key,
-        L"WARNING: PcdTcgPhysicalPresenceInterfaceVer is not DynamicHii type and maps to this option!",
+        L"WARNING: PcdTcgPhysicalPresenceInterfaceVer is not DynamicHii type and does not map to this option!",
         L"The version configuring by this setup option will not work!",
         NULL
         );