Correct exception names, s/amazon/amazonaws/