Changed env variable names