diff --git a/src/dodal/beamlines/i03.py b/src/dodal/beamlines/i03.py
index d260dbd1fe2..bbc5285dfa9 100644
--- a/src/dodal/beamlines/i03.py
+++ b/src/dodal/beamlines/i03.py
@@ -203,9 +203,9 @@ def pin_tip_detection() -> PinTipDetection:
     return PinTipDetection(f"{PREFIX.beamline_prefix}-DI-OAV-01:")
 
 
-@devices.factory()
+@devices.factory(use_factory_name=False)
 def smargon() -> Smargon:
-    return Smargon(f"{PREFIX.beamline_prefix}-MO-SGON-01:")
+    return Smargon(f"{PREFIX.beamline_prefix}-MO-SGON-01:", name="gonio")
 
 
 @devices.factory()
diff --git a/src/dodal/beamlines/i04.py b/src/dodal/beamlines/i04.py
index a7d7223ff1f..ef1ef5fdbb4 100644
--- a/src/dodal/beamlines/i04.py
+++ b/src/dodal/beamlines/i04.py
@@ -72,9 +72,9 @@
 devices = DeviceManager()
 
 
-@devices.factory()
+@devices.factory(use_factory_name=False)
 def smargon() -> Smargon:
-    return Smargon(f"{PREFIX.beamline_prefix}-MO-SGON-01:")
+    return Smargon(f"{PREFIX.beamline_prefix}-MO-SGON-01:", name="gonio")
 
 
 @devices.factory()