Makes all of the naming consistent with our code style, and makes parameters match their header equivalents. Essentially just a clean-up of things that weren't migrated over already.
5d42f31539