Renamed classes to better indicate their purpose.