Changed format AMI mapping to use id rather than ID, and to include the name
9.0.0