diff --git a/pmbus.cpp b/pmbus.cpp
index 12b8aa8..47560a0 100644
--- a/pmbus.cpp
+++ b/pmbus.cpp
@@ -18,8 +18,7 @@
 #include <phosphor-logging/elog.hpp>
 #include <phosphor-logging/elog-errors.hpp>
 #include <xyz/openbmc_project/Common/error.hpp>
-#include <xyz/openbmc_project/Control/Device/error.hpp>
-#include <xyz/openbmc_project/Sensor/Device/error.hpp>
+#include <xyz/openbmc_project/Common/Device/error.hpp>
 #include "pmbus.hpp"
 
 namespace witherspoon
@@ -29,8 +28,7 @@
 
 using namespace phosphor::logging;
 using namespace sdbusplus::xyz::openbmc_project::Common::Error;
-using namespace sdbusplus::xyz::openbmc_project::Control::Device::Error;
-using namespace sdbusplus::xyz::openbmc_project::Sensor::Device::Error;
+using namespace sdbusplus::xyz::openbmc_project::Common::Device::Error;
 namespace fs = std::experimental::filesystem;
 
 std::string PMBus::insertPageNum(const std::string& templateName,
@@ -117,11 +115,11 @@
         log<level::ERR>("Failed to read sysfs file",
                         entry("FILENAME=%s", path.c_str()));
 
-        elog<ReadFailure>(xyz::openbmc_project::Sensor::Device::
-                          ReadFailure::CALLOUT_ERRNO(rc),
-                          xyz::openbmc_project::Sensor::Device::
-                          ReadFailure::CALLOUT_DEVICE_PATH(
-                              fs::canonical(basePath).c_str()));
+        using metadata = xyz::openbmc_project::Common::Device::ReadFailure;
+
+        elog<ReadFailure>(metadata::CALLOUT_ERRNO(rc),
+                          metadata::CALLOUT_DEVICE_PATH(
+                                  fs::canonical(basePath).c_str()));
     }
 
     return value != 0;
@@ -156,7 +154,7 @@
         log<level::ERR>("Failed to read sysfs file",
                         entry("FILENAME=%s", path.c_str()));
 
-        using metadata = xyz::openbmc_project::Sensor::Device::ReadFailure;
+        using metadata = xyz::openbmc_project::Common::Device::ReadFailure;
 
         elog<ReadFailure>(metadata::CALLOUT_ERRNO(rc),
                           metadata::CALLOUT_DEVICE_PATH(
@@ -189,11 +187,11 @@
         log<level::ERR>("Failed to write sysfs file",
                         entry("FILENAME=%s", path.c_str()));
 
-        elog<WriteFailure>(xyz::openbmc_project::Control::Device::
-                           WriteFailure::CALLOUT_ERRNO(rc),
-                           xyz::openbmc_project::Control::Device::
-                           WriteFailure::CALLOUT_DEVICE_PATH(
-                               fs::canonical(basePath).c_str()));
+        using metadata = xyz::openbmc_project::Common::Device::WriteFailure;
+
+        elog<WriteFailure>(metadata::CALLOUT_ERRNO(rc),
+                           metadata::CALLOUT_DEVICE_PATH(
+                                   fs::canonical(basePath).c_str()));
     }
 }
 
diff --git a/power-sequencer/ucd90160.cpp b/power-sequencer/ucd90160.cpp
index e7fc8cf..1f7f167 100644
--- a/power-sequencer/ucd90160.cpp
+++ b/power-sequencer/ucd90160.cpp
@@ -18,9 +18,8 @@
 #include <phosphor-logging/elog.hpp>
 #include <phosphor-logging/log.hpp>
 #include <elog-errors.hpp>
-#include <xyz/openbmc_project/Sensor/Device/error.hpp>
-#include <xyz/openbmc_project/Control/Device/error.hpp>
 #include <org/open_power/Witherspoon/Fault/error.hpp>
+#include <xyz/openbmc_project/Common/Device/error.hpp>
 #include "names_values.hpp"
 #include "ucd90160.hpp"
 #include "utility.hpp"
@@ -42,9 +41,11 @@
 using namespace gpio;
 using namespace pmbus;
 using namespace phosphor::logging;
