Rename cf-aws-template to be consistent with all releases