diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f2eab40b2c21b365065edb196c710259e2c1929..412fec35e5a0bac263c8544b779222342219238f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -213,7 +213,7 @@ SET(HDRS_SENSOR
   include/core/sensor/sensor_base.h
   include/core/sensor/sensor_diff_drive.h
   include/core/sensor/factory_sensor.h
-  include/core/sensor/sensor_model.h
+  include/core/sensor/sensor_motion_model.h
   include/core/sensor/sensor_odom_2d.h
   include/core/sensor/sensor_odom_3d.h
   include/core/sensor/sensor_pose.h
@@ -319,7 +319,7 @@ SET(SRCS_PROCESSOR
 SET(SRCS_SENSOR
   src/sensor/sensor_base.cpp
   src/sensor/sensor_diff_drive.cpp
-  src/sensor/sensor_model.cpp
+  src/sensor/sensor_motion_model.cpp
   src/sensor/sensor_odom_2d.cpp
   src/sensor/sensor_odom_3d.cpp
   src/sensor/sensor_pose.cpp
diff --git a/include/core/sensor/sensor_motion_model.h b/include/core/sensor/sensor_motion_model.h
index 7070ff1c72da933fa44a0ca180a596224ab66ee5..63d8ac73ec74fda3a6b515b41dcd809ad96ded11 100644
--- a/include/core/sensor/sensor_motion_model.h
+++ b/include/core/sensor/sensor_motion_model.h
@@ -19,26 +19,26 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 //--------LICENSE_END--------
-#ifndef SRC_SENSOR_MODEL_H_
-#define SRC_SENSOR_MODEL_H_
+#ifndef SRC_SENSOR_MOTION_MODEL_H_
+#define SRC_SENSOR_MOTION_MODEL_H_
 
 //wolf includes
 #include "core/sensor/sensor_base.h"
 
 namespace wolf {
 
-WOLF_PTR_TYPEDEFS(SensorModel);
+WOLF_PTR_TYPEDEFS(SensorMotionModel);
 
-class SensorModel : public SensorBase
+class SensorMotionModel : public SensorBase
 {
     public:
-        SensorModel();
-        ~SensorModel() override;
+        SensorMotionModel();
+        ~SensorMotionModel() override;
 
         static SensorBasePtr create(const std::string& _unique_name,
                                     const ParamsServer& _server)
         {
-            auto sensor = std::make_shared<SensorModel>();
+            auto sensor = std::make_shared<SensorMotionModel>();
             sensor      ->setName(_unique_name);
             return sensor;
         }
@@ -47,7 +47,7 @@ class SensorModel : public SensorBase
                                     const Eigen::VectorXd& _extrinsics,
                                     const ParamsSensorBasePtr _intrinsics)
         {
-            auto sensor = std::make_shared<SensorModel>();
+            auto sensor = std::make_shared<SensorMotionModel>();
             sensor      ->setName(_unique_name);
             return sensor;
         }
@@ -56,4 +56,4 @@ class SensorModel : public SensorBase
 
 } /* namespace wolf */
 
-#endif /* SRC_SENSOR_POSE_H_ */
+#endif /* SRC_SENSOR_MOTION_MODEL_H_ */
diff --git a/src/sensor/sensor_motion_model.cpp b/src/sensor/sensor_motion_model.cpp
index 292f1a05e1bfd5aaf1931998106a505afaf10df8..68a57213348ed529aa8021d276a8e584bc9f700e 100644
--- a/src/sensor/sensor_motion_model.cpp
+++ b/src/sensor/sensor_motion_model.cpp
@@ -19,18 +19,18 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 //--------LICENSE_END--------
-#include "core/sensor/sensor_model.h"
+#include "../../include/core/sensor/sensor_motion_model.h"
 
 namespace wolf {
 
 
-SensorModel::SensorModel() :
+SensorMotionModel::SensorMotionModel() :
     SensorBase("SensorModel", nullptr, nullptr, nullptr, 6)
 {
     //
 }
 
-SensorModel::~SensorModel()
+SensorMotionModel::~SensorMotionModel()
 {
     //
 }
@@ -40,6 +40,6 @@ SensorModel::~SensorModel()
 // Register in the FactorySensor
 #include "core/sensor/factory_sensor.h"
 namespace wolf {
-WOLF_REGISTER_SENSOR(SensorModel);
-WOLF_REGISTER_SENSOR_AUTO(SensorModel);
+WOLF_REGISTER_SENSOR(SensorMotionModel);
+WOLF_REGISTER_SENSOR_AUTO(SensorMotionModel);
 }