make the naming consistent