diff --git a/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c b/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c
index 233f2a043c..38e5be3699 100644
--- a/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.c
@@ -163,7 +163,7 @@ typedef struct {
   EFI_UNICODE_COLLATION_PROTOCOL *UC;
 } UC2_PRIVATE_DATA;
 
-#define UC2_PRIVATE_DATA_FROM_THIS(a) CR (a, UC2_PRIVATE_DATA, UC, UC2_PRIVATE_DATA_SIGNATURE)
+#define UC2_PRIVATE_DATA_FROM_THIS(a) CR (a, UC2_PRIVATE_DATA, UC2, UC2_PRIVATE_DATA_SIGNATURE)
 
 //
 // Firmware Volume Protocol template
@@ -251,7 +251,7 @@ Uc2NotificationEvent (
     // Fill in rest of private data structure
     //
     Private->UC2.SupportedLanguages = AllocateZeroPool (RFC_3066_ENTRY_SIZE);
-    Status = ConvertIso639LanguageToRfc3066Language (Private->UC->SupportedLanguages ,Private->UC2.SupportedLanguages);
+    Status = ConvertIso639LanguageToRfc3066Language (Private->UC->SupportedLanguages, Private->UC2.SupportedLanguages);
 
     if (!EFI_ERROR (Status)) {
 
diff --git a/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.inf b/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.inf
index 50fae2da50..f65ed41032 100644
--- a/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/Uc2ToUcThunk/Uc2ToUcThunk.inf
@@ -2,7 +2,7 @@
 # Module produce UC2 on top of UC.
 #
 # UEFI 2.1 specification supersedes Inte's EFI Specification 1.10.
-# EFI_UNICODE_COLLATION_PROTOCOL defined in Inte's EFI Specification 1.10 is replaced by
+# UNICODE_COLLATION_PROTOCOL defined in Inte's EFI Specification 1.10 is replaced by
 # EFI_UNICODE_COLLATION_PROTOCOL in UEFI 2.1.
 # This module produces UC2 on top of UC. This module is used on platform when both of
 # these two conditions are true: