diff --git a/service_files/obmc-power-start@.service b/service_files/obmc-power-start@.service
index 10d4a3b..a21f012 100644
--- a/service_files/obmc-power-start@.service
+++ b/service_files/obmc-power-start@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Start Power%i
+Description=Start Power On for Chassis%i
 Wants=obmc-power-start@%i.target
 Before=obmc-power-start@%i.target
 Wants=obmc-power-start-pre@%i.target
@@ -17,4 +17,4 @@
 SyslogIdentifier=phosphor-power-start
 
 [Install]
-WantedBy=obmc-host-start@%i.target
+WantedBy=obmc-chassis-poweron@%i.target
diff --git a/service_files/obmc-power-stop@.service b/service_files/obmc-power-stop@.service
index e5e821a..52c79f2 100644
--- a/service_files/obmc-power-stop@.service
+++ b/service_files/obmc-power-stop@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Stop Power%i
+Description=Start Power Off for Chassis%i
 Wants=obmc-power-stop@%i.target
 Before=obmc-power-stop@%i.target
 Wants=obmc-power-stop-pre@%i.target
@@ -14,4 +14,4 @@
 SyslogIdentifier=obmc-power-stop
 
 [Install]
-WantedBy=obmc-host-stop@%i.target
+WantedBy=obmc-chassis-poweroff@%i.target
diff --git a/service_files/obmc-powered-off@.service b/service_files/obmc-powered-off@.service
index 434e0da..cd45cbd 100644
--- a/service_files/obmc-powered-off@.service
+++ b/service_files/obmc-powered-off@.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Power is off to chassis%i
+Description=Power is off to Chassis%i
 After=phosphor-wait-power-off@%i.service
 Requires=phosphor-wait-power-off@%i.service
 
@@ -14,6 +14,7 @@
 # services may conflict with this target to ensure they
 # are stopped at the appropriate time.
 ExecStart=/bin/systemctl start obmc-chassis-powered-off@%i.target
+SyslogIdentifier=phosphor-powered-off
 
 
 [Install]
diff --git a/service_files/phosphor-reset-chassis-on@.service b/service_files/phosphor-reset-chassis-on@.service
index d7555b7..f403fa9 100644
--- a/service_files/phosphor-reset-chassis-on@.service
+++ b/service_files/phosphor-reset-chassis-on@.service
@@ -9,7 +9,7 @@
 [Service]
 RemainAfterExit=no
 ExecStart=/bin/systemctl start obmc-chassis-poweron@%i.target
-
+SyslogIdentifier=phosphor-reset-chassis-on
 
 [Install]
 WantedBy=obmc-chassis-powerreset@%i.target
diff --git a/service_files/phosphor-reset-chassis-running@.service b/service_files/phosphor-reset-chassis-running@.service
index 381f89d..09c1493 100644
--- a/service_files/phosphor-reset-chassis-running@.service
+++ b/service_files/phosphor-reset-chassis-running@.service
@@ -10,6 +10,7 @@
 RemainAfterExit=no
 Type=oneshot
 ExecStart=/bin/sh -c "if [ $(busctl get-property `mapper get-service /org/openbmc/control/power%i` /org/openbmc/control/power%i org.openbmc.control.Power pgood | sed 's/i\s*[1]/on/' | grep on | wc -l) != 0 ]; then mkdir -p /run/openbmc/ && touch /run/openbmc/chassis@%i-on; fi"
+SyslogIdentifier=phosphor-reset-chassis-running
 
 [Install]
 WantedBy=obmc-chassis-powerreset@%i.target