Change env var names to avoid global naming conflicts