Renamed class for removal of EC2