Correct names for AWS