diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c
similarity index 94%
rename from IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
rename to IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c
index 58239f67d1..86c8dafea9 100644
--- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
+++ b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.c
@@ -24,7 +24,7 @@
 //
 // The Library classes this module consumes
 //
-#include <Library/FrameworkHiiLib.h>
+#include <Library/HiiLibFramework.h>
 #include <Library/DebugLib.h>
 #include <Library/MemoryAllocationLib.h>
 
diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf
similarity index 95%
rename from IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
rename to IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf
index cd56e01901..fb3d2f512b 100644
--- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
+++ b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf
@@ -21,7 +21,7 @@
 ################################################################################
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = FrameworkHiiLib
+  BASE_NAME                      = HiiLibFramework
   FILE_GUID                      = 1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.msa
similarity index 92%
rename from IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa
rename to IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.msa
index 2d0ad1e1dd..67e1f0d7f1 100644
--- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.msa
+++ b/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.msa
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <ModuleName>FrameworkHiiLib</ModuleName>
+    <ModuleName>HiiLibFramework</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
     <GuidValue>1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c</GuidValue>
     <Version>1.0</Version>
@@ -19,7 +19,7 @@
   <ModuleDefinitions>
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
     <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>FrameworkHiiLib</OutputFileBasename>
+    <OutputFileBasename>HiiLibFramework</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_PRODUCED" SupModuleList="DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER">
diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/CommonHeader.h b/IntelFrameworkPkg/Library/IfrSupportLibFramework/CommonHeader.h
similarity index 93%
rename from IntelFrameworkPkg/Library/FrameworkIfrSupportLib/CommonHeader.h
rename to IntelFrameworkPkg/Library/IfrSupportLibFramework/CommonHeader.h
index 552000f857..6d6137358f 100644
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/CommonHeader.h
+++ b/IntelFrameworkPkg/Library/IfrSupportLibFramework/CommonHeader.h
@@ -28,7 +28,7 @@
 //
 // The Library classes this module consumes
 //
-#include <Library/FrameworkIfrSupportLib.h>
+#include <Library/IfrSupportLibFramework.h>
 #include <Library/DebugLib.h>
 #include <Library/BaseLib.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrCommon.c
similarity index 100%
rename from IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
rename to IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrCommon.c
diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOnTheFly.c
similarity index 100%
rename from IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
rename to IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOnTheFly.c
diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOpCodeCreation.c
similarity index 100%
rename from IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c
rename to IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrOpCodeCreation.c
diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf
similarity index 93%
rename from IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf
rename to IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf
index 3fa870c7c7..7dcb22b6b1 100644
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf
+++ b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf
@@ -22,11 +22,11 @@
 ################################################################################
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = FrameworkIfrSupportLib
+  BASE_NAME                      = IfrSupportLibFramework
   FILE_GUID                      = ea55bada-d488-427b-9d2d-227e0aaa3707
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = FrameworkIfrSupportLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER 
+  LIBRARY_CLASS                  = IfrSupportLibFramework|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER 
   EDK_RELEASE_VERSION            = 0x00020000
   EFI_SPECIFICATION_VERSION      = 0x00020000
 
diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.msa b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.msa
similarity index 100%
rename from IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.msa
rename to IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.msa
diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c b/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrVariable.c
similarity index 100%
rename from IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrVariable.c
rename to IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrVariable.c