diff --git a/NPAnalysis/10He_Riken/Analysis.cxx b/NPAnalysis/10He_Riken/Analysis.cxx
index 0bef83e13c1ad9353f10681c04c36ba98015b0e6..337854f57e2932e329c8e2ac5f846d3e42656e75 100644
--- a/NPAnalysis/10He_Riken/Analysis.cxx
+++ b/NPAnalysis/10He_Riken/Analysis.cxx
@@ -26,7 +26,6 @@ int main(int argc,char** argv)
    // get input files from NPOptionManager
    string reactionfileName    = myOptionManager->GetReactionFile();
    string detectorfileName    = myOptionManager->GetDetectorFile();
-   string calibrationfileName = myOptionManager->GetCalibrationFile();
    string OutputfileName      = myOptionManager->GetOutputFile();
 
 	//	Instantiate some Reaction
@@ -40,8 +39,6 @@ int main(int argc,char** argv)
 	NPA::DetectorManager* myDetector = new DetectorManager 			  ;
 	myDetector	->	ReadConfigurationFile(detectorfileName)		;
 
-	//	Instantiate the Calibration Manger using a file
-	CalibrationManager* myCalibration = CalibrationManager::getInstance(calibrationfileName) ;
 	
 	//	Attach more branch to the output
 	
diff --git a/NPAnalysis/Gaspard/Analysis.cxx b/NPAnalysis/Gaspard/Analysis.cxx
index 01edddb4663d15c07bf2c9f0a6e7bfabc09c6d17..87c382706c4992f06eadd93b9a4e6d14e4ee8f8d 100644
--- a/NPAnalysis/Gaspard/Analysis.cxx
+++ b/NPAnalysis/Gaspard/Analysis.cxx
@@ -27,7 +27,6 @@ int main(int argc,char** argv)
    // get input files from NPOptionManager
    string reactionfileName    = myOptionManager->GetReactionFile();
    string detectorfileName    = myOptionManager->GetDetectorFile();
-   string calibrationfileName = myOptionManager->GetCalibrationFile();
    string OutputfileName      = myOptionManager->GetOutputFile();
 
    // Initialize the reaction
diff --git a/NPAnalysis/Hyde/Analysis.cxx b/NPAnalysis/Hyde/Analysis.cxx
index ad9f68460444754bae75d7189be9e5902fa8a5a1..1d37c533271c43fd69d1e0852d528cfa10f16819 100644
--- a/NPAnalysis/Hyde/Analysis.cxx
+++ b/NPAnalysis/Hyde/Analysis.cxx
@@ -27,7 +27,6 @@ int main(int argc,char** argv)
    // get input files from NPOptionManager
    string reactionfileName    = myOptionManager->GetReactionFile();
    string detectorfileName    = myOptionManager->GetDetectorFile();
-   string calibrationfileName = myOptionManager->GetCalibrationFile();
    string OutputfileName      = myOptionManager->GetOutputFile();
 
    // Initialize the reaction
diff --git a/NPAnalysis/Paris/Analysis.cxx b/NPAnalysis/Paris/Analysis.cxx
index 634cfa7d149829cba9b719e8fea3d02384dd42cb..9b10c2a0c0def345feb55b883606dbdd34c11e62 100644
--- a/NPAnalysis/Paris/Analysis.cxx
+++ b/NPAnalysis/Paris/Analysis.cxx
@@ -27,7 +27,6 @@ int main(int argc,char** argv)
    // get input files from NPOptionManager
    string reactionfileName    = myOptionManager->GetReactionFile();
    string detectorfileName    = myOptionManager->GetDetectorFile();
-   string calibrationfileName = myOptionManager->GetCalibrationFile();
    string OutputfileName      = myOptionManager->GetOutputFile();
 	
    // Initialize the reaction
diff --git a/NPAnalysis/RRC66/Analysis.cxx b/NPAnalysis/RRC66/Analysis.cxx
index a1fd58ebbcc19e90f04b232cc44ad6e695406754..4fd81654b331b216d6dd1273b73e5adeda6d6d72 100644
--- a/NPAnalysis/RRC66/Analysis.cxx
+++ b/NPAnalysis/RRC66/Analysis.cxx
@@ -18,7 +18,6 @@ int main(int argc, char** argv)
 
    // get input files from NPOptionManager
    string detectorfileName    = myOptionManager->GetDetectorFile();
-   string calibrationfileName = myOptionManager->GetCalibrationFile();
    string OutputfileName      = myOptionManager->GetOutputFile();
    
    // Instantiate RootOutput
