Namespace improvement.