Tweaking env var names used.