diff --git a/pxiii_bec/device_configs/x06da_device_config.yaml b/pxiii_bec/device_configs/x06da_device_config.yaml
index d37444b..2bae734 100644
--- a/pxiii_bec/device_configs/x06da_device_config.yaml
+++ b/pxiii_bec/device_configs/x06da_device_config.yaml
@@ -595,7 +595,7 @@ abr:
   softwareTrigger: false
 shx:
   description: SmarGon X axis
-  deviceClass: pxiii_bec.devices.SmarGonAxis
+  deviceClass: pxiii_bec.devices.SmarGonAxisA
   deviceConfig: {prefix: 'SCS', low_limit: -2, high_limit: 2, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
   onFailure: buffer
   enabled: true
@@ -604,7 +604,7 @@ shx:
   softwareTrigger: false
 shy:
   description: SmarGon Y axis
-  deviceClass: pxiii_bec.devices.SmarGonAxis
+  deviceClass: pxiii_bec.devices.SmarGonAxisA
   deviceConfig: {prefix: 'SCS', low_limit: -2, high_limit: 2, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
   onFailure: buffer
   enabled: true
@@ -613,7 +613,7 @@ shy:
   softwareTrigger: false
 shz:
   description: SmarGon Z axis
-  deviceClass: pxiii_bec.devices.SmarGonAxis
+  deviceClass: pxiii_bec.devices.SmarGonAxisA
   deviceConfig: {prefix: 'SCS', low_limit: 10, high_limit: 22, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
   onFailure: buffer
   enabled: true
@@ -622,7 +622,7 @@ shz:
   softwareTrigger: false
 chi:
   description: SmarGon CHI axis
-  deviceClass: pxiii_bec.devices.SmarGonAxis
+  deviceClass: pxiii_bec.devices.SmarGonAxisA
   deviceConfig: {prefix: 'SCS', low_limit: 0, high_limit: 40, sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
   onFailure: buffer
   enabled: true
@@ -631,7 +631,7 @@ chi:
   softwareTrigger: false
 phi:
   description: SmarGon PHI axis
-  deviceClass: pxiii_bec.devices.SmarGonAxis
+  deviceClass: pxiii_bec.devices.SmarGonAxisA
   deviceConfig: {prefix: 'SCS', sg_url: 'http://x06da-smargopolo.psi.ch:3000'}
   onFailure: buffer
   enabled: true
diff --git a/pxiii_bec/devices/SmarGon.py b/pxiii_bec/devices/SmarGonA.py
similarity index 100%
rename from pxiii_bec/devices/SmarGon.py
rename to pxiii_bec/devices/SmarGonA.py
diff --git a/pxiii_bec/devices/SmarGon2.py b/pxiii_bec/devices/SmarGonB.py
similarity index 100%
rename from pxiii_bec/devices/SmarGon2.py
rename to pxiii_bec/devices/SmarGonB.py
diff --git a/pxiii_bec/devices/__init__.py b/pxiii_bec/devices/__init__.py
index f486996..fd4877e 100644
--- a/pxiii_bec/devices/__init__.py
+++ b/pxiii_bec/devices/__init__.py
@@ -6,7 +6,8 @@ Ophyd devices for the PX III beamline, including the MX specific Aerotech A3200
 """
 from .A3200 import AerotechAbrStage
 from .A3200utils import A3200Axis
-from .SmarGon2 import SmarGonAxis
+from .SmarGonA import SmarGonAxis as SmarGonAxisA
+from .SmarGonB import SmarGonAxis as SmarGonAxisB
 from .StdDaqPreview import StdDaqPreviewDetector
 from .NDArrayPreview import NDArrayPreview
 from .SamCamDetector import SamCamDetector