Changed environment variable names and defaults