changed class names and name