diff --git a/NPAnalysis/Example1/Analysis.cxx b/NPAnalysis/Example1/Analysis.cxx
index 0ca09aa68e8e5805a5f6a3426ffcdc28fb8317d5..febc1f59403b6a9c82320d04ffa931c7a5d09738 100644
--- a/NPAnalysis/Example1/Analysis.cxx
+++ b/NPAnalysis/Example1/Analysis.cxx
@@ -203,8 +203,8 @@ void Analysis::ReInitValue(){
 ////////////////////////////////////////////////////////////////////////////////
 //            Construct Method to be pass to the DetectorFactory              //
 ////////////////////////////////////////////////////////////////////////////////
-NPA::VAnalysis* Analysis::Construct(){
-  return (NPA::VAnalysis*) new Analysis();
+NPL::VAnalysis* Analysis::Construct(){
+  return (NPL::VAnalysis*) new Analysis();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -214,7 +214,7 @@ extern "C"{
 class proxy{
   public:
     proxy(){
-      NPA::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct);
+      NPL::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct);
     }
 };
 
diff --git a/NPAnalysis/Example1/Analysis.h b/NPAnalysis/Example1/Analysis.h
index 6537a6a23e65136ef014ef282347fa2a69b39fa8..d7f368ed30c33f0fd6b14a0d33b0aba1db929bc9 100644
--- a/NPAnalysis/Example1/Analysis.h
+++ b/NPAnalysis/Example1/Analysis.h
@@ -29,7 +29,7 @@
 #include "NPEnergyLoss.h"
 #include "NPReaction.h"
 #include "TRandom3.h"
-class Analysis: public NPA::VAnalysis{
+class Analysis: public NPL::VAnalysis{
   public:
     Analysis();
     ~Analysis();
@@ -41,7 +41,7 @@ class Analysis: public NPA::VAnalysis{
     void InitOutputBranch();
     void InitInputBranch();
     void ReInitValue();
-    static NPA::VAnalysis* Construct();
+    static NPL::VAnalysis* Construct();
 
   private:
     double Ex;
diff --git a/NPAnalysis/TAMU/Analysis.cxx b/NPAnalysis/TAMU/Analysis.cxx
index e307198ae61172e19fac5eba85e225165e16f14e..c37a57e953c3d3831725348f30367a0e2d6c5c57 100644
--- a/NPAnalysis/TAMU/Analysis.cxx
+++ b/NPAnalysis/TAMU/Analysis.cxx
@@ -250,8 +250,8 @@ void Analysis::InitInputBranch(){
 ////////////////////////////////////////////////////////////////////////////////
 //            Construct Method to be pass to the DetectorFactory              //
 ////////////////////////////////////////////////////////////////////////////////
-NPA::VAnalysis* Analysis::Construct(){
-  return (NPA::VAnalysis*) new Analysis();
+NPL::VAnalysis* Analysis::Construct(){
+  return (NPL::VAnalysis*) new Analysis();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -261,7 +261,7 @@ extern "C"{
 class proxy{
   public:
     proxy(){
-      NPA::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct);
+      NPL::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct);
     }
 };
 
diff --git a/NPAnalysis/TAMU/Analysis.h b/NPAnalysis/TAMU/Analysis.h
index 0e2d151448a93ce58bb1322df4dda2db38c650b8..74b6ef1cde5238ce8d9a0dc5dfd894cd5897bcc2 100644
--- a/NPAnalysis/TAMU/Analysis.h
+++ b/NPAnalysis/TAMU/Analysis.h
@@ -35,7 +35,7 @@
 
 
 
-class Analysis: public NPA::VAnalysis{
+class Analysis: public NPL::VAnalysis{
   public:
     Analysis();
     ~Analysis();
@@ -47,7 +47,7 @@ class Analysis: public NPA::VAnalysis{
     void ReInitValue();
     void InitOutputBranch();
     void InitInputBranch();
-    static NPA::VAnalysis* Construct();
+    static NPL::VAnalysis* Construct();
 
   private:
 
diff --git a/NPAnalysis/new/Analysis.cxx b/NPAnalysis/new/Analysis.cxx
index 0767bf3ff88725d35bc891378b0884a0a3840232..6698f224f75aa52053ea5c09a17bc0fe79b9e48d 100644
--- a/NPAnalysis/new/Analysis.cxx
+++ b/NPAnalysis/new/Analysis.cxx
@@ -48,8 +48,8 @@ void Analysis::End(){
 ////////////////////////////////////////////////////////////////////////////////
 //            Construct Method to be pass to the DetectorFactory              //
 ////////////////////////////////////////////////////////////////////////////////
-NPA::VAnalysis* Analysis::Construct(){
-  return (NPA::VAnalysis*) new Analysis();
+NPL::VAnalysis* Analysis::Construct(){
+  return (NPL::VAnalysis*) new Analysis();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -59,7 +59,7 @@ extern "C"{
 class proxy{
   public:
     proxy(){
-      NPA::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct);
+      NPL::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct);
     }
 };
 
diff --git a/NPAnalysis/new/Analysis.h b/NPAnalysis/new/Analysis.h
index 58859766e0e6b9a0bcdf77709ebc8be0b4d72e36..8c4974eac267e232b2ca0c59565152d8bf0bebbd 100644
--- a/NPAnalysis/new/Analysis.h
+++ b/NPAnalysis/new/Analysis.h
@@ -23,7 +23,7 @@
  *****************************************************************************/
 #include"NPVAnalysis.h"
 #include"TAnnularS1Physics.h"
-class Analysis: public NPA::VAnalysis{
+class Analysis: public NPL::VAnalysis{
   public:
     Analysis();
     ~Analysis();
@@ -33,7 +33,7 @@ class Analysis: public NPA::VAnalysis{
     void TreatEvent();
     void End();
 
-   static NPA::VAnalysis* Construct();
+   static NPL::VAnalysis* Construct();
 
   private:
    TAnnularS1Physics* S1;
diff --git a/NPAnalysis/newMUGAST/Analysis.cxx b/NPAnalysis/newMUGAST/Analysis.cxx
index 65d54642af19c86e9063e38c3b3add068484b36e..42349c3a5482f16f229cb128a53ef77ff8a564f4 100644
--- a/NPAnalysis/newMUGAST/Analysis.cxx
+++ b/NPAnalysis/newMUGAST/Analysis.cxx
@@ -205,8 +205,8 @@ void Analysis::ReInitValue(){
 ////////////////////////////////////////////////////////////////////////////////
 //            Construct Method to be pass to the AnalysisFactory              //
 ////////////////////////////////////////////////////////////////////////////////
-NPA::VAnalysis* Analysis::Construct(){
-  return (NPA::VAnalysis*) new Analysis();
+NPL::VAnalysis* Analysis::Construct(){
+  return (NPL::VAnalysis*) new Analysis();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -216,7 +216,7 @@ extern "C"{
 class proxy{
   public:
     proxy(){
-      NPA::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct);
+      NPL::AnalysisFactory::getInstance()->SetConstructor(Analysis::Construct);
     }
 };
 
diff --git a/NPAnalysis/newMUGAST/Analysis.h b/NPAnalysis/newMUGAST/Analysis.h
index 72dd8d00d7c668445ed9b2eb083e2dca3276f337..67905f72cd80cecd6936eb7667b0a102a0c2aacb 100644
--- a/NPAnalysis/newMUGAST/Analysis.h
+++ b/NPAnalysis/newMUGAST/Analysis.h
@@ -33,7 +33,7 @@
 #include <TVector3.h>
 #include <TMath.h>
 
-class Analysis: public NPA::VAnalysis{
+class Analysis: public NPL::VAnalysis{
   public:
     Analysis();
     ~Analysis();
@@ -46,7 +46,7 @@ class Analysis: public NPA::VAnalysis{
   void InitOutputBranch();
   void InitInputBranch();
   void ReInitValue();
-  static NPA::VAnalysis* Construct();
+  static NPL::VAnalysis* Construct();
  
   private:
   double Ex;