Fixed env var names