Rename classes for posterity (and to avoid name collisions)

This is a fix for my first pull request, in which I named the classes improperly.