-using namespace sdbusplus::xyz::openbmc_project::Control::Device::Error;
-using namespace sdbusplus::xyz::openbmc_project::Sensor::Device::Error;
-using namespace sdbusplus::org::open_power::Witherspoon::Fault::Error;
+
+namespace device_error = sdbusplus::xyz::openbmc_project::
+        Common::Device::Error;
+namespace power_error = sdbusplus::org::open_power::
+        Witherspoon::Fault::Error;
 
 UCD90160::UCD90160(size_t instance, sdbusplus::bus::bus& bus) :
         Device(DEVICE_NAME, instance),
@@ -72,11 +73,11 @@
             createPowerFaultLog();
         }
     }
-    catch (ReadFailure& e)
+    catch (device_error::ReadFailure& e)
     {
         if (!accessError)
         {
-            commit<ReadFailure>();
+            commit<device_error::ReadFailure>();
             accessError = true;
         }
     }
@@ -91,11 +92,11 @@
 
         checkPGOODFaults(true);
     }
-    catch (ReadFailure& e)
+    catch (device_error::ReadFailure& e)
     {
         if (!accessError)
         {
-            commit<ReadFailure>();
+            commit<device_error::ReadFailure>();
             accessError = true;
         }
     }
@@ -148,7 +149,7 @@
             using metadata = org::open_power::Witherspoon::Fault::
                     PowerSequencerVoltageFault;
 
-            report<PowerSequencerVoltageFault>(
+            report<power_error::PowerSequencerVoltageFault>(
                     metadata::RAIL(page),
                     metadata::RAIL_NAME(railName.c_str()),
                     metadata::RAW_STATUS(nv.get().c_str()));
@@ -240,7 +241,7 @@
             using metadata =  org::open_power::Witherspoon::Fault::
                     PowerSequencerPGOODFault;
 
-            report<PowerSequencerPGOODFault>(
+            report<power_error::PowerSequencerPGOODFault>(
                     metadata::INPUT_NUM(gpiNum),
                     metadata::INPUT_NAME(gpiName.c_str()),
                     metadata::RAW_STATUS(nv.get().c_str()));
@@ -262,7 +263,7 @@
     using metadata = org::open_power::Witherspoon::Fault::
         PowerSequencerFault;
 
-    report<PowerSequencerFault>(
+    report<power_error::PowerSequencerFault>(
             metadata::RAW_STATUS(nv.get().c_str()));
 }
 
@@ -411,7 +412,7 @@
 
     using metadata = org::open_power::Witherspoon::Fault::GPUPowerFault;
 
-    report<GPUPowerFault>(
+    report<power_error::GPUPowerFault>(
             metadata::RAW_STATUS(nv.get().c_str()),
             metadata::GPU(callout.c_str()));
 }
@@ -424,7 +425,7 @@
 
     using metadata = org::open_power::Witherspoon::Fault::GPUOverTemp;
 
-    report<GPUOverTemp>(
+    report<power_error::GPUOverTemp>(
             metadata::RAW_STATUS(nv.get().c_str()),
             metadata::GPU(callout.c_str()));
 }
diff --git a/power-supply/power_supply.cpp b/power-supply/power_supply.cpp
index 7fd9d4e..b1013da 100644
--- a/power-supply/power_supply.cpp
+++ b/power-supply/power_supply.cpp
@@ -15,9 +15,8 @@
  */
 #include <phosphor-logging/log.hpp>
 #include <phosphor-logging/elog.hpp>
-#include <xyz/openbmc_project/Sensor/Device/error.hpp>
-#include <xyz/openbmc_project/Control/Device/error.hpp>
 #include <org/open_power/Witherspoon/Fault/error.hpp>
+#include <xyz/openbmc_project/Common/Device/error.hpp>
 #include "elog-errors.hpp"
 #include "names_values.hpp"
 #include "power_supply.hpp"
@@ -25,9 +24,8 @@
 #include "utility.hpp"
 
 using namespace phosphor::logging;
-using namespace sdbusplus::xyz::openbmc_project::Control::Device::Error;
-using namespace sdbusplus::xyz::openbmc_project::Sensor::Device::Error;
 using namespace sdbusplus::org::open_power::Witherspoon::Fault::Error;
+using namespace sdbusplus::xyz::openbmc_project::Common::Device::Error;
 
 namespace witherspoon
 {