Changing some class names