diff --git a/server/extension/sql/20_geocode_street.sql b/server/extension/sql/20_geocode_street.sql
index b89acdd..314d899 100644
--- a/server/extension/sql/20_geocode_street.sql
+++ b/server/extension/sql/20_geocode_street.sql
@@ -148,7 +148,7 @@ RETURNS Geometry AS $$
   from cartodb_services.refactor.tools.redis_mock import RedisConnectionMock
   from cartodb_services.refactor.storage.redis_config import RedisMetadataConnectionConfigBuilder, RedisMetricsConnectionConfigBuilder
   from cartodb_services.refactor.storage.redis_connection import RedisConnectionBuilder
-  from cartodb_services.refactor.service.mapzen_geocoder import MapzenGeocoderConfigBuilder
+  from cartodb_services.refactor.service.mapzen_geocoder_config import MapzenGeocoderConfigBuilder
   from cartodb_services.refactor.core.environment import Environment
 
   server_config_storage = InDbServerConfigStorage()
diff --git a/server/lib/python/cartodb_services/cartodb_services/refactor/service/mapzen_geocoder.py b/server/lib/python/cartodb_services/cartodb_services/refactor/service/mapzen_geocoder_config.py
similarity index 98%
rename from server/lib/python/cartodb_services/cartodb_services/refactor/service/mapzen_geocoder.py
rename to server/lib/python/cartodb_services/cartodb_services/refactor/service/mapzen_geocoder_config.py
index 2db5784..71e2d35 100644
--- a/server/lib/python/cartodb_services/cartodb_services/refactor/service/mapzen_geocoder.py
+++ b/server/lib/python/cartodb_services/cartodb_services/refactor/service/mapzen_geocoder_config.py
@@ -1,6 +1,5 @@
 from dateutil.parser import parse as date_parse
 
-# TODO: rename this file
 class MapzenGeocoderConfig(object):
     """
     Value object that represents the configuration needed to operate the mapzen service.
@@ -86,7 +85,7 @@ class MapzenGeocoderConfigBuilder(object):
         self._org_conf = org_conf
         self._username = username
         self._orgname = orgname
-        
+
 
     def get(self):
         mapzen_server_conf = self._server_conf.get('mapzen_conf')
@@ -96,7 +95,7 @@ class MapzenGeocoderConfigBuilder(object):
         soft_geocoding_limit = self._user_conf.get('soft_geocoding_limit')
 
         cost_per_hit=0
-        
+
         period_end_date_str = self._org_conf.get('period_end_date') or self._user_conf.get('period_end_date')
         period_end_date = date_parse(period_end_date_str)