Issue #80: More renaming and minor refactoring