diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx b/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx
index 48a3f35..12b3d03 100644
--- a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx
+++ b/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.cxx
@@ -1,103 +1,103 @@
 // Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 /*******************************************************************************
 *    This file is part of NUISANCE.
 *
 *    NUISANCE is free software: you can redistribute it and/or modify
 *    it under the terms of the GNU General Public License as published by
 *    the Free Software Foundation, either version 3 of the License, or
 *    (at your option) any later version.
 *
 *    NUISANCE is distributed in the hope that it will be useful,
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *    GNU General Public License for more details.
 *
 *    You should have received a copy of the GNU General Public License
 *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 #include "MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu.h"
 
 //********************************************************************
 MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu::MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MiniBooNE Forward Horn Current nue + nuebar \n" \
                         "Signal: Any event with 1 muon, any nucleons, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
   fSettings.SetXTitle("cos#theta_{#pi^{0}}");
   fSettings.SetYTitle("d#sigma/dcos#theta_{#pi^{0}} (cm^{2}/nucleon)");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/FULL,DIAG/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(0.0, 5.0);
   fSettings.DefineAllowedTargets("C,H");
 
   fSettings.SetTitle("MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu");
-  nunubar_mode = fSettings.Found("name", "combined");
+  nunubar_mode = fSettings.Found("name", "rhc");
   if (!nunubar_mode) {
     fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/nubarcosthetapi0xsec_edit.txt" );
     fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/nubarcosthetapi0xsecerrormatrix.txt" );
     fSettings.DefineAllowedSpecies("numub");
 
   } else {
-    fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnumodecosthetapi0xsec_edit.txt");
-    fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnumodecosthetapi0xsecerrormatrix.txt");
+    fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnubarmodecosthetapi0xsec_edit.txt");
+    fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnubarmodecosthetapi0xsecerrormatrix.txt");
     fSettings.DefineAllowedSpecies("numu,numub");
 
   }
   
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = (GetEventHistogram()->Integral("width") * 1E-38) / double(fNEvents) / TotalIntegratedFlux("width");
 
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromTextFile( fSettings.GetCovarInput() );
   ScaleCovar(1.E-5);
   StatUtils::SetDataErrorFromCov(fDataHist, fFullCovar, 1E-38);
   SetShapeCovar();
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 void MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu::FillEventVariables(FitEvent *event) {
 
   // (CP) require pi0 in final state (this makes some assumptions about how the
   // generator treats the pi0 after it is produced in the nucleus.
   // MB required 2 photons to make a pion signal, so check for those later
   if (event->NumFSParticle(111) == 0 ) {
     return;
   }
 
   if (abs(event->NumFSParticle(13)) == 1 || abs(event->NumFSParticle(11)) == 1 || abs(event->NumFSParticle(15)) == 1 || abs(event->NumFSParticle(17)) == 1) return;
 
   TLorentzVector Pnu  = event->GetNeutrinoIn()->fP;
   TLorentzVector Ppi0 = event->GetHMFSParticle(111)->fP;
 
   double CosPi0 = cos(FitUtils::th(Pnu, Ppi0));
 
   fXVar = CosPi0;
 
   return;
 };
 
 //********************************************************************
 bool MiniBooNE_NC1pi0_XSec_1Dcospi0_antinu::isSignal(FitEvent *event) {
 //********************************************************************
   if (nunubar_mode) {
     return (SignalDef::isNC1pi(event, 14, 111, EnuMin, EnuMax) ||
             SignalDef::isNC1pi(event, -14, 111, EnuMin, EnuMax));
   } else {
     return SignalDef::isNC1pi(event, -14, 111, EnuMin, EnuMax);
   }
 }
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx b/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx
index fcc28a0..ac1680d 100644
--- a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx
+++ b/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.cxx
@@ -1,105 +1,105 @@
 // Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 /*******************************************************************************
 *    This file is part of NUISANCE.
 *
 *    NUISANCE is free software: you can redistribute it and/or modify
 *    it under the terms of the GNU General Public License as published by
 *    the Free Software Foundation, either version 3 of the License, or
 *    (at your option) any later version.
 *
 *    NUISANCE is distributed in the hope that it will be useful,
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *    GNU General Public License for more details.
 *
 *    You should have received a copy of the GNU General Public License
 *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 #include "MiniBooNE_NC1pi0_XSec_1Dcospi0_nu.h"
 
 
 //********************************************************************
 MiniBooNE_NC1pi0_XSec_1Dcospi0_nu::MiniBooNE_NC1pi0_XSec_1Dcospi0_nu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MiniBooNE_NC1pi0_XSec_1Dcospi0_nu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MiniBooNE Forward Horn Current nue + nuebar \n" \
                         "Signal: Any event with 1 muon, any nucleons, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
   fSettings.SetXTitle("cos#theta_{#pi^{0}}");
   fSettings.SetYTitle("d#sigma/dcos#theta_{#pi^{0}} (cm^{2}/nucleon)");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/FULL,DIAG/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(0.0, 5.0);
   fSettings.DefineAllowedTargets("C,H");
 
   fSettings.SetTitle("MiniBooNE_NC1pi0_XSec_1Dcospi0_nu");
