Further renaming and refactoring.