Fixing conflicting namespace