refactor namespace change