Eliminated the Amazon environment names, since we're not going to AWS
after all.