renaming some things in preparation for other things