Renamed classes for better ordering