diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dcb01c..906ebfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,8 @@ set(SRC_ROOT_DIR src/${PROJECT_NAME})
 
 set(HEADER_FILES
     ${SRC_ROOT_DIR}/initCosserat.h.in
-    ${SRC_ROOT_DIR}/mapping/BaseCosserat.h
-    ${SRC_ROOT_DIR}/mapping/BaseCosserat.inl
+    ${SRC_ROOT_DIR}/mapping/BaseCosseratMapping.h
+    ${SRC_ROOT_DIR}/mapping/BaseCosseratMapping.inl
     ${SRC_ROOT_DIR}/mapping/DiscreteCosseratMapping.h
     ${SRC_ROOT_DIR}/mapping/DiscreteCosseratMapping.inl
     ${SRC_ROOT_DIR}/mapping/DiscreteDynamicCosseratMapping.h
@@ -50,7 +50,7 @@ set(HEADER_FILES
     )
 set(SOURCE_FILES
     ${SRC_ROOT_DIR}/initCosserat.cpp
-    ${SRC_ROOT_DIR}/mapping/BaseCosserat.cpp
+    ${SRC_ROOT_DIR}/mapping/BaseCosseratMapping.cpp
     ${SRC_ROOT_DIR}/mapping/DiscreteCosseratMapping.cpp
     ${SRC_ROOT_DIR}/mapping/DiscreteDynamicCosseratMapping.cpp
     ${SRC_ROOT_DIR}/engine/ProjectionEngine.cpp
diff --git a/src/Cosserat/mapping/BaseCosserat.cpp b/src/Cosserat/mapping/BaseCosseratMapping.cpp
similarity index 99%
rename from src/Cosserat/mapping/BaseCosserat.cpp
rename to src/Cosserat/mapping/BaseCosseratMapping.cpp
index 852484c..5c6c87b 100644
--- a/src/Cosserat/mapping/BaseCosserat.cpp
+++ b/src/Cosserat/mapping/BaseCosseratMapping.cpp
@@ -20,7 +20,7 @@
  * Contact information: contact@sofa-framework.org                             *
  ******************************************************************************/
 #define SOFA_COSSERAT_CPP_BaseCosseratMapping
-#include <Cosserat/mapping/BaseCosserat.inl>
+#include <Cosserat/mapping/BaseCosseratMapping.inl>
 
 #include <sofa/core/ObjectFactory.h>
 #include <sofa/defaulttype/RigidTypes.h>
diff --git a/src/Cosserat/mapping/BaseCosserat.h b/src/Cosserat/mapping/BaseCosseratMapping.h
similarity index 100%
rename from src/Cosserat/mapping/BaseCosserat.h
rename to src/Cosserat/mapping/BaseCosseratMapping.h
diff --git a/src/Cosserat/mapping/BaseCosserat.inl b/src/Cosserat/mapping/BaseCosseratMapping.inl
similarity index 99%
rename from src/Cosserat/mapping/BaseCosserat.inl
rename to src/Cosserat/mapping/BaseCosseratMapping.inl
index e272948..fdf25e8 100644
--- a/src/Cosserat/mapping/BaseCosserat.inl
+++ b/src/Cosserat/mapping/BaseCosseratMapping.inl
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <Cosserat/initCosserat.h>
-#include <Cosserat/mapping/BaseCosserat.h>
+#include <Cosserat/mapping/BaseCosseratMapping.h>
 
 #include <sofa/core/Multi2Mapping.inl>
 #include <sofa/core/behavior/MechanicalState.h>
diff --git a/src/Cosserat/mapping/DifferenceMultiMapping.h b/src/Cosserat/mapping/DifferenceMultiMapping.h
index 7ec2b65..f4567d0 100644
--- a/src/Cosserat/mapping/DifferenceMultiMapping.h
+++ b/src/Cosserat/mapping/DifferenceMultiMapping.h
@@ -21,7 +21,7 @@
 ******************************************************************************/
 #pragma once
 #include <Cosserat/initCosserat.h>
-#include <Cosserat/mapping/BaseCosserat.h>
+#include <Cosserat/mapping/BaseCosseratMapping.h>
 
 #include <sofa/core/BaseMapping.h>
 #include <sofa/core/config.h>
diff --git a/src/Cosserat/mapping/DiscreteCosseratMapping.h b/src/Cosserat/mapping/DiscreteCosseratMapping.h
index d3eb3ed..cb05746 100644
--- a/src/Cosserat/mapping/DiscreteCosseratMapping.h
+++ b/src/Cosserat/mapping/DiscreteCosseratMapping.h
@@ -23,7 +23,7 @@
 #include <Cosserat/initCosserat.h>
 
 #include <Cosserat/forcefield/BeamHookeLawForceField.h>
-#include <Cosserat/mapping/BaseCosserat.h>
+#include <Cosserat/mapping/BaseCosseratMapping.h>
 
 #include <sofa/core/BaseMapping.h>
 #include <sofa/core/Multi2Mapping.h>
diff --git a/src/Cosserat/mapping/DiscreteDynamicCosseratMapping.h b/src/Cosserat/mapping/DiscreteDynamicCosseratMapping.h
index 349748b..bf30dc1 100644
--- a/src/Cosserat/mapping/DiscreteDynamicCosseratMapping.h
+++ b/src/Cosserat/mapping/DiscreteDynamicCosseratMapping.h
@@ -21,7 +21,7 @@
 ******************************************************************************/
 #pragma once
 #include <Cosserat/initCosserat.h>
-#include <Cosserat/mapping/BaseCosserat.h>
+#include <Cosserat/mapping/BaseCosseratMapping.h>
 
 #include <sofa/core/BaseMapping.h>
 #include <sofa/core/Multi2Mapping.h>
diff --git a/src/Cosserat/mapping/LegendrePolynomialsMapping.h b/src/Cosserat/mapping/LegendrePolynomialsMapping.h
index 5a1571b..4a72683 100644
--- a/src/Cosserat/mapping/LegendrePolynomialsMapping.h
+++ b/src/Cosserat/mapping/LegendrePolynomialsMapping.h
@@ -3,7 +3,7 @@
 //
 #pragma once
 #include <Cosserat/initCosserat.h>
-#include <Cosserat/mapping/BaseCosserat.h>
+#include <Cosserat/mapping/BaseCosseratMapping.h>
 
 #include <sofa/core/BaseMapping.h>
 #include <sofa/core/config.h>
diff --git a/src/Cosserat/mapping/RigidDistanceMapping.h b/src/Cosserat/mapping/RigidDistanceMapping.h
index c75c2ae..8258e66 100644
--- a/src/Cosserat/mapping/RigidDistanceMapping.h
+++ b/src/Cosserat/mapping/RigidDistanceMapping.h
@@ -21,7 +21,7 @@
 ******************************************************************************/
 #pragma once
 #include <Cosserat/initCosserat.h>
-#include <Cosserat/mapping/BaseCosserat.h>
+#include <Cosserat/mapping/BaseCosseratMapping.h>
 
 #include <sofa/core/BaseMapping.h>
 #include <sofa/core/config.h>