solve the naming problem