Naming issues fixed