restructuring the class names to be more accurate