Rename class names