diff --git a/sbnobj/Common/SBNEventWeight/EventWeightParameterSet.cxx b/sbnobj/Common/SBNEventWeight/EventWeightParameterSet.cxx
index 24aa42835..7a03e1a28 100644
--- a/sbnobj/Common/SBNEventWeight/EventWeightParameterSet.cxx
+++ b/sbnobj/Common/SBNEventWeight/EventWeightParameterSet.cxx
@@ -15,13 +15,13 @@ void EventWeightParameterSet::Configure(std::string name, ReweightType rwtype, s
   fRWType = rwtype;
   fNuniverses = nuni;
 
-  if (fRWType == kMultisim) {
+  if (fRWType == kMultiSim) {
     fNuniverses = nuni;
   }
   else if (fRWType == kPMNSigma) {
     fNuniverses = 2;
   }
-  else if (fRWType == kMultisigma) {
+  else if (fRWType == kMultiSigma) {
     fNuniverses = nuni;
   }
   else if (fRWType == kFixed) {
@@ -37,9 +37,9 @@ void EventWeightParameterSet::Configure(std::string name, ReweightType rwtype, s
 
 void EventWeightParameterSet::Configure(std::string name, std::string rwtype_string, size_t nuni) {
 
-  if (rwtype_string == "multisim") Configure(name, kMultisim, nuni);
+  if (rwtype_string == "multisim") Configure(name, kMultiSim, nuni);
   else if (rwtype_string == "pmNsigma") Configure(name, kPMNSigma);
-  else if (rwtype_string == "multisigma") Configure(name, kMultisigma, nuni);
+  else if (rwtype_string == "multisigma") Configure(name, kMultiSigma, nuni);
   else if (rwtype_string == "fixed") Configure(name, kFixed);
   else {
     std::cerr << "EventWeightParameterSet: Unknown reweight type " << rwtype_string << std::endl;
@@ -61,7 +61,7 @@ void EventWeightParameterSet::AddParameter(
 }
 
 void EventWeightParameterSet::Sample(CLHEP::HepRandomEngine& engine) {
-  if (fRWType == kDefault) {
+  if (fRWType == kDefaultRWType) {
     std::cerr << "EventWeightParameterSet: Must be configured before sampling." << std::endl;
     assert(false);
   }
@@ -71,7 +71,7 @@ void EventWeightParameterSet::Sample(CLHEP::HepRandomEngine& engine) {
     for (auto& it : fParameterMap) {
       const EventWeightParameter& p = it.first;
 
-      if (fRWType == kMultisim) {
+      if (fRWType == kMultiSim) {
         for (size_t i=0; i<fNuniverses; i++) {
           float r = p.fWidth*CLHEP::RandGaussQ::shoot(&engine, p.fMean, 1);
           it.second.push_back(r);
@@ -83,7 +83,7 @@ void EventWeightParameterSet::Sample(CLHEP::HepRandomEngine& engine) {
         it.second.push_back(p.fMean - p.fWidth);
       }
 
-      else if (fRWType == kMultisigma) {
+      else if (fRWType == kMultiSigma) {
 
         for(size_t j=0; j<p.fWidths.size(); j++){
           it.second.push_back(p.fMean + p.fWidths.at(j));
diff --git a/sbnobj/Common/SBNEventWeight/EventWeightParameterSet.h b/sbnobj/Common/SBNEventWeight/EventWeightParameterSet.h
index 3ef2f6b26..a004e8326 100644
--- a/sbnobj/Common/SBNEventWeight/EventWeightParameterSet.h
+++ b/sbnobj/Common/SBNEventWeight/EventWeightParameterSet.h
@@ -64,15 +64,15 @@ class EventWeightParameterSet {
   //==== ReweightType_t in sbnanaobj/StandardRecord/SREnums.h should be synchronized to this
   typedef enum rwtype
   {
-    kDefault = -1,
-    kMultisim = 0,
+    kDefaultRWType = -1,
+    kMultiSim = 0,
     kPMNSigma = 1,
     kFixed = 2,
-    kMultisigma = 3,
+    kMultiSigma = 3,
   } ReweightType;
 
   /** Default constructor. */
-  EventWeightParameterSet() : fCovarianceMatrix(nullptr), fRWType(kDefault) {}
+  EventWeightParameterSet() : fCovarianceMatrix(nullptr), fRWType(kDefaultRWType) {}
 
   /** Equality operator, testing equality of all members. */
   inline friend bool operator==(const EventWeightParameterSet& lhs,