diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
index d72812c65418f6bfd00f8288284b201417d7b3b9..ef26af2b848c5d441f25bf29db4707ae9df3fe37 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.cxx
@@ -17,7 +17,7 @@
 #include "CbmDrawHist.h"
 #include "CbmGlobalTrack.h"
 #include "CbmKFParticleFinder.h"
-#include "CbmKFParticleFinderQA.h"
+#include "CbmKFParticleFinderQa.h"
 #include "CbmL1PFFitter.h"
 #include "CbmMCTrack.h"
 #include "CbmRichHit.h"
@@ -1736,7 +1736,7 @@ void CbmAnaConversion::ReconstructGamma()
 }
 
 
-void CbmAnaConversion::SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQA* kfparticleQA)
+void CbmAnaConversion::SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQa* kfparticleQA)
 {
 
   fKFparticle         = kfparticle;
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.h
index 021dd2163e5fbb47ba781c7bec93022947139768..5772c5faa34b94ee4eaef45ad1868d04640683ad 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversion.h
@@ -31,7 +31,7 @@
 #include "CbmAnaConversionTest2.h"
 #include "CbmAnaConversionTomography.h"
 #include "CbmKFParticleFinder.h"
-#include "CbmKFParticleFinderQA.h"
+#include "CbmKFParticleFinderQa.h"
 
 #include "TStopwatch.h"
 
@@ -114,7 +114,7 @@ public:
   void ReconstructGamma();
 
 
-  void SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQA* kfparticleQA);
+  void SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQa* kfparticleQA);
 
   Bool_t AnalysePi0_MC(CbmMCTrack* mctrack, int i);
   void AnalysePi0_Reco();
@@ -212,7 +212,7 @@ private:
 
 
   CbmKFParticleFinder* fKFparticle;
-  CbmKFParticleFinderQA* fKFparticleFinderQA;
+  CbmKFParticleFinderQa* fKFparticleFinderQA;
   const KFParticleTopoReconstructor* fKFtopo;
   std::vector<int> trackindexarray;
   Int_t particlecounter;
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.cxx b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.cxx
index f5b30cab45778c11905da0b649677a783df3bfb7..80d3ea1dd65038d71f98edc98576e50073d11e8b 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.cxx
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.cxx
@@ -17,7 +17,7 @@
 
 // included from CbmRoot
 #include "CbmKFParticleFinder.h"
-#include "CbmKFParticleFinderQA.h"
+#include "CbmKFParticleFinderQa.h"
 #include "CbmMCTrack.h"
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
@@ -189,7 +189,7 @@ void CbmAnaConversionKF::Exec()
 }
 
 
-void CbmAnaConversionKF::SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQA* kfparticleQA)
+void CbmAnaConversionKF::SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQa* kfparticleQA)
 {
   fKFparticle         = kfparticle;
   fKFparticleFinderQA = kfparticleQA;
diff --git a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
index 9499bb1d1f426c1b9cd42b65c9d65af56d237e80..8eec0678880f048800a1b55784927a50108d2662 100644
--- a/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
+++ b/analysis/PWGDIL/dielectron/conversion/CbmAnaConversionKF.h
@@ -23,7 +23,7 @@
 // included from CbmRoot
 #include "CbmKFParticle.h"
 #include "CbmKFParticleFinder.h"
-#include "CbmKFParticleFinderQA.h"
+#include "CbmKFParticleFinderQa.h"
 #include "CbmMCTrack.h"
 #include "CbmVertex.h"
 
@@ -46,7 +46,7 @@ public:
 
   //void KFParticle_Analysis();
 
-  void SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQA* kfparticleQA);
+  void SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQa* kfparticleQA);
   void SetSignalIds(std::vector<int>* signalids);
   void SetGhostIds(std::vector<int>* ghostids);
 
@@ -74,7 +74,7 @@ private:
   TClonesArray* fStsTrackMatches;
 
   CbmKFParticleFinder* fKFparticle;
-  CbmKFParticleFinderQA* fKFparticleFinderQA;
+  CbmKFParticleFinderQa* fKFparticleFinderQA;
 
   const KFParticleTopoReconstructor* fKFtopo;
   KFTopoPerformance* fKFtopoPerf;
diff --git a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
index 6b139f3be8a431723101217acccd1840b600be8a..129de37c203bcb1a61ec65662c18963bed83aa9f 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
+++ b/analysis/PWGDIL/dielectron/papaframework/CMakeLists.txt
@@ -76,7 +76,7 @@ PairAnalysisPairLV.cxx
 PairAnalysisHelper.cxx
 PairAnalysisStyler.cxx
 
-PairAnalysisCutQA.cxx
+PairAnalysisCutQa.cxx
 PairAnalysisVarCuts.cxx
 PairAnalysisObjectCuts.cxx
 PairAnalysisPairLegCuts.cxx
diff --git a/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h b/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h
index 00b834f4b9a8f35e21949f7e394c6209ca9c5ed0..6c9c1e4ba823f4e2430a2295a9eb68191ce71973 100644
--- a/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h
+++ b/analysis/PWGDIL/dielectron/papaframework/CbmPapaLinkDef.h
@@ -18,7 +18,7 @@
 #pragma link C++ class PairAnalysisPairLV + ;
 #pragma link C++ class PairAnalysisPairKF + ;
 
-#pragma link C++ class PairAnalysisCutQA + ;
+#pragma link C++ class PairAnalysisCutQa + ;
 #pragma link C++ class PairAnalysisPairLegCuts + ;
 #pragma link C++ class PairAnalysisVarCuts + ;
 #pragma link C++ class PairAnalysisObjectCuts + ;
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.cxx
index 7883a856b0cc1fd2668c0183272c159d8209cade..6e348b767d425138df2c4417a7330dbd9f42fa2c 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.cxx
@@ -176,7 +176,7 @@ void PairAnalysis::Init()
 
   // initialize simple cut qa
   if (fCutQA) {
-    fQAmonitor = new PairAnalysisCutQA(Form("QAcuts_%s", GetName()), "QAcuts");
+    fQAmonitor = new PairAnalysisCutQa(Form("QAcuts_%s", GetName()), "QAcuts");
     fQAmonitor->AddTrackFilterMC(&fTrackFilterMC);
     fQAmonitor->AddTrackFilter(&fTrackFilter);
     fQAmonitor->AddPrePairFilter(&fPairPreFilter);
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h
index 1258c4cfb44462bf49d2634fe79b02f0ef23ec2e..3a1094a4ffabb4364bb1ef766a9a80cd3528b9b9 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysis.h
@@ -11,7 +11,7 @@
 #include <TSpline.h>
 
 #include "AnalysisFilter.h"
-#include "PairAnalysisCutQA.h"
+#include "PairAnalysisCutQa.h"
 #include "PairAnalysisHF.h"
 #include "PairAnalysisHistos.h"
 
@@ -157,7 +157,7 @@ public:
 
 private:
   Bool_t fCutQA                 = kFALSE;  // monitor cuts
-  PairAnalysisCutQA* fQAmonitor = NULL;    // monitoring of cuts
+  PairAnalysisCutQa* fQAmonitor = NULL;    // monitoring of cuts
 
   AnalysisFilter fEventFilter;        // Event cuts
   AnalysisFilter fTrackFilter;        // leg cuts
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.cxx
similarity index 95%
rename from analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.cxx
rename to analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.cxx
index 92b5ffa2f58cfaf4d51f9c98a2a5864c0a9d6d08..89d67a16b2276cd79e4c9e9fc19c90396689e79b 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.cxx
@@ -12,7 +12,7 @@
      PairAnalysis::SetCutQA(); 
 */
 
-#include "PairAnalysisCutQA.h"
+#include "PairAnalysisCutQa.h"
 
 #include "CbmMCTrack.h"
 
@@ -29,11 +29,11 @@
 #include "PairAnalysisTrack.h"
 
 
-ClassImp(PairAnalysisCutQA)
+ClassImp(PairAnalysisCutQa)
 
 
-  PairAnalysisCutQA::PairAnalysisCutQA()
-  : PairAnalysisCutQA("QAcuts", "QAcuts")
+  PairAnalysisCutQa::PairAnalysisCutQa()
+  : PairAnalysisCutQa("QAcuts", "QAcuts")
 {
   //
   // Default constructor
@@ -41,7 +41,7 @@ ClassImp(PairAnalysisCutQA)
 }
 
 //_____________________________________________________________________
-PairAnalysisCutQA::PairAnalysisCutQA(const char* name, const char* title) : TNamed(name, title), fQAHistList()
+PairAnalysisCutQa::PairAnalysisCutQa(const char* name, const char* title) : TNamed(name, title), fQAHistList()
 {
   //
   // Named Constructor
@@ -62,7 +62,7 @@ PairAnalysisCutQA::PairAnalysisCutQA(const char* name, const char* title) : TNam
 }
 
 //_____________________________________________________________________
-PairAnalysisCutQA::~PairAnalysisCutQA()
+PairAnalysisCutQa::~PairAnalysisCutQa()
 {
   //
   //Default Destructor
@@ -71,7 +71,7 @@ PairAnalysisCutQA::~PairAnalysisCutQA()
 }
 
 //_____________________________________________________________________
-void PairAnalysisCutQA::Init()
+void PairAnalysisCutQa::Init()
 {
 
   fQAHistList.SetName(Form("%s", GetName()));
@@ -197,7 +197,7 @@ void PairAnalysisCutQA::Init()
 }
 
 //_____________________________________________________________________
-void PairAnalysisCutQA::AddTrackFilter(AnalysisFilter* filter)
+void PairAnalysisCutQa::AddTrackFilter(AnalysisFilter* filter)
 {
   //
   // add track filter cuts to the qa histogram
@@ -219,7 +219,7 @@ void PairAnalysisCutQA::AddTrackFilter(AnalysisFilter* filter)
 }
 
 //_____________________________________________________________________
-void PairAnalysisCutQA::AddTrackFilterMC(AnalysisFilter* filter)
+void PairAnalysisCutQa::AddTrackFilterMC(AnalysisFilter* filter)
 {
   //
   // add MC track filter cuts to the qa histogram
@@ -242,7 +242,7 @@ void PairAnalysisCutQA::AddTrackFilterMC(AnalysisFilter* filter)
 }
 
 //_____________________________________________________________________
-void PairAnalysisCutQA::AddTrackFilter2(AnalysisFilter* filter)
+void PairAnalysisCutQa::AddTrackFilter2(AnalysisFilter* filter)
 {
   //
   // add track filter cuts to the qa histogram
@@ -265,7 +265,7 @@ void PairAnalysisCutQA::AddTrackFilter2(AnalysisFilter* filter)
 
 
 //_____________________________________________________________________
-void PairAnalysisCutQA::AddPairFilter(AnalysisFilter* pairFilter)
+void PairAnalysisCutQa::AddPairFilter(AnalysisFilter* pairFilter)
 {
   //
   // add track filter cuts to the qa histogram
@@ -286,7 +286,7 @@ void PairAnalysisCutQA::AddPairFilter(AnalysisFilter* pairFilter)
 }
 
 //_____________________________________________________________________
-void PairAnalysisCutQA::AddPrePairFilter(AnalysisFilter* pairFilter)
+void PairAnalysisCutQa::AddPrePairFilter(AnalysisFilter* pairFilter)
 {
   //
   // add track filter cuts to the qa histogram
@@ -309,7 +309,7 @@ void PairAnalysisCutQA::AddPrePairFilter(AnalysisFilter* pairFilter)
 }
 
 //_____________________________________________________________________
-void PairAnalysisCutQA::AddEventFilter(AnalysisFilter* eventFilter)
+void PairAnalysisCutQa::AddEventFilter(AnalysisFilter* eventFilter)
 {
   //
   // add track filter cuts to the qa histogram
@@ -331,7 +331,7 @@ void PairAnalysisCutQA::AddEventFilter(AnalysisFilter* eventFilter)
 }
 
 //_____________________________________________________________________
-void PairAnalysisCutQA::Fill(UInt_t mask, TObject* obj, UInt_t addIdx)
+void PairAnalysisCutQa::Fill(UInt_t mask, TObject* obj, UInt_t addIdx)
 {
   //
   // fill the corresponding step in the qa histogram
@@ -399,7 +399,7 @@ void PairAnalysisCutQA::Fill(UInt_t mask, TObject* obj, UInt_t addIdx)
 }
 
 //_____________________________________________________________________
-void PairAnalysisCutQA::FillAll(TObject* obj, UInt_t addIdx)
+void PairAnalysisCutQa::FillAll(TObject* obj, UInt_t addIdx)
 {
   //
   // fill the corresponding step in the qa histogram
@@ -456,7 +456,7 @@ void PairAnalysisCutQA::FillAll(TObject* obj, UInt_t addIdx)
 }
 
 //______________________________________________________________________
-UInt_t PairAnalysisCutQA::GetObjIndex(TObject* obj)
+UInt_t PairAnalysisCutQa::GetObjIndex(TObject* obj)
 {
   //
   // return the corresponding idex
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.h b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.h
similarity index 83%
rename from analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.h
rename to analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.h
index e4fd61d77888dc55ef5237d8c4845df4d7bf3c70..b7dff09967b6f58b0f828e613932c42129f333a0 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQA.h
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.h
@@ -6,7 +6,7 @@
 #define PAIRANALYSISCUTQA_H
 //#################################################################
 //#                                                               #
-//#             Class PairAnalysisCutQA                             #
+//#             Class PairAnalysisCutQa                             #
 //#              PairAnalysis Group of cuts                         #
 //#                                                               #
 //#  Authors:                                                     #
@@ -25,7 +25,7 @@
 
 class TCollection;
 
-class PairAnalysisCutQA : public TNamed {
+class PairAnalysisCutQa : public TNamed {
 
 public:
   enum class ETypes
@@ -39,10 +39,10 @@ public:
     kNtypes
   };
 
-  PairAnalysisCutQA();
-  PairAnalysisCutQA(const char* name, const char* title);
+  PairAnalysisCutQa();
+  PairAnalysisCutQa(const char* name, const char* title);
 
-  virtual ~PairAnalysisCutQA();
+  virtual ~PairAnalysisCutQa();
 
   void Init();
   void AddTrackFilterMC(AnalysisFilter* trkFilterMC);
@@ -68,10 +68,10 @@ private:
 
   UInt_t GetObjIndex(TObject* obj);  // return object index
 
-  PairAnalysisCutQA(const PairAnalysisCutQA&);
-  PairAnalysisCutQA& operator=(const PairAnalysisCutQA&);
+  PairAnalysisCutQa(const PairAnalysisCutQa&);
+  PairAnalysisCutQa& operator=(const PairAnalysisCutQa&);
 
-  ClassDef(PairAnalysisCutQA, 3)  // Simple automatic cut QA
+  ClassDef(PairAnalysisCutQa, 3)  // Simple automatic cut QA
 };
 
 #endif
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisVarCuts.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisVarCuts.cxx
index 3e86db31d6183924e915329f87ee923ea560e7be..d55f4582db21b1eaa92c20aa19ca54356fad915f 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisVarCuts.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisVarCuts.cxx
@@ -12,7 +12,7 @@
   include or exclude a certain selection in the analysis.
 
   It is recommmended to give the cut object a unique and meaning full name(+title), since 
-  they are used e.g. in PairAnalysisCutQA and PairAnalysis::GetCutStepHistogramList()
+  they are used e.g. in PairAnalysisCutQa and PairAnalysis::GetCutStepHistogramList()
   to monitor the cut impact.
 
   Many objects can be combined in a PairAnalysisCutGroup with additional cut logics.
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
index e277d38c6af6274eab21f2c442b44fd69c147207..ccac39d2b0bb56dcf7c88aaae5174b2966dec43d 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
@@ -23,7 +23,7 @@
 
 #include "CbmGlobalTrack.h"
 #include "CbmKFParticleFinder.h"
-#include "CbmKFParticleFinderQA.h"
+#include "CbmKFParticleFinderQa.h"
 #include "CbmKresConversionBG.h"
 #include "CbmKresFunctions.h"
 #include "CbmLmvmKinematicParams.h"
@@ -467,7 +467,7 @@ CbmKresConversionKF::CbmKresConversionKF()
 
 CbmKresConversionKF::~CbmKresConversionKF() {}
 
-void CbmKresConversionKF::SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQA* kfparticleQA)
+void CbmKresConversionKF::SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQa* kfparticleQA)
 {
   fKFparticle         = kfparticle;
   fKFparticleFinderQA = kfparticleQA;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
index 18cca0b8d648f7b847b50c193c8c5bb802e8eb56..41a2bceb9d755c50a005e0e6939f88bd5b113f69 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.h
@@ -6,7 +6,7 @@
 #define CBM_KRES_CONVERSION_KF
 
 #include "CbmKFParticleFinder.h"
-#include "CbmKFParticleFinderQA.h"
+#include "CbmKFParticleFinderQa.h"
 #include "CbmKresConversionBG.h"
 #include "CbmMCTrack.h"
 #include "CbmRichRing.h"
@@ -35,7 +35,7 @@ public:
   void InitHistograms();
   void Finish();
 
-  void SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQA* kfparticleQA);
+  void SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQa* kfparticleQA);
 
   void Exec(int fEventNumKF, double OpeningAngleCut, double GammaInvMassCut, int RealPID);
 
