diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index ba146bc..174d9d0 100644
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -1,15 +1,15 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SYSTEMD_SERVICE_${PN}-ledmanager_append_rainier += "obmc-led-set-all-groups-asserted@.service"
+SYSTEMD_SERVICE_${PN}_append_rainier += "obmc-led-set-all-groups-asserted@.service"
 
 # Copies config file having arguments for led-set-all-groups-asserted.sh
-SYSTEMD_ENVIRONMENT_FILE_${PN}-ledmanager_append_rainier +="obmc/led/set-all/groups/config"
+SYSTEMD_ENVIRONMENT_FILE_${PN}_append_rainier +="obmc/led/set-all/groups/config"
 
 # Use the JSON configuration file at runtime than the static led.yaml
 # Also, enable Lamp Test feature for rainier systems
 PACKAGECONFIG_append_rainier = " use-json use-lamp-test"
 
-pkg_postinst_${PN}-ledmanager_rainier () {
+pkg_postinst_${PN}_rainier () {
 
     # Needed this to run as part of BMC boot
     mkdir -p $D$systemd_system_unitdir/multi-user.target.wants
@@ -24,7 +24,7 @@
     ln -s $TARGET $LINK
 }
 
-pkg_prerm_${PN}-ledmanager_rainier () {
+pkg_prerm_${PN}_rainier () {
 
     LINK="$D$systemd_system_unitdir/multi-user.target.wants/obmc-led-set-all-groups-asserted@false.service"
     rm $LINK
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index d5e07e3..b8f4c52 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -52,7 +52,7 @@
 # obmc-led-manager
 #
 # Provides an implementation of the xyz.openbmc_project.ledmanager interface.
-VIRTUAL-RUNTIME_obmc-leds-manager ?= "phosphor-led-manager-ledmanager"
+VIRTUAL-RUNTIME_obmc-leds-manager ?= "phosphor-led-manager"
 
 # obmc-led-monitor
 #
diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
index beaf931..3f70891 100644
--- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
@@ -3,26 +3,17 @@
 PR = "r1"
 PV = "1.0+git${SRCPV}"
 
-require ${BPN}.inc
+require ${PN}.inc
 
 inherit autotools pkgconfig python3native
 inherit obmc-phosphor-dbus-service obmc-phosphor-systemd
 
-LED_MGR_PACKAGES = " \
-    ${PN}-ledmanager \
-    ${PN}-faultmonitor \
-"
-
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[use-json] = "--enable-use-json, --disable-use-json"
 PACKAGECONFIG[use-lamp-test] = "--enable-use-lamp-test, --disable-use-lamp-test"
 
-PACKAGE_BEFORE_PN += "${LED_MGR_PACKAGES}"
-ALLOW_EMPTY_${PN} = "1"
-
-DBUS_PACKAGES = "${PN}-ledmanager"
-
-SYSTEMD_PACKAGES = "${LED_MGR_PACKAGES}"
+SYSTEMD_PACKAGES = "${PN} ${PN}-faultmonitor"
+PACKAGE_BEFORE_PN += "${PN}-faultmonitor"
 
 DEPENDS += "${PYTHON_PN}-native"
 DEPENDS += "${PYTHON_PN}-pyyaml-native"
@@ -35,28 +26,27 @@
 
 DEPENDS += "virtual/${PN}-config-native"
 
-RDEPENDS_${PN}-ledmanager += "bash"
+RDEPENDS_${PN} += "bash"
 
 S = "${WORKDIR}/git"
 
-FILES_${PN}-ledmanager += "${bindir}/phosphor-ledmanager ${bindir}/led-set-all-groups-asserted.sh"
 FILES_${PN}-faultmonitor += "${bindir}/phosphor-fru-fault-monitor"
 
-DBUS_SERVICE_${PN}-ledmanager += "xyz.openbmc_project.LED.GroupManager.service"
+DBUS_SERVICE_${PN} += "xyz.openbmc_project.LED.GroupManager.service"
 
-SYSTEMD_SERVICE_${PN}-ledmanager += "obmc-led-group-start@.service obmc-led-group-stop@.service"
+SYSTEMD_SERVICE_${PN} += "obmc-led-group-start@.service obmc-led-group-stop@.service"
 SYSTEMD_SERVICE_${PN}-faultmonitor += "obmc-fru-fault-monitor.service"
 
-SYSTEMD_LINK_${PN}-ledmanager += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service"
+SYSTEMD_LINK_${PN} += "../obmc-led-group-start@.service:multi-user.target.wants/obmc-led-group-start@bmc_booted.service"
 
 STATES = "start stop"
 TMPLFMT = "obmc-led-group-{0}@.service"
 TGTFMT = "obmc-power-{0}@0.target"
 INSTFMT = "obmc-led-group-{0}@power_on.service"
 FMT = "../${TMPLFMT}:${TGTFMT}.wants/${INSTFMT}"
-SYSTEMD_LINK_${PN}-ledmanager += "${@compose_list(d, 'FMT', 'STATES')}"
+SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'STATES')}"
 
 # Install the override to set up a Conflicts relation
-SYSTEMD_OVERRIDE_${PN}-ledmanager += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf"
+SYSTEMD_OVERRIDE_${PN} += "bmc_booted.conf:obmc-led-group-start@bmc_booted.service.d/bmc_booted.conf"
 
 EXTRA_OECONF = "YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN}"
diff --git a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend
index 760a12a..6708a6a 100644
--- a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend
+++ b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend
@@ -4,7 +4,7 @@
     op-proc-control \
     openpower-esel-parser \
     phosphor-debug-collector \
-    phosphor-led-manager-ledmanager \
+    phosphor-led-manager \
     phosphor-mapper \
     phosphor-state-manager \
 "