Update namespace and doc