Fixing the environment variable names.