Updated references to environment variables.