diff --git a/server/extension/cdb_dataservices_server--0.2.0.sql b/server/extension/cdb_dataservices_server--0.2.0.sql
index e638c40..9c66887 100644
--- a/server/extension/cdb_dataservices_server--0.2.0.sql
+++ b/server/extension/cdb_dataservices_server--0.2.0.sql
@@ -84,7 +84,7 @@ RETURNS boolean AS $$
     return True
 $$ LANGUAGE plpythonu SECURITY DEFINER;
 -- Geocodes a street address given a searchtext and a state and/or country
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_street_point_v2(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_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 $$
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
diff --git a/server/extension/cdb_dataservices_server--0.3.0.sql b/server/extension/cdb_dataservices_server--0.3.0.sql
index 3bad0e2..85119c8 100644
--- a/server/extension/cdb_dataservices_server--0.3.0.sql
+++ b/server/extension/cdb_dataservices_server--0.3.0.sql
@@ -84,7 +84,7 @@ RETURNS boolean AS $$
     return True
 $$ LANGUAGE plpythonu SECURITY DEFINER;
 -- Geocodes a street address given a searchtext and a state and/or country
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_street_point_v2(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_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 $$
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
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 c5a6808..de77f62 100644
--- a/server/extension/sql/0.2.0/20_geocode_street.sql
+++ b/server/extension/sql/0.2.0/20_geocode_street.sql
@@ -1,5 +1,5 @@
 -- Geocodes a street address given a searchtext and a state and/or country
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_street_point_v2(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_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 $$
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
diff --git a/server/extension/sql/0.3.0/15_config_helper.sql b/server/extension/sql/0.3.0/15_config_helper.sql
index ed4e198..0edd87e 100644
--- a/server/extension/sql/0.3.0/15_config_helper.sql
+++ b/server/extension/sql/0.3.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_dataservices_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.3.0/20_geocode_street.sql b/server/extension/sql/0.3.0/20_geocode_street.sql
index cddcd1c..de77f62 100644
--- a/server/extension/sql/0.3.0/20_geocode_street.sql
+++ b/server/extension/sql/0.3.0/20_geocode_street.sql
@@ -1,5 +1,5 @@
 -- Geocodes a street address given a searchtext and a state and/or country
-CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_geocode_street_point_v2(username TEXT, orgname TEXT, searchtext TEXT, city TEXT DEFAULT NULL, state_province TEXT DEFAULT NULL, country TEXT DEFAULT NULL)
+CREATE OR REPLACE FUNCTION cdb_dataservices_server.cdb_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 $$
   plpy.execute("SELECT cdb_dataservices_server._connect_to_redis('{0}')".format(username))
   redis_conn = GD["redis_connection_{0}".format(username)]['redis_metrics_connection']
@@ -20,7 +20,7 @@ $$ LANGUAGE plpythonu;
 CREATE OR REPLACE FUNCTION cdb_dataservices_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_dataservices_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/test/0.2.0/expected/20_street_test.out b/server/extension/test/0.2.0/expected/20_street_test.out
index d57771b..8fbce7a 100644
--- a/server/extension/test/0.2.0/expected/20_street_test.out
+++ b/server/extension/test/0.2.0/expected/20_street_test.out
@@ -3,7 +3,7 @@ SELECT exists(SELECT *
               FROM pg_proc p
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
-              AND proname = 'cdb_geocode_street_point_v2'
+              AND proname = 'cdb_geocode_street_point'
               AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');
  exists 
 --------
diff --git a/server/extension/test/0.2.0/sql/20_street_test.sql b/server/extension/test/0.2.0/sql/20_street_test.sql
index 00674e3..86e0368 100644
--- a/server/extension/test/0.2.0/sql/20_street_test.sql
+++ b/server/extension/test/0.2.0/sql/20_street_test.sql
@@ -3,5 +3,5 @@ SELECT exists(SELECT *
               FROM pg_proc p
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
-              AND proname = 'cdb_geocode_street_point_v2'
+              AND proname = 'cdb_geocode_street_point'
               AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');
diff --git a/server/extension/test/0.3.0/expected/20_street_test.out b/server/extension/test/0.3.0/expected/20_street_test.out
index d57771b..8fbce7a 100644
--- a/server/extension/test/0.3.0/expected/20_street_test.out
+++ b/server/extension/test/0.3.0/expected/20_street_test.out
@@ -3,7 +3,7 @@ SELECT exists(SELECT *
               FROM pg_proc p
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
-              AND proname = 'cdb_geocode_street_point_v2'
+              AND proname = 'cdb_geocode_street_point'
               AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');
  exists 
 --------
diff --git a/server/extension/test/0.3.0/sql/20_street_test.sql b/server/extension/test/0.3.0/sql/20_street_test.sql
index 00674e3..86e0368 100644
--- a/server/extension/test/0.3.0/sql/20_street_test.sql
+++ b/server/extension/test/0.3.0/sql/20_street_test.sql
@@ -3,5 +3,5 @@ SELECT exists(SELECT *
               FROM pg_proc p
               INNER JOIN pg_namespace ns ON (p.pronamespace = ns.oid)
               WHERE ns.nspname = 'cdb_dataservices_server'
-              AND proname = 'cdb_geocode_street_point_v2'
+              AND proname = 'cdb_geocode_street_point'
               AND oidvectortypes(p.proargtypes)  = 'text, text, text, text, text, text');