Fix naming conflicts with environment variables