Fix environment variables names