More renaming and refactoring