Renamed class to make it API Compliant