Class renaming

Fixes #139