Fix the namespace conflicts that will occur