Fix the namespace conflict