sanitized resolve_namespace mess