Make env variable names consistent