@@ -56,7 +56,7 @@ public:
 
 private:
   CbmKFParticleFinder* fKFparticle;
-  CbmKFParticleFinderQA* fKFparticleFinderQA;
+  CbmKFParticleFinderQa* fKFparticleFinderQA;
   const KFParticleTopoReconstructor* fKFtopo;
 
   CbmRichRingFitterEllipseTau* fTauFit;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.cxx
index bc391ae864593b81dd57abc21e49c1c08edc4553..5a4ecc9c619f251eb9b65fffdf57969ea227d8d6 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.cxx
@@ -255,7 +255,7 @@ void CbmKresConversionMain::Exec(Option_t* /*option*/)
 }
 
 ///// one needs to set KFparticle if one wants to use its features.
-void CbmKresConversionMain::SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQA* kfparticleQA)
+void CbmKresConversionMain::SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQa* kfparticleQA)
 {
   fKFparticle         = kfparticle;
   fKFparticleFinderQA = kfparticleQA;
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h
index dad9fc71e53e1ccf4c8c6311eb9e00be1d3b19f1..f3337f193c3a80b817a6989fabf6a9ac061bd45c 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionMain.h
@@ -6,7 +6,7 @@
 #define CBM_KRES_CONVERSION_MAIN
 
 #include "CbmKFParticleFinder.h"
-#include "CbmKFParticleFinderQA.h"
+#include "CbmKFParticleFinderQa.h"
 #include "CbmKresConversionCorrectedPhotons.h"
 #include "CbmKresConversionGeneral.h"
 #include "CbmKresConversionKF.h"
@@ -51,7 +51,7 @@ public:
 
   virtual void Finish();
 
-  void SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQA* kfparticleQA);
+  void SetKF(CbmKFParticleFinder* kfparticle, CbmKFParticleFinderQa* kfparticleQA);
 
 
 private:
@@ -74,7 +74,7 @@ private:
   CbmKresConversionKF* fKresKF;
   CbmKresConversionManual* fKresManual;
   CbmKFParticleFinder* fKFparticle;
-  CbmKFParticleFinderQA* fKFparticleFinderQA;
+  CbmKFParticleFinderQa* fKFparticleFinderQA;
 
   CbmKresConversionManualmbias1* fKresManualmbiasPart1;
   CbmKresConversionManualmbias2* fKresManualmbiasPart2;
diff --git a/analysis/detectors/tof/CMakeLists.txt b/analysis/detectors/tof/CMakeLists.txt
index 424e5ec74438c577f0a9c7f93b9f1cda30008c6f..7915ca6a1be78f3814e7128702cecfbb1d02a63b 100644
--- a/analysis/detectors/tof/CMakeLists.txt
+++ b/analysis/detectors/tof/CMakeLists.txt
@@ -35,7 +35,7 @@ set(SRCS
   CbmTofAnaTestbeam.cxx 
   CbmTofGeometryQa.cxx
   CbmTofHitFinderQa.cxx
-  CbmTofHitFinderTBQA.cxx
+  CbmTofHitFinderTBQa.cxx
   CbmTofTests.cxx 
 )
 
diff --git a/analysis/detectors/tof/CbmTofAnaLinkDef.h b/analysis/detectors/tof/CbmTofAnaLinkDef.h
index 79aa894a61e2e37da88e8ef6b1e9c1df9d3fc0f0..058c2962a7d0edbf67b0b9882ffb17ad28d053ca 100644
--- a/analysis/detectors/tof/CbmTofAnaLinkDef.h
+++ b/analysis/detectors/tof/CbmTofAnaLinkDef.h
@@ -7,7 +7,7 @@
 #pragma link C++ class CbmTofTests + ;
 #pragma link C++ class CbmTofGeometryQa + ;
 #pragma link C++ class CbmTofHitFinderQa + ;
-#pragma link C++ class CbmTofHitFinderTBQA + ;
+#pragma link C++ class CbmTofHitFinderTBQa + ;
 #pragma link C++ class CbmTofAnaTestbeam + ;
 
 #endif
diff --git a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx b/analysis/detectors/tof/CbmTofHitFinderTBQa.cxx
similarity index 98%
rename from analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
rename to analysis/detectors/tof/CbmTofHitFinderTBQa.cxx
index c38ee75c54e790cad4be40fc41abc1258693a581..ee365e01767ae390a1a53a6a84d797a8f345750f 100644
--- a/analysis/detectors/tof/CbmTofHitFinderTBQA.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderTBQa.cxx
@@ -8,7 +8,7 @@
  * and open the template in the editor.
  */
 
-#include "CbmTofHitFinderTBQA.h"
+#include "CbmTofHitFinderTBQa.h"
 
 #include "CbmMCDataManager.h"
 #include "CbmMatch.h"
@@ -115,7 +115,7 @@ static TH1F* pullYHisto              = 0;
 static TH1F* nofHitsHisto            = 0;
 static TH1F* nofTracksDepositedHisto = 0;
 
-CbmTofHitFinderTBQA::CbmTofHitFinderTBQA()
+CbmTofHitFinderTBQa::CbmTofHitFinderTBQa()
   : isEvByEv(false)
   , fTofHits(0)
   , fTofDigiMatchs(0)
@@ -128,7 +128,7 @@ CbmTofHitFinderTBQA::CbmTofHitFinderTBQA()
 {
 }
 
