Standardize class names