Refactor namespace use.