diff --git a/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h b/IntelFrameworkPkg/Include/Library/HiiLibFramework.h
similarity index 100%
rename from IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
rename to IntelFrameworkPkg/Include/Library/HiiLibFramework.h
diff --git a/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h b/IntelFrameworkPkg/Include/Library/IfrSupportLibFramework.h
similarity index 100%
rename from IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
rename to IntelFrameworkPkg/Include/Library/IfrSupportLibFramework.h
diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec
index e581a0fa41..ee742a2ea6 100644
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dec
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -47,8 +47,8 @@
 #
 ################################################################################
 [LibraryClass.common]
-  FrameworkHiiLib|Include/Library/FrameworkHiiLib.h
-  FrameworkIfrSupportLib|Include/Library/FrameworkIfrSupportLib.h
+  HiiLibFramework|Include/Library/HiiLibFramework.h
+  IfrSupportLibFramework|Include/Library/IfrSupportLibFramework.h
 
 
 
diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dsc b/IntelFrameworkPkg/IntelFrameworkPkg.dsc
index 067ac03558..91431348d6 100644
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dsc
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dsc
@@ -65,6 +65,6 @@
   ${WORKSPACE}/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
   ${WORKSPACE}/IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.inf
   ${WORKSPACE}/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
-  ${WORKSPACE}/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
+  ${WORKSPACE}/IntelFrameworkPkg/Library/HiiLibFramework/HiiLib.inf
   ${WORKSPACE}/IntelFrameworkPkg/Library/DxeReportStatusCodeLibFramework/DxeReportStatusCodeLib.inf
-  ${WORKSPACE}/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf
\ No newline at end of file
+  ${WORKSPACE}/IntelFrameworkPkg/Library/IfrSupportLibFramework/IfrSupportLib.inf
\ No newline at end of file
diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.nspd b/IntelFrameworkPkg/IntelFrameworkPkg.nspd
index f1eafef9d5..49b4f9c76f 100644
--- a/IntelFrameworkPkg/IntelFrameworkPkg.nspd
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.nspd
@@ -20,8 +20,8 @@
     <RePackage>false</RePackage>
   </PackageDefinitions>
   <LibraryClassDeclarations>
-    <LibraryClass Name="FrameworkHiiLib">
-      <IncludeHeader>Include/Library/FrameworkHiiLib.h</IncludeHeader>
+    <LibraryClass Name="HiiLibFramework">
+      <IncludeHeader>Include/Library/HiiLibFramework.h</IncludeHeader>
       <HelpText>This library provide the service function for package manipulations based on Intel Framework HII specification.</HelpText>
     </LibraryClass>
   </LibraryClassDeclarations>