More progress eliminating camel case.