Fix conflicting namespace