Renamed classes to reflect what they actually do