diff --git a/EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvHobToFvInfoThunk.c b/EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvInfoToFvHobThunk.c
similarity index 96%
rename from EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvHobToFvInfoThunk.c
rename to EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvInfoToFvHobThunk.c
index 00e971f3e1..a98331edc0 100644
--- a/EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvHobToFvInfoThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvInfoToFvHobThunk.c
@@ -84,7 +84,7 @@ FvInfoPpiInstalled (
 **/
 EFI_STATUS
 EFIAPI
-FvHobtoFvInfoThunkEntry (
+PeimEntry (
   IN EFI_PEI_FILE_HANDLE       FfsHeader,
   IN CONST EFI_PEI_SERVICES    **PeiServices
   )
diff --git a/EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvHobToFvInfoThunk.inf b/EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvInfoToFvHobThunk.inf
similarity index 92%
rename from EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvHobToFvInfoThunk.inf
rename to EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvInfoToFvHobThunk.inf
index b8bfbf9d5e..d9fec783f8 100644
--- a/EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvHobToFvInfoThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/FvHobToFvInfoThunk/FvInfoToFvHobThunk.inf
@@ -25,14 +25,14 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = FvHobToFvInfoThunk
+  BASE_NAME                      = FvInfoToFvHobThunk
   FILE_GUID                      = 9E00A9F6-B88E-4ab5-A825-15970E12731A
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
-  ENTRY_POINT                    = FvHobtoFvInfoThunkEntry
+  ENTRY_POINT                    = PeimEntry
 
 #
 # The following information is for reference only and not required by the build tools.