diff --git a/Test/FrmPkg/Core/DlEntryDump.c b/Test/FrmPkg/Core/DlEntryDump.c
index 646eccc..75b22e1 100644
--- a/Test/FrmPkg/Core/DlEntryDump.c
+++ b/Test/FrmPkg/Core/DlEntryDump.c
@@ -2764,6 +2764,9 @@ GLOBAL_REMOVE_IF_UNREFERENCED CHAR16  *mTxtEventTypeName[] = {
   L"OSSINITDATA_CAP_HASH",
   L"SINIT_PUBKEY_HASH",
   L"LCP_HASH",
+  L"LCP_DETAILS_HASH",
+  L"LCP_AUTHORITIES_HASH",
+  L"NV_INFO_HASH",
 };
 
 /**
@@ -2783,6 +2786,8 @@ EventTypeToString(
   if ((EventType >= TXT_EVTYPE_BASE) &&
       (EventType < TXT_EVTYPE_BASE + sizeof(mTxtEventTypeName)/sizeof(mTxtEventTypeName[0]))) {
     return mTxtEventTypeName[EventType - TXT_EVTYPE_BASE];
+  } else if (EventType == TXT_EVTYPE_CAP_VALUE) {
+    return L"CAP_VALUE";
   } else {
     if (EventType < sizeof(mEventTypeName) / sizeof(mEventTypeName[0])) {
       return mEventTypeName[EventType];
diff --git a/Test/FrmPkg/Core/Tpm.c b/Test/FrmPkg/Core/Tpm.c
index 86e4d8e..ce46113 100644
--- a/Test/FrmPkg/Core/Tpm.c
+++ b/Test/FrmPkg/Core/Tpm.c
@@ -374,12 +374,12 @@ CapPcr (
   case FRM_TPM_TYPE_TPM12:
     Tpm12GetRandom(sizeof(NonceData), (UINT8 *)&NonceData);
     Tpm12HashAndExtend(PcrIndex, (UINT8 *)&NonceData, sizeof(NonceData), &DigestToEntend);
-    Tpm12LogEvent(PcrIndex, EV_EVENT_TAG, &DigestToEntend, 0, NULL);
+    Tpm12LogEvent(PcrIndex, TXT_EVTYPE_CAP_VALUE, &DigestToEntend, 0, NULL);
     break;
   case FRM_TPM_TYPE_TPM2:
     Tpm2GetRandom(sizeof(RandomBytes.buffer), &RandomBytes);
     HashAndExtend (PcrIndex, (UINT8 *)&RandomBytes.buffer, sizeof(RandomBytes.buffer), &DigestList);
-    Tpm2LogEvent(PcrIndex, EV_EVENT_TAG, &DigestList, 0, NULL);
+    Tpm2LogEvent(PcrIndex, TXT_EVTYPE_CAP_VALUE, &DigestList, 0, NULL);
     break;
   }
 
diff --git a/Test/FrmPkg/Include/Library/Smx.h b/Test/FrmPkg/Include/Library/Smx.h
index 1eccd76..b3eb8b8 100644
--- a/Test/FrmPkg/Include/Library/Smx.h
+++ b/Test/FrmPkg/Include/Library/Smx.h
@@ -531,6 +531,10 @@ typedef union {
 #define TXT_EVTYPE_OSSINITDATA_CAP_HASH  (TXT_EVTYPE_BASE + 15)
 #define TXT_EVTYPE_SINIT_PUBKEY_HASH     (TXT_EVTYPE_BASE + 16)
 #define TXT_EVTYPE_LCP_HASH              (TXT_EVTYPE_BASE + 17)
+#define TXT_EVTYPE_LCP_DETAILS_HASH      (TXT_EVTYPE_BASE + 18)
+#define TXT_EVTYPE_LCP_AUTHORITIES_HASH  (TXT_EVTYPE_BASE + 19)
+#define TXT_EVTYPE_NV_INFO_HASH          (TXT_EVTYPE_BASE + 20)
+#define TXT_EVTYPE_CAP_VALUE             (TXT_EVTYPE_BASE + 255)
 
 #pragma pack (pop)