Clarify imports (update NAMESPACE).