Fix environment variable names