Renaming some things for consistency