Update namespace handling.