diff --git a/superxas_bec/device_configs/x10da_frontend.yaml b/superxas_bec/device_configs/x10da_frontend.yaml
index a9b2bcf..5ea1b28 100644
--- a/superxas_bec/device_configs/x10da_frontend.yaml
+++ b/superxas_bec/device_configs/x10da_frontend.yaml
@@ -20,7 +20,7 @@ abs:
 sldi_trxr:
   readoutPriority: baseline
   description: Front-end slit diaphragm X-translation Ring-edge
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-SLDI:TRXR
   onFailure: retry
@@ -30,7 +30,7 @@ sldi_trxr:
 sldi_trxw:
   readoutPriority: baseline
   description: Front-end slit diaphragm X-translation Wall-edge
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-SLDI:TRXW
   onFailure: retry
@@ -40,7 +40,7 @@ sldi_trxw:
 sldi_tryb:
   readoutPriority: baseline
   description: Front-end slit diaphragm Y-translation Bottom-edge
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-SLDI:TRYB
   onFailure: retry
@@ -50,7 +50,7 @@ sldi_tryb:
 sldi_tryt:
   readoutPriority: baseline
   description: Front-end slit diaphragm X-translation Top-edge
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-SLDI:TRYT
   onFailure: retry
@@ -60,7 +60,7 @@ sldi_tryt:
 sldi_centerx:
   readoutPriority: baseline
   description: Front-end slit diaphragm X-center
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-SLDI:CENTERX
   onFailure: retry
@@ -70,7 +70,7 @@ sldi_centerx:
 sldi_gapx:
   readoutPriority: baseline
   description: Front-end slit diaphragm X-gap
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-SLDI:GAPX
   onFailure: retry
@@ -80,7 +80,7 @@ sldi_gapx:
 sldi_centery:
   readoutPriority: baseline
   description: Front-end slit diaphragm Y-center
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-SLDI:CENTERY
   onFailure: retry
@@ -90,7 +90,7 @@ sldi_centery:
 sldi_gapy:
   readoutPriority: baseline
   description: Front-end slit diaphragm Y-gap
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-SLDI:GAPY
   onFailure: retry
@@ -104,7 +104,7 @@ sldi_gapy:
 cm_trxu:
   readoutPriority: baseline
   description: Collimating Mirror X-translation upstream
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:TRXU
   onFailure: retry
@@ -114,7 +114,7 @@ cm_trxu:
 cm_trxd:
   readoutPriority: baseline
   description: Collimating Mirror X-translation downstream
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:TRXD
   onFailure: retry
@@ -124,7 +124,7 @@ cm_trxd:
 cm_tryu:
   readoutPriority: baseline
   description: Collimating Mirror Y-translation upstream
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:TRYU
   onFailure: retry
@@ -134,7 +134,7 @@ cm_tryu:
 cm_trydr:
   readoutPriority: baseline
   description: Collimating Mirror Y-translation downstream ring
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:TRYDR
   onFailure: retry
@@ -144,7 +144,7 @@ cm_trydr:
 cm_trydw:
   readoutPriority: baseline
   description: Collimating Mirror Y-translation downstream wall
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:TRYDW
   onFailure: retry
@@ -154,7 +154,7 @@ cm_trydw:
 cm_bnd:
   readoutPriority: baseline
   description: Collimating Mirror bender
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:BND
   onFailure: retry
@@ -175,7 +175,7 @@ cm_bnd:
 cm_rotx:
   readoutPriority: baseline
   description: Collimating Morror Pitch
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:ROTX
   onFailure: retry
@@ -185,7 +185,7 @@ cm_rotx:
 cm_roty:
   readoutPriority: baseline
   description: Collimating Morror Yaw
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:ROTY
   onFailure: retry
@@ -195,7 +195,7 @@ cm_roty:
 cm_rotz:
   readoutPriority: baseline
   description: Collimating Morror Roll
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:ROTZ
   onFailure: retry
@@ -205,7 +205,7 @@ cm_rotz:
 cm_trx:
   readoutPriority: baseline
   description: Collimating Morror Center Point X
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:XTCP
   onFailure: retry
@@ -215,7 +215,7 @@ cm_trx:
 cm_try:
   readoutPriority: baseline
   description: Collimating Morror Center Point Y
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:YTCP
   onFailure: retry
@@ -225,7 +225,7 @@ cm_try:
 cm_ztcp:
   readoutPriority: baseline
   description: Collimating Morror Center Point Z
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:ZTCP
   onFailure: retry
@@ -235,7 +235,7 @@ cm_ztcp:
 cm_xstripe:
   readoutPriority: baseline
   description: Collimating Morror X Stripe
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotorEC
   deviceConfig:
     prefix: X10DA-FE-CM:XSTRIPE
   onFailure: retry