diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
index 6ee00c0..212859b 100644
--- a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
+++ b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%.bbappend
@@ -12,10 +12,10 @@
 WSPOON_ITEMS = "${@compose_list(d, 'WSPOON_ITEMSFMT', 'WSPOON_CHIPS')}"
 
 WSPOON_OCCS = " \
-              cfam@0,0/sbefifo@2400/occ@1 \
-              cfam@0,0/sbefifo@82400/occ@2 \
+              sbefifo@2400/occ@1/occ-hwmon@1 \
+              hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2 \
               "
-WSPOON_OCCSFMT = "base/gpio-fsi/{0}.conf"
+WSPOON_OCCSFMT = "gpio-fsi/cfam@0,0/{0}.conf"
 WSPOON_OCCITEMS = "${@compose_list(d, 'WSPOON_OCCSFMT', 'WSPOON_OCCS')}"
 
 ENVS = "obmc/hwmon/{0}"
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@82400/occ@2.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/hub@3400/cfam@1,0/sbefifo@2400/occ@2/occ-hwmon@2.conf
diff --git a/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf b/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1/occ-hwmon@1.conf
similarity index 100%
rename from meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/base/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1.conf
rename to meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon%/obmc/hwmon/gpio-fsi/cfam@0,0/sbefifo@2400/occ@1/occ-hwmon@1.conf