7636: refactor namespace