-  nunubarmode = fSettings.Found("name", "combined");
+  nunubarmode = fSettings.Found("name", "fhc");
   if (!nunubarmode) {
     fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/nucosthetapi0xsec_edit.txt" );
     fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/nucosthetapi0xsecerrormatrix.txt" );
     fSettings.DefineAllowedSpecies("numu");
 
   } else {
-    fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnubarmodecosthetapi0xsec_edit.txt");
-    fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnubarmodecosthetapi0xsecerrormatrix.txt");
+    fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnumodecosthetapi0xsec_edit.txt");
+    fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnumodecosthetapi0xsecerrormatrix.txt");
     fSettings.DefineAllowedSpecies("numu,numub");
 
   }
 
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = (GetEventHistogram()->Integral("width") * 1E-38) / double(fNEvents) / TotalIntegratedFlux("width");
 
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromTextFile( fSettings.GetCovarInput() );
   ScaleCovar(1.E-5);
   StatUtils::SetDataErrorFromCov(fDataHist, fFullCovar, 1E-38);
   SetShapeCovar();
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 
 void MiniBooNE_NC1pi0_XSec_1Dcospi0_nu::FillEventVariables(FitEvent *event) {
 
   // (CP) require pi0 in final state (this makes some assumptions about how the
   // generator treats the pi0 after it is produced in the nucleus.
   // MB required 2 photons to make a pion signal, so check for those later
   if (event->NumFSParticle(111) == 0 ) {
     return;
   }
 
   if (abs(event->NumFSParticle(13)) == 1 || abs(event->NumFSParticle(11)) == 1 || abs(event->NumFSParticle(15)) == 1 || abs(event->NumFSParticle(17)) == 1) return; 
 
   TLorentzVector Pnu  = event->GetNeutrinoIn()->fP;
   TLorentzVector Ppi0 = event->GetHMFSParticle(111)->fP;
 
   double CosPi0 = cos(FitUtils::th(Pnu, Ppi0));
 
   fXVar = CosPi0;
 
   return;
 };
 
 //********************************************************************
 bool MiniBooNE_NC1pi0_XSec_1Dcospi0_nu::isSignal(FitEvent *event) {
 //********************************************************************
   if (nunubarmode){
     return (SignalDef::isNC1pi(event, 14, 111, EnuMin, EnuMax) ||
 	    SignalDef::isNC1pi(event, -14, 111, EnuMin, EnuMax));
   } else {
     return SignalDef::isNC1pi(event, 14, 111, EnuMin, EnuMax);
   }
 }
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx b/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx
index 3f13396..fc376b6 100644
--- a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx
+++ b/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.cxx
@@ -1,104 +1,104 @@
 // Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 /*******************************************************************************
 *    This file is part of NUISANCE.
 *
 *    NUISANCE is free software: you can redistribute it and/or modify
 *    it under the terms of the GNU General Public License as published by
 *    the Free Software Foundation, either version 3 of the License, or
 *    (at your option) any later version.
 *
 *    NUISANCE is distributed in the hope that it will be useful,
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *    GNU General Public License for more details.
 *
 *    You should have received a copy of the GNU General Public License
 *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 #include "MiniBooNE_NC1pi0_XSec_1Dppi0_antinu.h"
 
 
 //********************************************************************
 MiniBooNE_NC1pi0_XSec_1Dppi0_antinu::MiniBooNE_NC1pi0_XSec_1Dppi0_antinu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MiniBooNE_NC1pi0_XSec_1Dppi0_antinu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MiniBooNE Forward Horn Current nue + nuebar \n" \
                         "Signal: Any event with 1 muon, any nucleons, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
   fSettings.SetXTitle("p_{#pi^{0}} (GeV/c)");
   fSettings.SetYTitle("d#sigma/dp_{#pi^{0}} (cm^{2}/(GeV/c)/nucleon)");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/FULL,DIAG/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(0.0, 5.0);
   fSettings.DefineAllowedTargets("C,H");
 
   fSettings.SetTitle("MiniBooNE_NC1pi0_XSec_1Dppi0_antinu");
 
