diff --git a/css/app.css b/css/app.css
index 85315f609..dd151ef46 100644
--- a/css/app.css
+++ b/css/app.css
@@ -674,7 +674,7 @@ div.combobox {
     border-right: none;
 }
 
-.preset-input .addr-streetname {
+.preset-input .addr-street {
     width: 80%;
 }
 
diff --git a/js/id/ui/preset/address.js b/js/id/ui/preset/address.js
index 945b634bd..054d9647d 100644
--- a/js/id/ui/preset/address.js
+++ b/js/id/ui/preset/address.js
@@ -56,12 +56,12 @@ iD.ui.preset.address = function() {
 
         var streetwrap = selection.append('span')
             .attr('class', 'input-wrap-position')
-            .datum({ 'key': 'addr:streetname' });
+            .datum({ 'key': 'addr:street' });
 
         streetwrap.append('input')
             .property('type', 'text')
             .attr('placeholder', 'Oak Street')
-            .attr('class', 'addr-streetname')
+            .attr('class', 'addr-street')
             .on('blur', change)
             .on('change', change);