diff --git a/include/core/processor/is_motion.h b/include/core/processor/is_motion.h
index b1fabc0a71a2a0b2009c597ad2be60abf87d69b9..761e41e8d9390b9def65bfba63a704ca5fe39678 100644
--- a/include/core/processor/is_motion.h
+++ b/include/core/processor/is_motion.h
@@ -22,17 +22,18 @@ class IsMotion
 {
     public:
 
-        // TODO move somewhere below
-        virtual bool    getStateComposite(VectorComposite& _state) const = 0;
-        virtual bool    getStateComposite(const TimeStamp& _ts, VectorComposite& _state) const = 0;
-        VectorComposite  getStateComposite() const;
-        VectorComposite  getStateComposite(const TimeStamp& _ts) const;
-
 
         virtual ~IsMotion();
 
         // Queries to the processor:
 
+        virtual bool        getVectorComposite(VectorComposite& _state) const = 0;
+        virtual bool        getVectorComposite(const TimeStamp& _ts, VectorComposite& _state) const = 0;
+
+        VectorComposite     getVectorComposite() const;
+        VectorComposite     getVectorComposite(const TimeStamp& _ts) const;
+
+
         /** \brief Fill a reference to the state integrated so far
          * \param _x the returned state vector
          */
@@ -91,17 +92,17 @@ inline Eigen::VectorXd IsMotion::getState(const TimeStamp& _ts) const
     return x;
 }
 
-inline VectorComposite IsMotion::getStateComposite() const
+inline VectorComposite IsMotion::getVectorComposite() const
 {
     VectorComposite state;
-    getStateComposite(state);
+    getVectorComposite(state);
     return state;
 }
 
-inline VectorComposite IsMotion::getStateComposite(const TimeStamp &_ts) const
+inline VectorComposite IsMotion::getVectorComposite(const TimeStamp &_ts) const
 {
     VectorComposite state;
-    getStateComposite(_ts, state);
+    getVectorComposite(_ts, state);
     return state;
 }