diff --git a/include/laser/processor/processor_odom_icp.h b/include/laser/processor/processor_odom_icp.h
index 2e82eafc83f430d151808d64947725cc74069f83..12051e701336ec0850533ee98f9de6405d56f6ff 100644
--- a/include/laser/processor/processor_odom_icp.h
+++ b/include/laser/processor/processor_odom_icp.h
@@ -42,7 +42,7 @@ namespace wolf {
 WOLF_PTR_TYPEDEFS(ProcessorOdomIcp);
 WOLF_STRUCT_PTR_TYPEDEFS(ParamsProcessorOdomIcp);
 
-struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMotion
+struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsMotionProvider
 {
     // ICP Params
     laserscanutils::icpParams icp_params;
@@ -60,7 +60,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo
     ParamsProcessorOdomIcp() = default;
     ParamsProcessorOdomIcp(std::string _unique_name, const ParamsServer &_server):
         ParamsProcessorTracker(_unique_name, _server),
-        ParamsIsMotion(_unique_name, _server)
+        ParamsMotionProvider(_unique_name, _server)
     {
         // keyframe voting
         vfk_min_dist               = _server.getParam<double> (prefix + _unique_name  + "/keyframe_vote/min_dist");
@@ -127,7 +127,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo
     }
 };
 
-class ProcessorOdomIcp : public ProcessorTracker, public IsMotion
+class ProcessorOdomIcp : public ProcessorTracker, public MotionProvider
 {
     protected:
         // Useful sensor stuff
diff --git a/src/processor/processor_odom_icp.cpp b/src/processor/processor_odom_icp.cpp
index bd5808fce567edd8e748b6b148f8304f0a8d762a..50872148fcc3afea0b727813fc3ee219f9e50d37 100644
--- a/src/processor/processor_odom_icp.cpp
+++ b/src/processor/processor_odom_icp.cpp
@@ -29,7 +29,7 @@ namespace wolf
 
 ProcessorOdomIcp::ProcessorOdomIcp(ParamsProcessorOdomIcpPtr _params):
                     ProcessorTracker("ProcessorOdomIcp", "PO", 2, _params),
-                    IsMotion("PO", _params),
+                    MotionProvider("PO", _params),
                     odom_origin_(Eigen::Vector3d::Zero()),
                     odom_last_(Eigen::Vector3d::Zero()),
                     odom_incoming_(Eigen::Vector3d::Zero()),
@@ -372,7 +372,7 @@ VectorComposite ProcessorOdomIcp::getState(const TimeStamp& _ts, const StateStru
 void ProcessorOdomIcp::setProblem(ProblemPtr _problem_ptr)
 {
     NodeBase::setProblem(_problem_ptr);
-    addToProblem(_problem_ptr, std::dynamic_pointer_cast<IsMotion>(shared_from_this()));
+    addToProblem(_problem_ptr, std::dynamic_pointer_cast<MotionProvider>(shared_from_this()));
 }
 
 } // namespace wolf