diff --git a/build.js b/build.js
index 87b7ffdc2..993cea44f 100644
--- a/build.js
+++ b/build.js
@@ -5,7 +5,8 @@ var fs = require('fs'),
     _ = require('./js/lib/lodash'),
     jsonschema = require('jsonschema'),
     fieldSchema = require('./data/presets/schema/field.json'),
-    presetSchema = require('./data/presets/schema/preset.json');
+    presetSchema = require('./data/presets/schema/preset.json'),
+    suggestions = require('./data/name-suggestions.json');
 
 function readtxt(f) {
     return fs.readFileSync(f, 'utf8');
@@ -104,6 +105,32 @@ function generatePresets() {
         presets[id] = preset;
     });
 
+    // for each suggestion make preset with name, geometry, tags
+    for (var key in suggestions) {
+        for (var value in suggestions[key]) {
+            for (var name in suggestions[key][value]) {
+                var item = key + '/' + value + '/' + name;
+                presets[item] = {
+                    geometry: [
+                        'point',
+                        'area'
+                    ],
+                    tags: {},
+                    name: name,
+                    icon: value
+                };
+
+                presets[item].tags[key] = value;
+                presets[item].tags.name = name;
+
+                for (var tag in suggestions[key][value][name]) {
+                    if (tag !== 'count')
+                        presets[item].tags[tag] = suggestions[key][value][name][tag];
+                }
+            }
+        }
+    }
+
     fs.writeFileSync('data/presets/presets.json', stringify(presets));
 
     var presetsYaml = _.cloneDeep(translations);
diff --git a/js/id/presets/preset.js b/js/id/presets/preset.js
index 634bdd81a..4f2b42d07 100644
--- a/js/id/presets/preset.js
+++ b/js/id/presets/preset.js
@@ -34,8 +34,9 @@ iD.presets.Preset = function(id, preset, fields) {
         return t('presets.presets.' + id + '.' + scope, options);
     };
 
+    var name = preset.name;
     preset.name = function() {
-        return preset.t('name', {'default': id});
+        return preset.t('name', {'default': name});
     };
 
     preset.terms = function() {