more consistent use of env var names, avoid env vars without prefix