diff --git a/scripts-available/CDB_Groups.sql b/scripts-available/CDB_Groups.sql
index 439431c..d569dd3 100644
--- a/scripts-available/CDB_Groups.sql
+++ b/scripts-available/CDB_Groups.sql
@@ -33,8 +33,14 @@ $$ LANGUAGE PLPGSQL VOLATILE;
 CREATE OR REPLACE
 FUNCTION cartodb.CDB_Group_RenameGroup(old_group_name text, new_group_name text)
     RETURNS VOID AS $$
+DECLARE
+    old_group_role TEXT;
+    new_group_role TEXT;
 BEGIN
-    EXECUTE format('ALTER ROLE "%s" RENAME TO "%s"', cartodb._CDB_Group_GroupRole(old_group_name), cartodb._CDB_Group_GroupRole(new_group_name));
+    old_group_role = cartodb._CDB_Group_GroupRole(old_group_name);
+    new_group_role = cartodb._CDB_Group_GroupRole(new_group_name);
+    EXECUTE format('ALTER ROLE "%s" RENAME TO "%s"', old_group_role, new_group_role);
+    PERFORM cartodb._CDB_Group_RenameGroup_API(current_database(), old_group_name, new_group_name, new_group_role);
 END
 $$ LANGUAGE PLPGSQL VOLATILE;
 
diff --git a/scripts-available/CDB_Groups_API.sql b/scripts-available/CDB_Groups_API.sql
index 7e70171..be3583d 100644
--- a/scripts-available/CDB_Groups_API.sql
+++ b/scripts-available/CDB_Groups_API.sql
@@ -46,6 +46,29 @@ $$
       raise err
 $$ LANGUAGE 'plpythonu' VOLATILE;
 
+CREATE OR REPLACE
+FUNCTION cartodb._CDB_Group_RenameGroup_API(database_name text, old_group_name text, new_group_name text, new_group_role text)
+    RETURNS VOID AS
+$$
+    import httplib
+    import string
+
+    try:
+      params = plpy.execute("select c.host, c.port, c.timeout, c.auth from cartodb._CDB_Group_API_Conf() c;")[0]
+      if params['host'] is None:
+        return
+
+      client = httplib.HTTPConnection(params['host'], params['port'], False, params['timeout'])
+      body = '{ "name": "%s", "database_role": "%s" }' % (new_group_name, new_group_role)
+      headers = { 'Authorization': params['auth'], 'Content-Type': 'application/json' }
+      client.request('PUT', '/api/v1/databases/%s/groups/%s' % (database_name, old_group_name), body, headers)
+      response = client.getresponse()
+      assert response.status == 200
+    except Exception as err:
+      plpy.warning('group creation error: ' + str(err))
+      raise err
+$$ LANGUAGE 'plpythonu' VOLATILE;
+
 DO LANGUAGE 'plpgsql' $$
 BEGIN
     DROP FUNCTION IF EXISTS cartodb._CDB_Group_API_Conf();