added Hcal prefix to the classes