Correct interface names and ns docstrings