Fix namespace conflicts