Per component capability namespaces

Merged with upstream, so it should be able to automerge now