update to follow naming for variables hadronic vs hadrons+leptons