Fixed a handful of naming inconsistencies.