Renaming some things to clarify their function.