Renamed some classes to help readability.