changed class names