diff --git a/NPAnalysis/W1/Analysis.cxx b/NPAnalysis/W1/Analysis.cxx
index 26aec047354412bd927c7d30aefe9370e0d10517..558d068b28f3c26757a5f1dcd620292ed56e5e5c 100644
--- a/NPAnalysis/W1/Analysis.cxx
+++ b/NPAnalysis/W1/Analysis.cxx
@@ -27,7 +27,6 @@ int main(int argc,char** argv)
    // get input files from NPOptionManager
    string reactionfileName    = myOptionManager->GetReactionFile();
    string detectorfileName    = myOptionManager->GetDetectorFile();
-   string calibrationfileName = myOptionManager->GetCalibrationFile();
    string OutputfileName      = myOptionManager->GetOutputFile();
 
    // Initialize the reaction
diff --git a/NPAnalysis/must2/Analysis.cxx b/NPAnalysis/must2/Analysis.cxx
index 0f7d002f109e129dcf65527216e02091d8da88e5..7c69e2d4e4c3b6cb5eb54d499d1724d24799dd17 100644
--- a/NPAnalysis/must2/Analysis.cxx
+++ b/NPAnalysis/must2/Analysis.cxx
@@ -31,7 +31,6 @@ int main(int argc,char** argv)
    // get input files from NPOptionManager
    string reactionfileName    = myOptionManager->GetReactionFile();
    string detectorfileName    = myOptionManager->GetDetectorFile();
-   string calibrationfileName = myOptionManager->GetCalibrationFile();
    string OutputfileName      = myOptionManager->GetOutputFile();
 
    // Instantiate some Reaction
@@ -39,9 +38,6 @@ int main(int argc,char** argv)
    NPL::Reaction* myReaction = new Reaction();
    myReaction->ReadConfigurationFile(reactionfileName);
     
-   // Instantiate the Calibration Manger using a file (WARNING:prior to the detector instantiation)
-   CalibrationManager* myCalibration = CalibrationManager::getInstance(calibrationfileName) ;
-    
    // Instantiate the detector using a file 
    NPA::DetectorManager* myDetector = new DetectorManager();
    myDetector->ReadConfigurationFile(detectorfileName);
@@ -60,9 +56,6 @@ int main(int argc,char** argv)
    // Set energy beam at target middle
    myReaction->SetBeamEnergy(BeamEnergy);
    myReaction->Print();
-     
-   // Ask the detector manager to load the parameter added by the detector in the calibrationfileName
-   myCalibration->LoadParameterFromFile() ;
       
    // Attach more branch to the output
    const int mult = 2;
diff --git a/NPAnalysis/sssd/Analysis.cxx b/NPAnalysis/sssd/Analysis.cxx
index b5b590d36b278bf3e9a50b71eb4e2f5fbf08e744..9dce1f6dddeeed22962ed3ffbf643761dd8295e9 100644
--- a/NPAnalysis/sssd/Analysis.cxx
+++ b/NPAnalysis/sssd/Analysis.cxx
@@ -18,7 +18,6 @@ int main(int argc, char** argv)
 
    // get input files from NPOptionManager
    string detectorfileName    = myOptionManager->GetDetectorFile();
-   string calibrationfileName = myOptionManager->GetCalibrationFile();
    string OutputfileName      = myOptionManager->GetOutputFile();
    
    // Instantiate RootOutput
diff --git a/NPSimulation/src/MUST2Array.cc b/NPSimulation/src/MUST2Array.cc
index e55ea8bf1ed427c01705abb29a4efe128ecc95fe..1b39c9db67ec9697fe6baec974f76ff30f62d117 100644
--- a/NPSimulation/src/MUST2Array.cc
+++ b/NPSimulation/src/MUST2Array.cc
@@ -43,7 +43,7 @@
 
 //G4 sensitive
 #include "GeneralScorers.hh"
-#include "Must2Scorers.hh"
+#include "MUST2Scorers.hh"
 
 //Not G4
 #include "RootOutput.h"
diff --git a/NPSimulation/src/Must2Scorers.cc b/NPSimulation/src/Must2Scorers.cc
index d00f95e7acc5cbd152f399180fbd8bb46ced5192..b94747015facd4e09db94450831ef95148ce1119 100644
--- a/NPSimulation/src/Must2Scorers.cc
+++ b/NPSimulation/src/Must2Scorers.cc
@@ -22,7 +22,7 @@
  *  a global ID for each event you should not use those scorer with some G4  *
  *  provided ones or being very carefull doing so.                           *
  *****************************************************************************/
-#include "Must2Scorers.hh"
+#include "MUST2Scorers.hh"
 #include "G4UnitsTable.hh"
 #include "GeneralScorers.hh"
 #include <string>