fix minor naming issues