Renamed classes.

Renamed classes to be clear.