Renamed amazon to aws #6444