Renamed aws varibles to be consistent with standards