Renamed classes to make them less verbose.