diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtExternalGenFactory.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtExternalGenFactory.hh
index 1078a97330137448a109795bc8b4cd756c7d385e..68a990566b0bb69dcabb9d8b86ed643890dd1bf6 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtExternalGenFactory.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtExternalGenFactory.hh
@@ -58,8 +58,8 @@ private:
 
   EvtExternalGenFactory(const EvtExternalGenFactory&) {};
 
-  ExtGenMap _extGenMap;
-  ExtGenCommandMap _extGenCommandMap;
+  ExtGenMap m_extGenMap;
+  ExtGenCommandMap m_extGenCommandMap;
 
 };
 
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPHOTOS.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPHOTOS.hh
index 2f1a7a9171dd437ec5e99221407218374c15c9ef..0577f0485a14ba4677409d944e102b878d53394b 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPHOTOS.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPHOTOS.hh
@@ -40,7 +40,7 @@ public:
 
 private:
 
-  EvtAbsExternalGen* _photosEngine;
+  EvtAbsExternalGen* m_photosEngine;
 
 };
 
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPythia.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPythia.hh
index f849dcfe766b95729a642aa28a6cbe57544d4fae..67dca8783017b1d23410c224a0bed3e6a78b2040 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPythia.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtPythia.hh
@@ -56,12 +56,12 @@ public:
 
 protected:
 
-  EvtAbsExternalGen* _pythiaEngine;
+  EvtAbsExternalGen* m_pythiaEngine;
 
 private:
 
   void fixPolarisations(EvtParticle *p);
-  std::vector<std::string> _commandList;
+  std::vector<std::string> m_commandList;
 
 };
 
diff --git a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauola.hh b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauola.hh
index c6aff28559408a66f138c846547531d73925b7ff..e3096101612536ac5530a2b210c49abece3d3883 100644
--- a/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauola.hh
+++ b/Generators/EvtGen_i/EvtGen_i/EvtGenExternal/EvtTauola.hh
@@ -43,7 +43,7 @@ public:
 
 protected:
 
-  EvtAbsExternalGen* _tauolaEngine;
+  EvtAbsExternalGen* m_tauolaEngine;
 
 private:
 
