diff --git a/EdkCompatibilityPkg/Compatibility/Library/LanguageLib.c b/EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.c
similarity index 100%
rename from EdkCompatibilityPkg/Compatibility/Library/LanguageLib.c
rename to EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.c
diff --git a/EdkCompatibilityPkg/Compatibility/Library/LanguageLib.inf b/EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
similarity index 91%
rename from EdkCompatibilityPkg/Compatibility/Library/LanguageLib.inf
rename to EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
index 8b2959972d..715658c592 100644
--- a/EdkCompatibilityPkg/Compatibility/Library/LanguageLib.inf
+++ b/EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
@@ -18,7 +18,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = LanguageLib
+  BASE_NAME                      = UefiLanguageLib
   FILE_GUID                      = 283cad13-a151-4d55-be2d-96ea57392a82 
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -29,7 +29,7 @@
 #
 
 [Sources.common]
-  LanguageLib.c
+  UefiLanguageLib.c
 
 [Packages]
   MdePkg/MdePkg.dec
diff --git a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
index 9830f4f0dc..51130e5c1d 100644
--- a/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
+++ b/EdkCompatibilityPkg/EdkCompatibilityPkg.dsc
@@ -61,8 +61,8 @@ define GCC_MACRO                 = -DEFI_SPECIFICATION_VERSION=0x00020000 -DPI_S
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf
-  LanguageLib|EdkCompatibilityPkg/Compatibility/Library/LanguageLib.inf
-  
+  LanguageLib|EdkCompatibilityPkg/Compatibility/Library/UefiLanguageLib/UefiLanguageLib.inf
+    
 [LibraryClasses.common.PEIM]
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
   MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf