added support for default AWS CLI env naming convention