Fixed more namespace conflicts