AMI Naming fix