diff --git a/nanoAOD/plugins/JetUncertaintyEvaluator.cc b/nanoAOD/plugins/JetUncertaintyEvaluator.cc
index eec18723..89c479c7 100644
--- a/nanoAOD/plugins/JetUncertaintyEvaluator.cc
+++ b/nanoAOD/plugins/JetUncertaintyEvaluator.cc
@@ -1,4 +1,4 @@
-#include "JetMetUncertainty.h"
+#include "JetUncertaintyEvaluator.h"
 
 
 //#define debugMode
@@ -6,7 +6,7 @@ using namespace edm;
 using namespace std;
 
 
-JetMetUncertainty::JetMetUncertainty(const edm::ParameterSet &iConfig) : 
+JetUncertaintyEvaluator::JetUncertaintyEvaluator(const edm::ParameterSet &iConfig) : 
   src_(consumes<std::vector<pat::Jet>>(iConfig.getParameter<edm::InputTag>("src"))),
   rhoToken_(consumes<double>(iConfig.getParameter<edm::InputTag>("rho"))),
   payloadName_(iConfig.getParameter<std::string>("payloadName")),
@@ -17,20 +17,20 @@ JetMetUncertainty::JetMetUncertainty(const edm::ParameterSet &iConfig) :
 }
 
 
-void JetMetUncertainty::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void JetUncertaintyEvaluator::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
 
 
-void JetMetUncertainty::beginLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup&) {
+void JetUncertaintyEvaluator::beginLuminosityBlock(const edm::LuminosityBlock& lumi, const edm::EventSetup&) {
   edm::Service<edm::RandomNumberGenerator> rng;
   rng_ = &rng->getEngine(lumi.index());
 }
 
 
-void JetMetUncertainty::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+void JetUncertaintyEvaluator::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   runOnMC_ = !iEvent.isRealData();
   
   Handle<pat::JetCollection> jets;
@@ -137,6 +137,6 @@ void JetMetUncertainty::produce(edm::Event &iEvent, const edm::EventSetup &iSetu
   iEvent.put(move(outJetCor));
 }
 
-DEFINE_FWK_MODULE(JetMetUncertainty);
+DEFINE_FWK_MODULE(JetUncertaintyEvaluator);
 
 
diff --git a/nanoAOD/plugins/JetUncertaintyEvaluator.h b/nanoAOD/plugins/JetUncertaintyEvaluator.h
index c1d4423a..bce99b5a 100644
--- a/nanoAOD/plugins/JetUncertaintyEvaluator.h
+++ b/nanoAOD/plugins/JetUncertaintyEvaluator.h
@@ -1,5 +1,5 @@
-#ifndef JetMetUncertainty_H
-#define JetMetUncertainty_H
+#ifndef JetUncertaintyEvaluator_H
+#define JetUncertaintyEvaluator_H
 
 #include<memory>
 
@@ -41,9 +41,9 @@ using namespace edm;
 using namespace std;
 
 
-class JetMetUncertainty: public edm::stream::EDProducer<> {
+class JetUncertaintyEvaluator: public edm::stream::EDProducer<> {
 public:  
-  explicit JetMetUncertainty(const edm::ParameterSet &iConfig);
+  explicit JetUncertaintyEvaluator(const edm::ParameterSet &iConfig);
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
   
 private:
@@ -62,6 +62,6 @@ class JetMetUncertainty: public edm::stream::EDProducer<> {
   CLHEP::HepRandomEngine* rng_;
 };
 
-#endif // JetMetUncertainty_H
+#endif // JetUncertaintyEvaluater_H
 
 
diff --git a/nanoAOD/python/JetMetUncertainty_cff.py b/nanoAOD/python/JetMetUncertainty_cff.py
index cd72887e..71e87cf3 100644
--- a/nanoAOD/python/JetMetUncertainty_cff.py
+++ b/nanoAOD/python/JetMetUncertainty_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 from  PhysicsTools.NanoAOD.common_cff import *
 
-jetUncEvaluatorTable = cms.EDProducer("JetMetUncertainty",
+jetUncEvaluatorTable = cms.EDProducer("JetUncertaintyEvaluator",
   src = cms.InputTag("linkedObjects","jets"),
   rho = cms.InputTag('fixedGridRhoFastjetAll'), 
   payloadName  = cms.string('AK4PFchs'),