Namespace adjustment