Renamed key classes to make things clearer about what they do.