simplify namespace handling