diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index 669d40e4f..06b58fafa 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -15,7 +15,7 @@ export {
 
 export function uiFieldCombo(field, context) {
     var dispatch = d3.dispatch('change'),
-        nominatim = services.nominatim,
+        nominatim = services.geocoder,
         taginfo = services.taginfo,
         isMulti = (field.type === 'multiCombo'),
         isNetwork = (field.type === 'networkCombo'),
diff --git a/modules/ui/fields/input.js b/modules/ui/fields/input.js
index 1b343de8c..9faf7597f 100644
--- a/modules/ui/fields/input.js
+++ b/modules/ui/fields/input.js
@@ -15,7 +15,7 @@ export {
 
 export function uiFieldText(field, context) {
     var dispatch = d3.dispatch('change'),
-        nominatim = services.nominatim,
+        nominatim = services.geocoder,
         input,
         entity;
 
diff --git a/test/spec/services/nominatim.js b/test/spec/services/nominatim.js
index a64d4ddb1..df3a098e9 100644
--- a/test/spec/services/nominatim.js
+++ b/test/spec/services/nominatim.js
@@ -3,7 +3,7 @@ describe('iD.serviceNominatim', function() {
 
     beforeEach(function() {
         server = sinon.fakeServer.create();
-        nominatim = iD.services.nominatim;
+        nominatim = iD.services.geocoder;
         nominatim.reset();
     });