CDK-140: Add namespaces

Nit: javadoc order typically matches parameter order in the method.