Updated specs to use the new AWS::SERVICES format.