restore _maybe_match_name