diff --git a/pxiii_bec/device_configs/DbGenerator.py b/pxiii_bec/device_configs/DbGenerator.py
index 59a8297..b086624 100644
--- a/pxiii_bec/device_configs/DbGenerator.py
+++ b/pxiii_bec/device_configs/DbGenerator.py
@@ -37,6 +37,12 @@ def MigrateYamlFile(filein, fileout):
         if 'softwareTrigger' not in new:
             new['softwareTrigger'] = False
         
+        if new['deviceClass'] == "ophyd.EpicsSignalRO":
+            if "read_pv" not in new['deviceConfig']:
+                new["deviceConfig"]["read_pv"] = new["deviceConfig"]["prefix"] 
+                del new["deviceConfig"]["prefix"] 
+
+
         db[k] = new
     
     with open(fileout, 'w') as stream:
@@ -46,4 +52,4 @@ def MigrateYamlFile(filein, fileout):
 
 # Automatically start simulation if directly invoked
 if __name__ == "__main__":
-    MigrateYamlFile("./x06da_compact.yaml", "x06da_device_config.yml")
+    MigrateYamlFile("./x06da_compact.yml", "x06da_device_config.yaml")
diff --git a/pxiii_bec/device_configs/x06da_compact.yaml b/pxiii_bec/device_configs/x06da_compact.yml
similarity index 64%
rename from pxiii_bec/device_configs/x06da_compact.yaml
rename to pxiii_bec/device_configs/x06da_compact.yml
index b6670db..de44bc8 100644
--- a/pxiii_bec/device_configs/x06da_compact.yaml
+++ b/pxiii_bec/device_configs/x06da_compact.yml
@@ -2,192 +2,184 @@
 slh_trxr:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-OP-SLH:TRXR'
+        prefix: 'X06DA-OP-SLH:TRXR'
 slh_trxw:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-OP-SLH:TRXW'
-slh_tryt:
-    deviceClass: ophyd.EpicsMotor
-    deviceConfig:
-        prefix: 'X02DA-OP-SLH:TRYT'
-slh_tryb:
-    deviceClass: ophyd.EpicsMotor
-    deviceConfig:
-        prefix: 'X02DA-OP-SLH:TRYB'
+        prefix: 'X06DA-OP-SLH:TRXW'
 fi1_try:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-OP-SFI1:TRY1'
+        prefix: 'X06DA-OP-FI1:TRY1'
 
 # DCCM crystal 1
 dccm_pitch1:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-OP-DCCM:PITCH1'
+        prefix: 'X06DA-OP-DCCM:PITCH1'
 dccm_energy1:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-OP-DCCM:ENERGY1'
+        prefix: 'X06DA-OP-DCCM:ENERGY1'
 dccm_diode:
     deviceClass: ophyd.EpicsSignalRO
     deviceConfig:
-        prefix: 'X02DA-OP-XPM1:BOT:READOUT'
+        prefix: 'X06DA-OP-XPM1:BOT:READOUT'
 
 # DCCM crystal 2
 dccm_pitch2:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-OP-DCCM:PITCH2'
+        prefix: 'X06DA-OP-DCCM:PITCH2'
 dccm_energy2:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-OP-DCCM:ENERGY2'
+        prefix: 'X06DA-OP-DCCM:ENERGY2'
 dccm_xbpm:
     deviceClass: ophyd.EpicsSignalRO
     deviceConfig:
-        prefix: 'X02DA-OP-XBPM1:SumAll:MeanValue_RBV'
+        prefix: 'X06DA-OP-XBPM1:SumAll:MeanValue_RBV'
 
 # Secondary source XBPM
 ssxbpm_trx:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-SSBPM:TRX1'
+        prefix: 'X06DA-ES-SSBPM1:TRX1'
 ssxbpm_try:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-SSBPM:TRY1'
+        prefix: 'X06DA-ES-SSBPM1:TRY1'
 
 ssslit_trxr:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-SSSH:TRXR'
+        prefix: 'X06DA-ES-SSSH1:TRXI'
 ssslit_trxw:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-SSSH:TRXW'
+        prefix: 'X06DA-ES-SSSH1:TRXO'
 ssslit_tryt:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-SSSV:TRYT'
+        prefix: 'X06DA-ES-SSSV1:TRYT'
 ssslit_tryb:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-SSSV:TRYB'
+        prefix: 'X06DA-ES-SSSV1:TRYB'
 ssxi1_trx:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-SSSV:TRX1'
+        prefix: 'X06DA-ES-SSXI1:TRX1'
 ssxi1_try:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-SSSV:TRY1'
+        prefix: 'X06DA-ES-SSXI1:TRY1'
 
 # Vertical focusing mirror
 vfm_trxu:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:TRXU'
+        prefix: 'X06DA-ES1-VFM:TRXU'
     enabled: false
 vfm_trxd:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:TRXD'
+        prefix: 'X06DA-ES1-VFM:TRXD'
     enabled: false
 vfm_tryuw:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:TRYUW'
+        prefix: 'X06DA-ES1-VFM:TRYUW'
 vfm_tryr:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:TRYR'
