Renamed classes for new autoloader