diff --git a/Generators/EvtGen_i/src/EvtExternalGenFactory.cxx b/Generators/EvtGen_i/src/EvtExternalGenFactory.cxx
index 219534a699b37557a0787df96252f4b1893cf068..1c1668d4a74eb751b2dbf2d8c25f1b93c34e81bd 100644
--- a/Generators/EvtGen_i/src/EvtExternalGenFactory.cxx
+++ b/Generators/EvtGen_i/src/EvtExternalGenFactory.cxx
@@ -40,21 +40,21 @@ using std::endl;
 
 EvtExternalGenFactory::EvtExternalGenFactory() {
 
-  _extGenMap.clear();
+  m_extGenMap.clear();
 
 }
 
 EvtExternalGenFactory::~EvtExternalGenFactory() {
 
   ExtGenMap::iterator iter;
-  for (iter = _extGenMap.begin(); iter != _extGenMap.end(); ++iter) {
+  for (iter = m_extGenMap.begin(); iter != m_extGenMap.end(); ++iter) {
 
     EvtAbsExternalGen* theGenerator = iter->second;
     delete theGenerator;
 
   }
   
-  _extGenMap.clear();
+  m_extGenMap.clear();
 
 }
 
@@ -93,7 +93,7 @@ void EvtExternalGenFactory::definePythiaGenerator(std::string xmlDir,
   }
 
   EvtAbsExternalGen* pythiaGenerator = new EvtPythiaEngine(xmlDir, convertPhysCodes, useEvtGenRandom);
-  _extGenMap[genId] = pythiaGenerator;
+  m_extGenMap[genId] = pythiaGenerator;
 }
 #else
 void EvtExternalGenFactory::definePythiaGenerator(std::string , 
@@ -110,7 +110,7 @@ void EvtExternalGenFactory::definePhotosGenerator(std::string photonType, bool u
   int genId = EvtExternalGenFactory::PhotosGenId;
   EvtGenReport(EVTGEN_INFO,"EvtGen")<<"Defining EvtPhotosEngine using photonType = "<<photonType<<endl;
   EvtAbsExternalGen* photosGenerator = new EvtPhotosEngine(photonType, useEvtGenRandom);
-  _extGenMap[genId] = photosGenerator;
+  m_extGenMap[genId] = photosGenerator;
 }
 #else
 void EvtExternalGenFactory::definePhotosGenerator(std::string, bool)
@@ -124,7 +124,7 @@ void EvtExternalGenFactory::defineTauolaGenerator(bool useEvtGenRandom) {
   int genId = EvtExternalGenFactory::TauolaGenId;
   EvtGenReport(EVTGEN_INFO,"EvtGen")<<"Defining EvtTauolaEngine."<<endl;
   EvtAbsExternalGen* tauolaGenerator = new EvtTauolaEngine(useEvtGenRandom);
-  _extGenMap[genId] = tauolaGenerator;
+  m_extGenMap[genId] = tauolaGenerator;
 }
 #else
 void EvtExternalGenFactory::defineTauolaGenerator(bool) {}
@@ -137,7 +137,7 @@ EvtAbsExternalGen* EvtExternalGenFactory::getGenerator(int genId) {
 
   ExtGenMap::iterator iter;
 
-  if ((iter = _extGenMap.find(genId)) != _extGenMap.end()) {
+  if ((iter = m_extGenMap.find(genId)) != m_extGenMap.end()) {
 
     // Retrieve the external generator engine
     theGenerator = iter->second;
@@ -151,7 +151,7 @@ EvtAbsExternalGen* EvtExternalGenFactory::getGenerator(int genId) {
 void EvtExternalGenFactory::initialiseAllGenerators() {
 
   ExtGenMap::iterator iter;
-  for (iter = _extGenMap.begin(); iter != _extGenMap.end(); ++iter) {
+  for (iter = m_extGenMap.begin(); iter != m_extGenMap.end(); ++iter) {
 
     EvtAbsExternalGen* theGenerator = iter->second;
     if (theGenerator != 0) {
diff --git a/Generators/EvtGen_i/src/EvtPHOTOS.cxx b/Generators/EvtGen_i/src/EvtPHOTOS.cxx
index b934e16264f3aea48a255ac8e11243a3cbebfb45..7c9d3c84ae21f7b69a254c96e9bbc483149a5e4e 100644
--- a/Generators/EvtGen_i/src/EvtPHOTOS.cxx
+++ b/Generators/EvtGen_i/src/EvtPHOTOS.cxx
@@ -28,7 +28,7 @@
 
 EvtPHOTOS::EvtPHOTOS() {
 
-  _photosEngine = 0;
+  m_photosEngine = 0;
   
 }
 
@@ -38,12 +38,12 @@ EvtPHOTOS::~EvtPHOTOS() {
 
 void EvtPHOTOS::doRadCorr(EvtParticle *p) {
 
-  if (_photosEngine == 0) {
-    _photosEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::PhotosGenId);
+  if (m_photosEngine == 0) {
+    m_photosEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::PhotosGenId);
   }
 
-  if (_photosEngine != 0) {
-    _photosEngine->doDecay(p);
+  if (m_photosEngine != 0) {
+    m_photosEngine->doDecay(p);
   }
   
 }
diff --git a/Generators/EvtGen_i/src/EvtPythia.cxx b/Generators/EvtGen_i/src/EvtPythia.cxx
index 8a078f4d093f73909fe9d1a331a7d7583b732d58..4190a240efbb71a66423e508ce1c4b21ec69f938 100644
--- a/Generators/EvtGen_i/src/EvtPythia.cxx
+++ b/Generators/EvtGen_i/src/EvtPythia.cxx
@@ -40,12 +40,12 @@ EvtPythia::EvtPythia() {
   // Set the Pythia engine to a null pointer at first.
   // When we do the decay, we retrieve the pointer to the Pythia engine
   // and use that for all decays. All clones will use the same Pythia engine.
-  _pythiaEngine = 0;
+  m_pythiaEngine = 0;
 
 }
 
 EvtPythia::~EvtPythia() {
-  _commandList.clear();
+  m_commandList.clear();
 }
 
 std::string EvtPythia::getName(){
@@ -83,12 +83,12 @@ void EvtPythia::decay( EvtParticle *p ){
   // We check to see if the engine has been created before doing the decay.
   // This should only create the full Pythia engine once, and all clones will point to the same engine.
 
-  if (_pythiaEngine == 0) {
-    _pythiaEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::PythiaGenId);
+  if (m_pythiaEngine == 0) {
+    m_pythiaEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::PythiaGenId);
   }
     
-  if (_pythiaEngine != 0) {
-    _pythiaEngine->doDecay(p);
+  if (m_pythiaEngine != 0) {
+    m_pythiaEngine->doDecay(p);
   }
 
   this->fixPolarisations(p);
@@ -156,6 +156,6 @@ std::string EvtPythia::commandName() {
 void EvtPythia::command(std::string cmd) {
 
   // Locally store commands in a vector
-  _commandList.push_back(cmd);
+  m_commandList.push_back(cmd);
 
 }
diff --git a/Generators/EvtGen_i/src/EvtTauola.cxx b/Generators/EvtGen_i/src/EvtTauola.cxx
index bb8020c9cff9628b4d60f3e9a68854abdd1c9ed9..75d30de8fbc71d74efea1b077fe9911e33cfb71a 100644
--- a/Generators/EvtGen_i/src/EvtTauola.cxx
+++ b/Generators/EvtGen_i/src/EvtTauola.cxx
@@ -35,7 +35,7 @@ EvtTauola::EvtTauola() {
   // Set the Tauola engine to a null pointer at first.
   // When we do the decay, we retrieve the pointer to the Tauola engine
   // and use that for all decays. All clones will use the same Tauola engine.
-  _tauolaEngine = 0;
+  m_tauolaEngine = 0;
 
 }
 
@@ -71,12 +71,12 @@ void EvtTauola::decay( EvtParticle *p ){
   // This should only create the full Tauola engine once, and all clones will 
   // point to the same engine.
 
-  if (_tauolaEngine == 0) {
-    _tauolaEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::TauolaGenId);
+  if (m_tauolaEngine == 0) {
+    m_tauolaEngine = EvtExternalGenFactory::getInstance()->getGenerator(EvtExternalGenFactory::TauolaGenId);
   }
     
-  if (_tauolaEngine != 0) {
-    _tauolaEngine->doDecay(p);
+  if (m_tauolaEngine != 0) {
+    m_tauolaEngine->doDecay(p);
   }
 
 }