un-camelcase a bunch of names, no functional changes