diff --git a/mo/src/algo/moMetropolisHasting.h b/mo/src/algo/moMetropolisHastings.h
similarity index 100%
rename from mo/src/algo/moMetropolisHasting.h
rename to mo/src/algo/moMetropolisHastings.h
diff --git a/mo/src/explorer/moMetropolisHastingExplorer.h b/mo/src/explorer/moMetropolisHastingsExplorer.h
similarity index 100%
rename from mo/src/explorer/moMetropolisHastingExplorer.h
rename to mo/src/explorer/moMetropolisHastingsExplorer.h
diff --git a/mo/src/explorer/moSAexplorer.h b/mo/src/explorer/moSAExplorer.h
similarity index 100%
rename from mo/src/explorer/moSAexplorer.h
rename to mo/src/explorer/moSAExplorer.h
diff --git a/mo/src/sampling/moMHBestFitnessCloudSampling.h b/mo/src/sampling/moMHBestFitnessCloudSampling.h
index ebba8a3b9..e9c71f35b 100644
--- a/mo/src/sampling/moMHBestFitnessCloudSampling.h
+++ b/mo/src/sampling/moMHBestFitnessCloudSampling.h
@@ -39,7 +39,7 @@
 #include <neighborhood/moNeighborhood.h>
 #include <eval/moEval.h>
 #include <eoEvalFunc.h>
-#include <algo/moMetropolisHasting.h>
+#include <algo/moMetropolisHastings.h>
 #include <continuator/moNeighborBestStat.h>
 #include <sampling/moFitnessCloudSampling.h>
 
@@ -87,7 +87,7 @@ public:
         delete localSearch;
 
         // Metropolis-Hasting sampling
-        localSearch = new moMetropolisHasting<Neighbor>(_neighborhood, _fullEval, _eval, _nbStep);
+        localSearch = new moMetropolisHastings<Neighbor>(_neighborhood, _fullEval, _eval, _nbStep);
 
         // delete the checkpoint with the wrong continuator
         delete checkpoint;
diff --git a/mo/src/sampling/moMHRndFitnessCloudSampling.h b/mo/src/sampling/moMHRndFitnessCloudSampling.h
index 292d42344..2a3cca639 100644
--- a/mo/src/sampling/moMHRndFitnessCloudSampling.h
+++ b/mo/src/sampling/moMHRndFitnessCloudSampling.h
@@ -39,7 +39,7 @@
 #include <neighborhood/moNeighborhood.h>
 #include <eval/moEval.h>
 #include <eoEvalFunc.h>
-#include <algo/moMetropolisHasting.h>
+#include <algo/moMetropolisHastings.h>
 #include <continuator/moNeighborFitnessStat.h>
 #include <sampling/moFitnessCloudSampling.h>
 
@@ -87,7 +87,7 @@ public:
         delete localSearch;
 
         // Metropolis-Hasting sampling
-        localSearch = new moMetropolisHasting<Neighbor>(_neighborhood, _fullEval, _eval, _nbStep);
+        localSearch = new moMetropolisHastings<Neighbor>(_neighborhood, _fullEval, _eval, _nbStep);
 
         // delete the checkpoint with the wrong continuator
         delete checkpoint;
diff --git a/mo/src/continuator/moStdDevEstimator.h b/mo/src/sampling/moStdDevEstimator.h
similarity index 100%
rename from mo/src/continuator/moStdDevEstimator.h
rename to mo/src/sampling/moStdDevEstimator.h
diff --git a/mo/test/CMakeLists.txt b/mo/test/CMakeLists.txt
index 319ffb0c9..898e6e22d 100644
--- a/mo/test/CMakeLists.txt
+++ b/mo/test/CMakeLists.txt
@@ -38,7 +38,7 @@ set (TEST_LIST
 		t-moNeutralHCexplorer
 		t-moFirstImprHCexplorer
 		t-moRandomWalkExplorer
-		t-moMetropolisHastingExplorer
+		t-moMetropolisHastingsExplorer
 		t-moRandomNeutralWalkExplorer
 		t-moTSexplorer
 		t-moSolComparator
@@ -52,7 +52,7 @@ set (TEST_LIST
 		t-moMonOpPerturb
 		t-moRestartPerturb
 		t-moNeighborhoodPerturb
-		t-moSAexplorer
+		t-moSAExplorer
 		t-moSA
 		t-moLocalSearch
 		t-moILSexplorer
@@ -65,7 +65,7 @@ set (TEST_LIST
 		t-moILS
 		t-moDummyLS
 		t-moRandomSearch
-		t-moMetropolisHasting
+		t-moMetropolisHastings
 		t-moNeutralHC
 		t-moRandomWalk
 		t-moRandomNeutralWalk
diff --git a/mo/test/t-moMetropolisHasting.cpp b/mo/test/t-moMetropolisHastings.cpp
similarity index 100%
rename from mo/test/t-moMetropolisHasting.cpp
rename to mo/test/t-moMetropolisHastings.cpp
diff --git a/mo/test/t-moMetropolisHastingExplorer.cpp b/mo/test/t-moMetropolisHastingsExplorer.cpp
similarity index 100%
rename from mo/test/t-moMetropolisHastingExplorer.cpp
rename to mo/test/t-moMetropolisHastingsExplorer.cpp
diff --git a/mo/test/t-moSAexplorer.cpp b/mo/test/t-moSAExplorer.cpp
similarity index 100%
rename from mo/test/t-moSAexplorer.cpp
rename to mo/test/t-moSAExplorer.cpp