Renamed some classes for clarity