Some further renaming and minor refactoring.
minor fixups.