diff --git a/include/sot-core/op-point-modifier.h b/include/sot-core/op-point-modifier.h
index 66381a55fad370b39f409c4059b8ccabd21644a6..38a07b106f16d6d37b699b8ebe98e71246ad9faa 100644
--- a/include/sot-core/op-point-modifier.h
+++ b/include/sot-core/op-point-modifier.h
@@ -34,13 +34,13 @@ namespace ml = maal::boost;
 /* --------------------------------------------------------------------- */
 
 #if defined (WIN32) 
-#  if defined (sotOpPointModifior_EXPORTS)
-#    define SOTOPPOINTMODIFIOR_EXPORT __declspec(dllexport)
+#  if defined (OpPointModifier_EXPORTS)
+#    define SOTOPPOINTMODIFIER_EXPORT __declspec(dllexport)
 #  else  
-#    define SOTOPPOINTMODIFIOR_EXPORT __declspec(dllimport)
+#    define SOTOPPOINTMODIFIER_EXPORT __declspec(dllimport)
 #  endif 
 #else
-#  define SOTOPPOINTMODIFIOR_EXPORT
+#  define SOTOPPOINTMODIFIER_EXPORT
 #endif
 
 /* --------------------------------------------------------------------- */
@@ -50,7 +50,7 @@ namespace ml = maal::boost;
 namespace sot {
 namespace dg = dynamicgraph;
 
-class SOTOPPOINTMODIFIOR_EXPORT OpPointModifior
+class SOTOPPOINTMODIFIER_EXPORT OpPointModifier
 : public dg::Entity
 {
  public:
@@ -68,9 +68,9 @@ class SOTOPPOINTMODIFIOR_EXPORT OpPointModifior
   dg::SignalTimeDependent<MatrixHomogeneous,int> positionSOUT;
 
 public:
-  OpPointModifior( const std::string& name );
+  OpPointModifier( const std::string& name );
 
-  virtual ~OpPointModifior( void ){}
+  virtual ~OpPointModifier( void ){}
 
   ml::Matrix& computeJacobian( ml::Matrix& res,const int& time );
   MatrixHomogeneous& computePosition( MatrixHomogeneous& res,const int& time );
diff --git a/src/math/op-point-modifier.cpp b/src/math/op-point-modifier.cpp
index bf013012c5600a338ed9ab591dac16e73a216e8b..2c15a8b9d215fdf4b6ab509a78841b7801c8070d 100644
--- a/src/math/op-point-modifier.cpp
+++ b/src/math/op-point-modifier.cpp
@@ -2,7 +2,7 @@
  * Copyright Projet JRL-Japan, 2007
  *+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  *
- * File:      OpPointModifior.cp
+ * File:      OpPointModifier.cp
  * Project:   SOT
  * Author:    Nicolas Mansard
  *
@@ -30,23 +30,23 @@ using namespace sot;
 using namespace dynamicgraph;
 
 
-SOT_FACTORY_ENTITY_PLUGIN(OpPointModifior,"OpPointModifior");
+SOT_FACTORY_ENTITY_PLUGIN(OpPointModifier,"OpPointModifior");
 
 
 /* --------------------------------------------------------------------- */
 /* --------------------------------------------------------------------- */
 /* --------------------------------------------------------------------- */
 
-OpPointModifior::
-OpPointModifior( const std::string& name )
+OpPointModifier::
+OpPointModifier( const std::string& name )
   :Entity( name )
    ,transformation()
    ,jacobianSIN(NULL,"OpPointModifior("+name+")::input(matrix)::jacobianIN")
    ,positionSIN(NULL,"OpPointModifior("+name+")::input(matrixhomo)::positionIN")
-   ,jacobianSOUT( boost::bind(&OpPointModifior::computeJacobian,this,_1,_2),
+   ,jacobianSOUT( boost::bind(&OpPointModifier::computeJacobian,this,_1,_2),
 		  jacobianSIN,
 		  "OpPointModifior("+name+")::output(matrix)::jacobian" )
-   ,positionSOUT( boost::bind(&OpPointModifior::computePosition,this,_1,_2),
+   ,positionSOUT( boost::bind(&OpPointModifier::computePosition,this,_1,_2),
 		  jacobianSIN,
 		  "OpPointModifior("+name+")::output(matrixhomo)::position" )
 
@@ -57,7 +57,7 @@ OpPointModifior( const std::string& name )
 }
 
 ml::Matrix&
-OpPointModifior::computeJacobian( ml::Matrix& res,const int& time )
+OpPointModifier::computeJacobian( ml::Matrix& res,const int& time )
 {
   const ml::Matrix& jacobian = jacobianSIN( time );
   MatrixTwist V( transformation );
@@ -66,7 +66,7 @@ OpPointModifior::computeJacobian( ml::Matrix& res,const int& time )
 }
 
 MatrixHomogeneous&
-OpPointModifior::computePosition( MatrixHomogeneous& res,const int& time )
+OpPointModifier::computePosition( MatrixHomogeneous& res,const int& time )
 {
   sotDEBUGIN(15);
   sotDEBUGIN(15) << time << " " << positionSIN.getTime() << positionSOUT.getTime() << endl;
@@ -77,11 +77,11 @@ OpPointModifior::computePosition( MatrixHomogeneous& res,const int& time )
 }
 
 void
-OpPointModifior::setTransformation( const MatrixHomogeneous& tr )
+OpPointModifier::setTransformation( const MatrixHomogeneous& tr )
 { transformation = tr; }
 
 
-void OpPointModifior::
+void OpPointModifier::
 commandLine( const std::string& cmdLine,
 	     std::istringstream& cmdArgs, 
 	     std::ostream& os )