fixing minor naming issues