Cleaning up some naming issues that weren't standardized.