Fixed env variable names