More renaming and refactoring.
.
.