Changed names to the classes