[cirpass2 review] Unify Namespaces

See Unify Namespaces:

1. 30 terms appear as duplicates in different namespaces, resulting in 96 occurrences (same localname, different namespace) Merge them all to core and don't recast the namespace. I think this is pretty uncontroversial.
2. Better yet, unify all namespaces to just untp: This is a more controversial suggestion since some will argue that impinges on "modularity". I personally think the benefits of modularity can still be reaped, even if a single namespace is used. There are only 240 total terms, so that's not too many for a single namespace.