Class renaming

Reports a few commits from the PR #183