diff --git a/wau/addons.py b/wau/addons.py
index 3f855ac..076dd30 100644
--- a/wau/addons.py
+++ b/wau/addons.py
@@ -124,9 +124,9 @@ def find_addon_dirs(path: Path) -> Dict[str, Path]:
 def toc_stem(toc: str):
     """
     Removes AddOn .toc client version suffixes, such as '-Classic.toc' or '-BCC.toc'.
-    See https://github.com/Stanzilla/WoWUIBugs/issues/68#issuecomment-830351390 for more information.
+    See https://github.com/Stanzilla/WoWUIBugs/issues/68#issuecomment-889431675 for more information.
     """
-    return re.sub(r"(.*)-(BCC|Classic|Mainline)(\.toc)", r"\1\3", toc)
+    return re.sub(r"(.*)[_-](Classic|Vanilla|BCC|TBC|Mainline)(\.toc)", r"\1\3", toc)
 
 
 def get_valid_dir_filename(s: str) -> str: