Change envvar references