Change of class names

names changed