diff --git a/modules/validations/suspicious_name.js b/modules/validations/suspicious_name.js
index e03479651..63c0be0f7 100644
--- a/modules/validations/suspicious_name.js
+++ b/modules/validations/suspicious_name.js
@@ -10,7 +10,10 @@ let _discardNameRegexes = [];
 
 export function validationSuspiciousName() {
   const type = 'suspicious_name';
-  const keysToTestForGenericValues = ['amenity', 'building', 'leisure', 'man_made', 'shop', 'tourism'];
+  const keysToTestForGenericValues = [
+    'aerialway', 'aeroway', 'amenity', 'building', 'craft', 'highway',
+    'leisure', 'railway', 'man_made', 'office', 'shop', 'tourism', 'waterway'
+  ];
 
   // A concern here in switching to async data means that `_nsiFilters` will not
   // be available at first, so the data on early tiles may not have tags validated fully.