diff --git a/EdkCompatibilityPkg/Compatibility/PciCfgOnPciCfg2Thunk/PciCfgToPciCfg2Thunk.inf b/EdkCompatibilityPkg/Compatibility/PciCfgOnPciCfg2Thunk/PciCfgToPciCfg2Thunk.inf
index 4b5d09c575..9dbad54526 100644
--- a/EdkCompatibilityPkg/Compatibility/PciCfgOnPciCfg2Thunk/PciCfgToPciCfg2Thunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/PciCfgOnPciCfg2Thunk/PciCfgToPciCfg2Thunk.inf
@@ -29,7 +29,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = PciCfgToPciCfg2Thunk
+  BASE_NAME                      = PciCfgOnPciCfg2Thunk
   FILE_GUID                      = 717886AB-C40A-44cf-9114-4119E84B0DC7
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -45,7 +45,7 @@
 #
 
 [Sources.common]
-  PciCfgToPciCfg2Thunk.c
+  PciCfgOnPciCfg2Thunk.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2OnReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.inf b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2OnReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.inf
index 3d6f1f5df9..64664f1cd2 100644
--- a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2OnReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariable2OnReadOnlyVariableThunk/ReadOnlyVariable2ToReadOnlyVariableThunk.inf
@@ -27,7 +27,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = ReadOnlyVariable2ToReadOnlyVariableThunk
+  BASE_NAME                      = ReadOnlyVariable2OnReadOnlyVariableThunk
   FILE_GUID                      = 950216A2-A621-479c-A13D-2990617BDFE7
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -43,7 +43,7 @@
 #
 
 [Sources.common]
-  ReadOnlyVariable2ToReadOnlyVariableThunk.c
+  ReadOnlyVariable2OnReadOnlyVariableThunk.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableOnReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.inf b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableOnReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.inf
index 73362f3653..f3975c2f2c 100644
--- a/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableOnReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/ReadOnlyVariableOnReadOnlyVariable2Thunk/ReadOnlyVariableToReadOnlyVariable2Thunk.inf
@@ -25,7 +25,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = ReadOnlyVariableToReadOnlyVariable2Thunk
+  BASE_NAME                      = ReadOnlyVariableOnReadOnlyVariable2Thunk
   FILE_GUID                      = 0FDB764B-E669-4c69-83AC-5EDD99A2711E
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -41,7 +41,7 @@
 #
 
 [Sources.common]
-  ReadOnlyVariableToReadOnlyVariable2Thunk.c
+  ReadOnlyVariableOnReadOnlyVariable2Thunk.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcToUc2Thunk.inf b/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcToUc2Thunk.inf
index 760bd3829c..ffe2d3f29c 100644
--- a/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcToUc2Thunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/UcOnUc2Thunk/UcToUc2Thunk.inf
@@ -23,7 +23,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = UcToUc2Thunk
+  BASE_NAME                      = UcOnUc2Thunk
   FILE_GUID                      = FD76FF8E-665F-4afc-AF75-724EF5A569E5
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -38,7 +38,7 @@
 #
 
 [Sources.common]
-  UcToUc2Thunk.c
+  UcOnUc2Thunk.c
 
 [Packages]
   MdePkg/MdePkg.dec