Fixing some env variable names.