Collapsing namespaces into a single data type and sharing between op/svc