diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
index 1cca366..265ea1e 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets.bb
@@ -48,7 +48,7 @@
 
 CHASSIS_FMT = "obmc-chassis-{0}@.target"
 SYNCH_POWER_FMT = "obmc-power-{0}@.target"
-CHASSIS_POWER_FMT = "obmc-power-chassis-{0}@.target"
+CHASSIS_POWER_FMT = "obmc-chassis-power{0}@.target"
 CHASSIS_POWER_FMT_2 = "obmc-chassis-{0}@.target"
 HOST_SYNCH_FMT = "obmc-host-{0}@.target"
 HOST_ACTION_FMT = "obmc-{0}-host@.target"
@@ -56,7 +56,7 @@
 
 CHASSIS_LINK_FMT = "${CHASSIS_FMT}:obmc-chassis-{0}@{1}.target"
 SYNCH_POWER_LINK_FMT = "${SYNCH_POWER_FMT}:obmc-power-{0}@{1}.target"
-CHASSIS_POWER_LINK_FMT = "${CHASSIS_POWER_FMT}:obmc-power-chassis-{0}@{1}.target"
+CHASSIS_POWER_LINK_FMT = "${CHASSIS_POWER_FMT}:obmc-chassis-power{0}@{1}.target"
 CHASSIS_POWER_LINK_FMT_2 = "${CHASSIS_POWER_FMT_2}:obmc-chassis-{0}@{1}.target"
 HOST_LINK_SYNCH_FMT = "${HOST_SYNCH_FMT}:obmc-host-{0}@{1}.target"
 HOST_LINK_ACTION_FMT = "${HOST_ACTION_FMT}:obmc-{0}-host@{1}.target"
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-off@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
similarity index 87%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-off@.target
rename to meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
index ceba1e3..bf775fd 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-off@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweroff@.target
@@ -4,6 +4,6 @@
 After={SYSTEMD_DEFAULT_TARGET}
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 Conflicts=obmc-chassis-reset@%i.target
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
similarity index 75%
rename from meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target
rename to meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
index 32250a4..bb7e797 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-chassis-on@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-poweron@.target
@@ -4,7 +4,7 @@
 After={SYSTEMD_DEFAULT_TARGET}
 Wants=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
 After=mapper-wait@-xyz-openbmc_project-state-chassis%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStop=yes
-OnFailure=obmc-power-chassis-off@%i.target
+OnFailure=obmc-chassis-poweroff@%i.target
 OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target
index ce9e3b0..2ef6c70 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-reset@.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Chassis%i (Reset Check)
-Conflicts=obmc-power-chassis-off%i.target
+Conflicts=obmc-chassis-poweroff%i.target
 RefuseManualStop=yes
 
 [Install]
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
index 0fccea2..bc887b3 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-chassis-stop@.target
@@ -6,5 +6,5 @@
 After=mapper-wait@-org-openbmc-control-chassis%i.service
 Conflicts=obmc-chassis-start@%i.target
 RefuseManualStop=yes
-OnFailure=obmc-power-chassis-off@%i.target
+OnFailure=obmc-chassis-poweroff@%i.target
 OnFailureJobMode=flush
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
index 0ca4aa9..c47b21e 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-off@.target
@@ -2,6 +2,6 @@
 Description=Power%i (Off)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After=obmc-power-stop@%i.target
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
index 6eefba0..52135ff 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-on@.target
@@ -2,6 +2,6 @@
 Description=Power%i (On)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After=obmc-power-start@%i.target
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
index 5c8d3e6..d24d401 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-reset-on@.target
@@ -1,5 +1,5 @@
 [Unit]
 Description=Chassis%i power on after reset
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
index 2900d16..1a1ea63 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start-pre@.target
@@ -2,6 +2,6 @@
 Description=Power%i On (Pre)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
index 355ab1c..a977d5a 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-start@.target
@@ -2,6 +2,6 @@
 Description=Power%i On
 After=obmc-power-start-pre@%i.target
 Wants={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
index d28871b..2f130c9 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop-pre@.target
@@ -2,6 +2,6 @@
 Description=Power%i Off (Pre)
 Wants={SYSTEMD_DEFAULT_TARGET}
 After={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
index edf6697..b32d76f 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-power-stop@.target
@@ -2,7 +2,7 @@
 Description=Power%i Off
 After=obmc-power-stop-pre@%i.target
 Wants={SYSTEMD_DEFAULT_TARGET}
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 Conflicts=fsi-disable.service
 RefuseManualStart=yes
 RefuseManualStop=yes
diff --git a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target
index d0473b0..4f10419 100644
--- a/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target
+++ b/meta-phosphor/common/recipes-core/systemd/obmc-targets/obmc-quiesce-host@.target
@@ -3,4 +3,4 @@
 Wants={SYSTEMD_DEFAULT_TARGET}
 After={SYSTEMD_DEFAULT_TARGET}
 RefuseManualStop=yes
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
index 6217e14..44421bd 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
@@ -25,12 +25,12 @@
 SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/power_control"
 
 START_TMPL = "op-power-start@.service"
-START_TGTFMT = "obmc-power-chassis-on@{1}.target"
+START_TGTFMT = "obmc-chassis-poweron@{1}.target"
 START_INSTFMT = "op-power-start@{0}.service"
 START_FMT = "../${START_TMPL}:${START_TGTFMT}.requires/${START_INSTFMT}"
 
 STOP_TMPL = "op-power-stop@.service"
-STOP_TGTFMT = "obmc-power-chassis-off@{1}.target"
+STOP_TGTFMT = "obmc-chassis-poweroff@{1}.target"
 STOP_INSTFMT = "op-power-stop@{0}.service"
 STOP_FMT = "../${STOP_TMPL}:${STOP_TGTFMT}.requires/${STOP_INSTFMT}"
 
@@ -65,15 +65,15 @@
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'RESET_ON_CHASSIS_FMT', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 
 # Now show that the main control target requires these power targets
-START_TMPL_CTRL = "obmc-power-chassis-on@.target"
+START_TMPL_CTRL = "obmc-chassis-poweron@.target"
 START_TGTFMT_CTRL = "obmc-chassis-start@{1}.target"
-START_INSTFMT_CTRL = "obmc-power-chassis-on@{0}.target"
+START_INSTFMT_CTRL = "obmc-chassis-poweron@{0}.target"
 START_FMT_CTRL = "../${START_TMPL_CTRL}:${START_TGTFMT_CTRL}.requires/${START_INSTFMT_CTRL}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'START_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 
-STOP_TMPL_CTRL = "obmc-power-chassis-off@.target"
+STOP_TMPL_CTRL = "obmc-chassis-poweroff@.target"
 STOP_TGTFMT_CTRL = "obmc-chassis-stop@{1}.target"
-STOP_INSTFMT_CTRL = "obmc-power-chassis-off@{0}.target"
+STOP_INSTFMT_CTRL = "obmc-chassis-poweroff@{0}.target"
 STOP_FMT_CTRL = "../${STOP_TMPL_CTRL}:${STOP_TGTFMT_CTRL}.requires/${STOP_INSTFMT_CTRL}"
 SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'STOP_FMT_CTRL', 'OBMC_POWER_INSTANCES', 'OBMC_CHASSIS_INSTANCES')}"
 
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
index 0813123..f76695e 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-start@.service
@@ -6,7 +6,7 @@
 After=obmc-fan-control.target
 Wants=mapper-wait@-org-openbmc-control-power%i.service
 After=mapper-wait@-org-openbmc-control-power%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
