diff --git a/server/extension/cdb_geocoder_server--0.2.0.sql b/server/extension/cdb_geocoder_server--0.2.0.sql
index 7429649..283d18a 100644
--- a/server/extension/cdb_geocoder_server--0.2.0.sql
+++ b/server/extension/cdb_geocoder_server--0.2.0.sql
@@ -66,7 +66,7 @@ RETURNS boolean AS $$
     return False
   else:
     import json
-    from cartodb_services.quota import GeocoderConfig
+    from cartodb_services.metrics import GeocoderConfig
     plpy.execute("SELECT cdb_geocoder_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metadata_connection']
     heremaps_conf_json = plpy.execute("SELECT cartodb.CDB_Conf_GetConf('heremaps_conf') as heremaps_conf", 1)[0]['heremaps_conf']
@@ -105,7 +105,7 @@ $$ LANGUAGE plpythonu;
 CREATE OR REPLACE FUNCTION cdb_geocoder_server._cdb_here_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
 RETURNS Geometry AS $$
   from cartodb_services.here import HereMapsGeocoder
-  from cartodb_services.quota import QuotaService
+  from cartodb_services.metrics import QuotaService
 
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
   user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]
@@ -140,7 +140,7 @@ $$ LANGUAGE plpythonu;
 CREATE OR REPLACE FUNCTION cdb_geocoder_server._cdb_google_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
 RETURNS Geometry AS $$
   from cartodb_services.google import GoogleMapsGeocoder
-  from cartodb_services.quota import QuotaService
+  from cartodb_services.metrics import QuotaService
 
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
   user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]
diff --git a/server/extension/sql/0.2.0/15_config_helper.sql b/server/extension/sql/0.2.0/15_config_helper.sql
index 0f33450..cdf9242 100644
--- a/server/extension/sql/0.2.0/15_config_helper.sql
+++ b/server/extension/sql/0.2.0/15_config_helper.sql
@@ -6,7 +6,7 @@ RETURNS boolean AS $$
     return False
   else:
     import json
-    from cartodb_services.quota import GeocoderConfig
+    from cartodb_services.metrics import GeocoderConfig
     plpy.execute("SELECT cdb_geocoder_server._connect_to_redis('{0}')".format(username))
     redis_conn = GD["redis_connection_{0}".format(username)]['redis_metadata_connection']
     heremaps_conf_json = plpy.execute("SELECT cartodb.CDB_Conf_GetConf('heremaps_conf') as heremaps_conf", 1)[0]['heremaps_conf']
diff --git a/server/extension/sql/0.2.0/20_geocode_street.sql b/server/extension/sql/0.2.0/20_geocode_street.sql
index b05e168..54eb175 100644
--- a/server/extension/sql/0.2.0/20_geocode_street.sql
+++ b/server/extension/sql/0.2.0/20_geocode_street.sql
@@ -20,7 +20,7 @@ $$ LANGUAGE plpythonu;
 CREATE OR REPLACE FUNCTION cdb_geocoder_server._cdb_here_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
 RETURNS Geometry AS $$
   from cartodb_services.here import HereMapsGeocoder
-  from cartodb_services.quota import QuotaService
+  from cartodb_services.metrics import QuotaService
 
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
   user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]
@@ -55,7 +55,7 @@ $$ LANGUAGE plpythonu;
 CREATE OR REPLACE FUNCTION cdb_geocoder_server._cdb_google_geocode_street_point(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
 RETURNS Geometry AS $$
   from cartodb_services.google import GoogleMapsGeocoder
-  from cartodb_services.quota import QuotaService
+  from cartodb_services.metrics import QuotaService
 
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
   user_geocoder_config = GD["user_geocoder_config_{0}".format(username)]