Fix class CamelCase naming for non underscore names