Renaming some things.
More refactor.