Some renaming.
Refactoring, some conveniences applied/implemented.