+        prefix: 'X06DA-ES1-VFM:TRYR'
 vfm_trydw:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:TRYDW'
+        prefix: 'X06DA-ES1-VFM:TRYDW'
 vfm_pitch:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:PITCH'
+        prefix: 'X06DA-ES1-VFM:PITCH'
 vfm_yaw:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:YAW'
+        prefix: 'X06DA-ES1-VFM:YAW'
     enabled: false
 vfm_roll:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:ROLL'
+        prefix: 'X06DA-ES1-VFM:ROLL'
     enabled: false
 vfm_trx:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:TRX'
+        prefix: 'X06DA-ES1-VFM:TRX'
     enabled: false
 vfm_try:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-VFM:TRY'
+        prefix: 'X06DA-ES1-VFM:TRY'
           
 # Horizontal focusing mirror
 hfm_trxu:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:TRXU'
+        prefix: 'X06DA-ES1-HFM:TRXU'
     enabled: false
 hfm_trxd:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:TRXD'  
+        prefix: 'X06DA-ES1-HFM:TRXD'  
     enabled: false
 hfm_tryur:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:TRYUR'
+        prefix: 'X06DA-ES1-HFM:TRYUR'
 hfm_tryw:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:TRYW'
+        prefix: 'X06DA-ES1-HFM:TRYW'
 hfm_trydr:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:TRYDR'
+        prefix: 'X06DA-ES1-HFM:TRYDR'
 hfm_pitch:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:PITCH'
+        prefix: 'X06DA-ES1-HFM:PITCH'
     enabled: false
 hfm_yaw:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:YAW'
+        prefix: 'X06DA-ES1-HFM:YAW'
     enabled: false
 hfm_roll:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:ROLL'
+        prefix: 'X06DA-ES1-HFM:ROLL'
     enabled: false
 hfm_trx:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:TRX'
+        prefix: 'X06DA-ES1-HFM:TRX'
     enabled: false
 hfm_try:
     deviceClass: ophyd.EpicsMotor
     deviceConfig:
-        prefix: 'X02DA-ES-HFM:TRY'
+        prefix: 'X06DA-ES1-HFM:TRY'
         
         
 # Exposure box signals       
 #xbox_diode:
 #    deviceClass: ophyd.EpicsSignalRO
 #    deviceConfig:
-#        prefix: 'X02DA-ES-DI1:READOUT'
+#        prefix: 'X06DA-ES-DI1:READOUT'
 #bstop_diode:
 #    deviceClass: ophyd.EpicsSignalRO
 #    deviceConfig:
-#        prefix: 'X02DA-ES-BS:READOUT'
+#        prefix: 'X06DA-ES-BS:READOUT'
        
         
         
diff --git a/pxiii_bec/device_configs/x06da_device_config.yml b/pxiii_bec/device_configs/x06da_device_config.yaml
similarity index 71%
rename from pxiii_bec/device_configs/x06da_device_config.yml
rename to pxiii_bec/device_configs/x06da_device_config.yaml
index f385087..0ee2b49 100644
--- a/pxiii_bec/device_configs/x06da_device_config.yml
+++ b/pxiii_bec/device_configs/x06da_device_config.yaml
@@ -1,7 +1,6 @@
 slh_trxr:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-OP-SLH:TRXR'
