diff --git a/src/modules/idler.cpp b/src/modules/idler.cpp
index 6be1be4..b04dd4b 100644
--- a/src/modules/idler.cpp
+++ b/src/modules/idler.cpp
@@ -22,7 +22,7 @@ bool Idler::Disengage() {
 
     mm::motion.InitAxis(mm::Idler);
     // plan move to idle position
-    mm::motion.PlanMove(mm::Idler, config::idlerSlotPositions[IdleSlotIndex()] - mm::motion.CurrentPos(mm::Idler), 1000); // @@TODO
+    mm::motion.PlanMove(mm::Idler, config::idlerSlotPositions[IdleSlotIndex()] - mm::motion.Position(mm::Idler), 1000); // @@TODO
     state = Moving;
     return true;
 }
@@ -38,7 +38,7 @@ bool Idler::Engage(uint8_t slot) {
         return true;
 
     mm::motion.InitAxis(mm::Idler);
-    mm::motion.PlanMove(mm::Idler, config::idlerSlotPositions[slot] - mm::motion.CurrentPos(mm::Idler), 1000); // @@TODO
+    mm::motion.PlanMove(mm::Idler, config::idlerSlotPositions[slot] - mm::motion.Position(mm::Idler), 1000); // @@TODO
     state = Moving;
     return true;
 }
diff --git a/src/modules/motion.cpp b/src/modules/motion.cpp
index a902f7a..1380be7 100644
--- a/src/modules/motion.cpp
+++ b/src/modules/motion.cpp
@@ -39,7 +39,7 @@ void Motion::PlanMoveTo(Axis axis, pos_t pos, steps_t feedrate) {
     }
 }
 
-pos_t Motion::CurrentPos(Axis axis) const {
+pos_t Motion::Position(Axis axis) const {
     return axisData[axis].ctrl.Position();
 }
 
diff --git a/src/modules/motion.h b/src/modules/motion.h
index fcc3132..1937ef3 100644
--- a/src/modules/motion.h
+++ b/src/modules/motion.h
@@ -112,12 +112,12 @@ public:
     /// @param delta relative to current position
     /// @param feedrate maximum feedrate
     void PlanMove(Axis axis, pos_t delta, steps_t feedrate) {
-        PlanMoveTo(axis, CurrentPos(axis) + delta, feedrate);
+        PlanMoveTo(axis, Position(axis) + delta, feedrate);
     }
 
-    /// @returns current position of an axis
+    /// @returns head position of an axis (last enqueued position)
     /// @param axis axis affected
-    pos_t CurrentPos(Axis axis) const;
+    pos_t Position(Axis axis) const;
 
     /// Set acceleration for the selected axis
     /// @param axis axis affected
diff --git a/src/modules/selector.cpp b/src/modules/selector.cpp
index ed0f8a6..67605e0 100644
--- a/src/modules/selector.cpp
+++ b/src/modules/selector.cpp
@@ -21,7 +21,7 @@ bool Selector::MoveToSlot(uint8_t slot) {
         return true;
 
     mm::motion.InitAxis(mm::Selector);
-    mm::motion.PlanMove(mm::Selector, config::selectorSlotPositions[slot] - mm::motion.CurrentPos(mm::Selector), 1000); // @@TODO
+    mm::motion.PlanMove(mm::Selector, config::selectorSlotPositions[slot] - mm::motion.Position(mm::Selector), 1000); // @@TODO
     state = Moving;
     return true;
 }
diff --git a/tests/unit/logic/stubs/stub_motion.cpp b/tests/unit/logic/stubs/stub_motion.cpp
index 48fdf5f..b22ec88 100644
--- a/tests/unit/logic/stubs/stub_motion.cpp
+++ b/tests/unit/logic/stubs/stub_motion.cpp
@@ -34,7 +34,7 @@ void Motion::PlanMoveTo(Axis axis, pos_t pos, steps_t feedrate) {
     axes[axis].targetPos = pos;
 }
 
-pos_t Motion::CurrentPos(Axis axis) const {
+pos_t Motion::Position(Axis axis) const {
     return axes[axis].pos;
 }