Changed AWS related environment variable names.