diff --git a/procedures/openfsi/scan.cpp b/procedures/openfsi/scan.cpp
index a9693fb..c7ae797 100644
--- a/procedures/openfsi/scan.cpp
+++ b/procedures/openfsi/scan.cpp
@@ -29,14 +29,9 @@
 namespace fs = std::experimental::filesystem;
 namespace fsi_error = sdbusplus::org::open_power::Proc::FSI::Error;
 
-constexpr auto masterScanPath =
-    "/sys/bus/platform/devices/gpio-fsi/fsi0/rescan";
-
-constexpr auto hubScanPath = "/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/"
-                             "00:00:00:0a/fsi1/rescan";
-
-constexpr auto masterCalloutPath =
-    "/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw";
+constexpr auto masterScanPath = "/sys/class/fsi-master/fsi0/rescan";
+constexpr auto hubScanPath = "/sys/class/fsi-master/fsi1/rescan";
+constexpr auto masterCalloutPath = "/sys/class/fsi-master/fsi0/slave@00:00/raw";
 
 /**
  * Writes a 1 to the sysfs file passed in to trigger
diff --git a/targeting.hpp b/targeting.hpp
index 204b901..9c63f6c 100644
--- a/targeting.hpp
+++ b/targeting.hpp
@@ -10,11 +10,9 @@
 namespace targeting
 {
 
-constexpr auto fsiMasterDevPath =
-    "/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw";
+constexpr auto fsiMasterDevPath = "/sys/class/fsi-master/fsi0/slave@00:00/raw";
 
-constexpr auto fsiSlaveBaseDir =
-    "/sys/devices/platform/gpio-fsi/fsi0/slave@00:00/00:00:00:0a/fsi1/";
+constexpr auto fsiSlaveBaseDir = "/sys/class/fsi-master/fsi1/";
 
 /**
  * Represents a specific P9 processor in the system.  Used by