Simplify camel-case normalization