Cleaning up class names.