-InitStatus CbmTofHitFinderTBQA::Init()
+InitStatus CbmTofHitFinderTBQa::Init()
 {
   FairRootManager* ioman = FairRootManager::Instance();
 
@@ -214,7 +214,7 @@ static Int_t currentEvN = 0;
 static int globalNofHits  = 0;
 static int globalNofDigis = 0;
 
-void CbmTofHitFinderTBQA::Exec(Option_t*)
+void CbmTofHitFinderTBQa::Exec(Option_t*)
 {
   /*vector<TofHitDesc>& tofHitsEv = tofHitsAll[currentEvN];
    Int_t nofHits = fTofHits->GetEntriesFast();
@@ -379,7 +379,7 @@ static void SaveHisto(TH1* histo)
   TFile::CurrentFile() = curFile;
 }
 
-void CbmTofHitFinderTBQA::Finish()
+void CbmTofHitFinderTBQa::Finish()
 {
   /*cout << "min entry = " << minEntry << endl;
    cout << "max entry = " << maxEntry << endl;
@@ -585,4 +585,4 @@ void CbmTofHitFinderTBQA::Finish()
   cout << "Pure hits: " << eff << " % [ " << nofSingleHits << " / " << nofHits << " ]" << endl;
 }
 
-ClassImp(CbmTofHitFinderTBQA)
+ClassImp(CbmTofHitFinderTBQa)
diff --git a/analysis/detectors/tof/CbmTofHitFinderTBQA.h b/analysis/detectors/tof/CbmTofHitFinderTBQa.h
similarity index 78%
rename from analysis/detectors/tof/CbmTofHitFinderTBQA.h
rename to analysis/detectors/tof/CbmTofHitFinderTBQa.h
index 9faff4a33f6633eb4d1f6291c24fb5135205d8c2..a58990c0fae34eecba647e94be6f5ba60e10c0e9 100644
--- a/analysis/detectors/tof/CbmTofHitFinderTBQA.h
+++ b/analysis/detectors/tof/CbmTofHitFinderTBQa.h
@@ -13,11 +13,11 @@
 
 #include "TClonesArray.h"
 
-class CbmTofHitFinderTBQA : public FairTask {
+class CbmTofHitFinderTBQa : public FairTask {
 public:
-  CbmTofHitFinderTBQA();
-  CbmTofHitFinderTBQA(const CbmTofHitFinderTBQA&) = delete;
-  CbmTofHitFinderTBQA& operator=(const CbmTofHitFinderTBQA&) = delete;
+  CbmTofHitFinderTBQa();
+  CbmTofHitFinderTBQa(const CbmTofHitFinderTBQa&) = delete;
+  CbmTofHitFinderTBQa& operator=(const CbmTofHitFinderTBQa&) = delete;
 
   InitStatus Init();
   void Exec(Option_t* option);
@@ -35,7 +35,7 @@ private:
   CbmTimeSlice* fTimeSlice;
   CbmMCEventList* fEventList;
 
-  ClassDef(CbmTofHitFinderTBQA, 1)
+  ClassDef(CbmTofHitFinderTBQa, 1)
 };
 
 #endif /* CBMTOFHITFINDERTBQA_H */
diff --git a/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C b/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C
index 04e6b9c4a3e802ebe59b302c80ba9b617bb55520..14354bd5f8404869874b5a1c031b4d7feeeb8620 100644
--- a/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C
+++ b/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.C
@@ -26,7 +26,7 @@ void DrawParticlesFitQA(int iParticle = 0)
   plain->SetOptTitle(0);
   plain->cd();
 
-  TString name = "CbmKFParticleFinderQA.root";
+  TString name = "CbmKFParticleFinderQa.root";
   //TFile *dir = new TFile(name.Data(),"read");
   TFile* f = new TFile(name.Data(), "read");
 
diff --git a/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.sh b/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.sh
index 601677078b4ae8d0db8a4bac1ff57bde2d98d4c1..cfd4878b27a0417f36e763273046cea236cce2cd 100644
--- a/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.sh
+++ b/macro/KF/KFParticleFinderSignalTest/DrawParticlesFitQA.sh
@@ -15,14 +15,14 @@ function DrawParticle {
   cd $CURDIR
   echo `pwd`
   
-  cp $MAINDIR/CbmKFParticleFinderQA.root .
+  cp $MAINDIR/CbmKFParticleFinderQa.root .
   cp $MAINDIR/DrawParticlesFitQA.C .
   root -l -b -q "DrawParticlesFitQA.C($1)" > fit.log
   
   mkdir Daughters
   mv *Daughters.pdf Daughters
   
-  rm -rf CbmKFParticleFinderQA.root DrawParticlesFitQA.C
+  rm -rf CbmKFParticleFinderQa.root DrawParticlesFitQA.C
   cd ../
 }
 
diff --git a/macro/KF/KFParticleFinderSignalTest/Signal/physSignal.C b/macro/KF/KFParticleFinderSignalTest/Signal/physSignal.C
index 62fdd178095faf0237e3929736a61f9bf4706402..9b2b7320a6d48dd3755e684d94aacfd7ba42ef29 100644
--- a/macro/KF/KFParticleFinderSignalTest/Signal/physSignal.C
+++ b/macro/KF/KFParticleFinderSignalTest/Signal/physSignal.C
@@ -122,15 +122,15 @@ void physSignal(Int_t nEvents = 1000, const char* setupName = "sis100_electron")
   run->AddTask(kfParticleFinder);
 
   // ----- KF Particle Finder QA --------------------------------------------
-  CbmKFParticleFinderQA* kfParticleFinderQA =
-    new CbmKFParticleFinderQA("CbmKFParticleFinderQA", 0, kfParticleFinder->GetTopoReconstructor(), histoFile.Data());
+  CbmKFParticleFinderQa* kfParticleFinderQA =
+    new CbmKFParticleFinderQa("CbmKFParticleFinderQa", 0, kfParticleFinder->GetTopoReconstructor(), histoFile.Data());
   kfParticleFinderQA->SetPrintEffFrequency(100);  //nEvents);
   //  kfParticleFinderQA->SetSuperEventAnalysis(); // SuperEvent
   kfParticleFinderQA->SetEffFileName(effFile.Data());
   run->AddTask(kfParticleFinderQA);
 
   // ----- KF Track QA --------------------------------------------
-  //  CbmKFTrackQA* kfTrackQA = new CbmKFTrackQA();
+  //  CbmKFTrackQa* kfTrackQA = new CbmKFTrackQa();
   //  run->AddTask(kfTrackQA);
 
   // -----  Parameter database   --------------------------------------------
diff --git a/macro/KF/kf_kfparticle.C b/macro/KF/kf_kfparticle.C
index c3f9ccb1340e7c2580d7913092fb88064555f14e..e6fb43fee0eaa3cd28bbdbc4ccf1fce46af1ae15 100644
--- a/macro/KF/kf_kfparticle.C
+++ b/macro/KF/kf_kfparticle.C
@@ -175,8 +175,8 @@ void kf_kfparticle(Int_t nEvents = 2, const TString setupName = "sis100_electron
   // ------------------------------------------------------------------------
 
   // ----- KF Particle Finder QA --------------------------------------------
-  CbmKFParticleFinderQA* kfParticleFinderQA =
-    new CbmKFParticleFinderQA("CbmKFParticleFinderQA", 0, kfParticleFinder->GetTopoReconstructor(), histoFile.Data());
+  CbmKFParticleFinderQa* kfParticleFinderQA =
+    new CbmKFParticleFinderQa("CbmKFParticleFinderQa", 0, kfParticleFinder->GetTopoReconstructor(), histoFile.Data());
   kfParticleFinderQA->SetPrintEffFrequency(nEvents);
   if (superEvent) kfParticleFinderQA->SetSuperEventAnalysis();  // SuperEvent
   kfParticleFinderQA->SetEffFileName(effFile.Data());
@@ -194,7 +194,7 @@ void kf_kfparticle(Int_t nEvents = 2, const TString setupName = "sis100_electron
 
   // ----- KF Track QA ------------------------------------------------------
   // The module is under development.
-  //   CbmKFTrackQA* kfTrackQA = new CbmKFTrackQA();
+  //   CbmKFTrackQa* kfTrackQA = new CbmKFTrackQa();
   //   run->AddTask(kfTrackQA);
   // ------------------------------------------------------------------------
 
diff --git a/macro/analysis/dielectron/run_reco.C b/macro/analysis/dielectron/run_reco.C
index 44c53b58bc2219eb2ee822871e48d23b07b09d74..29434b23a6d7a017b883fcd715ed6582f3d92841 100755
--- a/macro/analysis/dielectron/run_reco.C
+++ b/macro/analysis/dielectron/run_reco.C
@@ -217,7 +217,7 @@ void run_reco(const string& mcFile   = "/lustre/nyx/cbm/users/criesen/cbm/data/l
 
   // ----------- QA for raw event builder -----------------------------------
   if (eventBased && useMC) {
-    CbmBuildEventsQA* evBuildQA = new CbmBuildEventsQA();
+    CbmBuildEventsQa* evBuildQA = new CbmBuildEventsQa();
     run->AddTask(evBuildQA);
   }
   // ------------------------------------------------------------------------
diff --git a/macro/kronos/macro/run_phys.C b/macro/kronos/macro/run_phys.C
index 0813b073637af9674e95385ac72dc23f0e37d32b..17784848a1c9f1ecf14d788356098b1c6f116fe8 100644
--- a/macro/kronos/macro/run_phys.C
+++ b/macro/kronos/macro/run_phys.C
@@ -84,8 +84,8 @@ void run_phys(TString setupName, Int_t nEvents = 10, TString inputDir = "")
   run->AddTask(kfParticleFinder);
 
   // ----- KF Particle Finder QA --------------------------------------------
-  CbmKFParticleFinderQA* kfParticleFinderQA =
-    new CbmKFParticleFinderQA("CbmKFParticleFinderQA", 0, kfParticleFinder->GetTopoReconstructor(), histoFile.Data());
+  CbmKFParticleFinderQa* kfParticleFinderQA =
+    new CbmKFParticleFinderQa("CbmKFParticleFinderQa", 0, kfParticleFinder->GetTopoReconstructor(), histoFile.Data());
   kfParticleFinderQA->SetPrintEffFrequency(nEvents);
   //  kfParticleFinderQA->SetSuperEventAnalysis(); // SuperEvent
   kfParticleFinderQA->SetEffFileName(effFile.Data());
diff --git a/macro/rich/run/run_reco.C b/macro/rich/run/run_reco.C
index 68ed3bfedeeda0d90d8c52d5ac20164d74e4566e..30b3c89020b97b8f138834c5bc730be854e1c3e0 100644
--- a/macro/rich/run/run_reco.C
+++ b/macro/rich/run/run_reco.C
@@ -123,7 +123,7 @@ void run_reco(const string& traFile  = "/Users/slebedev/Development/cbm/data/sim
 
 
   if (eventBased && useMC) {
-    CbmBuildEventsQA* evBuildQA = new CbmBuildEventsQA();
+    CbmBuildEventsQa* evBuildQA = new CbmBuildEventsQa();
     run->AddTask(evBuildQA);
   }
 
diff --git a/macro/run/run_phys.C b/macro/run/run_phys.C
index b903ac2b83bcbed936475c4515834c9aa7e00feb..810687242ce48abd81af7ccad5f8dee693025d8b 100644
--- a/macro/run/run_phys.C
+++ b/macro/run/run_phys.C
@@ -95,8 +95,8 @@ void run_phys(Int_t nEvents = 2, TString dataset = "test", TString setupName = "
   run->AddTask(kfParticleFinder);
 
   // ----- KF Particle Finder QA --------------------------------------------
-  CbmKFParticleFinderQA* kfParticleFinderQA =
-    new CbmKFParticleFinderQA("CbmKFParticleFinderQA", 0, kfParticleFinder->GetTopoReconstructor(), histoFile.Data());
+  CbmKFParticleFinderQa* kfParticleFinderQA =
+    new CbmKFParticleFinderQa("CbmKFParticleFinderQa", 0, kfParticleFinder->GetTopoReconstructor(), histoFile.Data());
   kfParticleFinderQA->SetPrintEffFrequency(nEvents);
   //  kfParticleFinderQA->SetSuperEventAnalysis(); // SuperEvent
   kfParticleFinderQA->SetEffFileName(effFile.Data());
diff --git a/macro/run/run_reco.C b/macro/run/run_reco.C
index 3c59f14f78c3e0f506fa0b4a537603b7e66551f0..b92cf78eba4091b24ae00ee65cbe82f45281f7c6 100644
--- a/macro/run/run_reco.C
+++ b/macro/run/run_reco.C
@@ -254,7 +254,7 @@ void run_reco(TString input = "", Int_t nTimeSlices = -1, Int_t firstTimeSlice =
 
   // ----------- QA for raw event builder -----------------------------------
   if (eventBased && useMC) {
-    CbmBuildEventsQA* evBuildQA = new CbmBuildEventsQA();
+    CbmBuildEventsQa* evBuildQA = new CbmBuildEventsQa();
     run->AddTask(evBuildQA);
   }
   // ------------------------------------------------------------------------
diff --git a/reco/KF/CMakeLists.txt b/reco/KF/CMakeLists.txt
index da9d382369fc442d297757a76b1cb4b1f0aeb5b0..f4ee221aa5802ddb18b688a9733a449af2887a64 100644
--- a/reco/KF/CMakeLists.txt
+++ b/reco/KF/CMakeLists.txt
@@ -78,12 +78,12 @@ Interface/CbmGlobalTrackFitterKF.cxx
 # CbmKFParticle_simd.cxx
 # CbmKFParticleInterface.cxx
 KFQA/CbmKFTrErrMCPoints.cxx
-KFQA/CbmKFTrackFitQA.cxx
-KFQA/CbmKFTrackQA.cxx
+KFQA/CbmKFTrackFitQa.cxx
+KFQA/CbmKFTrackQa.cxx
 KFQA/KFParticleMatch.cxx
 CbmKFParticleFinder.cxx
 CbmKFParticleFinderPID.cxx
-CbmKFParticleFinderQA.cxx
+CbmKFParticleFinderQa.cxx
 CbmKFParticleInterface.cxx
 )
 
@@ -114,13 +114,13 @@ Interface/CbmTofTrackFitterKF.h
 Interface/CbmGlobalTrackFitterKF.h
 # CbmKFParticle.h
 KFQA/CbmKFTrErrMCPoints.h
-KFQA/CbmKFTrackFitQA.h
-KFQA/CbmKFTrackQA.h
+KFQA/CbmKFTrackFitQa.h
+KFQA/CbmKFTrackQa.h
 KFQA/CbmKFPartEfficiencies.h
 KFQA/KFParticleMatch.h
 CbmKFParticleFinder.h
 CbmKFParticleFinderPID.h
-CbmKFParticleFinderQA.h
+CbmKFParticleFinderQa.h
 CbmKFParticleInterface.h
 )
 
diff --git a/reco/KF/CbmKFParticleFinderQA.cxx b/reco/KF/CbmKFParticleFinderQa.cxx
similarity index 95%
rename from reco/KF/CbmKFParticleFinderQA.cxx
rename to reco/KF/CbmKFParticleFinderQa.cxx
index 0749f6d6466112187c1faea663b841b4d6906c3f..71d9b44726fe658549ef44709f4784c1c06fa4a1 100644
--- a/reco/KF/CbmKFParticleFinderQA.cxx
+++ b/reco/KF/CbmKFParticleFinderQa.cxx
@@ -6,7 +6,7 @@
 //-----------------------------------------------------------
 
 // Cbm Headers ----------------------
-#include "CbmKFParticleFinderQA.h"
+#include "CbmKFParticleFinderQa.h"
 
 #include "CbmMCDataArray.h"
 #include "CbmMCDataManager.h"
@@ -42,7 +42,7 @@
 #include <cmath>
 using std::vector;
 
-CbmKFParticleFinderQA::CbmKFParticleFinderQA(const char* name, Int_t iVerbose, const KFParticleTopoReconstructor* tr,
+CbmKFParticleFinderQa::CbmKFParticleFinderQa(const char* name, Int_t iVerbose, const KFParticleTopoReconstructor* tr,
                                              TString outFileName)
   : FairTask(name, iVerbose)
   , fMCTracksBranchName("MCTrack")
@@ -88,7 +88,7 @@ CbmKFParticleFinderQA::CbmKFParticleFinderQA(const char* name, Int_t iVerbose, c
   gDirectory = curDirectory;
 }
 
-CbmKFParticleFinderQA::~CbmKFParticleFinderQA()
+CbmKFParticleFinderQa::~CbmKFParticleFinderQa()
 {
   if (fTopoPerformance) delete fTopoPerformance;
 
@@ -99,13 +99,13 @@ CbmKFParticleFinderQA::~CbmKFParticleFinderQA()
   }
 }
 
-InitStatus CbmKFParticleFinderQA::Init()
+InitStatus CbmKFParticleFinderQa::Init()
 {
   //Get ROOT Manager
   FairRootManager* ioman = FairRootManager::Instance();
 
   if (ioman == 0) {
-    Error("CbmKFParticleFinderQA::Init", "RootManager not instantiated!");
+    Error("CbmKFParticleFinderQa::Init", "RootManager not instantiated!");
     return kERROR;
   }
 
@@ -117,18 +117,18 @@ InitStatus CbmKFParticleFinderQA::Init()
   if (fTimeSliceMode) {
     FairRootManager* fManger    = FairRootManager::Instance();
     CbmMCDataManager* mcManager = (CbmMCDataManager*) fManger->GetObject("MCDataManager");
-    if (mcManager == 0) Error("CbmKFParticleFinderQA::Init", "MC Data Manager not found!");
+    if (mcManager == 0) Error("CbmKFParticleFinderQa::Init", "MC Data Manager not found!");
 
     fMCTrackArray = mcManager->InitBranch("MCTrack");
 
     if (fMCTrackArray == 0) {
-      Error("CbmKFParticleFinderQA::Init", "mc track array not found!");
+      Error("CbmKFParticleFinderQa::Init", "mc track array not found!");
       return kERROR;
     }
 
     fEventList = (CbmMCEventList*) ioman->GetObject("MCEventList.");
     if (fEventList == 0) {
-      Error("CbmKFParticleFinderQA::Init", "MC Event List not found!");
+      Error("CbmKFParticleFinderQa::Init", "MC Event List not found!");
       return kERROR;
     }
   }
@@ -139,7 +139,7 @@ InitStatus CbmKFParticleFinderQA::Init()
   //Track match
   fTrackMatchArray = (TClonesArray*) ioman->GetObject(fTrackMatchBranchName);
   if (fTrackMatchArray == 0) {
-    Error("CbmKFParticleFinderQA::Init", "track match array not found!");
+    Error("CbmKFParticleFinderQa::Init", "track match array not found!");
     return kERROR;
   }
 
@@ -161,7 +161,7 @@ InitStatus CbmKFParticleFinderQA::Init()
   return kSUCCESS;
 }
 
-void CbmKFParticleFinderQA::Exec(Option_t* /*opt*/)
+void CbmKFParticleFinderQa::Exec(Option_t* /*opt*/)
 {
   if (!fSuperEventAnalysis) {
     if (fSaveParticles) fRecParticles->Delete();
@@ -337,7 +337,7 @@ void CbmKFParticleFinderQA::Exec(Option_t* /*opt*/)
   }
 }
 
-void CbmKFParticleFinderQA::Finish()
+void CbmKFParticleFinderQa::Finish()
 {
   if (fSuperEventAnalysis) {
     fTopoPerformance->SetPrintEffFrequency(1);
@@ -372,7 +372,7 @@ void CbmKFParticleFinderQA::Finish()
   WriteHistosCurFile(fTopoPerformance->GetHistosDirectory());
 
   if (fCheckDecayQA && fDecayToAnalyse > -1) {
-    if (fDecayToAnalyse < 0) Error("CbmKFParticleFinderQA::Finish", "Please specify the decay to be analysed.");
+    if (fDecayToAnalyse < 0) Error("CbmKFParticleFinderQa::Finish", "Please specify the decay to be analysed.");
     else
       CheckDecayQA();
   }
@@ -389,7 +389,7 @@ void CbmKFParticleFinderQA::Finish()
   eff.close();
 }
 
-void CbmKFParticleFinderQA::WriteHistosCurFile(TObject* obj)
+void CbmKFParticleFinderQa::WriteHistosCurFile(TObject* obj)
 {
   if (!obj->IsFolder()) obj->Write();
   else {
@@ -408,13 +408,13 @@ void CbmKFParticleFinderQA::WriteHistosCurFile(TObject* obj)
   }
 }
 
-void CbmKFParticleFinderQA::SetPrintEffFrequency(Int_t n)
+void CbmKFParticleFinderQa::SetPrintEffFrequency(Int_t n)
 {
   fTopoPerformance->SetPrintEffFrequency(n);
   fPrintFrequency = n;
 }
 
-void CbmKFParticleFinderQA::FitDecayQAHistograms(float sigma[14], const bool saveReferenceResults) const
+void CbmKFParticleFinderQa::FitDecayQAHistograms(float sigma[14], const bool saveReferenceResults) const
 {
   static const int nParameters       = 7;
   TString parameterName[nParameters] = {"X", "Y", "Z", "Px", "Py", "Pz", "E"};
@@ -467,7 +467,7 @@ void CbmKFParticleFinderQA::FitDecayQAHistograms(float sigma[14], const bool sav
     if (fit[iHisto]) delete fit[iHisto];
 }
 
-void CbmKFParticleFinderQA::CheckDecayQA()
+void CbmKFParticleFinderQa::CheckDecayQA()
 {
   float sigma[14];
   FitDecayQAHistograms(sigma, true);
@@ -538,4 +538,4 @@ void CbmKFParticleFinderQA::CheckDecayQA()
   gDirectory = curDirectory;
 }
 
-ClassImp(CbmKFParticleFinderQA);
+ClassImp(CbmKFParticleFinderQa);
diff --git a/reco/KF/CbmKFParticleFinderQA.h b/reco/KF/CbmKFParticleFinderQa.h
similarity index 85%
rename from reco/KF/CbmKFParticleFinderQA.h
rename to reco/KF/CbmKFParticleFinderQa.h
index ab440b5ffda472c251248d49a6c75ca6cd3f0d1e..b66c511718ccce22e09fb71857d3c13f152a5ca6 100644
--- a/reco/KF/CbmKFParticleFinderQA.h
+++ b/reco/KF/CbmKFParticleFinderQa.h
@@ -5,8 +5,8 @@
 //-----------------------------------------------------------
 //-----------------------------------------------------------
 
-#ifndef CbmKFParticleFinderQA_HH
-#define CbmKFParticleFinderQA_HH
+#ifndef CbmKFParticleFinderQa_HH
+#define CbmKFParticleFinderQa_HH
 
 #include "FairTask.h"
 
@@ -22,12 +22,12 @@ class CbmMCDataArray;
 class TFile;
 class TObject;
 
-class CbmKFParticleFinderQA : public FairTask {
+class CbmKFParticleFinderQa : public FairTask {
 public:
   // Constructors/Destructors ---------
-  CbmKFParticleFinderQA(const char* name = "CbmKFParticleFinderQA", Int_t iVerbose = 0,
-                        const KFParticleTopoReconstructor* tr = 0, TString outFileName = "CbmKFParticleFinderQA.root");
-  ~CbmKFParticleFinderQA();
+  CbmKFParticleFinderQa(const char* name = "CbmKFParticleFinderQa", Int_t iVerbose = 0,
+                        const KFParticleTopoReconstructor* tr = 0, TString outFileName = "CbmKFParticleFinderQa.root");
+  ~CbmKFParticleFinderQa();
 
   void SetEffFileName(const TString& name) { fEfffileName = name; }
   void SetMCTrackBranchName(const TString& name) { fMCTracksBranchName = name; }
@@ -52,8 +52,8 @@ public:
   bool IsTestPassed() { return fTestOk; }
 
 private:
-  const CbmKFParticleFinderQA& operator=(const CbmKFParticleFinderQA&);
-  CbmKFParticleFinderQA(const CbmKFParticleFinderQA&);
+  const CbmKFParticleFinderQa& operator=(const CbmKFParticleFinderQa&);
+  CbmKFParticleFinderQa(const CbmKFParticleFinderQa&);
 
   void WriteHistosCurFile(TObject* obj);
   void FitDecayQAHistograms(float sigma[14], const bool saveReferenceResults = false) const;
@@ -99,7 +99,7 @@ private:
   bool fCheckDecayQA;
   bool fTestOk;
 
-  ClassDef(CbmKFParticleFinderQA, 1);
+  ClassDef(CbmKFParticleFinderQa, 1);
 };
 
 #endif
diff --git a/reco/KF/KFLinkDef.h b/reco/KF/KFLinkDef.h
index e9b0e3fc5ebe70d423b5796c7a400730003edbe1..ed9ca1bcc6e23a7d52e9f0cf5d0825dc58a901d3 100644
--- a/reco/KF/KFLinkDef.h
+++ b/reco/KF/KFLinkDef.h
@@ -49,14 +49,14 @@
 #pragma link C++ class CbmKFPartEfficiencies + ;
 
 #pragma link C++ class CbmKFTrErrMCPoints + ;
-#pragma link C++ class CbmKFTrackFitQA + ;
-#pragma link C++ class CbmKFTrackQA + ;
+#pragma link C++ class CbmKFTrackFitQa + ;
+#pragma link C++ class CbmKFTrackQa + ;
 #pragma link C++ class KFParticleMatch + ;
 
 
 #pragma link C++ class CbmKFParticleFinder + ;
 #pragma link C++ class CbmKFParticleFinderPID + ;
-#pragma link C++ class CbmKFParticleFinderQA + ;
+#pragma link C++ class CbmKFParticleFinderQa + ;
 #pragma link C++ class CbmKFParticleInterface + ;
 
 #endif
diff --git a/reco/KF/KFQA/CbmKFTrackFitQA.cxx b/reco/KF/KFQA/CbmKFTrackFitQa.cxx
similarity index 97%
rename from reco/KF/KFQA/CbmKFTrackFitQA.cxx
rename to reco/KF/KFQA/CbmKFTrackFitQa.cxx
index 76699f04063b95f753d3eb3a64dd8108c9a03715..18c32875d7a78352fec498081c8ed7caf2658c63 100644
--- a/reco/KF/KFQA/CbmKFTrackFitQA.cxx
+++ b/reco/KF/KFQA/CbmKFTrackFitQa.cxx
@@ -9,7 +9,7 @@
  *
  *====================================================================
  */
-#include "CbmKFTrackFitQA.h"
+#include "CbmKFTrackFitQa.h"
 
 #include "CbmKF.h"
 #include "CbmKFMath.h"
@@ -33,9 +33,9 @@
 using namespace std;
 using std::vector;
 
-ClassImp(CbmKFTrackFitQA)
+ClassImp(CbmKFTrackFitQa)
 
-  CbmKFTrackFitQA::CbmKFTrackFitQA()
+  CbmKFTrackFitQa::CbmKFTrackFitQa()
   : listStsPts(0)
   , listMvdPts(0)
   , listMCTracks(0)
@@ -171,7 +171,7 @@ ClassImp(CbmKFTrackFitQA)
   gDirectory = currentDir;
 }
 
-CbmKFTrackFitQA::~CbmKFTrackFitQA()
+CbmKFTrackFitQa::~CbmKFTrackFitQa()
 {
   if (res_STShit_x) delete res_STShit_x;
   if (res_STShit_y) delete res_STShit_y;
@@ -208,9 +208,9 @@ CbmKFTrackFitQA::~CbmKFTrackFitQA()
   if (pull_AtFP_qp) delete pull_AtFP_qp;
 }
 
-InitStatus CbmKFTrackFitQA::ReInit() { return Init(); }
+InitStatus CbmKFTrackFitQa::ReInit() { return Init(); }
 
-InitStatus CbmKFTrackFitQA::Init()
+InitStatus CbmKFTrackFitQa::Init()
 {
   FairRootManager* fManger = FairRootManager::Instance();
 
@@ -237,7 +237,7 @@ InitStatus CbmKFTrackFitQA::Init()
   return kSUCCESS;
 }
 
-void CbmKFTrackFitQA::Exec(Option_t* /*option*/)
+void CbmKFTrackFitQa::Exec(Option_t* /*option*/)
 {
   FillHitHistos();
 
@@ -267,9 +267,9 @@ void CbmKFTrackFitQA::Exec(Option_t* /*option*/)
   }
   delete[] MCTrackSortedArray;
 }
-void CbmKFTrackFitQA::Finish() { KFWrite(); }
+void CbmKFTrackFitQa::Finish() { KFWrite(); }
 
-void CbmKFTrackFitQA::FillHistoAtParticleVertex(CbmMCTrack* track_mc, CbmKFTrack* track_kf)
+void CbmKFTrackFitQa::FillHistoAtParticleVertex(CbmMCTrack* track_mc, CbmKFTrack* track_kf)
 {
   CbmKFTrackInterface* tr_help1 = track_kf;
   CbmKFTrack* tr1               = new CbmKFTrack(*tr_help1);
@@ -325,7 +325,7 @@ void CbmKFTrackFitQA::FillHistoAtParticleVertex(CbmMCTrack* track_mc, CbmKFTrack
   }
 }
 
-void CbmKFTrackFitQA::FillHistoAtFirstPoint(CbmKFTrErrMCPoints* mc_points, CbmMCTrack* track_mc, CbmKFTrack* track_kf)
+void CbmKFTrackFitQa::FillHistoAtFirstPoint(CbmKFTrErrMCPoints* mc_points, CbmMCTrack* track_mc, CbmKFTrack* track_kf)
 {
   Double_t* fT = track_kf->GetTrack();
   Double_t* fC = track_kf->GetCovMatrix();
@@ -413,7 +413,7 @@ void CbmKFTrackFitQA::FillHistoAtFirstPoint(CbmKFTrErrMCPoints* mc_points, CbmMC
   }
 }
 
-void CbmKFTrackFitQA::KFWrite()
+void CbmKFTrackFitQa::KFWrite()
 {
   //This function writes obtained histograms to the root file
   TDirectory* curr   = gDirectory;
@@ -466,7 +466,7 @@ void CbmKFTrackFitQA::KFWrite()
   gDirectory = curr;
 }
 
-void CbmKFTrackFitQA::Save()
+void CbmKFTrackFitQa::Save()
 {
   //This function writes obtained histograms to the root file
 
@@ -509,7 +509,7 @@ void CbmKFTrackFitQA::Save()
   pull_AtFP_qp->SaveAs("pull_AtFP_qp.gif");
 }
 
-void CbmKFTrackFitQA::FillHitHistos()
+void CbmKFTrackFitQa::FillHitHistos()
 {
   vStsHitMatch.resize(listStsHits->GetEntriesFast());
   StsHitMatch();
@@ -548,7 +548,7 @@ void CbmKFTrackFitQA::FillHitHistos()
   //   }
 }
 
-void CbmKFTrackFitQA::StsHitMatch()
+void CbmKFTrackFitQa::StsHitMatch()
 {
   const bool useLinks =
     0;  // 0 - use HitMatch, one_to_one; 1 - use FairLinks, many_to_many. Set 0 to switch to old definition of efficiency.
@@ -617,7 +617,7 @@ void CbmKFTrackFitQA::StsHitMatch()
 }
 
 
-void CbmKFTrackFitQA::FindBackTracks()
+void CbmKFTrackFitQa::FindBackTracks()
 {
   /*
   Nback=0;
@@ -670,7 +670,7 @@ void CbmKFTrackFitQA::FindBackTracks()
   }*/
 }
 
-void CbmKFTrackFitQA::FindBackTracks(CbmKFTrErrMCPoints* /*mc_points*/, CbmMCTrack* /*track_mc*/,
+void CbmKFTrackFitQa::FindBackTracks(CbmKFTrErrMCPoints* /*mc_points*/, CbmMCTrack* /*track_mc*/,
                                      CbmKFTrack* /*track_kf*/, int /*iEvent*/)
 {
   /*
diff --git a/reco/KF/KFQA/CbmKFTrackFitQA.h b/reco/KF/KFQA/CbmKFTrackFitQa.h
similarity index 90%
rename from reco/KF/KFQA/CbmKFTrackFitQA.h
rename to reco/KF/KFQA/CbmKFTrackFitQa.h
index 68e1e5629886fef858b4273e52cc8977982052fc..6d6a5b75ce6dc3e83787823ba78ad6e0c999ebb4 100644
--- a/reco/KF/KFQA/CbmKFTrackFitQA.h
+++ b/reco/KF/KFQA/CbmKFTrackFitQa.h
@@ -10,8 +10,8 @@
  *====================================================================
  */
 
-#ifndef _CbmKFTrackFitQA_h_
-#define _CbmKFTrackFitQA_h_
+#ifndef _CbmKFTrackFitQa_h_
+#define _CbmKFTrackFitQa_h_
 
 #include "CbmKFTrErrMCPoints.h"
 #include "CbmKFTrack.h"
@@ -34,10 +34,10 @@
 #include <iostream>
 #include <vector>
 
-class CbmKFTrackFitQA : public FairTask {
+class CbmKFTrackFitQa : public FairTask {
 public:
-  CbmKFTrackFitQA();
-  ~CbmKFTrackFitQA();
+  CbmKFTrackFitQa();
+  ~CbmKFTrackFitQa();
 
   void StsHitMatch();
   void FillHitHistos();
@@ -125,11 +125,11 @@ private:
   int Nback;
   //FILE *fBack;
 
-  ClassDef(CbmKFTrackFitQA, 1);
+  ClassDef(CbmKFTrackFitQa, 1);
 
 private:
-  CbmKFTrackFitQA(const CbmKFTrackFitQA&);
-  void operator=(const CbmKFTrackFitQA&);
+  CbmKFTrackFitQa(const CbmKFTrackFitQa&);
+  void operator=(const CbmKFTrackFitQa&);
 };
 
-#endif  // _CbmKFTrackFitQA_h_
+#endif  // _CbmKFTrackFitQa_h_
diff --git a/reco/KF/KFQA/CbmKFTrackQA.cxx b/reco/KF/KFQA/CbmKFTrackQa.cxx
similarity index 95%
rename from reco/KF/KFQA/CbmKFTrackQA.cxx
rename to reco/KF/KFQA/CbmKFTrackQa.cxx
index 1779d2c931115e4006b8ced76dd2f0d341edf093..3f56e4b62f0d9fb8a735e3da492bf0f02e8d4d80 100644
--- a/reco/KF/KFQA/CbmKFTrackQA.cxx
+++ b/reco/KF/KFQA/CbmKFTrackQa.cxx
@@ -6,7 +6,7 @@
 //-----------------------------------------------------------
 
 // Cbm Headers ----------------------
-#include "CbmKFTrackQA.h"
+#include "CbmKFTrackQa.h"
 
 #include "CbmMCTrack.h"
 #include "CbmTrack.h"
@@ -55,7 +55,7 @@
 using std::map;
 using std::vector;
 
-CbmKFTrackQA::CbmKFTrackQA(const char* name, Int_t iVerbose, TString outFileName)
+CbmKFTrackQa::CbmKFTrackQa(const char* name, Int_t iVerbose, TString outFileName)
   : FairTask(name, iVerbose)
   , fStsTrackBranchName("StsTrack")
   , fGlobalTrackBranchName("GlobalTrack")
@@ -261,87 +261,87 @@ CbmKFTrackQA::CbmKFTrackQA(const char* name, Int_t iVerbose, TString outFileName
   fPDGtoIndexMap[1000020040] = 13;
 }
 
-CbmKFTrackQA::~CbmKFTrackQA() {}
+CbmKFTrackQa::~CbmKFTrackQa() {}
 
-InitStatus CbmKFTrackQA::Init()
+InitStatus CbmKFTrackQa::Init()
 {
   //Get ROOT Manager
   FairRootManager* ioman = FairRootManager::Instance();
 
   if (ioman == 0) {
-    Warning("CbmKFTrackQA::Init", "RootManager not instantiated!");
+    Warning("CbmKFTrackQa::Init", "RootManager not instantiated!");
     return kERROR;
   }
 
   // Get sts tracks
   fStsTrackArray = (TClonesArray*) ioman->GetObject(fStsTrackBranchName);
   if (fStsTrackArray == 0) {
-    Warning("CbmKFTrackQA::Init", "track-array not found!");
+    Warning("CbmKFTrackQa::Init", "track-array not found!");
     return kERROR;
   }
 
   // Get global tracks
   fGlobalTrackArray = (TClonesArray*) ioman->GetObject(fGlobalTrackBranchName);
-  if (fGlobalTrackArray == 0) Warning("CbmKFTrackQA::Init", "global track array not found!");
+  if (fGlobalTrackArray == 0) Warning("CbmKFTrackQa::Init", "global track array not found!");
 
   // Get ToF hits
   fTofHitArray = (TClonesArray*) ioman->GetObject(fTofBranchName);
-  if (fTofHitArray == 0) Warning("CbmKFTrackQA::Init", "TOF hit-array not found!");
+  if (fTofHitArray == 0) Warning("CbmKFTrackQa::Init", "TOF hit-array not found!");
 
   // TRD
   fTrdTrackArray = (TClonesArray*) ioman->GetObject(fTrdBranchName);
-  if (fTrdTrackArray == 0) Warning("CbmKFTrackQA::Init", "TRD track-array not found!");
+  if (fTrdTrackArray == 0) Warning("CbmKFTrackQa::Init", "TRD track-array not found!");
 
   fTrdHitArray = (TClonesArray*) ioman->GetObject(fTrdHitBranchName);
-  if (fTrdHitArray == 0) Warning("CbmKFTrackQA::Init", "TRD hit-array not found!");
+  if (fTrdHitArray == 0) Warning("CbmKFTrackQa::Init", "TRD hit-array not found!");
 
   fRichRingArray = (TClonesArray*) ioman->GetObject(fRichBranchName);
-  if (fRichRingArray == 0) Warning("CbmKFTrackQA::Init", "Rich ring array not found!");
+  if (fRichRingArray == 0) Warning("CbmKFTrackQa::Init", "Rich ring array not found!");
 
   fMCTrackArray = (TClonesArray*) ioman->GetObject(fMCTracksBranchName);
   if (fMCTrackArray == 0) {
-    Warning("CbmKFTrackQA::Init", "mc track array not found!");
+    Warning("CbmKFTrackQa::Init", "mc track array not found!");
     return kERROR;
   }
 
   //Track match
   fStsTrackMatchArray = (TClonesArray*) ioman->GetObject(fStsTrackMatchBranchName);
   if (fStsTrackMatchArray == 0) {
-    Warning("CbmKFTrackQA::Init", "track match array not found!");
+    Warning("CbmKFTrackQa::Init", "track match array not found!");
     return kERROR;
   }
 
   //Ring match
   fRichRingMatchArray = (TClonesArray*) ioman->GetObject(fRichRingMatchBranchName);
-  if (fRichRingMatchArray == 0) Warning("CbmKFTrackQA::Init", "RichRing match array not found!");
+  if (fRichRingMatchArray == 0) Warning("CbmKFTrackQa::Init", "RichRing match array not found!");
 
   //Tof match
   fTofHitMatchArray = (TClonesArray*) ioman->GetObject(fTofHitMatchBranchName);
-  if (fTofHitMatchArray == 0) Warning("CbmKFTrackQA::Init", "TofHit match array not found!");
+  if (fTofHitMatchArray == 0) Warning("CbmKFTrackQa::Init", "TofHit match array not found!");
 
   //TRD match
   fTrdTrackMatchArray = (TClonesArray*) ioman->GetObject(fTrdTrackMatchBranchName);
-  if (fTrdTrackMatchArray == 0) Warning("CbmKFTrackQA::Init", "TrdTrack match array not found!");
+  if (fTrdTrackMatchArray == 0) Warning("CbmKFTrackQa::Init", "TrdTrack match array not found!");
 
   //Much track match
   fMuchTrackMatchArray = (TClonesArray*) ioman->GetObject(fMuchTrackMatchBranchName);
-  if (fMuchTrackMatchArray == 0) { Warning("CbmKFTrackQA::Init", "Much track match array not found!"); }
+  if (fMuchTrackMatchArray == 0) { Warning("CbmKFTrackQa::Init", "Much track match array not found!"); }
   //Much
   fMuchTrackArray = (TClonesArray*) ioman->GetObject(fMuchTrackBranchName);
-  if (fMuchTrackArray == 0) { Warning("CbmKFTrackQA::Init", "Much track-array not found!"); }
+  if (fMuchTrackArray == 0) { Warning("CbmKFTrackQa::Init", "Much track-array not found!"); }
 
   // mc data manager
   CbmMCDataManager* mcManager = (CbmMCDataManager*) ioman->GetObject("MCDataManager");
-  if (mcManager == 0) { Warning("CbmKFTrackQA::Init", "mc manager not found!"); }
+  if (mcManager == 0) { Warning("CbmKFTrackQa::Init", "mc manager not found!"); }
 
   // Tof points
   fTofPoints = (CbmMCDataArray*) mcManager->InitBranch("TofPoint");
-  if (fTofPoints == 0) { Warning("CbmKFTrackQA::Init", "tof points not found!"); }
+  if (fTofPoints == 0) { Warning("CbmKFTrackQa::Init", "tof points not found!"); }
 
   return kSUCCESS;
 }
 
-void CbmKFTrackQA::Exec(Option_t* /*opt*/)
+void CbmKFTrackQa::Exec(Option_t* /*opt*/)
 {
   fNEvents++;
 
@@ -731,7 +731,7 @@ void CbmKFTrackQA::Exec(Option_t* /*opt*/)
   }
 }
 
-void CbmKFTrackQA::Finish()
+void CbmKFTrackQa::Finish()
 {
   TDirectory* curr   = gDirectory;
   TFile* currentFile = gFile;
@@ -747,7 +747,7 @@ void CbmKFTrackQA::Finish()
   gDirectory = curr;
 }
 
-void CbmKFTrackQA::WriteHistosCurFile(TObject* obj)
+void CbmKFTrackQa::WriteHistosCurFile(TObject* obj)
 {
 
 
@@ -768,7 +768,7 @@ void CbmKFTrackQA::WriteHistosCurFile(TObject* obj)
   }
 }
 
-int CbmKFTrackQA::GetHistoIndex(int pdg)
+int CbmKFTrackQa::GetHistoIndex(int pdg)
 {
   map<int, int>::iterator it;
   it = fPDGtoIndexMap.find(TMath::Abs(pdg));
@@ -777,7 +777,7 @@ int CbmKFTrackQA::GetHistoIndex(int pdg)
     return 6;
 }
 
-Int_t CbmKFTrackQA::GetZtoNStation(Double_t getZ)
+Int_t CbmKFTrackQa::GetZtoNStation(Double_t getZ)
 {
   if (TMath::Abs(getZ - 145) <= 2.0) return 1;
   if (TMath::Abs(getZ - 155) <= 2.0) return 2;
@@ -801,4 +801,4 @@ Int_t CbmKFTrackQA::GetZtoNStation(Double_t getZ)
   return -1;
 }
 
-ClassImp(CbmKFTrackQA);
+ClassImp(CbmKFTrackQa);
diff --git a/reco/KF/KFQA/CbmKFTrackQA.h b/reco/KF/KFQA/CbmKFTrackQa.h
similarity index 91%
rename from reco/KF/KFQA/CbmKFTrackQA.h
rename to reco/KF/KFQA/CbmKFTrackQa.h
index 3af2643cafbb21e1773b8b54042f4223897474c4..70bd360bffbd64370ef1b0958c91731e58471f31 100644
--- a/reco/KF/KFQA/CbmKFTrackQA.h
+++ b/reco/KF/KFQA/CbmKFTrackQa.h
@@ -5,8 +5,8 @@
 //-----------------------------------------------------------
 //-----------------------------------------------------------
 
-#ifndef CbmKFTrackQA_HH
-#define CbmKFTrackQA_HH
+#ifndef CbmKFTrackQa_HH
+#define CbmKFTrackQa_HH
 
 #include "FairTask.h"
 
@@ -25,11 +25,11 @@ class TH2F;
 class TObject;
 class CbmMCDataArray;
 
-class CbmKFTrackQA : public FairTask {
+class CbmKFTrackQa : public FairTask {
 public:
   // Constructors/Destructors ---------
-  CbmKFTrackQA(const char* name = "CbmKFTrackQA", Int_t iVerbose = 0, TString outFileName = "CbmKFTrackQA.root");
-  ~CbmKFTrackQA();
+  CbmKFTrackQa(const char* name = "CbmKFTrackQa", Int_t iVerbose = 0, TString outFileName = "CbmKFTrackQa.root");
+  ~CbmKFTrackQa();
 
   void SetStsTrackBranchName(const TString& name) { fStsTrackBranchName = name; }
   void SetGlobalTrackBranchName(const TString& name) { fGlobalTrackBranchName = name; }
@@ -48,8 +48,8 @@ public:
   virtual void Finish();
 
 private:
-  const CbmKFTrackQA& operator=(const CbmKFTrackQA&);
-  CbmKFTrackQA(const CbmKFTrackQA&);
+  const CbmKFTrackQa& operator=(const CbmKFTrackQa&);
+  CbmKFTrackQa(const CbmKFTrackQa&);
 
   void WriteHistosCurFile(TObject* obj);
   int GetHistoIndex(int pdg);
@@ -121,7 +121,7 @@ private:
     [NTofHisto2D];  //All tracks, electrons, muons, pions, kaons, protons, fragments, mismatch, ghost hit, ghost tof hit, d, t, He3, He4
 
 
-  ClassDef(CbmKFTrackQA, 1);
+  ClassDef(CbmKFTrackQa, 1);
 };
 
 #endif
diff --git a/reco/eventbuilder/CMakeLists.txt b/reco/eventbuilder/CMakeLists.txt
index bb1c39a02c164cacd6fb54d7797cb61b188c47eb..569bcdc94defbb00b730f1e06e56cf933879437a 100644
--- a/reco/eventbuilder/CMakeLists.txt
+++ b/reco/eventbuilder/CMakeLists.txt
@@ -72,14 +72,14 @@ digis/CbmAlgoBuildRawEvents.cxx
 digis/CbmTaskBuildRawEvents.cxx
 digis/CbmBuildEventsIdeal.cxx
 digis/CbmBuildEventsIdealNew.cxx
-digis/CbmBuildEventsQA.cxx
+digis/CbmBuildEventsQa.cxx
 digis/CbmBuildEventsSimple.cxx
 digis/CbmSeedFinderSlidingWindow.cxx
 #digis/CbmEvBuildSource.cxx
 
 tracks/CbmBuildEventsFromTracksIdeal.cxx
 tracks/CbmBuildEventsFromTracksReal.cxx
-tracks/CbmEventBuilderQA.cxx
+tracks/CbmEventBuilderQa.cxx
 )
 
 
diff --git a/reco/eventbuilder/CbmEventBuilderLinkDef.h b/reco/eventbuilder/CbmEventBuilderLinkDef.h
index fb170a95e5b5bff71d3283a42cc1160e1ca8a6d8..5e52abb52acdedf73dbd55d8da72d4a2ae07c06f 100644
--- a/reco/eventbuilder/CbmEventBuilderLinkDef.h
+++ b/reco/eventbuilder/CbmEventBuilderLinkDef.h
@@ -14,10 +14,10 @@
 #pragma link C++ class CbmTaskBuildRawEvents + ;
 #pragma link C++ class CbmBuildEventsFromTracksIdeal + ;
 #pragma link C++ class CbmBuildEventsFromTracksReal + ;
-#pragma link C++ class CbmEventBuilderQA + ;
+#pragma link C++ class CbmEventBuilderQa + ;
 #pragma link C++ class CbmBuildEventsIdeal + ;
 #pragma link C++ class CbmBuildEventsIdealNew + ;
-#pragma link C++ class CbmBuildEventsQA + ;
+#pragma link C++ class CbmBuildEventsQa + ;
 #pragma link C++ class CbmBuildEventsSimple + ;
 #pragma link C++ class CbmSeedFinderSlidingWindow + ;
 //#pragma link C++ class CbmEvBuildSource+;
diff --git a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx b/reco/eventbuilder/digis/CbmBuildEventsQa.cxx
similarity index 96%
rename from reco/eventbuilder/digis/CbmBuildEventsQA.cxx
rename to reco/eventbuilder/digis/CbmBuildEventsQa.cxx
index d040a63da68b1760040642d01332e32015250105..07e617c08c02f797437426ee907cb83b6b1f2b56 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsQA.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsQa.cxx
@@ -7,7 +7,7 @@
  ** @date 20.09.2016
  **/
 
-#include "CbmBuildEventsQA.h"
+#include "CbmBuildEventsQa.h"
 
 #include "CbmDigiManager.h"
 #include "CbmEvent.h"
@@ -31,7 +31,7 @@
 using namespace std;
 
 // =====   Constructor   =====================================================
-CbmBuildEventsQA::CbmBuildEventsQA()
+CbmBuildEventsQa::CbmBuildEventsQa()
   : FairTask("BuildEventsQA")
   , fEvents(NULL)
   , fNofEntries(0)
@@ -42,12 +42,12 @@ CbmBuildEventsQA::CbmBuildEventsQA()
 
 
 // =====   Destructor   ======================================================
-CbmBuildEventsQA::~CbmBuildEventsQA() { DeInit(); }
+CbmBuildEventsQa::~CbmBuildEventsQa() { DeInit(); }
 // ===========================================================================
 
 
 // =====   De-initialisation   =============================================
-void CbmBuildEventsQA::DeInit()
+void CbmBuildEventsQa::DeInit()
 {
   fOutFolder.Clear();
   histFolder = nullptr;
@@ -65,7 +65,7 @@ void CbmBuildEventsQA::DeInit()
 }
 
 // =====   Task initialisation   =============================================
-InitStatus CbmBuildEventsQA::Init()
+InitStatus CbmBuildEventsQa::Init()
 {
   DeInit();
 
@@ -76,7 +76,7 @@ InitStatus CbmBuildEventsQA::Init()
   // --- Get input array (CbmEvent)
   fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
   if (nullptr == fEvents) {
-    LOG(fatal) << "CbmBuildEventsQA::Init"
+    LOG(fatal) << "CbmBuildEventsQa::Init"
                << "No CbmEvent TClonesArray found!";
   }
 
@@ -116,7 +116,7 @@ InitStatus CbmBuildEventsQA::Init()
 
 
 // =====   Task execution   ==================================================
-void CbmBuildEventsQA::Exec(Option_t*)
+void CbmBuildEventsQa::Exec(Option_t*)
 {
   // --- Time and counters
   TStopwatch timer;
@@ -224,7 +224,7 @@ void CbmBuildEventsQA::Exec(Option_t*)
 
 
 // =====   Match event   =====================================================
-void CbmBuildEventsQA::MatchEvent(CbmEvent* event)
+void CbmBuildEventsQa::MatchEvent(CbmEvent* event)
 {
   // --- Get event match object. If present, will be cleared first. If not,
   // --- it will be created.
@@ -273,7 +273,7 @@ void CbmBuildEventsQA::MatchEvent(CbmEvent* event)
 
 
 // =====  Finish task  =======================================================
-void CbmBuildEventsQA::Finish()
+void CbmBuildEventsQa::Finish()
 {
   //output histograms
   if (!FairRootManager::Instance() || !FairRootManager::Instance()->GetSink()) {
@@ -287,7 +287,7 @@ void CbmBuildEventsQA::Finish()
 
 
 // =====  Get digi type  =====================================================
-ECbmDataType CbmBuildEventsQA::GetDigiType(ECbmModuleId system)
+ECbmDataType CbmBuildEventsQa::GetDigiType(ECbmModuleId system)
 {
   switch (system) {
     case ECbmModuleId::kMvd: return ECbmDataType::kMvdDigi;
@@ -303,4 +303,4 @@ ECbmDataType CbmBuildEventsQA::GetDigiType(ECbmModuleId system)
 // ===========================================================================
 
 
-ClassImp(CbmBuildEventsQA)
+ClassImp(CbmBuildEventsQa)
diff --git a/reco/eventbuilder/digis/CbmBuildEventsQA.h b/reco/eventbuilder/digis/CbmBuildEventsQa.h
similarity index 90%
rename from reco/eventbuilder/digis/CbmBuildEventsQA.h
rename to reco/eventbuilder/digis/CbmBuildEventsQa.h
index 9100da7e26f86fd703fc927a2e0e25f461e8da52..2c62759ff962a5f7ffdf03e245889068a0d2490b 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsQA.h
+++ b/reco/eventbuilder/digis/CbmBuildEventsQa.h
@@ -30,14 +30,14 @@ class CbmEvent;
  ** and calculates the percentage of correctly assigned digis
  ** based on their matched link (largest weight).
  **/
-class CbmBuildEventsQA : public FairTask {
+class CbmBuildEventsQa : public FairTask {
 
 public:
   /** Constructor **/
-  CbmBuildEventsQA();
+  CbmBuildEventsQa();
 
   /** Destructor **/
-  virtual ~CbmBuildEventsQA();
+  virtual ~CbmBuildEventsQa();
 
   /** Task execution **/
   virtual void Exec(Option_t* opt);
@@ -74,10 +74,10 @@ private:
 
   std::vector<ECbmModuleId> fRefDetectors;  //  Detectors used for MC matching
 
-  CbmBuildEventsQA(const CbmBuildEventsQA&);
-  CbmBuildEventsQA& operator=(const CbmBuildEventsQA&);
+  CbmBuildEventsQa(const CbmBuildEventsQa&);
+  CbmBuildEventsQa& operator=(const CbmBuildEventsQa&);
 
-  ClassDef(CbmBuildEventsQA, 1);
+  ClassDef(CbmBuildEventsQa, 1);
 };
 
 #endif /* CBMBUILDEVENTSQA_H */
diff --git a/reco/eventbuilder/digis/README.md b/reco/eventbuilder/digis/README.md
index 00f35958338bde95ffee5470d94eb08b4a0a2226..c58881706846e3e61c92ad2607f7cc82b86a2d66 100644
--- a/reco/eventbuilder/digis/README.md
+++ b/reco/eventbuilder/digis/README.md
@@ -41,7 +41,7 @@ from digis can be carried out inside a Root macro:
 
 	// Add QA task in case of Monte Carlo data
 	if ( useMC ) {
-	   CbmBuildEventsQA* evBuildQA = new CbmBuildEventsQA();
+	   CbmBuildEventsQa* evBuildQA = new CbmBuildEventsQa();
 	   run->AddTask(evBuildQA);
 	}
 
diff --git a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
index d4698eea15687de9e63de453c11406416e60e21d..cbc7f9c6a3bf3510f8b47dd3033f000ce1a3d805 100644
--- a/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
+++ b/reco/eventbuilder/tracks/CbmBuildEventsFromTracksIdeal.cxx
@@ -77,7 +77,7 @@ InitStatus CbmBuildEventsFromTracksIdeal::Init()
 
   fEventList = (CbmMCEventList*) ioman->GetObject("MCEventList.");
   if (fEventList == 0) {
-    Error("CbmKFParticleFinderQA::Init", "MC Event List not found!");
+    Error("CbmKFParticleFinderQa::Init", "MC Event List not found!");
     return kERROR;
   }
 
@@ -87,7 +87,7 @@ InitStatus CbmBuildEventsFromTracksIdeal::Init()
 
   fStsTrackMatchArray = (TClonesArray*) ioman->GetObject("StsTrackMatch");
   if (fStsTrackMatchArray == 0) {
-    Error("CbmKFParticleFinderQA::Init", "track match array not found!");
+    Error("CbmKFParticleFinderQa::Init", "track match array not found!");
     return kERROR;
   }
 
diff --git a/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx b/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx
similarity index 97%
rename from reco/eventbuilder/tracks/CbmEventBuilderQA.cxx
rename to reco/eventbuilder/tracks/CbmEventBuilderQa.cxx
index 87d90d512fe453885951b74e86bf4b184dd64041..94e2fd4bade7a89df565d22848dd237771882be3 100644
--- a/reco/eventbuilder/tracks/CbmEventBuilderQA.cxx
+++ b/reco/eventbuilder/tracks/CbmEventBuilderQa.cxx
@@ -2,13 +2,13 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Valentina Akishina , Maksym Zyzak, Valentina Akishina [committer] */
 
-/** @file CbmEventBuilderQA.cxx
+/** @file CbmEventBuilderQa.cxx
  ** @author Valentina Akishina <v.akishina@gsi.de>, Maksym Zyzak <m.zyzak@gsi.de>
  ** @date 14.03.2017
  **/
 
 // Cbm Headers ----------------------
-#include "CbmEventBuilderQA.h"
+#include "CbmEventBuilderQa.h"
 
 #include "CbmMCTrack.h"
 #include "CbmTrack.h"
@@ -73,7 +73,7 @@ struct TH1FParameters {
   float xMin, xMax;
 };
 
-CbmEventBuilderQA::CbmEventBuilderQA(const char* name, Int_t iVerbose, TString outFileName)
+CbmEventBuilderQa::CbmEventBuilderQa(const char* name, Int_t iVerbose, TString outFileName)
   : FairTask(name, iVerbose)
   , fPointsInTracks()
   , fStsTrackBranchName("StsTrack")
@@ -185,7 +185,7 @@ CbmEventBuilderQA::CbmEventBuilderQA(const char* name, Int_t iVerbose, TString o
   gDirectory = curDirectory;
 }
 
-CbmEventBuilderQA::~CbmEventBuilderQA() {}
+CbmEventBuilderQa::~CbmEventBuilderQa() {}
 
 
 struct CbmBuildEventMCTrack {
@@ -199,13 +199,13 @@ struct CbmBuildEventMCTrack {
   vector<int> fRecoEventId;
 };
 
-InitStatus CbmEventBuilderQA::Init()
+InitStatus CbmEventBuilderQa::Init()
 {
   //Get ROOT Manager
   FairRootManager* ioman = FairRootManager::Instance();
 
   if (ioman == 0) {
-    Warning("CbmEventBuilderQA::Init", "RootManager not instantiated!");
+    Warning("CbmEventBuilderQa::Init", "RootManager not instantiated!");
     return kERROR;
   }
 
@@ -217,7 +217,7 @@ InitStatus CbmEventBuilderQA::Init()
 
   fEventList = (CbmMCEventList*) ioman->GetObject("MCEventList.");
   if (fEventList == 0) {
-    Error("CbmEventBuilderQA::Init", "MC Event List not found!");
+    Error("CbmEventBuilderQa::Init", "MC Event List not found!");
     return kERROR;
   }
 
@@ -227,7 +227,7 @@ InitStatus CbmEventBuilderQA::Init()
 
   fStsTrackMatchArray = (TClonesArray*) ioman->GetObject("StsTrackMatch");
   if (fStsTrackMatchArray == 0) {
-    Error("CbmEventBuilderQA::Init", "track match array not found!");
+    Error("CbmEventBuilderQa::Init", "track match array not found!");
     return kERROR;
   }
 
@@ -246,12 +246,12 @@ InitStatus CbmEventBuilderQA::Init()
 
   // --- Get input array (CbmEvent)
   fEvents = dynamic_cast<TClonesArray*>(ioman->GetObject("CbmEvent"));
-  if (nullptr == fEvents) { Fatal("CbmEventBuilderQA::Init", "No CbmEvent TClonesArray found!"); }
+  if (nullptr == fEvents) { Fatal("CbmEventBuilderQa::Init", "No CbmEvent TClonesArray found!"); }
 
   return kSUCCESS;
 }
 
-void CbmEventBuilderQA::Exec(Option_t* /*opt*/)
+void CbmEventBuilderQa::Exec(Option_t* /*opt*/)
 {
   fPointsInTracks.clear();
 
@@ -664,7 +664,7 @@ void CbmEventBuilderQA::Exec(Option_t* /*opt*/)
   }
 }
 
-bool CbmEventBuilderQA::CalculateIsReconstructable(const int iMCFile, const int iMCEvent, const int iMCTrack)
+bool CbmEventBuilderQa::CalculateIsReconstructable(const int iMCFile, const int iMCEvent, const int iMCTrack)
 {
 
   CbmMCTrack* mcTrack = (CbmMCTrack*) fMCTracks->Get(iMCFile, iMCEvent, iMCTrack);
@@ -747,7 +747,7 @@ bool CbmEventBuilderQA::CalculateIsReconstructable(const int iMCFile, const int
   return (isReconstructableTrack);
 };
 
-void CbmEventBuilderQA::Finish()
+void CbmEventBuilderQa::Finish()
 {
   TDirectory* curr   = gDirectory;
   TFile* currentFile = gFile;
@@ -763,7 +763,7 @@ void CbmEventBuilderQA::Finish()
   gDirectory = curr;
 }
 
-void CbmEventBuilderQA::WriteHistosCurFile(TObject* obj)
+void CbmEventBuilderQa::WriteHistosCurFile(TObject* obj)
 {
 
   if (!obj->IsFolder()) obj->Write();
@@ -784,4 +784,4 @@ void CbmEventBuilderQA::WriteHistosCurFile(TObject* obj)
 }
 
 
-ClassImp(CbmEventBuilderQA);
+ClassImp(CbmEventBuilderQa);
diff --git a/reco/eventbuilder/tracks/CbmEventBuilderQA.h b/reco/eventbuilder/tracks/CbmEventBuilderQa.h
similarity index 89%
rename from reco/eventbuilder/tracks/CbmEventBuilderQA.h
rename to reco/eventbuilder/tracks/CbmEventBuilderQa.h
index ee24857ec7f4aa5ebc4b9762b2aa57cdf7d5ba6d..1c344a41c650c4d51cd2a32d0f88b1230f881c09 100644
--- a/reco/eventbuilder/tracks/CbmEventBuilderQA.h
+++ b/reco/eventbuilder/tracks/CbmEventBuilderQa.h
@@ -2,13 +2,13 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Valentina Akishina , Maksym Zyzak, Valentina Akishina [committer] */
 
-/** @file CbmEventBuilderQA.h
+/** @file CbmEventBuilderQa.h
  ** @author Valentina Akishina <v.akishina@gsi.de>, Maksym Zyzak <m.zyzak@gsi.de>
  ** @date 14.03.2017
  **/
 
-#ifndef CbmEventBuilderQA_H
-#define CbmEventBuilderQA_H
+#ifndef CbmEventBuilderQa_H
+#define CbmEventBuilderQa_H
 
 #include "CbmEvent.h"
 #include "CbmStsTrack.h"
@@ -31,14 +31,14 @@ class TH1F;
 class TH2F;
 class TObject;
 
-class CbmEventBuilderQA : public FairTask {
+class CbmEventBuilderQa : public FairTask {
 public:
   // Constructors/Destructors ---------
-  CbmEventBuilderQA(const char* name = "CbmEventBuilderQA", Int_t iVerbose = 0,
-                    TString outFileName = "CbmEventBuilderQA.root");
-  const CbmEventBuilderQA& operator=(const CbmEventBuilderQA&) = delete;
-  CbmEventBuilderQA(const CbmEventBuilderQA&)                  = delete;
-  ~CbmEventBuilderQA();
+  CbmEventBuilderQa(const char* name = "CbmEventBuilderQa", Int_t iVerbose = 0,
+                    TString outFileName = "CbmEventBuilderQa.root");
+  const CbmEventBuilderQa& operator=(const CbmEventBuilderQa&) = delete;
+  CbmEventBuilderQa(const CbmEventBuilderQa&)                  = delete;
+  ~CbmEventBuilderQa();
 
   void SetStsTrackBranchName(const TString& name) { fStsTrackBranchName = name; }
   void SetGlobalTrackBranchName(const TString& name) { fGlobalTrackBranchName = name; }
@@ -124,7 +124,7 @@ private:
     [10]
     [NRichRingHisto2D];  //All tracks, electrons, muons, pions, kaons, protons, fragments, mismatch, ghost track, ghost ring
 
-  ClassDef(CbmEventBuilderQA, 1);
+  ClassDef(CbmEventBuilderQa, 1);
 };
 
 #endif
diff --git a/reco/tracking/BinnedTracker/CMakeLists.txt b/reco/tracking/BinnedTracker/CMakeLists.txt
index d9b9e12e387a5883abc2a1cb1bd0f141281401ad..5588b4f24eefee8cf5156761768c3e40d32fc350 100644
--- a/reco/tracking/BinnedTracker/CMakeLists.txt
+++ b/reco/tracking/BinnedTracker/CMakeLists.txt
@@ -41,8 +41,8 @@ Link_Directories( ${LINK_DIRECTORIES})
 Set(SRCS
   CbmBinnedTrackerConfigurator.cxx
   CbmBinnedTrackerTask.cxx
-  CbmBinnedTrackerQA.cxx
-  CbmBinnedTrackerQANew.cxx
+  CbmBinnedTrackerQa.cxx
+  CbmBinnedTrackerQaNew.cxx
   ContFactory.cxx
   Settings.cxx
   CbmTrackParam2.cxx
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h b/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h
index eb85cb208660778ee63d5b83a5a809f16a94c57d..1e58bb1642d6f712558e9a6dd5a8ac8b7a64d367 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerLinkDef.h
@@ -12,8 +12,8 @@
 #pragma link C++ class CbmBinnedSettings + ;
 #pragma link C++ class CbmBinnedTrackerConfigurator + ;
 #pragma link C++ class CbmBinnedTrackerTask + ;
-#pragma link C++ class CbmBinnedTrackerQA + ;
-#pragma link C++ class CbmBinnedTrackerQANew + ;
+#pragma link C++ class CbmBinnedTrackerQa + ;
+#pragma link C++ class CbmBinnedTrackerQaNew + ;
 #pragma link C++ class CbmTrackParam2 + ;
 
 #endif
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerQa.cxx
similarity index 99%
rename from reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx
rename to reco/tracking/BinnedTracker/CbmBinnedTrackerQa.cxx
index a951ecd02e89a899d9d04f2d29b7aa13937b9e98..5f6c37648912f752422979590670953ba94edbce 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQa.cxx
@@ -10,7 +10,7 @@
 
 //#define CBM_BINNED_QA_FILL_HISTOS
 
-#include "CbmBinnedTrackerQA.h"
+#include "CbmBinnedTrackerQa.h"
 
 #include "CbmMCDataManager.h"
 #include "CbmMCTrack.h"
@@ -266,7 +266,7 @@ static TH1F* trdNearestHitDistHistos[] = {0, 0, 0, 0};
 
 static list<TrackDesc*> lambdaList;
 
-CbmBinnedTrackerQA::CbmBinnedTrackerQA()
+CbmBinnedTrackerQa::CbmBinnedTrackerQa()
   : fPrimaryParticleIds()
   , fIsOnlyPrimary(false)
   , fSettings(0)
@@ -298,7 +298,7 @@ CbmBinnedTrackerQA::CbmBinnedTrackerQA()
   fPrimaryParticleIds.push_back(ppiNone);
 }
 
-InitStatus CbmBinnedTrackerQA::Init()
+InitStatus CbmBinnedTrackerQa::Init()
 {
   CbmStsSetup* stsSetup = CbmStsSetup::Instance();
 
@@ -695,7 +695,7 @@ InitStatus CbmBinnedTrackerQA::Init()
   return kSUCCESS;
 }
 
-void CbmBinnedTrackerQA::IterateTrdHits(std::function<void(const CbmTrdHit*, const CbmTrdPoint*)> handleData)
+void CbmBinnedTrackerQa::IterateTrdHits(std::function<void(const CbmTrdHit*, const CbmTrdPoint*)> handleData)
 {
   Int_t nofTrdHits = fTrdHits->GetEntriesFast();
 
@@ -728,7 +728,7 @@ static Int_t gNofNonGhosts  = 0;
 static Int_t gNofClones     = 0;
 static vector<bool> gIsRecoClone;
 
-void CbmBinnedTrackerQA::Exec(Option_t*)
+void CbmBinnedTrackerQa::Exec(Option_t*)
 {
   gIsRecoClone.clear();
 
@@ -1162,7 +1162,7 @@ void CbmBinnedTrackerQA::Exec(Option_t*)
 
 static inline void IncrementForId(map<Int_t, set<Int_t>>& ids, Int_t id, Int_t stId) { ids[id].insert(stId); }
 
-void CbmBinnedTrackerQA::HandleSts(Int_t stsTrackIndex, map<Int_t, set<Int_t>>& mcTrackIds,
+void CbmBinnedTrackerQa::HandleSts(Int_t stsTrackIndex, map<Int_t, set<Int_t>>& mcTrackIds,
                                    set<Int_t>* globalTrackMCRefs, Int_t* globalTracksHitInds)
 {
   int nofStations             = fSettings->GetNofStations();
@@ -1264,7 +1264,7 @@ void CbmBinnedTrackerQA::HandleSts(Int_t stsTrackIndex, map<Int_t, set<Int_t>>&
   }
 }
 
-void CbmBinnedTrackerQA::HandleMuch(Int_t muchTrackIndex, map<Int_t, set<Int_t>>& mcTrackIds,
+void CbmBinnedTrackerQa::HandleMuch(Int_t muchTrackIndex, map<Int_t, set<Int_t>>& mcTrackIds,
                                     set<Int_t>* globalTrackMCRefs, Int_t* globalTracksHitInds)
 {
   int nofStations               = fSettings->GetNofStations();
@@ -1368,7 +1368,7 @@ void CbmBinnedTrackerQA::HandleMuch(Int_t muchTrackIndex, map<Int_t, set<Int_t>>
   }
 }
 
-void CbmBinnedTrackerQA::HandleTrd(Int_t trdTrackIndex, map<Int_t, set<Int_t>>& mcTrackIds,
+void CbmBinnedTrackerQa::HandleTrd(Int_t trdTrackIndex, map<Int_t, set<Int_t>>& mcTrackIds,
                                    set<Int_t>* globalTrackMCRefs, Int_t* globalTracksHitInds)
 {
   int nofStations             = fSettings->GetNofStations();
@@ -1448,7 +1448,7 @@ void CbmBinnedTrackerQA::HandleTrd(Int_t trdTrackIndex, map<Int_t, set<Int_t>>&
   }
 }
 
-void CbmBinnedTrackerQA::HandleTof(Int_t globalTrackIndex, Int_t tofHitIndex, map<Int_t, set<Int_t>>& mcTrackIds,
+void CbmBinnedTrackerQa::HandleTof(Int_t globalTrackIndex, Int_t tofHitIndex, map<Int_t, set<Int_t>>& mcTrackIds,
                                    set<Int_t>* globalTrackMCRefs, Int_t* globalTracksHitInds)
 {
   const CbmGlobalTrack* globalTrack = static_cast<const CbmGlobalTrack*>(fGlobalTracks->At(globalTrackIndex));
@@ -1565,7 +1565,7 @@ static void effOfMCPoints(const char* name, const vector<vector<char>>& points)
        << endl;
 }
 
-void CbmBinnedTrackerQA::Finish()
+void CbmBinnedTrackerQa::Finish()
 {
   int nofAllTracks               = 0;
   int nofRefTracks               = 0;
@@ -2169,9 +2169,9 @@ void CbmBinnedTrackerQA::Finish()
 #endif  //CBM_BINNED_QA_FILL_HISTOS
 }
 
-void CbmBinnedTrackerQA::SetParContainers()
+void CbmBinnedTrackerQa::SetParContainers()
 {
   fSettings = static_cast<CbmBinnedSettings*>(FairRun::Instance()->GetRuntimeDb()->getContainer("CbmBinnedSettings"));
 }
 
-ClassImp(CbmBinnedTrackerQA)
+ClassImp(CbmBinnedTrackerQa)
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.h b/reco/tracking/BinnedTracker/CbmBinnedTrackerQa.h
similarity index 92%
rename from reco/tracking/BinnedTracker/CbmBinnedTrackerQA.h
rename to reco/tracking/BinnedTracker/CbmBinnedTrackerQa.h
index 42966659b261dabb20855522d36c41602baeb052..3cdbd58119b3897d7c51f78b5aca7d0663051b3d 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQA.h
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQa.h
@@ -27,11 +27,11 @@
 
 #include "Settings.h"
 
-class CbmBinnedTrackerQA : public FairTask {
+class CbmBinnedTrackerQa : public FairTask {
 public:
-  CbmBinnedTrackerQA();
-  CbmBinnedTrackerQA(const CbmBinnedTrackerQA&) = delete;
-  CbmBinnedTrackerQA& operator=(const CbmBinnedTrackerQA&) = delete;
+  CbmBinnedTrackerQa();
+  CbmBinnedTrackerQa(const CbmBinnedTrackerQa&) = delete;
+  CbmBinnedTrackerQa& operator=(const CbmBinnedTrackerQa&) = delete;
   InitStatus Init();         // Overridden from FairTask
   void Exec(Option_t* opt);  // Overridden from FairTask
   void Finish();             // Overridden from FairTask
@@ -88,7 +88,7 @@ private:
   CbmMCDataArray* fMuchPoints;
   CbmMCDataArray* fTrdPoints;
   CbmMCDataArray* fTofPoints;
-  ClassDef(CbmBinnedTrackerQA, 1)
+  ClassDef(CbmBinnedTrackerQa, 1)
 };
 
 #endif /* CBMBINNEDTRACKERQA_H */
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx b/reco/tracking/BinnedTracker/CbmBinnedTrackerQaNew.cxx
similarity index 98%
rename from reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx
rename to reco/tracking/BinnedTracker/CbmBinnedTrackerQaNew.cxx
index 4c2b2c7d64e2fa62b1d0f1ddf519f6c206bbc6b8..9723d680488a4fb58aefaf72af12c07390e9fc54 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.cxx
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQaNew.cxx
@@ -8,7 +8,7 @@
  * and open the template in the editor.
  */
 
-#include "CbmBinnedTrackerQANew.h"
+#include "CbmBinnedTrackerQaNew.h"
 
 #include "CbmMCDataManager.h"
 #include "CbmMCTrack.h"
@@ -41,9 +41,9 @@ struct MCTrackDesc {
 
 static vector<vector<MCTrackDesc>> gMCTracks;
 
-CbmBinnedTrackerQANew::CbmBinnedTrackerQANew() {}
+CbmBinnedTrackerQaNew::CbmBinnedTrackerQaNew() {}
 
-InitStatus CbmBinnedTrackerQANew::Init()
+InitStatus CbmBinnedTrackerQaNew::Init()
 {
   CbmStsSetup* stsSetup = CbmStsSetup::Instance();
 
@@ -246,7 +246,7 @@ static int gNofRecoTracks        = 0;
 static int gNofMatchedRecoTracks = 0;
 static int gNofClones            = 0;
 
-void CbmBinnedTrackerQANew::Exec(Option_t*)
+void CbmBinnedTrackerQaNew::Exec(Option_t*)
 {
   auto& eventMCTracks   = gMCTracks[gEventNumber];
   Int_t nofGlobalTracks = fGlobalTracks->GetEntriesFast();
@@ -434,7 +434,7 @@ void CbmBinnedTrackerQANew::Exec(Option_t*)
   ++gEventNumber;
 }  //Exec()
 
-void CbmBinnedTrackerQANew::Finish()
+void CbmBinnedTrackerQaNew::Finish()
 {
   int nofRefMCTRacks        = 0;
   int nofMatchedRefMCTracks = 0;
@@ -494,9 +494,9 @@ void CbmBinnedTrackerQANew::Finish()
   cout << "The share of clones: " << res << " % = 100 * " << gNofClones << " / " << gNofRecoTracks << endl;
 }
 
-void CbmBinnedTrackerQANew::SetParContainers()
+void CbmBinnedTrackerQaNew::SetParContainers()
 {
   fSettings = static_cast<CbmBinnedSettings*>(FairRun::Instance()->GetRuntimeDb()->getContainer("CbmBinnedSettings"));
 }
 
-ClassImp(CbmBinnedTrackerQANew)
+ClassImp(CbmBinnedTrackerQaNew)
diff --git a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.h b/reco/tracking/BinnedTracker/CbmBinnedTrackerQaNew.h
similarity index 90%
rename from reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.h
rename to reco/tracking/BinnedTracker/CbmBinnedTrackerQaNew.h
index 697af93f3992cb52a221cd81ecdf4753386efeb5..1ecc88d39a3ec3710f511c4ef0ffe81cfb2b8aa3 100644
--- a/reco/tracking/BinnedTracker/CbmBinnedTrackerQANew.h
+++ b/reco/tracking/BinnedTracker/CbmBinnedTrackerQaNew.h
@@ -25,11 +25,11 @@
 
 #include "Settings.h"
 
-class CbmBinnedTrackerQANew : public FairTask {
+class CbmBinnedTrackerQaNew : public FairTask {
 public:
-  CbmBinnedTrackerQANew();
-  CbmBinnedTrackerQANew(const CbmBinnedTrackerQANew&) = delete;
-  CbmBinnedTrackerQANew& operator=(const CbmBinnedTrackerQANew&) = delete;
+  CbmBinnedTrackerQaNew();
+  CbmBinnedTrackerQaNew(const CbmBinnedTrackerQaNew&) = delete;
+  CbmBinnedTrackerQaNew& operator=(const CbmBinnedTrackerQaNew&) = delete;
   InitStatus Init();     // Overridden from FairTask
   void Exec(Option_t*);  // Overridden from FairTask
   void Finish();         // Overridden from FairTask
@@ -75,7 +75,7 @@ private:
 
   uint fMinTrackLength = 0;
 
-  ClassDef(CbmBinnedTrackerQANew, 1)
+  ClassDef(CbmBinnedTrackerQaNew, 1)
 };
 
 #endif /* CBMBINNEDTRACKERQANEW_H */
diff --git a/reco/tracking/BinnedTracker/Tracker.h b/reco/tracking/BinnedTracker/Tracker.h
index fbe935a6c3dc4b9c1fc8e769e89625f17eabad6b..910a94c00c9d0cb33518208c7d6ffbc557e135b1 100644
--- a/reco/tracking/BinnedTracker/Tracker.h
+++ b/reco/tracking/BinnedTracker/Tracker.h
@@ -898,7 +898,7 @@ private:
   CbmBinnedDebug fDebug;
 #endif
 
-  friend class CbmBinnedTrackerQA;
+  friend class CbmBinnedTrackerQa;
   friend struct CbmBinnedTracker::Track;
 };
 
diff --git a/reco/tracking/global/CMakeLists.txt b/reco/tracking/global/CMakeLists.txt
index 71f75c1275f7b7447cfa4fd3ee7c2813b2bba083..ae6c029fc293156f8a9f4ffddbad093828314976 100755
--- a/reco/tracking/global/CMakeLists.txt
+++ b/reco/tracking/global/CMakeLists.txt
@@ -47,7 +47,7 @@ Link_Directories( ${LINK_DIRECTORIES})
 
 Set(SRCS
   CbmGlobalTrackingTask.cxx
-  CbmGlobalTrackingQA.cxx
+  CbmGlobalTrackingQa.cxx
 )
 
 Set(NO_DICT_SRCS
diff --git a/reco/tracking/global/CbmGlobalTrackingQA.cxx b/reco/tracking/global/CbmGlobalTrackingQa.cxx
similarity index 97%
rename from reco/tracking/global/CbmGlobalTrackingQA.cxx
rename to reco/tracking/global/CbmGlobalTrackingQa.cxx
index 3f06e0ac418b210e75a03b45486761dc8b060636..75c26786dd586ebffb4cf5060f30f40e882111ac 100644
--- a/reco/tracking/global/CbmGlobalTrackingQA.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingQa.cxx
@@ -8,7 +8,7 @@
  * and open the template in the editor.
  */
 
-#include "CbmGlobalTrackingQA.h"
+#include "CbmGlobalTrackingQa.h"
 
 #include "CbmDigiManager.h"
 #include "CbmGlobalTrack.h"
@@ -33,9 +33,9 @@ using std::set;
 using std::vector;
 
 
-CbmGlobalTrackingQA::CbmGlobalTrackingQA() {}
+CbmGlobalTrackingQa::CbmGlobalTrackingQa() {}
 
-InitStatus CbmGlobalTrackingQA::Init()
+InitStatus CbmGlobalTrackingQa::Init()
 {
   // FairRootManager
   FairRootManager* ioman = FairRootManager::Instance();
@@ -167,7 +167,7 @@ InitStatus CbmGlobalTrackingQA::Init()
   return kSUCCESS;
 }
 
-bool CbmGlobalTrackingQA::CheckMatch(const TrackData* stsMCTrack, Int_t tofHitInd, bool deepSearch) const
+bool CbmGlobalTrackingQa::CheckMatch(const TrackData* stsMCTrack, Int_t tofHitInd, bool deepSearch) const
 {
   set<TrackData*> tofMCTracks;
 
@@ -197,7 +197,7 @@ bool CbmGlobalTrackingQA::CheckMatch(const TrackData* stsMCTrack, Int_t tofHitIn
   return false;
 }
 
-bool CbmGlobalTrackingQA::SemiTofTrack(const TrackData* mcTrack) const
+bool CbmGlobalTrackingQa::SemiTofTrack(const TrackData* mcTrack) const
 {
   if (!mcTrack->tofPoints.empty()) return true;
 
@@ -222,7 +222,7 @@ int nofNonTofTracks          = 0;
 int nofMergedNonTofTracks    = 0;
 int nofNonMergedNonTofTracks = 0;
 
-void CbmGlobalTrackingQA::Exec(Option_t*)
+void CbmGlobalTrackingQa::Exec(Option_t*)
 {
   Int_t nofHits = fTofHits->GetEntriesFast();
 
@@ -345,7 +345,7 @@ void CbmGlobalTrackingQA::Exec(Option_t*)
   }  //for (int i = 0; i < nofGlobalTracks; ++i)
 }
 
-void CbmGlobalTrackingQA::Finish()
+void CbmGlobalTrackingQa::Finish()
 {
   double eff = 100 * nofCorMergedReferenceTofTracks;
   eff /= nofReferenceTofTracks;
@@ -383,4 +383,4 @@ void CbmGlobalTrackingQA::Finish()
        << " ]" << endl;
 }
 
-ClassImp(CbmGlobalTrackingQA)
+ClassImp(CbmGlobalTrackingQa)
diff --git a/reco/tracking/global/CbmGlobalTrackingQA.h b/reco/tracking/global/CbmGlobalTrackingQa.h
similarity index 92%
rename from reco/tracking/global/CbmGlobalTrackingQA.h
rename to reco/tracking/global/CbmGlobalTrackingQa.h
index f8a6ced3f574e87e251a569c2da4188a642f4fd6..485eb4e9f222b7c7362316b13f08f6e02cc077eb 100644
--- a/reco/tracking/global/CbmGlobalTrackingQA.h
+++ b/reco/tracking/global/CbmGlobalTrackingQa.h
@@ -28,7 +28,7 @@
 class CbmDigiManager;
 
 
-class CbmGlobalTrackingQA : public FairTask {
+class CbmGlobalTrackingQa : public FairTask {
 public:
   struct PointData;
 
@@ -82,10 +82,10 @@ public:
   };
 
 public:
-  CbmGlobalTrackingQA();
+  CbmGlobalTrackingQa();
 
-  CbmGlobalTrackingQA(const CbmGlobalTrackingQA&) = delete;
-  CbmGlobalTrackingQA& operator=(const CbmGlobalTrackingQA&) = delete;
+  CbmGlobalTrackingQa(const CbmGlobalTrackingQa&) = delete;
+  CbmGlobalTrackingQa& operator=(const CbmGlobalTrackingQa&) = delete;
 
   InitStatus Init();         // Overridden from FairTask
   void Exec(Option_t* opt);  // Overridden from FairTask
@@ -113,7 +113,7 @@ private:
   std::vector<std::vector<PointData>> fTofPoints {};
   std::vector<std::vector<PointData>> fStsPoints {};
   Int_t fNofEvents = 0;
-  ClassDef(CbmGlobalTrackingQA, 1)
+  ClassDef(CbmGlobalTrackingQa, 1)
 };
 
 #endif /* CBMGLOBALTRACKINGQA_H */
diff --git a/reco/tracking/global/GlobalLinkDef.h b/reco/tracking/global/GlobalLinkDef.h
index 2802ba28cbc72835ba702ad102b5563b78c07fe9..7bd6f19ab433ae903818816d0521b73127bd9696 100644
--- a/reco/tracking/global/GlobalLinkDef.h
+++ b/reco/tracking/global/GlobalLinkDef.h
@@ -11,6 +11,6 @@
 #pragma link off all functions;
 
 #pragma link C++ class CbmGlobalTrackingTask + ;
-#pragma link C++ class CbmGlobalTrackingQA + ;
+#pragma link C++ class CbmGlobalTrackingQa + ;
 
 #endif
diff --git a/reco/tracking/vector/CMakeLists.txt b/reco/tracking/vector/CMakeLists.txt
index b86da8460303f02b4ee71d0c499c46eb18ea46e8..1b1188ce5ee4471342bcd356974e0144fde51380 100644
--- a/reco/tracking/vector/CMakeLists.txt
+++ b/reco/tracking/vector/CMakeLists.txt
@@ -51,9 +51,9 @@ CbmTrdFindVectors.cxx
 CbmTrdToTofVector.cxx
 CbmMuchFindVectors.cxx
 CbmMuchFindVectorsGem.cxx
-#CbmMuchFindVectorsQA.cxx
+#CbmMuchFindVectorsQa.cxx
 CbmMuchMergeVectors.cxx
-#CbmMuchMergeVectorsQA.cxx
+#CbmMuchMergeVectorsQa.cxx
 CbmMuchToTrdVectors.cxx
 CbmMuchToTofVectors.cxx
 )
diff --git a/reco/tracking/vector/CbmMuchFindVectorsQA.cxx b/reco/tracking/vector/CbmMuchFindVectorsQa.cxx
similarity index 98%
rename from reco/tracking/vector/CbmMuchFindVectorsQA.cxx
rename to reco/tracking/vector/CbmMuchFindVectorsQa.cxx
index 2e39bc5c604eb57a125d30558bf7e1833b700ba0..41a584e848275a2bd99b409a4175b579bc8087d4 100644
--- a/reco/tracking/vector/CbmMuchFindVectorsQA.cxx
+++ b/reco/tracking/vector/CbmMuchFindVectorsQa.cxx
@@ -2,11 +2,11 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Alexander Zinchenko [committer] */
 
-/** CbmMuchFindVectorsQA.cxx
+/** CbmMuchFindVectorsQa.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
  **/
-#include "CbmMuchFindVectorsQA.h"
+#include "CbmMuchFindVectorsQa.h"
 
 #include "CbmMuchCluster.h"
 #include "CbmMuchDigiMatch.h"
@@ -40,7 +40,7 @@ using std::pair;
 using std::set;
 
 // -----   Default (stabdard) constructor   --------------------------------
-CbmMuchFindVectorsQA::CbmMuchFindVectorsQA()
+CbmMuchFindVectorsQa::CbmMuchFindVectorsQa()
   : FairTask("MuchFindVectorsQA")
   , fGeoScheme(CbmMuchGeoScheme::Instance())
   , fStatFirst(-1)
@@ -50,11 +50,11 @@ CbmMuchFindVectorsQA::CbmMuchFindVectorsQA()
 // -------------------------------------------------------------------------
 
 // -----   Destructor   ----------------------------------------------------
-CbmMuchFindVectorsQA::~CbmMuchFindVectorsQA() {}
+CbmMuchFindVectorsQa::~CbmMuchFindVectorsQa() {}
 // -------------------------------------------------------------------------
 
 // -----   Public method Init (abstract in base class)  --------------------
-InitStatus CbmMuchFindVectorsQA::Init()
+InitStatus CbmMuchFindVectorsQa::Init()
 {
 
   // Get and check FairRootManager
@@ -111,11 +111,11 @@ InitStatus CbmMuchFindVectorsQA::Init()
 // -------------------------------------------------------------------------
 
 // -----  SetParContainers -------------------------------------------------
-void CbmMuchFindVectorsQA::SetParContainers() {}
+void CbmMuchFindVectorsQa::SetParContainers() {}
 // -------------------------------------------------------------------------
 
 // -----   Private method BookHistos   -------------------------------------
-void CbmMuchFindVectorsQA::BookHistos()
+void CbmMuchFindVectorsQa::BookHistos()
 {
   // Book histograms
 
@@ -205,7 +205,7 @@ void CbmMuchFindVectorsQA::BookHistos()
 // -------------------------------------------------------------------------
 
 // -----   Public method Exec   --------------------------------------------
-void CbmMuchFindVectorsQA::Exec(Option_t* opt)
+void CbmMuchFindVectorsQa::Exec(Option_t* opt)
 {
   // Do all processing
 
@@ -274,7 +274,7 @@ void CbmMuchFindVectorsQA::Exec(Option_t* opt)
 // -------------------------------------------------------------------------
 
 // -----   Private method CheckMatch   -------------------------------------
-Bool_t CbmMuchFindVectorsQA::CheckMatch(CbmMuchTrack* vec)
+Bool_t CbmMuchFindVectorsQa::CheckMatch(CbmMuchTrack* vec)
 {
   // Check matching quality of the vector
 
@@ -429,7 +429,7 @@ Bool_t CbmMuchFindVectorsQA::CheckMatch(CbmMuchTrack* vec)
 // -------------------------------------------------------------------------
 
 // -----   Private method CheckMatchGem   ----------------------------------
-Bool_t CbmMuchFindVectorsQA::CheckMatchGem(CbmMuchTrack* vec)
+Bool_t CbmMuchFindVectorsQa::CheckMatchGem(CbmMuchTrack* vec)
 {
   // Check matching quality of the vector for GEM stations
 
@@ -521,7 +521,7 @@ Bool_t CbmMuchFindVectorsQA::CheckMatchGem(CbmMuchTrack* vec)
 // -------------------------------------------------------------------------
 
 // -----   Private method CheckShorts   ------------------------------------
-void CbmMuchFindVectorsQA::CheckShorts(TClonesArray* hitArray)
+void CbmMuchFindVectorsQa::CheckShorts(TClonesArray* hitArray)
 {
   // Check short tracks
 
@@ -575,7 +575,7 @@ void CbmMuchFindVectorsQA::CheckShorts(TClonesArray* hitArray)
 // -------------------------------------------------------------------------
 
 // -----   Private method CheckEffic   -------------------------------------
-void CbmMuchFindVectorsQA::CheckEffic()
+void CbmMuchFindVectorsQa::CheckEffic()
 {
   // Check efficiency of the vector reco
 
@@ -740,7 +740,7 @@ void CbmMuchFindVectorsQA::CheckEffic()
 // -------------------------------------------------------------------------
 
 // -----   Public method Finish   ------------------------------------------
-void CbmMuchFindVectorsQA::Finish()
+void CbmMuchFindVectorsQa::Finish()
 {
   for (Int_t ista = 0; ista < fNstat; ++ista) {
     if (fNdoubl[ista]) fhOccup[ista]->Scale(1. / 2 / fNdoubl[ista] / 2 / fhEvents->GetEntries());
@@ -755,4 +755,4 @@ void CbmMuchFindVectorsQA::Finish()
 
 // -------------------------------------------------------------------------
 
-ClassImp(CbmMuchFindVectorsQA);
+ClassImp(CbmMuchFindVectorsQa);
diff --git a/reco/tracking/vector/CbmMuchFindVectorsQA.h b/reco/tracking/vector/CbmMuchFindVectorsQa.h
similarity index 89%
rename from reco/tracking/vector/CbmMuchFindVectorsQA.h
rename to reco/tracking/vector/CbmMuchFindVectorsQa.h
index 6a907fbf49e6a48e2015f134985c02c18f063f6e..6297d6c52db6a4e447583eb188945d8f03417c76 100644
--- a/reco/tracking/vector/CbmMuchFindVectorsQA.h
+++ b/reco/tracking/vector/CbmMuchFindVectorsQa.h
@@ -2,7 +2,7 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Alexander Zinchenko [committer] */
 
-/** CbmMuchFindVectorsQA.h
+/** CbmMuchFindVectorsQa.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
  **
@@ -25,13 +25,13 @@ class TClonesArray;
 class TH1D;
 class TH2D;
 
-class CbmMuchFindVectorsQA : public FairTask {
+class CbmMuchFindVectorsQa : public FairTask {
 public:
   /** Default (standard) constructor **/
-  CbmMuchFindVectorsQA();
+  CbmMuchFindVectorsQa();
 
   /** Destructor **/
-  virtual ~CbmMuchFindVectorsQA();
+  virtual ~CbmMuchFindVectorsQa();
 
   /** Initialisation **/
   virtual InitStatus Init();
@@ -108,10 +108,10 @@ private:
   void CheckShorts(TClonesArray* hitArray);
   void CheckEffic();
 
-  CbmMuchFindVectorsQA(const CbmMuchFindVectorsQA&);
-  CbmMuchFindVectorsQA& operator=(const CbmMuchFindVectorsQA&);
+  CbmMuchFindVectorsQa(const CbmMuchFindVectorsQa&);
+  CbmMuchFindVectorsQa& operator=(const CbmMuchFindVectorsQa&);
 
-  ClassDef(CbmMuchFindVectorsQA, 1)
+  ClassDef(CbmMuchFindVectorsQa, 1)
 };
 
 #endif
diff --git a/reco/tracking/vector/CbmMuchMergeVectorsQA.cxx b/reco/tracking/vector/CbmMuchMergeVectorsQa.cxx
similarity index 97%
rename from reco/tracking/vector/CbmMuchMergeVectorsQA.cxx
rename to reco/tracking/vector/CbmMuchMergeVectorsQa.cxx
index 987e19cafc5aed690184468ed8646dd7f3ca589c..df75d257970f3e39e3f33461f68d6b52e8dca5f4 100644
--- a/reco/tracking/vector/CbmMuchMergeVectorsQA.cxx
+++ b/reco/tracking/vector/CbmMuchMergeVectorsQa.cxx
@@ -2,11 +2,11 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Alexander Zinchenko [committer] */
 
-/** CbmMuchMergeVectorsQA.cxx
+/** CbmMuchMergeVectorsQa.cxx
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
  **/
-#include "CbmMuchMergeVectorsQA.h"
+#include "CbmMuchMergeVectorsQa.h"
 //#include "CbmMuchFindVectors.h"
 #include "CbmMuchDigiMatch.h"
 #include "CbmMuchFindHitsStraws.h"
@@ -34,7 +34,7 @@ using std::endl;
 using std::set;
 
 // -----   Default (stabdard) constructor   --------------------------------
-CbmMuchMergeVectorsQA::CbmMuchMergeVectorsQA()
+CbmMuchMergeVectorsQa::CbmMuchMergeVectorsQa()
   : FairTask("MuchMergeVectorsQA")
   , fGeoScheme(CbmMuchGeoScheme::Instance())
   , fStatFirst(-1)
@@ -44,11 +44,11 @@ CbmMuchMergeVectorsQA::CbmMuchMergeVectorsQA()
 // -------------------------------------------------------------------------
 
 // -----   Destructor   ----------------------------------------------------
-CbmMuchMergeVectorsQA::~CbmMuchMergeVectorsQA() {}
+CbmMuchMergeVectorsQa::~CbmMuchMergeVectorsQa() {}
 // -------------------------------------------------------------------------
 
 // -----   Public method Init (abstract in base class)  --------------------
-InitStatus CbmMuchMergeVectorsQA::Init()
+InitStatus CbmMuchMergeVectorsQa::Init()
 {
 
   // Get and check FairRootManager
@@ -108,11 +108,11 @@ InitStatus CbmMuchMergeVectorsQA::Init()
 // -------------------------------------------------------------------------
 
 // -----  SetParContainers -------------------------------------------------
-void CbmMuchMergeVectorsQA::SetParContainers() {}
+void CbmMuchMergeVectorsQa::SetParContainers() {}
 // -------------------------------------------------------------------------
 
 // -----   Private method BookHistos   -------------------------------------
-void CbmMuchMergeVectorsQA::BookHistos()
+void CbmMuchMergeVectorsQa::BookHistos()
 {
   // Book histograms
 
@@ -135,7 +135,7 @@ void CbmMuchMergeVectorsQA::BookHistos()
 // -------------------------------------------------------------------------
 
 // -----   Public method Exec   --------------------------------------------
-void CbmMuchMergeVectorsQA::Exec(Option_t* opt)
+void CbmMuchMergeVectorsQa::Exec(Option_t* opt)
 {
   // Do all processing
 
@@ -145,7 +145,7 @@ void CbmMuchMergeVectorsQA::Exec(Option_t* opt)
 // -------------------------------------------------------------------------
 
 // -----   Private method CheckMatch   -------------------------------------
-Bool_t CbmMuchMergeVectorsQA::CheckMatch(CbmMuchTrack* vec)
+Bool_t CbmMuchMergeVectorsQa::CheckMatch(CbmMuchTrack* vec)
 {
   // Check matching quality of the vector
 
@@ -277,7 +277,7 @@ Bool_t CbmMuchMergeVectorsQA::CheckMatch(CbmMuchTrack* vec)
 // -------------------------------------------------------------------------
 
 // -----   Private method CheckEffic   -------------------------------------
-void CbmMuchMergeVectorsQA::CheckEffic()
+void CbmMuchMergeVectorsQa::CheckEffic()
 {
   // Check efficiency of the vector reco
 
@@ -437,7 +437,7 @@ void CbmMuchMergeVectorsQA::CheckEffic()
 // -------------------------------------------------------------------------
 
 // -----   Public method Finish   ------------------------------------------
-void CbmMuchMergeVectorsQA::Finish()
+void CbmMuchMergeVectorsQa::Finish()
 {
 
   TDirectory* dir0 = (TDirectory*) gROOT->FindObjectAny("muchQA");
@@ -450,4 +450,4 @@ void CbmMuchMergeVectorsQA::Finish()
 
 // -------------------------------------------------------------------------
 
-ClassImp(CbmMuchMergeVectorsQA);
+ClassImp(CbmMuchMergeVectorsQa);
diff --git a/reco/tracking/vector/CbmMuchMergeVectorsQA.h b/reco/tracking/vector/CbmMuchMergeVectorsQa.h
similarity index 85%
rename from reco/tracking/vector/CbmMuchMergeVectorsQA.h
rename to reco/tracking/vector/CbmMuchMergeVectorsQa.h
index c6b6a4fab14b718b987d27073c68cd9e6ae786dc..ca999042ecf58503bd42b7c816542297dc9d6f54 100644
--- a/reco/tracking/vector/CbmMuchMergeVectorsQA.h
+++ b/reco/tracking/vector/CbmMuchMergeVectorsQa.h
@@ -2,7 +2,7 @@
    SPDX-License-Identifier: GPL-3.0-only
    Authors: Alexander Zinchenko [committer] */
 
-/** CbmMuchMergeVectorsQA.h
+/** CbmMuchMergeVectorsQa.h
  *@author A.Zinchenko <Alexander.Zinchenko@jinr.ru>
  *@since 2014
  **
@@ -25,13 +25,13 @@ class TClonesArray;
 class TH1D;
 class TH2D;
 
-class CbmMuchMergeVectorsQA : public FairTask {
+class CbmMuchMergeVectorsQa : public FairTask {
 public:
   /** Default (standard) constructor **/
-  CbmMuchMergeVectorsQA();
+  CbmMuchMergeVectorsQa();
 
   /** Destructor **/
-  virtual ~CbmMuchMergeVectorsQA();
+  virtual ~CbmMuchMergeVectorsQa();
 
   /** Initialisation **/
   virtual InitStatus Init();
@@ -79,10 +79,10 @@ private:
   Bool_t CheckMatch(CbmMuchTrack* vec);
   void CheckEffic();
 
-  CbmMuchMergeVectorsQA(const CbmMuchMergeVectorsQA&);
-  CbmMuchMergeVectorsQA& operator=(const CbmMuchMergeVectorsQA&);
+  CbmMuchMergeVectorsQa(const CbmMuchMergeVectorsQa&);
+  CbmMuchMergeVectorsQa& operator=(const CbmMuchMergeVectorsQa&);
 
-  ClassDef(CbmMuchMergeVectorsQA, 1)
+  ClassDef(CbmMuchMergeVectorsQa, 1)
 };
 
 #endif
diff --git a/reco/tracking/vector/CbmVectorLinkDef.h b/reco/tracking/vector/CbmVectorLinkDef.h
index 7d9f9030bc3b73448810361d46777f2035ea93ea..537e63f3e3af34e1e9a7d9a04a7ec5bbf4dce73f 100644
--- a/reco/tracking/vector/CbmVectorLinkDef.h
+++ b/reco/tracking/vector/CbmVectorLinkDef.h
@@ -13,9 +13,9 @@
 #pragma link C++ class CbmTrdToTofVector + ;
 #pragma link C++ class CbmMuchFindVectors + ;
 #pragma link C++ class CbmMuchFindVectorsGem + ;
-//#pragma link C++ class  CbmMuchFindVectorsQA+;
+//#pragma link C++ class  CbmMuchFindVectorsQa+;
 #pragma link C++ class CbmMuchMergeVectors + ;
-//#pragma link C++ class  CbmMuchMergeVectorsQA+;
+//#pragma link C++ class  CbmMuchMergeVectorsQa+;
 #pragma link C++ class CbmMuchToTrdVectors + ;
 #pragma link C++ class CbmMuchToTofVectors + ;