Renaming some things to make the new linter happy