Add a namespace prefix of "default" for namespaces with no prefix and refactor to simplify namespace mappings