[RFC] Namespace fix and docblocks