Index: trunk/resources/data/validator/highway.mapcss
===================================================================
--- trunk/resources/data/validator/highway.mapcss	(revision 17387)
+++ trunk/resources/data/validator/highway.mapcss	(revision 17388)
@@ -9,5 +9,6 @@
 }
 
-way[highway][name =~ /(?i).* (Ave|Blvd|Br|Brg|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pky|Pkwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)[.]?$/] {
+/* r3669, #9384, #20117 */
+way[highway][name =~ /(?i).* (Ave|Blvd|Bnd|Br|Brg|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Cv|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pky|Pkwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Trl|Vw|Wy|Xing)[.]?$/] {
   throwWarning: tr("abbreviated street name");
   assertMatch: "way highway=unclassified name=\"Foo Ave\"";