Convert some class names to CamelCase: forgotten files