7639: refactor namespace (3)