diff --git a/examples/example_04_HtoWWto4l.C b/examples/example_04_HtoWWto4l.C
index 840e5ae..8f0ff4b 100644
--- a/examples/example_04_HtoWWto4l.C
+++ b/examples/example_04_HtoWWto4l.C
@@ -157,7 +157,7 @@ void example_04_HtoWWto4l(const string& output_name = "output_04.root"){
   ContraBoostJigsaw_R.AddInvisibleFrames((Wa_R.GetListInvisibleFrames()), 0);
   ContraBoostJigsaw_R.AddInvisibleFrames((Wb_R.GetListInvisibleFrames()), 1);
 
-  g_Log << LogInfo << "Initializing tree for analysis" << m_End;
+  g_Log << LogInfo << "Initializing tree for analysis" << m_RF_End;
   // check reconstruction trees
   if(LAB_R.InitializeAnalysis()){
     g_Log << LogInfo;
diff --git a/examples/example_05_DiToptoblnu.C b/examples/example_05_DiToptoblnu.C
index c2e9dfa..7367030 100644
--- a/examples/example_05_DiToptoblnu.C
+++ b/examples/example_05_DiToptoblnu.C
@@ -158,7 +158,7 @@ void example_05_DiToptoblnu(string output_name = "output_05.root"){
   HemiJigsaw_R.AddFrames((Ta_R.GetListVisibleFrames()),0);
   HemiJigsaw_R.AddFrames((Tb_R.GetListVisibleFrames()),1);
 
-  g_Log << LogInfo << "Initializing tree for analysis" << m_End;
+  g_Log << LogInfo << "Initializing tree for analysis" << m_RF_End;
   // check reconstruction trees
   if(LAB_R.InitializeAnalysis()){
     g_Log << LogInfo;
diff --git a/inc/RestFrames/RFLog.hh b/inc/RestFrames/RFLog.hh
index a7b06d5..eed7aac 100644
--- a/inc/RestFrames/RFLog.hh
+++ b/inc/RestFrames/RFLog.hh
@@ -132,7 +132,7 @@ namespace RestFrames {
   const RFList<RFBase>* Log(const RFList<T>* ptr){ return (const RFList<RFBase>*)ptr; }
 
 #ifndef __MAKECINT__
-  #define m_End RFLog::EndMessage  
+  #define m_RF_End RFLog::EndMessage  
   #define g_End RFLog::EndMessage
 #endif
 
diff --git a/src/CombinatoricJigsaw.cc b/src/CombinatoricJigsaw.cc
index cad61ec..257ea8e 100644
--- a/src/CombinatoricJigsaw.cc
+++ b/src/CombinatoricJigsaw.cc
@@ -188,13 +188,13 @@ namespace RestFrames {
 
     if(!InitializeCombinatoric()){
       m_Log << LogWarning;
-      m_Log << "Problem initializing event info" << m_End;
+      m_Log << "Problem initializing event info" << m_RF_End;
       return SetSpirit(false);
     }
 
     if(!LoopCombinatoric()){
       m_Log << LogWarning;
-      m_Log << "Problem looping over combinatorics" << m_End;
+      m_Log << "Problem looping over combinatorics" << m_RF_End;
       return SetSpirit(false);
     }
 
@@ -243,7 +243,7 @@ namespace RestFrames {
       m_Log << LogWarning;
       m_Log << "Unable to execute Jigsaw. ";
       m_Log << "Insufficienct number of inputs.";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       return SetSpirit(false);
     }
 
@@ -254,7 +254,7 @@ namespace RestFrames {
       m_Log << "Incorrect number of exclusive inputs: ";
       m_Log << NTOTOT << " (required) != ";
       m_Log << m_InputStates.GetN() << " (provided)";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       return SetSpirit(false);
     }
 
@@ -319,7 +319,7 @@ namespace RestFrames {
     if(c_max < 0){
       m_Log << LogWarning;
       m_Log << "Unable to find combinatoric with positive metric";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       return SetSpirit(false);
     }
      
diff --git a/src/DecayGenFrame.cc b/src/DecayGenFrame.cc
index defddb5..5ebb999 100755
--- a/src/DecayGenFrame.cc
+++ b/src/DecayGenFrame.cc
@@ -86,7 +86,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "Unable to set mass to negative value ";
-      m_Log << val << ". Setting to zero." << m_End;
+      m_Log << val << ". Setting to zero." << m_RF_End;
       m_Mass = 0.;
     } else {
       m_Mass = val;
@@ -100,7 +100,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "Unable to set child momentum to negative value ";
-      m_Log << val << ". Setting to zero." << m_End;
+      m_Log << val << ". Setting to zero." << m_RF_End;
       m_ChildP = 0.;
     } else {
       m_ChildP = val;
@@ -114,7 +114,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "Unable to set child gamma less than one: ";
-      m_Log << val << ". Setting to one." << m_End;
+      m_Log << val << ". Setting to one." << m_RF_End;
       m_ChildGamma = 1.;
     } else {
       m_ChildGamma = val;
@@ -129,7 +129,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "CosDecay angle must be in [-1, 1]: ";
-      m_Log << val << ". Setting to random." << m_End;
+      m_Log << val << ". Setting to random." << m_RF_End;
       m_CosDecayAngle = -2.;
     } else {
       m_CosDecayAngle = val;
@@ -223,7 +223,7 @@ namespace RestFrames {
     m_Log << LogVerbose;
     m_Log << "Burning in Markov Chain MC with ";
     m_Log << m_N_MCMC_BurnIn;
-    m_Log << " trials to be discarded..." << m_End;
+    m_Log << " trials to be discarded..." << m_RF_End;
 
     int N    = GetNChildren();
     int Nres = m_Resonances.GetN();
@@ -246,7 +246,7 @@ namespace RestFrames {
     if(Msum >= M){
       m_Log << LogWarning;
       m_Log << "Sum of child masses is in excess of parent mass: ";
-      m_Log << M << " < " << Msum << m_End;
+      m_Log << M << " < " << Msum << m_RF_End;
       return SetSpirit(false);
     }
 
@@ -262,12 +262,12 @@ namespace RestFrames {
       if(!MCMC_Generate()){
 	m_Log << LogWarning;
 	m_Log << "Problem with Markov-chain MC generation";
-	m_Log << m_End;
+	m_Log << m_RF_End;
 	m_Burnt = false;
 	return false;
       }
     }
-    m_Log << LogVerbose << "...Done" << m_End;
+    m_Log << LogVerbose << "...Done" << m_RF_End;
 
     m_Burnt = true;
     return true;
@@ -322,7 +322,7 @@ namespace RestFrames {
     if(!IsSoundBody()){ 
       m_Log << LogWarning;
       m_Log << "Unable to generate event for frame";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       return SetSpirit(false);
     }
 
@@ -332,7 +332,7 @@ namespace RestFrames {
 	  return SetSpirit(false);
       if(!MCMC_Generate()){
 	m_Log << "Problem with Markov-chain MC generation";
-	m_Log << m_End;
+	m_Log << m_RF_End;
 	return SetSpirit(false);
       }
     }
@@ -352,7 +352,7 @@ namespace RestFrames {
       m_Log << LogWarning;
       m_Log << "Problem in event generation: frame mass is less ";
       m_Log << "than or equal to the sum of child masses: ";
-      m_Log << Mass << " <= " << ChildMassTOT << m_End;
+      m_Log << Mass << " <= " << ChildMassTOT << m_RF_End;
       SetSpirit(false);
       return false;
     }
diff --git a/src/GeneratorFrame.cc b/src/GeneratorFrame.cc
index 2443b84..660d327 100755
--- a/src/GeneratorFrame.cc
+++ b/src/GeneratorFrame.cc
@@ -124,7 +124,7 @@ namespace RestFrames {
     if(!GenerateFrame()){
       m_Log << LogWarning;
       m_Log << "Unable to generate event for this frame.";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       return SetSpirit(false);
     }
 
diff --git a/src/Group.cc b/src/Group.cc
index 895dc46..3517bcc 100755
--- a/src/Group.cc
+++ b/src/Group.cc
@@ -136,7 +136,7 @@ namespace RestFrames {
   bool Group::InitializeAnalysis(){
     m_Log << LogVerbose;
     m_Log << "Initializing Group for analysis...";
-    m_Log << m_End;
+    m_Log << m_RF_End;
 
     if(m_GroupStatePtr) delete m_GroupStatePtr;
     m_GroupStatePtr = &InitializeParentState();
@@ -146,11 +146,11 @@ namespace RestFrames {
       m_Log << LogWarning;
       m_Log << "Unable to resolve unknowns associated with ";
       m_Log << "Frames in this Group with available Jigsaws";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       return SetBody(false);
     }
 
-    m_Log << LogVerbose << "...Done" << m_End;
+    m_Log << LogVerbose << "...Done" << m_RF_End;
     SetBody(true);
     return SetMind(true);
   }
@@ -168,7 +168,7 @@ namespace RestFrames {
 	  m_Log << LogWarning;
 	  m_Log << "Cannot find Jigsaw to Resolve State for frames:";
 	  m_Log << endl << "   " << Log(state.GetListFrames());
-	  m_Log << m_End;
+	  m_Log << m_RF_End;
 	  return false; 
 	}
 	m_StatesToResolve.Remove(state);
@@ -202,7 +202,7 @@ namespace RestFrames {
     m_Log << " Frames:" << endl << "   ";
     m_Log << Log(state.GetListFrames()) << endl;
     m_Log << " Jigsaw:" << Log(jigsawSolutionPtr);
-    m_Log << m_End;
+    m_Log << m_RF_End;
     InitializeJigsaw(*jigsawSolutionPtr);
     m_JigsawsToUse.Remove(*jigsawSolutionPtr);
     return true;
@@ -214,7 +214,7 @@ namespace RestFrames {
     if(!jigsaw.InitializeTree()){
       m_Log << LogWarning;
       m_Log << "Unable to initialize Jigsaw:";
-      m_Log << Log(jigsaw) << m_End;
+      m_Log << Log(jigsaw) << m_RF_End;
     }
     m_States += jigsaw.GetChildStates();
     m_StatesToResolve -= state;
@@ -279,7 +279,7 @@ namespace RestFrames {
     if(!(frames == match_frames)){
       m_Log << LogWarning;
       m_Log << "Unable to find States corresponding to Frames: " << endl;
-      m_Log << Log(frames) << m_End;
+      m_Log << Log(frames) << m_RF_End;
       SetMind(false);
       return RFList<State>();
     }
diff --git a/src/InvisibleFrame.cc b/src/InvisibleFrame.cc
index bb63d11..9344781 100755
--- a/src/InvisibleFrame.cc
+++ b/src/InvisibleFrame.cc
@@ -59,7 +59,7 @@ namespace RestFrames {
     
     int Nchild = T::GetNChildren();
     if(Nchild > 0 || T::GetParentFrame().IsEmpty()){
-      T::m_Log << LogWarning << "Problem with parent or child frames" << m_End;
+      T::m_Log << LogWarning << "Problem with parent or child frames" << m_RF_End;
       return T::SetBody(false);
     }
     return T::SetBody(true);
diff --git a/src/InvisibleGenFrame.cc b/src/InvisibleGenFrame.cc
index 001349b..6dd84f3 100755
--- a/src/InvisibleGenFrame.cc
+++ b/src/InvisibleGenFrame.cc
@@ -48,7 +48,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "Unable to set mass to negative value ";
-      m_Log << val << ". Setting to zero." << m_End;
+      m_Log << val << ". Setting to zero." << m_RF_End;
       m_Mass = 0.;
     } else {
       m_Mass = val;
diff --git a/src/InvisibleJigsaw.cc b/src/InvisibleJigsaw.cc
index b903a4a..7067657 100644
--- a/src/InvisibleJigsaw.cc
+++ b/src/InvisibleJigsaw.cc
@@ -223,21 +223,21 @@ namespace RestFrames {
     if(Ndep != m_Nvis || Nout != m_Ninv){
       m_Log << LogWarning;
       m_Log << "Incorrect number of input/output frames for jigsaw";
-      m_Log<< m_End;
+      m_Log<< m_RF_End;
       return SetBody(false);
     }
     for(int i = 0; i < Ndep; i++)
       if(m_DependancyFrames[i].GetN() == 0){
 	m_Log << LogWarning;
 	m_Log << "Empty collection of visible frames: " << i;
-	m_Log << m_End;
+	m_Log << m_RF_End;
 	return SetBody(false);
       }
     for(int i = 0; i < Nout; i++)
       if(m_ChildFrames[i].GetN() == 0){
 	m_Log << LogWarning;
 	m_Log << "Empty collection of invisible frames: " << i;
-	m_Log << m_End;
+	m_Log << m_RF_End;
 	return SetBody(false);
       }
     return SetBody(true);
diff --git a/src/Jigsaw.cc b/src/Jigsaw.cc
index d9c6594..fe646d2 100755
--- a/src/Jigsaw.cc
+++ b/src/Jigsaw.cc
@@ -194,7 +194,7 @@ namespace RestFrames {
     if(!GetParentState()){
       m_Log << LogWarning;
       m_Log << "Unable to initialize Jigsaw. ";
-      m_Log << "No parent State set." << m_End;
+      m_Log << "No parent State set." << m_RF_End;
       return SetMind(false);
     }
 
@@ -203,7 +203,7 @@ namespace RestFrames {
       m_Log << "Unable to resolve input parent State. ";
       m_Log << "  Frames (capable): " << Log(GetParentFrames()) << endl;
       m_Log << "  Frames (requested): " << Log(GetParentState().GetListFrames());
-      m_Log << m_End;
+      m_Log << m_RF_End;
       return SetMind(false);
     }
       
@@ -261,13 +261,13 @@ namespace RestFrames {
 	  if(!state){
 	    m_Log << LogWarning;
 	    m_Log << "Cannot find States corresponding to frame: " << endl;
-	    m_Log << Log(frame) << " " << Log(states) << m_End;
+	    m_Log << Log(frame) << " " << Log(states) << m_RF_End;
 	    return SetMind(false);
 	  }
 	  m_Log << LogVerbose;
 	  m_Log << "Adding dependancy State for index " << d;
 	  m_Log << " corresponding to frame:";
-	  m_Log << Log(frame) << m_End;
+	  m_Log << Log(frame) << m_RF_End;
 	  m_DependancyStates[d] += state;
 	}
       }
@@ -279,7 +279,7 @@ namespace RestFrames {
 	  m_Log << " Frames:" << endl << "   ";
 	  m_Log << Log(group_frames[g]) << endl;
 	  m_Log << " Group:" << endl;
-	  m_Log << Log(groups.Get(g)) << m_End;
+	  m_Log << Log(groups.Get(g)) << m_RF_End;
 	  return SetMind(false);
 	}
 	m_Log << LogVerbose;
@@ -292,7 +292,7 @@ namespace RestFrames {
 	  m_Log << "   state " << s << ": ";
 	  m_Log << Log(group_states[s].GetListFrames()) << endl;
 	}
-	m_Log << m_End;
+	m_Log << m_RF_End;
 	m_DependancyStates[d].Add(group_states);
       }
     }
@@ -329,7 +329,7 @@ namespace RestFrames {
       m_Log << "    Frame:" << endl;
       m_Log << Log(frame) << endl;
       m_Log << "    Group:" << endl;
-      m_Log << Log(GetGroup()) << m_End;
+      m_Log << Log(GetGroup()) << m_RF_End;
       return;
     }
     
@@ -360,13 +360,13 @@ namespace RestFrames {
 	  m_Log << "Child frames are repeated between ";
 	  m_Log << "more than one output index: ";
 	  m_Log << Log(m_ChildFrames[i].Intersection(m_ChildFrames[j]));
-	  m_Log << m_End;
+	  m_Log << m_RF_End;
 	  return SetBody(false);
 	}
     for(int i = 0; i < Nout; i++)
       if(m_ChildFrames[i].GetN() == 0){
 	m_Log << "No child frames at index ";
-	m_Log << i << m_End;
+	m_Log << i << m_RF_End;
 	return SetBody(false);
       }
     return SetBody(true);
diff --git a/src/LabFrame.cc b/src/LabFrame.cc
index 246d847..fb6ae1d 100755
--- a/src/LabFrame.cc
+++ b/src/LabFrame.cc
@@ -62,12 +62,12 @@ namespace RestFrames {
     int Nchild = T::GetNChildren();
     if(Nchild != 1){
       T::m_Log << LogWarning << "Number of LabFrame children != 1: ";
-      T::m_Log << Nchild << m_End;
+      T::m_Log << Nchild << m_RF_End;
       return T::SetBody(false);
     }
     if(!T::GetParentFrame().IsEmpty()){
       T::m_Log << LogWarning << "Parent frame of LabFrame is not empty: ";
-      T::m_Log << Log(T::GetParentFrame()) << m_End;
+      T::m_Log << Log(T::GetParentFrame()) << m_RF_End;
       return T::SetBody(false);
     }
     return T::SetBody(true);;
@@ -82,26 +82,26 @@ namespace RestFrames {
   bool LabFrame<T>::InitializeTree() {
     T::m_Log << LogVerbose;
     T::m_Log << "Initializing tree skeleton...";
-    T::m_Log << m_End;
+    T::m_Log << m_RF_End;
 
     vector<RFKey> keys;
     if(T::IsCircularTree(keys)){
       T::m_Log << LogWarning;
       T::m_Log << "   Tree is circular in construction";
-      T::m_Log << m_End;
+      T::m_Log << m_RF_End;
       return false;
     }
 
     if(!T::InitializeTreeRecursive()){
       T::m_Log << LogWarning;
       T::m_Log << "   Problem with structure of tree";
-      T::m_Log << m_End;
+      T::m_Log << m_RF_End;
       return false;
     }
 
     T::m_Log << LogVerbose;
     T::m_Log << "...Done";
-    T::m_Log << m_End;
+    T::m_Log << m_RF_End;
     
     return true;
   }
diff --git a/src/LabGenFrame.cc b/src/LabGenFrame.cc
index 4f715dd..1986387 100755
--- a/src/LabGenFrame.cc
+++ b/src/LabGenFrame.cc
@@ -61,7 +61,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "Unable to set transverse mass to negative value ";
-      m_Log << val << ". Setting to zero." << m_End;
+      m_Log << val << ". Setting to zero." << m_RF_End;
       m_PT = 0.;
     } else {
       m_PT = val;
@@ -89,7 +89,7 @@ namespace RestFrames {
   }
 
   bool LabGenFrame::InitializeAnalysis(){
-    m_Log << LogVerbose << "Initializing this tree for analysis..." << m_End;
+    m_Log << LogVerbose << "Initializing this tree for analysis..." << m_RF_End;
    
     if(!IsSoundBody()){
       UnSoundBody(RF_FUNCTION);
@@ -97,11 +97,11 @@ namespace RestFrames {
     }
 
     if(!InitializeAnalysisRecursive()){
-      m_Log << LogWarning << "Unable to recursively initialize analysis" << m_End;
+      m_Log << LogWarning << "Unable to recursively initialize analysis" << m_RF_End;
       return SetMind(false);
     }
 
-    m_Log << LogVerbose << "...Done" << m_End;
+    m_Log << LogVerbose << "...Done" << m_RF_End;
     return SetMind(true);
   }
   
diff --git a/src/LabRecoFrame.cc b/src/LabRecoFrame.cc
index 1aa3b50..1da2598 100755
--- a/src/LabRecoFrame.cc
+++ b/src/LabRecoFrame.cc
@@ -80,7 +80,7 @@ namespace RestFrames {
   }
 
   bool LabRecoFrame::InitializeTreeGroups(){
-     m_Log << LogVerbose << "Initializing Groups for analysis..." << m_End;
+     m_Log << LogVerbose << "Initializing Groups for analysis..." << m_RF_End;
     
     m_TreeGroups.Clear();
     m_TreeGroups += GetListGroups();
@@ -90,16 +90,16 @@ namespace RestFrames {
       if(!m_TreeGroups[i].InitializeAnalysis()){
 	m_Log << LogWarning;
 	m_Log << "Unable to initialize analysis for Group ";
-	m_Log << Log(m_TreeGroups[i]) << m_End;
+	m_Log << Log(m_TreeGroups[i]) << m_RF_End;
 	return false;
       }
     }
-    m_Log << LogVerbose << "...Done" << m_End;
+    m_Log << LogVerbose << "...Done" << m_RF_End;
     return true;
   }
 
   bool LabRecoFrame::InitializeTreeStates(){
-    m_Log << LogVerbose << "Initializing States for analysis..." << m_End;
+    m_Log << LogVerbose << "Initializing States for analysis..." << m_RF_End;
     
     m_TreeStates.Clear();
     int Ng = m_TreeGroups.GetN();
@@ -134,16 +134,16 @@ namespace RestFrames {
       if(!has_group){
 	m_Log << LogWarning;
 	m_Log << "Found InvisibleRecoFrame without an assigned group: " << endl;
-	m_Log << Log(frames[f]) << m_End;
+	m_Log << Log(frames[f]) << m_RF_End;
 	return false;
       }
     }
-    m_Log << LogVerbose << "...Done initializing States" << m_End;
+    m_Log << LogVerbose << "...Done initializing States" << m_RF_End;
     return true;
   }
 
   bool LabRecoFrame::InitializeTreeJigsaws(){
-    m_Log << LogVerbose << "Initializing Jigsaws for analysis..." << m_End;
+    m_Log << LogVerbose << "Initializing Jigsaws for analysis..." << m_RF_End;
     
     m_TreeJigsaws.Clear();
     
@@ -157,7 +157,7 @@ namespace RestFrames {
 	if(!jigsaws[j].InitializeAnalysis()){
 	  m_Log << LogWarning;
 	  m_Log << "Unable to initialize Jigsaw for analysis:" << endl;
-	  m_Log << Log(jigsaws[j]) << m_End;
+	  m_Log << Log(jigsaws[j]) << m_RF_End;
 	  return false;
 	}
     }
@@ -170,7 +170,7 @@ namespace RestFrames {
 	if(!jigsaw.InitializeDependancyJigsaws()){
 	  m_Log << LogWarning;
 	  m_Log << "Unable to initialize dependancy Jigsaw list for Jigsaw:" << endl;
-	  m_Log << Log(jigsaw) << m_End;
+	  m_Log << Log(jigsaw) << m_RF_End;
 	  return false;
 	}
 	m_TreeJigsaws.Add(jigsaw);
@@ -184,19 +184,19 @@ namespace RestFrames {
 	m_TreeJigsaws.Clear();
 	m_Log << LogWarning;
 	m_Log << "Unable to initialize Jigsaw execution list in Jigsaw:" << endl;
-	m_Log << Log(m_TreeJigsaws[j]) << m_End;
+	m_Log << Log(m_TreeJigsaws[j]) << m_RF_End;
 	return false;
       }
     }  
     m_TreeJigsaws.Clear();
     m_TreeJigsaws.Add(exec_jigsaws);
 
-    m_Log << LogVerbose << "...Done initializing Jigsaws" << m_End;
+    m_Log << LogVerbose << "...Done initializing Jigsaws" << m_RF_End;
     return true;
   }
 
   bool LabRecoFrame::InitializeAnalysis(){
-    m_Log << LogVerbose << "Initializing this tree for analysis..." << m_End;
+    m_Log << LogVerbose << "Initializing this tree for analysis..." << m_RF_End;
    
     if(!IsSoundBody()){
       UnSoundBody(RF_FUNCTION);
@@ -204,26 +204,26 @@ namespace RestFrames {
     }
 
     if(!InitializeTreeGroups()){
-      m_Log << LogWarning << "Unable to intialize Groups" << m_End;
+      m_Log << LogWarning << "Unable to intialize Groups" << m_RF_End;
       return SetMind(false);
     }
     if(!InitializeTreeStates()){
-      m_Log << LogWarning << "Unable to intialize States" << m_End;
+      m_Log << LogWarning << "Unable to intialize States" << m_RF_End;
       return SetMind(false);
     }
     
     if(!InitializeTreeJigsaws()){
-      m_Log << LogWarning << "Unable to intialize Jigsaws" << m_End;
+      m_Log << LogWarning << "Unable to intialize Jigsaws" << m_RF_End;
       return SetMind(false);
     }
     if(!InitializeAnalysisRecursive()){
       m_Log << LogWarning;
       m_Log << "Unable to recursively initialize tree for analysis";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       return SetMind(false);
     }
 
-    m_Log << LogVerbose << "...Done initializing tree for analysis" << m_End;
+    m_Log << LogVerbose << "...Done initializing tree for analysis" << m_RF_End;
     SetMind(true);
     return SetMind(true);
   }
@@ -260,7 +260,7 @@ namespace RestFrames {
       if(!m_TreeGroups[i].AnalyzeEvent()){
 	m_Log << LogWarning;
 	m_Log << "Unable to analyze event for Group: ";
-	m_Log << Log(m_TreeGroups[i]) << m_End;
+	m_Log << Log(m_TreeGroups[i]) << m_RF_End;
 	return SetSpirit(false);
       }
     }
@@ -269,13 +269,13 @@ namespace RestFrames {
       if(!m_TreeJigsaws[i].AnalyzeEvent()){
 	m_Log << LogWarning;
 	m_Log << "Unable to analyze event for Jigsaw: ";
-	m_Log << Log(m_TreeJigsaws[i]) << m_End;
+	m_Log << Log(m_TreeJigsaws[i]) << m_RF_End;
 	return SetSpirit(false);
       }
     }
     if(!AnalyzeEventRecursive()){
       m_Log << LogWarning;
-      m_Log << "Unable to recursively analyze event" << m_End;
+      m_Log << "Unable to recursively analyze event" << m_RF_End;
       return SetSpirit(false);
     }
     return SetSpirit(true);
diff --git a/src/MinMassesCombJigsaw.cc b/src/MinMassesCombJigsaw.cc
index 8db97f6..198a30b 100755
--- a/src/MinMassesCombJigsaw.cc
+++ b/src/MinMassesCombJigsaw.cc
@@ -57,7 +57,7 @@ namespace RestFrames {
 
     if(!InitializeCombinatoric()){
       m_Log << LogWarning;
-      m_Log << "Problem initializing event info" << m_End;
+      m_Log << "Problem initializing event info" << m_RF_End;
       return SetSpirit(false);
     }
 
diff --git a/src/RFBase.cc b/src/RFBase.cc
index 6eb1e42..0162769 100755
--- a/src/RFBase.cc
+++ b/src/RFBase.cc
@@ -135,7 +135,7 @@ namespace RestFrames {
 
   void RFBase::Print(LogType type) const {
     string output = PrintString(type);
-    m_Log << type << output << m_End;
+    m_Log << type << output << m_RF_End;
   }
 
   string RFBase::PrintString(LogType type) const {
@@ -150,7 +150,7 @@ namespace RestFrames {
     m_Log << "Unable to evaluate function \"" << function << "\". ";
     m_Log << "Requires a successful call to \"InitializeTree()\" ";
     m_Log << "from the LabFrame associated with this tree.";
-    m_Log << m_End;
+    m_Log << m_RF_End;
   }
 
   void RFBase::UnSoundMind(const string& function) const {
@@ -158,7 +158,7 @@ namespace RestFrames {
     m_Log << "Unable to evaluate function \"" << function << "\". ";
     m_Log << "Requires a successful call to \"InitializeAnalysis()\" ";
     m_Log << "from the LabFrame associated with this tree.";
-    m_Log << m_End;
+    m_Log << m_RF_End;
   }
 
   void RFBase::UnSoundSpirit(const string& function) const {
@@ -166,7 +166,7 @@ namespace RestFrames {
     m_Log << "Unable to evaluate function \"" << function << "\". ";
     m_Log << "Requires a successful call to \"AnalyzeEvent()\" ";
     m_Log << "from the LabFrame associated with this tree.";
-    m_Log << m_End;
+    m_Log << m_RF_End;
   }
 
   // Initializer.
diff --git a/src/ReconstructionFrame.cc b/src/ReconstructionFrame.cc
index c5287e9..54bc506 100755
--- a/src/ReconstructionFrame.cc
+++ b/src/ReconstructionFrame.cc
@@ -147,7 +147,7 @@ namespace RestFrames {
 	  if(!m_ChildStates[&child].Add(RFList<State>(states).GetFrame(frames[f]))){
 	    m_Log << LogWarning;
 	    m_Log << "Unable to associate State with Group-less Frame:";
-	    m_Log << Log(frames[f]) << m_End;
+	    m_Log << Log(frames[f]) << m_RF_End;
 	    return false;
 	  }
     }
@@ -172,7 +172,7 @@ namespace RestFrames {
 	      m_Log << LogWarning;
 	      m_Log << "Unable to get State associated with Group Frame: " << endl;
 	      m_Log << " Frame:" << Log(frames[f]);
-	      m_Log << " Group:" << Log(groups[g]) << m_End;
+	      m_Log << " Group:" << Log(groups[g]) << m_RF_End;
 	      return false;
 	    }
 	    m_ChildStates[&GetChildFrame(c)].Add(state);
@@ -199,7 +199,7 @@ namespace RestFrames {
       if(!GetChildFrame(i).InitializeAnalysisRecursive()){
 	m_Log << LogWarning;
 	m_Log << "Unable to recursively initialize analysis for frame:";
-	m_Log << Log(GetChildFrame(i)) << m_End;
+	m_Log << Log(GetChildFrame(i)) << m_RF_End;
 	return SetMind(false);
       }
 
@@ -247,7 +247,7 @@ namespace RestFrames {
       if(!child.AnalyzeEventRecursive()){
 	m_Log << LogWarning;
 	m_Log << "Recursive event analysis failed for frame: ";
-	m_Log << Log(child) << m_End;
+	m_Log << Log(child) << m_RF_End;
 	return SetSpirit(false);
       } 
      
diff --git a/src/ResonanceGenFrame.cc b/src/ResonanceGenFrame.cc
index c91befb..e4463b5 100755
--- a/src/ResonanceGenFrame.cc
+++ b/src/ResonanceGenFrame.cc
@@ -71,7 +71,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "Unable to set mass to negative value ";
-      m_Log << val << ". Setting to zero." << m_End;
+      m_Log << val << ". Setting to zero." << m_RF_End;
       m_PoleMass = 0.;
     } else {
       m_PoleMass = val;
@@ -82,7 +82,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "Unable to set mass to negative value ";
-      m_Log << val << ". Setting to zero." << m_End;
+      m_Log << val << ". Setting to zero." << m_RF_End;
       m_Mass = 0.;
     } else {
       m_Mass = val;
@@ -94,7 +94,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "Unable to set width to negative value ";
-      m_Log << val << ". Setting to zero." << m_End;
+      m_Log << val << ". Setting to zero." << m_RF_End;
       m_Width = 0.;
     } else 
       m_Width = val;
diff --git a/src/RestFrame.cc b/src/RestFrame.cc
index 7044afa..e1267ab 100755
--- a/src/RestFrame.cc
+++ b/src/RestFrame.cc
@@ -127,7 +127,7 @@ namespace RestFrames {
     for(int i = 0; i < Nchild; i++)
       if(!GetChildFrame(i)){
 	m_Log << LogWarning << "Empty child frame:";
-	m_Log << Log(GetChildFrame(i)) << m_End;
+	m_Log << Log(GetChildFrame(i)) << m_RF_End;
 	return SetBody(false);
       }
     return SetBody(true);
@@ -140,7 +140,7 @@ namespace RestFrames {
       if(!GetChildFrame(i).InitializeTreeRecursive()){
 	m_Log << LogWarning;
 	m_Log << "Problem with recursive tree structure from frame: ";
-	m_Log << Log(GetChildFrame(i)) << m_End;
+	m_Log << Log(GetChildFrame(i)) << m_RF_End;
 	return SetBody(false);
       }
     }
@@ -182,16 +182,16 @@ namespace RestFrames {
   void RestFrame::AddChildFrame(RestFrame& frame){
     SetBody(false);
     if(!frame){
-      m_Log << LogWarning << "Cannot add empty frame as child." << m_End;
+      m_Log << LogWarning << "Cannot add empty frame as child." << m_RF_End;
       return;
     }
     if(frame.IsLabFrame()){
-      m_Log << LogWarning << "Cannot add LabFrame frame as child: " << Log(frame) << m_End;
+      m_Log << LogWarning << "Cannot add LabFrame frame as child: " << Log(frame) << m_RF_End;
       return;
     }
     if(!m_ChildFrames.Add(frame)){
       m_Log << LogWarning << "Unable to add child frame:";
-      m_Log << Log(frame) << m_End;
+      m_Log << Log(frame) << m_RF_End;
       return;
     }
     frame.SetParentFrame(*this);
@@ -213,7 +213,7 @@ namespace RestFrames {
     if(i >= Nchild || i < 0){
       m_Log << LogWarning;
       m_Log << "Cannot GetChildFrame(" << i << "). ";
-      m_Log << "No " << i << "th child" << m_End;
+      m_Log << "No " << i << "th child" << m_RF_End;
     }
     return m_ChildFrames[i];
   }
@@ -236,7 +236,7 @@ namespace RestFrames {
     if(!GetParentFrame()){
       m_Log << LogWarning;
       m_Log << "Unable to find LabFrame above this frame. ";
-      m_Log << "No parent frame set" << m_End;
+      m_Log << "No parent frame set" << m_RF_End;
       return RestFrame::Empty();
     } 
     return m_ParentFramePtr->GetLabFrame();
@@ -278,7 +278,7 @@ namespace RestFrames {
       m_Log << LogWarning;
       m_Log << "Unable to set child's boost vector. ";
       m_Log << "Frame is not among childrend:";
-      m_Log << Log(frame) << m_End;
+      m_Log << Log(frame) << m_RF_End;
       return;
     }
     m_ChildBoosts[&frame] = boost;
@@ -290,7 +290,7 @@ namespace RestFrames {
       m_Log << LogWarning;
       m_Log << "Unable to set parent boost vector. ";
       m_Log << "No parent frame set.";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       return;
     }
     m_ParentBoost = boost;
@@ -301,7 +301,7 @@ namespace RestFrames {
       m_Log << LogWarning;
       m_Log << "Unable to get child's boost vector. ";
       m_Log << "Frame is not among children:";
-      m_Log << Log(frame) << m_End;
+      m_Log << Log(frame) << m_RF_End;
       return TVector3(0.,0.,0.);
     }
     return m_ChildBoosts[&frame];
@@ -339,7 +339,7 @@ namespace RestFrames {
       if(keys[i] == GetKey()){
 	m_Log << LogWarning;
 	m_Log << "This RestFrame appears more than once in the tree:";
-	m_Log << Log(*this) << m_End;
+	m_Log << Log(*this) << m_RF_End;
 	return true;
       }
     }
@@ -419,7 +419,7 @@ namespace RestFrames {
     if(!GetProductionFrame()){
       m_Log << LogWarning;
       m_Log << "Unable to get four vector. ";
-      m_Log << "Production frame is not defined." << m_End;
+      m_Log << "Production frame is not defined." << m_RF_End;
       return TLorentzVector(0.,0.,0.,0.);
     }
 
@@ -434,7 +434,7 @@ namespace RestFrames {
       m_Log << LogWarning;
       m_Log << "Unable to get four vector. ";
       m_Log << "Cannot find a path to frame " << frame.GetName();
-      m_Log << " from frame " << GetProductionFrame().GetName() << m_End;
+      m_Log << " from frame " << GetProductionFrame().GetName() << m_RF_End;
       return TLorentzVector(0.,0.,0.,0.);
     }
   
@@ -568,7 +568,7 @@ namespace RestFrames {
 	m_Log << LogWarning;
 	m_Log << "Unable to get four vector. ";
 	m_Log << "Cannot find a path to frame " << GetName();
-	m_Log << " from frame " << GetLabFrame().GetName() << m_End;
+	m_Log << " from frame " << GetLabFrame().GetName() << m_RF_End;
 	return TLorentzVector(0.,0.,0.,0.);
       }
     } else {
@@ -577,7 +577,7 @@ namespace RestFrames {
 	m_Log << LogWarning;
 	m_Log << "Unable to get four vector. ";
 	m_Log << "Cannot find a path to frame " << GetName();
-	m_Log << " from frame " << GetLabFrame().GetName() << m_End;
+	m_Log << " from frame " << GetLabFrame().GetName() << m_RF_End;
 	return TLorentzVector(0.,0.,0.,0.);
        }
     }
@@ -610,7 +610,7 @@ namespace RestFrames {
 	m_Log << LogWarning;
 	m_Log << "Unable to get four vector. ";
 	m_Log << "Cannot find a path to frame " << axis_frame.GetName();
-	m_Log << " from frame " << GetLabFrame().GetName() << m_End;
+	m_Log << " from frame " << GetLabFrame().GetName() << m_RF_End;
 	return 0.;
       }
       int Nboost = boosts.size();
diff --git a/src/SelfAssemblingRecoFrame.cc b/src/SelfAssemblingRecoFrame.cc
index f116a89..6d33e91 100755
--- a/src/SelfAssemblingRecoFrame.cc
+++ b/src/SelfAssemblingRecoFrame.cc
@@ -86,7 +86,7 @@ namespace RestFrames {
     if(!InitializeTreeRecursive()){
       m_Log << LogWarning;
       m_Log << "Problem with recursive tree after disassembly";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       SetBody(false);
       return;
     } else 
@@ -95,7 +95,7 @@ namespace RestFrames {
     if(!InitializeAnalysisRecursive()){
       m_Log << LogWarning;
       m_Log << "Problem connecting states after disassembly";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       SetMind(false);
       return;
     } else 
@@ -160,7 +160,7 @@ namespace RestFrames {
     if(!InitializeTreeRecursive()){
       m_Log << LogWarning;
       m_Log << "Problem with recursive tree after assembly";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       SetBody(false);
       return;
     }
@@ -171,7 +171,7 @@ namespace RestFrames {
     if(!InitializeAnalysisRecursive()){
       m_Log << LogWarning;
       m_Log << "Problem connecting states after assembly";
-      m_Log << m_End;
+      m_Log << m_RF_End;
       SetMind(false);
       return;
     }
@@ -276,7 +276,7 @@ namespace RestFrames {
     if(!ReconstructionFrame::AnalyzeEventRecursive()){
       m_Log << LogWarning;
       m_Log << "Unable to recursively analyze event with ";
-      m_Log << "disassembled SelfAssemblingRecoFrame" << m_End;
+      m_Log << "disassembled SelfAssemblingRecoFrame" << m_RF_End;
       return SetSpirit(false);
     }
     // Assemble Frame tree
@@ -284,7 +284,7 @@ namespace RestFrames {
     if(!ReconstructionFrame::AnalyzeEventRecursive()){
       m_Log << LogWarning;
       m_Log << "Unable to recursively analyze event with ";
-      m_Log << "assembled SelfAssemblingRecoFrame" << m_End;
+      m_Log << "assembled SelfAssemblingRecoFrame" << m_RF_End;
       return SetSpirit(false);
     }
     return SetSpirit(true);
diff --git a/src/VisibleFrame.cc b/src/VisibleFrame.cc
index 4cd90f7..bf693fc 100755
--- a/src/VisibleFrame.cc
+++ b/src/VisibleFrame.cc
@@ -59,7 +59,7 @@ namespace RestFrames {
     
     int Nchild = T::GetNChildren();
     if(Nchild > 0 || !T::GetParentFrame()){
-      T::m_Log << LogWarning << "Problem with parent or child frames" << m_End;
+      T::m_Log << LogWarning << "Problem with parent or child frames" << m_RF_End;
       return T::SetBody(false);
     }
     return T::SetBody(true);
diff --git a/src/VisibleGenFrame.cc b/src/VisibleGenFrame.cc
index bd4614b..6b4714b 100755
--- a/src/VisibleGenFrame.cc
+++ b/src/VisibleGenFrame.cc
@@ -55,7 +55,7 @@ namespace RestFrames {
     if(val < 0.){
       m_Log << LogWarning;
       m_Log << "Unable to set mass to negative value ";
-      m_Log << val << ". Setting to zero." << m_End;
+      m_Log << val << ". Setting to zero." << m_RF_End;
       m_Mass = 0.;
     } else {
       m_Mass = val;