diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
index ba3f631443..bfab83ac86 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
@@ -853,7 +853,7 @@ DeviceManagerCallback (
 **/
 EFI_STATUS
 EFIAPI
-DeviceManagerLibConstructor (
+DeviceManagerUiLibConstructor (
   IN EFI_HANDLE                            ImageHandle,
   IN EFI_SYSTEM_TABLE                      *SystemTable
 )
@@ -878,7 +878,7 @@ DeviceManagerLibConstructor (
                   &mDeviceManagerGuid,
                   gDeviceManagerPrivate.DriverHandle,
                   DeviceManagerVfrBin,
-                  DeviceManagerLibStrings,
+                  DeviceManagerUiLibStrings,
                   NULL
                   );
   ASSERT (gDeviceManagerPrivate.HiiHandle != NULL);
@@ -901,7 +901,7 @@ DeviceManagerLibConstructor (
 **/
 EFI_STATUS
 EFIAPI
-DeviceManagerLibDestructor(
+DeviceManagerUiLibDestructor(
   IN EFI_HANDLE                            ImageHandle,
   IN EFI_SYSTEM_TABLE                      *SystemTable
 )
diff --git a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
index 7baf56615f..1dc665b940 100644
--- a/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
+++ b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
@@ -13,14 +13,14 @@
 ##
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = DeviceManagerLib
-  MODULE_UNI_FILE                = DeviceManagerLib.uni
+  BASE_NAME                      = DeviceManagerUiLib
+  MODULE_UNI_FILE                = DeviceManagerUiLib.uni
   FILE_GUID                      = 75EBDC2E-5323-4F31-A41D-FD1A7A9FC65E
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
   LIBRARY_CLASS                  = NULL|DXE_DRIVER UEFI_APPLICATION
-  CONSTRUCTOR                    = DeviceManagerLibConstructor
-  DESTRUCTOR                     = DeviceManagerLibDestructor
+  CONSTRUCTOR                    = DeviceManagerUiLibConstructor
+  DESTRUCTOR                     = DeviceManagerUiLibDestructor
 #
 # The following information is for reference only and not required by the build tools.
 #