Clean up class names