Refactor namespace usage.