Fixed a couple more minor naming errors.