naming issues fixed