Improving namespace logic.