diff --git a/cpdctrl/measurement.py b/cpdctrl/measurement.py
index 94703ba..df5f975 100644
--- a/cpdctrl/measurement.py
+++ b/cpdctrl/measurement.py
@@ -79,8 +79,10 @@ def measure(
     if add_measurement_info_to_metadata:
         data.metadata["measurement_interval"] = str(delta_t) + " s"
         data.metadata["measurement_use_buffer"] = str(use_buffer)
-        data.metadata["measurement_voltage_device"] = str(vm_dev)
-        data.metadata["measurement_led_device"] = str(led_dev)
+        data.metadata["measurement_voltage_measurement_device"] = str(vm_dev)
+        data.metadata["measurement_led_control_device"] = str(led_dev)
+        led_name = led_dev.get_led_name()
+        if led_name: data.metadata["measurement_led_lamp"] = led_name
         data.metadata["measurement_time_start"] = get_time()
     # write metadata to disk
     data.write_metadata()