7641: refactor namespace (4)