diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BmLib.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/BmLib.c
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenance.c
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManager.h b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManager.h
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManager.vfr b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManager.vfr
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerStrings.uni b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerStrings.uni
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.inf b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.inf
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.uni
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.uni
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootOption.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/BootOption.c
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/ConsoleOption.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/ConsoleOption.c
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/Data.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Data.c
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/Data.c
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/Data.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/FormGuid.h b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/FormGuid.h
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/UpdatePage.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/UpdatePage.c
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/Variable.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
similarity index 100%
rename from MdeModulePkg/Library/BootMaintenanceManagerLib/Variable.c
rename to MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c