Did some renaming and refactoring.