8 files changed, 20 insertions, 20 deletions
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 7f98ec5d2f..af1486b2c6 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -80,8 +80,8 @@
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
-  HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf
-  IfrSupportLibFramework|IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf
+  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
+  FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf
   PciIncompatibleDeviceSupportLib|IntelFrameworkModulePkg/Library/PciIncompatibleDeviceSupportLib/PciIncompatibleDeviceSupportLib.inf
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   GraphicsLib|IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
@@ -98,8 +98,8 @@
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
   ReportStatusCodeLib|IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
-  HiiLibFramework|IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf
-  IfrSupportLibFramework|IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf
+  FrameworkHiiLib|IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
+  FrameworkIfrSupportLib|IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
 
 ################################################################################
diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
index 50eb1f56bc..5ab779a6a3 100644
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
@@ -25,7 +25,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/GraphicsOutput.h>
 #include <Protocol/FirmwareVolume2.h>
 #include <Protocol/UgaDraw.h>
-#include <Protocol/HiiFramework.h>
+#include <Protocol/FrameworkHii.h>
 
 #include <Guid/Bmp.h>
 
diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
index e32927d7a7..fbf93ece95 100644
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -20,8 +20,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <PiDxe.h>
 
-#include <Protocol/FormCallbackFramework.h>
-#include <Protocol/HiiFramework.h>
+#include <Protocol/FrameworkFormCallback.h>
+#include <Protocol/FrameworkHii.h>
 
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
@@ -29,10 +29,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiDriverEntryPoint.h>
 #include <Library/BaseLib.h>
 #include <Library/PrintLib.h>
-#include <Library/IfrSupportLibFramework.h>
+#include <Library/FrameworkIfrSupportLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/HiiLibFramework.h>
+#include <Library/FrameworkHiiLib.h>
 
 #include "NVDataStruc.h"
 
diff --git a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index 2a552838b0..aff2ae4695 100644
--- a/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -46,10 +46,10 @@
 
 
 [LibraryClasses]
-  HiiLibFramework
+  FrameworkHiiLib
   MemoryAllocationLib
   BaseMemoryLib
-  IfrSupportLibFramework
+  FrameworkIfrSupportLib
   PrintLib
   BaseLib
   UefiDriverEntryPoint
diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
index 077a0cccdc..1498f3cc9e 100644
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
@@ -21,8 +21,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <PiDxe.h>
 
 #include <Guid/GlobalVariable.h>
-#include <Protocol/FormCallbackFramework.h>
-#include <Protocol/HiiFramework.h>
+#include <Protocol/FrameworkFormCallback.h>
+#include <Protocol/FrameworkHii.h>
 
 #include <Library/BaseLib.h>
 #include <Library/DebugLib.h>
@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseMemoryLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/IfrSupportLibFramework.h>
+#include <Library/FrameworkIfrSupportLib.h>
 
 //
 // HII Database Global data
diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf
index a106feb14e..3e8c6d57f0 100644
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf
@@ -46,7 +46,7 @@
   IntelFrameworkPkg/IntelFrameworkPkg.dec
 
 [LibraryClasses]
-  IfrSupportLibFramework
+  FrameworkIfrSupportLib
   UefiRuntimeServicesTableLib
   UefiBootServicesTableLib
   BaseMemoryLib
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
index bc26a5905d..098077776f 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -18,9 +18,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include <PiDxe.h>
 
-#include <Protocol/FormCallbackFramework.h>
-#include <Protocol/FormBrowserFramework.h>
-#include <Protocol/HiiFramework.h>
+#include <Protocol/FrameworkFormCallback.h>
+#include <Protocol/FrameworkFormBrowser.h>
+#include <Protocol/FrameworkHii.h>
 #include <Protocol/Print.h>
 
 #include <Library/BaseLib.h>
@@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PrintLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/HiiLibFramework.h>
+#include <Library/FrameworkHiiLib.h>
 #include <Library/GraphicsLib.h>
 
 
diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf
index 2b811953e1..f01b83d757 100644
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/SetupBrowser.inf
@@ -54,7 +54,7 @@
 
 [LibraryClasses]
   GraphicsLib
-  HiiLibFramework
+  FrameworkHiiLib
   UefiRuntimeServicesTableLib
   UefiBootServicesTableLib
   PrintLib