-  nunubarmode = fSettings.Found("name", "combined");
+  nunubarmode = fSettings.Found("name", "rhc");
   if (!nunubarmode) {
     fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/nubarppi0xsec_edit.txt" );
     fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/nubarppi0xsecerrormatrix.txt" );
     fSettings.DefineAllowedSpecies("numu");
 
   } else {
-    fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnumodeppi0xsec_edit.txt");
-    fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnumodeppi0xsecerrormatrix.txt");
+    fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnubarmodeppi0xsec_edit.txt");
+    fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnubarmodeppi0xsecerrormatrix.txt");
     fSettings.DefineAllowedSpecies("numu,numub");
 
   }
 
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = (GetEventHistogram()->Integral("width") * 1E-38) / double(fNEvents) / TotalIntegratedFlux("width");
 
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromTextFile( fSettings.GetCovarInput() );
   ScaleCovar(1.E-5);
   StatUtils::SetDataErrorFromCov(fDataHist, fFullCovar, 1E-38);
   SetShapeCovar();
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 void MiniBooNE_NC1pi0_XSec_1Dppi0_antinu::FillEventVariables(FitEvent *event) {
 
   // (CP) require pi0 in final state (this makes some assumptions about how the
   // generator treats the pi0 after it is produced in the nucleus.
   // MB required 2 photons to make a pion signal, so check for those later
   if (event->NumFSParticle(111) == 0) {
     return;
   }
 
   if (abs(event->NumFSParticle(13)) == 1 || abs(event->NumFSParticle(11)) == 1 || abs(event->NumFSParticle(15)) == 1 || abs(event->NumFSParticle(17)) == 1) return;
   
   TLorentzVector Ppi0 = event->GetHMFSParticle(111)->fP;
 
   double p_pi0 = FitUtils::p(Ppi0);
 
   fXVar = p_pi0;
 
   return;
 };
 
 //********************************************************************
 bool MiniBooNE_NC1pi0_XSec_1Dppi0_antinu::isSignal(FitEvent *event) {
 //********************************************************************
   if (nunubarmode){
     return (SignalDef::isNC1pi(event, -14, 111, EnuMin, EnuMax) ||
 	    SignalDef::isNC1pi(event, 14, 111, EnuMin, EnuMax) );
   } else {
     return SignalDef::isNC1pi(event, -14, 111, EnuMin, EnuMax);
   }
 }
