Renamed classes for better debugging