Ensure namespace tree branches join up