diff --git a/shared/tools/tokenover b/shared/tools/tokenover
index feccdd8f..f620ac97 100755
--- a/shared/tools/tokenover
+++ b/shared/tools/tokenover
@@ -15,25 +15,25 @@ else
     /bin/echo "\begin{tabular}{l|c|c|c|}"
     /bin/echo "&\textit{italic}&\texttt{fixed}&default\\\\\hline"
     /bin/echo -n "\\tokenAlNum&N ("
-    cd ${SLPS}/topics/$1 ; make debug | grep -c "ITA ALNUM"
+    cd ${SLPS}/topics/$1 ; make debug | grep -c "ITA NONW ALNUM"
     /bin/echo -n ") &T ("
-    cd ${SLPS}/topics/$1 ; make debug | grep -c "FIX ALNUM"
+    cd ${SLPS}/topics/$1 ; make debug | grep -c "FIX NONW ALNUM"
     /bin/echo -n ")&T? ("
-    cd ${SLPS}/topics/$1 ; make debug | grep -c "DEF ALNUM"
+    cd ${SLPS}/topics/$1 ; make debug | grep -c "DEF NONW ALNUM"
     /bin/echo ")\\\\"
     /bin/echo -n "\\tokenBar&M ("
-    cd ${SLPS}/topics/$1 ; make debug | grep -c "ITA BNBAR"
+    cd ${SLPS}/topics/$1 ; make debug | grep -c "ITA NONW BNBAR"
     /bin/echo -n ") &T ("
-    cd ${SLPS}/topics/$1 ; make debug | grep -c "FIX BNBAR"
+    cd ${SLPS}/topics/$1 ; make debug | grep -c "FIX NONW BNBAR"
     /bin/echo -n ")&M? ("
-    cd ${SLPS}/topics/$1 ; make debug | grep -c "DEF BNBAR"
+    cd ${SLPS}/topics/$1 ; make debug | grep -c "DEF NONW BNBAR"
     /bin/echo ")\\\\"
     /bin/echo -n "\\tokenMeta&M ("
-    cd ${SLPS}/topics/$1 ; make debug | grep -c "ITA METAS"
+    cd ${SLPS}/topics/$1 ; make debug | grep -c "ITA NONW METAS"
     /bin/echo -n ") &T ("
-    cd ${SLPS}/topics/$1 ; make debug | grep -c "FIX METAS"
+    cd ${SLPS}/topics/$1 ; make debug | grep -c "FIX NONW METAS"
     /bin/echo -n ")&T? ("
-    cd ${SLPS}/topics/$1 ; make debug | grep -c "DEF METAS"
+    cd ${SLPS}/topics/$1 ; make debug | grep -c "DEF NONW METAS"
     /bin/echo ")\\\\"
     /bin/echo -n "\\tokenOther&T ("
     cd ${SLPS}/topics/$1 ; make debug | grep -c "ITA WEIRD"