Simplify namespace