Renamed classes to remove Haiti centricity