Make the naming consistent