refactor the naming