diff --git a/common/recipes-phosphor/fsi/op-fsi.bb b/common/recipes-phosphor/fsi/op-fsi.bb
index 37a326f..26cab2c 100644
--- a/common/recipes-phosphor/fsi/op-fsi.bb
+++ b/common/recipes-phosphor/fsi/op-fsi.bb
@@ -5,7 +5,7 @@
 inherit obmc-phosphor-systemd
 inherit obmc-phosphor-license
 
-TGTFMT = "obmc-power-chassis-on@{0}.target"
+TGTFMT = "obmc-chassis-poweron@{0}.target"
 
 TMPL_SCAN = "fsi-scan@.service"
 INSTFMT_SCAN = "fsi-scan@{0}.service"
diff --git a/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service b/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
index 77c61f4..82399ae 100644
--- a/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
+++ b/common/recipes-phosphor/fsi/op-fsi/fsi-bind@.service
@@ -6,7 +6,7 @@
 Before=obmc-host-start-pre@%i.target
 Wants=fsi-scan@%i.service
 Before=fsi-scan@%i.service
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 ConditionDirectoryNotEmpty=!/sys/bus/platform/drivers/fsi-master-gpio/fsi-master
 
 [Service]
@@ -15,4 +15,4 @@
 RemainAfterExit=yes
 
 [Install]
-RequiredBy=obmc-power-chassis-on@%i.target
+RequiredBy=obmc-chassis-poweron@%i.target
diff --git a/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service b/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
index 8f94e28..4321422 100644
--- a/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
+++ b/common/recipes-phosphor/fsi/op-fsi/fsi-scan@.service
@@ -4,7 +4,7 @@
 After=obmc-power-on@%i.target
 Wants=obmc-host-start-pre@%i.target
 Before=obmc-host-start-pre@%i.target
-Conflicts=obmc-power-chassis-off@%i.target
+Conflicts=obmc-chassis-poweroff@%i.target
 
 [Service]
 ExecStart=/bin/sh -c "echo 1 > /sys/bus/platform/devices/fsi-master/scan"
@@ -12,4 +12,4 @@
 RemainAfterExit=yes
 
 [Install]
-RequiredBy=obmc-power-chassis-on@%i.target
+RequiredBy=obmc-chassis-poweron@%i.target