diff --git a/MdeModulePkg/Library/DeviceManagerLib/DeviceManager.c b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
similarity index 100%
rename from MdeModulePkg/Library/DeviceManagerLib/DeviceManager.c
rename to MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.c
diff --git a/MdeModulePkg/Library/DeviceManagerLib/DeviceManager.h b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.h
similarity index 100%
rename from MdeModulePkg/Library/DeviceManagerLib/DeviceManager.h
rename to MdeModulePkg/Library/DeviceManagerUiLib/DeviceManager.h
diff --git a/MdeModulePkg/Library/DeviceManagerLib/DeviceManagerStrings.uni b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
similarity index 100%
rename from MdeModulePkg/Library/DeviceManagerLib/DeviceManagerStrings.uni
rename to MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerStrings.uni
diff --git a/MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.inf b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
similarity index 100%
rename from MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.inf
rename to MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf
diff --git a/MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.uni b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.uni
similarity index 100%
rename from MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.uni
rename to MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.uni
diff --git a/MdeModulePkg/Library/DeviceManagerLib/DeviceManagerVfr.Vfr b/MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr
similarity index 100%
rename from MdeModulePkg/Library/DeviceManagerLib/DeviceManagerVfr.Vfr
rename to MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerVfr.Vfr