Make env variables more consistent