diff --git a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx b/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx
index ea0fea1..85b8a7b 100644
--- a/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx
+++ b/src/MiniBooNE/MiniBooNE_NC1pi0_XSec_1Dppi0_nu.cxx
@@ -1,104 +1,104 @@
 // Copyright 2016 L. Pickering, P Stowell, R. Terri, C. Wilkinson, C. Wret
 
 /*******************************************************************************
 *    This file is part of NUISANCE.
 *
 *    NUISANCE is free software: you can redistribute it and/or modify
 *    it under the terms of the GNU General Public License as published by
 *    the Free Software Foundation, either version 3 of the License, or
 *    (at your option) any later version.
 *
 *    NUISANCE is distributed in the hope that it will be useful,
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
 *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *    GNU General Public License for more details.
 *
 *    You should have received a copy of the GNU General Public License
 *    along with NUISANCE.  If not, see <http://www.gnu.org/licenses/>.
 *******************************************************************************/
 
 #include "MiniBooNE_NC1pi0_XSec_1Dppi0_nu.h"
 
 
 //********************************************************************
 MiniBooNE_NC1pi0_XSec_1Dppi0_nu::MiniBooNE_NC1pi0_XSec_1Dppi0_nu(nuiskey samplekey) {
 //********************************************************************
 
   // Sample overview ---------------------------------------------------
   std::string descrip = "MiniBooNE_NC1pi0_XSec_1Dppi0_nu sample. \n" \
                         "Target: CH \n" \
                         "Flux: MiniBooNE Forward Horn Current nue + nuebar \n" \
                         "Signal: Any event with 1 muon, any nucleons, and no other FS particles \n";
 
   // Setup common settings
   fSettings = LoadSampleSettings(samplekey);
   fSettings.SetDescription(descrip);
   fSettings.SetXTitle("p_{#pi^{0}} (GeV/c)");
   fSettings.SetYTitle("d#sigma/dp_{#pi^{0}} (cm^{2}/(GeV/c)/nucleon)");
   fSettings.SetAllowedTypes("FIX,FREE,SHAPE/FULL,DIAG/NORM/MASK", "FIX/FULL");
   fSettings.SetEnuRange(0.0, 5.0);
   fSettings.DefineAllowedTargets("C,H");
 
   fSettings.SetTitle("MiniBooNE_NC1pi0_XSec_1Dppi0_nu");
-  nunubar_mode_nu = fSettings.Found("name", "combined");
+  nunubar_mode_nu = fSettings.Found("name", "fhc");
   if (!nunubar_mode_nu) {
     fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/nuppi0xsec_edit.txt" );
     fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/nuppi0xsecerrormatrix.txt" );
     fSettings.DefineAllowedSpecies("numu");
 
   } else {
-    fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnubarmodeppi0xsec_edit.txt");
-    fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnubarmodeppi0xsecerrormatrix.txt");
+    fSettings.SetDataInput(  FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnumodeppi0xsec_edit.txt");
+    fSettings.SetCovarInput( FitPar::GetDataBase() + "MiniBooNE/NC1pi0/combinedsignnumodeppi0xsecerrormatrix.txt");
     fSettings.DefineAllowedSpecies("numu,numub");
 
   }
 
   FinaliseSampleSettings();
 
   // Scaling Setup ---------------------------------------------------
   // ScaleFactor automatically setup for DiffXSec/cm2/Nucleon
   fScaleFactor = (GetEventHistogram()->Integral("width") * 1E-38) / double(fNEvents) / TotalIntegratedFlux("width");
 
   // Plot Setup -------------------------------------------------------
   SetDataFromTextFile( fSettings.GetDataInput() );
   SetCovarFromTextFile( fSettings.GetCovarInput() );
   ScaleCovar(1.E-5);
   StatUtils::SetDataErrorFromCov(fDataHist, fFullCovar, 1E-38);
   SetShapeCovar();
 
   // Final setup  ---------------------------------------------------
   FinaliseMeasurement();
 
 };
 
 void MiniBooNE_NC1pi0_XSec_1Dppi0_nu::FillEventVariables(FitEvent *event) {
 
   // (CP) require pi0 in final state (this makes some assumptions about how the
   // generator treats the pi0 after it is produced in the nucleus.
   // MB required 2 photons to make a pion signal, so check for those later
   if (event->NumFSParticle(111) == 0) {
     return;
   }
 
   if (abs(event->NumFSParticle(13)) == 1 || abs(event->NumFSParticle(11)) == 1 || abs(event->NumFSParticle(15)) == 1 || abs(event->NumFSParticle(17)) == 1) return;
   
   TLorentzVector Ppi0 = event->GetHMFSParticle(111)->fP;
 
   double p_pi0 = FitUtils::p(Ppi0);
 
   fXVar = p_pi0;
 
   return;
 };
 
 //********************************************************************
 bool MiniBooNE_NC1pi0_XSec_1Dppi0_nu::isSignal(FitEvent *event) {
 //********************************************************************
 
   if (nunubar_mode_nu){
     return (SignalDef::isNC1pi(event, 14, 111, EnuMin, EnuMax) ||
 	    SignalDef::isNC1pi(event, -14, 111, EnuMin, EnuMax));
   } else {
     return SignalDef::isNC1pi(event, 14, 111, EnuMin, EnuMax);
   }
 }