Renamed some classes for code clarity.