Renamed classes to better fit their usage.