Fixed minor naming issues