Refine namespace usage.