minor naming issues