More ID to CamelCase changes