diff --git a/adhoc.py b/adhoc.py
index 8944246..2acd1e9 100644
--- a/adhoc.py
+++ b/adhoc.py
@@ -54,17 +54,21 @@ class TXS(BaseDevice):
         self.y = Motor(Id + ":TRY1")
         self.z = Motor(Id + ":TRZ1")
 
-        self.bonus = SimpleNamespace(
-            tr_x11  = SmarActAxis(Id + ":TRX11"),
-            rot_y11 = SmarActAxis(Id + ":ROTY11"),
-            rot_x11 = SmarActAxis(Id + ":ROTX11"),
-            rot_x12 = SmarActAxis(Id + ":ROTX12"),
-            rot_x13 = SmarActAxis(Id + ":ROTX13"),
-            tr_x21  = SmarActAxis(Id + ":TRX21"),
-            rot_y21 = SmarActAxis(Id + ":ROTY21"),
-            rot_x21 = SmarActAxis(Id + ":ROTX21"),
-            rot_x22 = SmarActAxis(Id + ":ROTX22"),
-            rot_x23 = SmarActAxis(Id + ":ROTX23")
+        self.crystals = SimpleNamespace(
+            left = SimpleNamespace(
+                linear = SmarActAxis(Id + ":TRX11"),
+                rotary = SmarActAxis(Id + ":ROTY11"),
+                gonio1 = SmarActAxis(Id + ":ROTX11"),
+                gonio2 = SmarActAxis(Id + ":ROTX12"),
+                gonio3 = SmarActAxis(Id + ":ROTX13")
+            ),
+            right = SimpleNamespace(
+                linear = SmarActAxis(Id + ":TRX21"),
+                rotary = SmarActAxis(Id + ":ROTY21"),
+                gonio1 = SmarActAxis(Id + ":ROTX21"),
+                gonio2 = SmarActAxis(Id + ":ROTX22"),
+                gonio3 = SmarActAxis(Id + ":ROTX23")
+            )
         )