Refactor the naming.