index 9120a87..86ddf4a 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-power-stop@.service
@@ -5,7 +5,7 @@
 After=obmc-power-stop-pre@%i.target
 Wants=mapper-wait@-org-openbmc-control-power%i.service
 After=mapper-wait@-org-openbmc-control-power%i.service
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 
 [Service]
 RemainAfterExit=yes
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
index e41950d..cb78804 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-chassis-on@.service
@@ -7,7 +7,7 @@
 
 [Service]
 RemainAfterExit=no
-ExecStart=/bin/systemctl start obmc-power-chassis-on@%i.target
+ExecStart=/bin/systemctl start obmc-chassis-poweron@%i.target
 
 
 [Install]
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service
index b009537..2a46151 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-pgood-check@.service
@@ -4,7 +4,7 @@
 After=mapper-wait@-org-openbmc-control-power%i.service
 Wants=obmc-power-reset-on@%i.target
 Before=obmc-power-reset-on@%i.target
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
 RemainAfterExit=no
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service
index 4d58d61..da852ff 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-reset-set-power-on@.service
@@ -4,7 +4,7 @@
 Requires=obmc-power-reset-on@%i.target
 After=op-reset-pgood-check@%i.service
 Requires=op-reset-pgood-check@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
 RemainAfterExit=no
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
index 46e413e..32ae694 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-off@.service
@@ -5,7 +5,7 @@
 Before=obmc-power-stop@%i.target
 Wants=mapper-wait@-org-openbmc-control-power%i.service
 After=mapper-wait@-org-openbmc-control-power%i.service
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 
 [Service]
 Type=oneshot
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
index d612d61..1c85fc1 100644
--- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
+++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power/op-wait-power-on@.service
@@ -5,7 +5,7 @@
 Before=obmc-power-start@%i.target
 Wants=mapper-wait@-org-openbmc-control-power%i.service
 After=mapper-wait@-org-openbmc-control-power%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 ConditionPathExists=!/run/openbmc/chassis@%i-on
 
 [Service]
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb
index e43a5b4..2d52a26 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb
+++ b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd.bb
@@ -36,7 +36,7 @@
 }
 
 TMPL = "mboxd-reload@.service"
-TGTFMT = "obmc-power-chassis-off@{0}.target"
+TGTFMT = "obmc-chassis-poweroff@{0}.target"
 INSTFMT = "mboxd-reload@{0}.service"
 FMT = "../${TMPL}:${TGTFMT}.wants/${INSTFMT}"
 
diff --git a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
index 9a8d844..1b89de9 100644
--- a/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
+++ b/meta-phosphor/common/recipes-phosphor/mboxd/mboxd/mboxd-reload@.service
@@ -2,7 +2,7 @@
 Description=Reload mboxd after power off
 Wants=op-wait-power-off@%i.service
 After=op-wait-power-off@%i.service
-Conflicts=obmc-power-chassis-on@%i.target
+Conflicts=obmc-chassis-poweron@%i.target
 
 [Service]
 Type=oneshot
@@ -10,4 +10,4 @@
 ExecStart={sbindir}/mboxctl --reset
 
 [Install]
-WantedBy=obmc-power-chassis-off@%i.target
+WantedBy=obmc-chassis-poweroff@%i.target
diff --git a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
index dd2c5e9..c2963d9 100644
--- a/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
+++ b/meta-phosphor/common/recipes-phosphor/state/phosphor-state-manager.bb
@@ -50,6 +50,6 @@
 FILES_${PN}-discover = "${sbindir}/phosphor-discover-system-state"
 
 SRC_URI += "git://github.com/openbmc/phosphor-state-manager"
-SRCREV = "3ed10085ae988b08e8230d35693d370bf75f0574"
+SRCREV = "697474c5491f6840ae7c6fc64b7364d23b7e87b8"
 
 S = "${WORKDIR}/git"