Remove `Class` suffix

This PR builds on work in #16, and should be merged after #16 is merged to minimise conflicts.