Modify namespaces and documentation