Namespace adjustments