remove unneeded qualifiers, add namespaces