diff --git a/HLTrigger/JetMET/interface/HLTJetHbbFilter.h b/HLTrigger/JetMET/interface/HLTJetHbbFilter.h
index 7590ffae8aac7..ecddcf6f72d2d 100644
--- a/HLTrigger/JetMET/interface/HLTJetHbbFilter.h
+++ b/HLTrigger/JetMET/interface/HLTJetHbbFilter.h
@@ -4,7 +4,7 @@
 /** \class HLTJetHbbFilter
  *
  *
- *  This class, based on HLTJetSortedVBFFilter is an HLTFilter (-> EDFilter) 
+ *  This class is an HLTFilter (-> EDFilter) 
  *  implementing a two b-jet invariant mass requirement 
  *  Based on HLTJetSortedVBFFilter
  *
@@ -18,8 +18,8 @@
 #include "DataFormats/BTauReco/interface/JetTag.h"
 #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h"
 #include "HLTrigger/HLTcore/interface/HLTFilter.h"
-#include<string>
-#include<vector>
+#include <string>
+#include <vector>
 #include "DataFormats/Common/interface/RefToBase.h"
 #include "DataFormats/Common/interface/Handle.h"
 namespace edm {
diff --git a/HLTrigger/JetMET/src/HLTJetHbbFilter.cc b/HLTrigger/JetMET/src/HLTJetHbbFilter.cc
index 891c4b58545ea..b3d1bc095d84d 100644
--- a/HLTrigger/JetMET/src/HLTJetHbbFilter.cc
+++ b/HLTrigger/JetMET/src/HLTJetHbbFilter.cc
@@ -6,20 +6,18 @@
  *
  */
 
+#include <vector>
+#include <string>
 
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
 #include "DataFormats/Math/interface/deltaR.h"
 #include "DataFormats/Common/interface/RefToBase.h"
 #include "HLTrigger/JetMET/interface/HLTJetHbbFilter.h"
-
-#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
-#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-
-#include<vector>
-#include<string>
-#include<typeinfo>
+#include "HLTrigger/HLTcore/interface/defaultModuleLabel.h"
 
 using namespace std;
 //
@@ -72,7 +70,7 @@ HLTJetHbbFilter<T>::fillDescriptions(edm::ConfigurationDescriptions& description
   desc.add<double>("minTag2",0.4);
   desc.add<double>("maxTag",9999.0);
   desc.add<int>("triggerType",trigger::TriggerJet);
-  descriptions.add(string("hlt")+string(typeid(HLTJetHbbFilter<T>).name()),desc);
+  descriptions.add(defaultModuleLabel<HLTJetHbbFilter<T>>(), desc);
 }
 
 template<typename T> float HLTJetHbbFilter<T>::findCSV(const typename std::vector<T>::const_iterator & jet, const reco::JetTagCollection  & jetTags){