JFUSION-149 #comment renamed some more classes!!!