standardize on aws_id