Minor changes in AWS 1.9.0 support

proper naming convention, valid key names and values