Standardise env var names