nameing cleanup