+  deviceConfig: {prefix: 'X06DA-OP-SLH:TRXR'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -9,26 +8,7 @@ slh_trxr:
   softwareTrigger: false
 slh_trxw:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-OP-SLH:TRXW'
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-slh_tryt:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-OP-SLH:TRYT'
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-slh_tryb:
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-OP-SLH:TRYB'
+  deviceConfig: {prefix: 'X06DA-OP-SLH:TRXW'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -36,8 +16,7 @@ slh_tryb:
   softwareTrigger: false
 fi1_try:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-OP-SFI1:TRY1'
+  deviceConfig: {prefix: 'X06DA-OP-FI1:TRY1'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -45,8 +24,7 @@ fi1_try:
   softwareTrigger: false
 dccm_pitch1:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-OP-DCCM:PITCH1'
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:PITCH1'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -54,8 +32,7 @@ dccm_pitch1:
   softwareTrigger: false
 dccm_energy1:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-OP-DCCM:ENERGY1'
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:ENERGY1'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -63,8 +40,7 @@ dccm_energy1:
   softwareTrigger: false
 dccm_diode:
   deviceClass: ophyd.EpicsSignalRO
-  deviceConfig:
-    prefix: 'X02DA-OP-XPM1:BOT:READOUT'
+  deviceConfig: {read_pv: 'X06DA-OP-XPM1:BOT:READOUT'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -72,8 +48,7 @@ dccm_diode:
   softwareTrigger: false
 dccm_pitch2:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-OP-DCCM:PITCH2'
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:PITCH2'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -81,8 +56,7 @@ dccm_pitch2:
   softwareTrigger: false
 dccm_energy2:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-OP-DCCM:ENERGY2'
+  deviceConfig: {prefix: 'X06DA-OP-DCCM:ENERGY2'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -90,8 +64,7 @@ dccm_energy2:
   softwareTrigger: false
 dccm_xbpm:
   deviceClass: ophyd.EpicsSignalRO
-  deviceConfig:
-    prefix: 'X02DA-OP-XBPM1:SumAll:MeanValue_RBV'
+  deviceConfig: {read_pv: 'X06DA-OP-XBPM1:SumAll:MeanValue_RBV'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -99,8 +72,7 @@ dccm_xbpm:
   softwareTrigger: false
 ssxbpm_trx:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-SSBPM:TRX1'
+  deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRX1'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -108,8 +80,7 @@ ssxbpm_trx:
   softwareTrigger: false
 ssxbpm_try:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-SSBPM:TRY1'
+  deviceConfig: {prefix: 'X06DA-ES-SSBPM1:TRY1'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -117,8 +88,7 @@ ssxbpm_try:
   softwareTrigger: false
 ssslit_trxr:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-SSSH:TRXR'
+  deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXI'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -126,8 +96,7 @@ ssslit_trxr:
   softwareTrigger: false
 ssslit_trxw:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-SSSH:TRXW'
+  deviceConfig: {prefix: 'X06DA-ES-SSSH1:TRXO'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -135,8 +104,7 @@ ssslit_trxw:
   softwareTrigger: false
 ssslit_tryt:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-SSSV:TRYT'
+  deviceConfig: {prefix: 'X06DA-ES-SSSV1:TRYT'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -144,8 +112,7 @@ ssslit_tryt:
   softwareTrigger: false
 ssslit_tryb:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-SSSV:TRYB'
+  deviceConfig: {prefix: 'X06DA-ES-SSSV1:TRYB'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -153,8 +120,7 @@ ssslit_tryb:
   softwareTrigger: false
 ssxi1_trx:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-SSSV:TRX1'
+  deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRX1'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -162,8 +128,7 @@ ssxi1_trx:
   softwareTrigger: false
 ssxi1_try:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-SSSV:TRY1'
+  deviceConfig: {prefix: 'X06DA-ES-SSXI1:TRY1'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -171,8 +136,7 @@ ssxi1_try:
   softwareTrigger: false
 vfm_trxu:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:TRXU'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:TRXU'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -180,8 +144,7 @@ vfm_trxu:
   softwareTrigger: false
 vfm_trxd:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:TRXD'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:TRXD'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -189,8 +152,7 @@ vfm_trxd:
   softwareTrigger: false
 vfm_tryuw:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:TRYUW'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:TRYUW'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -198,8 +160,7 @@ vfm_tryuw:
   softwareTrigger: false
 vfm_tryr:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:TRYR'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:TRYR'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -207,8 +168,7 @@ vfm_tryr:
   softwareTrigger: false
 vfm_trydw:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:TRYDW'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:TRYDW'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -216,8 +176,7 @@ vfm_trydw:
   softwareTrigger: false
 vfm_pitch:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:PITCH'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:PITCH'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -225,8 +184,7 @@ vfm_pitch:
   softwareTrigger: false
 vfm_yaw:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:YAW'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:YAW'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -234,8 +192,7 @@ vfm_yaw:
   softwareTrigger: false
 vfm_roll:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:ROLL'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:ROLL'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -243,8 +200,7 @@ vfm_roll:
   softwareTrigger: false
 vfm_trx:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:TRX'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:TRX'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -252,8 +208,7 @@ vfm_trx:
   softwareTrigger: false
 vfm_try:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-VFM:TRY'
+  deviceConfig: {prefix: 'X06DA-ES1-VFM:TRY'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -261,8 +216,7 @@ vfm_try:
   softwareTrigger: false
 hfm_trxu:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:TRXU'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:TRXU'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -270,8 +224,7 @@ hfm_trxu:
   softwareTrigger: false
 hfm_trxd:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:TRXD'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:TRXD'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -279,8 +232,7 @@ hfm_trxd:
   softwareTrigger: false
 hfm_tryur:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:TRYUR'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:TRYUR'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -288,8 +240,7 @@ hfm_tryur:
   softwareTrigger: false
 hfm_tryw:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:TRYW'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:TRYW'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -297,8 +248,7 @@ hfm_tryw:
   softwareTrigger: false
 hfm_trydr:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:TRYDR'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:TRYDR'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
@@ -306,8 +256,7 @@ hfm_trydr:
   softwareTrigger: false
 hfm_pitch:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:PITCH'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:PITCH'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -315,8 +264,7 @@ hfm_pitch:
   softwareTrigger: false
 hfm_yaw:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:YAW'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:YAW'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -324,8 +272,7 @@ hfm_yaw:
   softwareTrigger: false
 hfm_roll:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:ROLL'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:ROLL'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -333,8 +280,7 @@ hfm_roll:
   softwareTrigger: false
 hfm_trx:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:TRX'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:TRX'}
   enabled: false
   onFailure: buffer
   readoutPriority: monitored
@@ -342,8 +288,7 @@ hfm_trx:
   softwareTrigger: false
 hfm_try:
   deviceClass: ophyd.EpicsMotor
-  deviceConfig:
-    prefix: 'X02DA-ES-HFM:TRY'
+  deviceConfig: {prefix: 'X06DA-ES1-HFM:TRY'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored