Resolved possible namespace conflicts