Allow alternative env var name to be specified

...and do such in such a way as to not break backwards compatibility.