CDK-140: Add namespaces

So long as we resolve it before 0.17, that's fine.