Made the naming consistent