diff --git a/slic/devices/general/motor.py b/slic/devices/general/motor.py
index 8238e1d0..7dbd41a1 100644
--- a/slic/devices/general/motor.py
+++ b/slic/devices/general/motor.py
@@ -123,11 +123,11 @@ class Motor(Adjustable):
         print(f"{low} < {val} < {high}")
 
 
-    def add_value_callback(self, callback, index=None):
+    def add_callback(self, callback, index=None):
         return self.pvs.readback.add_callback(callback=callback, index=index)
 
-    def clear_value_callback(self, index=None):
-        if index:
+    def remove_callback(self, index=None):
+        if index is not None:
             self.pvs.readback.remove_callback(index)
         else:
             self.pvs.readback.clear_callbacks()
diff --git a/slic/devices/general/update_changes.py b/slic/devices/general/update_changes.py
index b340ca6a..ef3bb76c 100644
--- a/slic/devices/general/update_changes.py
+++ b/slic/devices/general/update_changes.py
@@ -15,14 +15,14 @@ def update_changes(Adj):
             def cbfoo(**kwargs):
                 print(get_position_str(start, value, kwargs["value"]), end="\r")
 
-            cb_id = self.add_value_callback(cbfoo)
+            cb_id = self.add_callback(cbfoo)
             self._currentChange = self.set_target_value(value)
             self._currentChange.wait()
         except KeyboardInterrupt:
             self._currentChange.stop()
             print(f"\nAborted change at (~) {self.get_current_value():1.5g}")
         finally:
-            self.clear_value_callback(cb_id)
+            self.remove_callback(cb_id)
         return self._currentChange
 
     def update_change_relative(self, value, *args, **kwargs):