diff --git a/config/devices.properties b/config/devices.properties
index e9fd540..70e4d71 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -21,4 +21,4 @@ slit1H=ch.psi.pshell.epics.Slit X10SA-OP-SH1:TRX2 X10SA-OP-SH1:TRX1
 slit1V=ch.psi.pshell.epics.Slit X10SA-OP-SV1:TRY1 X10SA-OP-SV1:TRY2
 slit2H=ch.psi.pshell.epics.Slit X10SA-OP-SH2:TRX2 X10SA-OP-SH2:TRX1
 slit2V=ch.psi.pshell.epics.Slit X10SA-OP-SV2:TRY1 X10SA-OP-SV2:TRY2
-lamp=ch.psi.pshell.epics.Manipulator 
+lamp=ch.psi.pshell.epics.DiscretePositioner 
diff --git a/devices/lamp.properties b/devices/lamp.properties
index 3c0511e..7da3709 100644
--- a/devices/lamp.properties
+++ b/devices/lamp.properties
@@ -1,7 +1,8 @@
-#Tue Aug 18 15:51:26 CEST 2015
+#Tue Aug 18 16:01:14 CEST 2015
 accessType=ReadWrite
 position_pvs=X10SA-ES-KOI\:SET-POS|X10SA-ES-KOI\:SET-POS
 positions=Park|Measure
 precision=-1
 readback_pv=X10SA-ES-KOI\:GET-POS
+setpoint_pv=null
 stop_pv=null