diff --git a/devices.py b/devices.py
index 977add4..3c3be71 100755
--- a/devices.py
+++ b/devices.py
@@ -126,7 +126,7 @@ components = [
         "z_und": 92,
         "desc": "Vertical offset mirror 1",
         "type": "slic.devices.xoptics.offset_mirrors:OffsetMirror",
-        "kwargs": {"Id": "SAROP21-OOMV092"},
+        "kwargs": {"ID": "SAROP21-OOMV092"},
     },
     {
         "name": "mirr2",
@@ -135,7 +135,7 @@ components = [
         "z_und": 96,
         "desc": "Vertical offset mirror 2",
         "type": "slic.devices.xoptics.offset_mirrors:OffsetMirror",
-        "kwargs": {"Id": "SAROP21-OOMV096"},
+        "kwargs": {"ID": "SAROP21-OOMV096"},
     },
     {
         "name": "mono",
@@ -157,7 +157,7 @@ components = [
         "name": "xp",
         "args": [],
         "kwargs": {
-            "Id": "SAROP21-OPPI103",
+            "ID": "SAROP21-OPPI103",
             "evronoff": "SGE-CPCW-72-EVR0:FrontUnivOut15-Ena-SP",
             "evrsrc": "SGE-CPCW-72-EVR0:FrontUnivOut15-Src-SP",
         },
@@ -296,7 +296,7 @@ components = [
         "z_und": 142,
         "desc": "General purpose station",
         "type": "slic.devices.endstations.bernina_diffractometers:GPS",
-        "kwargs": {"Id": "SARES22-GPS", "configuration": config["gps_config"]},
+        "kwargs": {"ID": "SARES22-GPS", "configuration": config["gps_config"]},
     },
     {
         "args": [],
@@ -304,7 +304,7 @@ components = [
         "z_und": 142,
         "desc": "Xray diffractometer",
         "type": "slic.devices.endstations.bernina_diffractometers:XRD",
-        "kwargs": {"Id": "SARES21-XRD", "configuration": config["xrd_config"]},
+        "kwargs": {"ID": "SARES21-XRD", "configuration": config["xrd_config"]},
     },
     
     {
@@ -373,7 +373,7 @@ components = [
         "z_und": 142,
         "desc": "Experiment laser optics",
         "type": "slic.devices.loptics.bernina_experiment:Laser_Exp",
-        "kwargs": {"Id": "SLAAR21-LMOT", "smar_config": config["las_smar_config"]},
+        "kwargs": {"ID": "SLAAR21-LMOT", "smar_config": config["las_smar_config"]},
         "lazy": True,
     },
     {