diff --git a/scripts-available/CDB_GhostTables.sql b/scripts-available/CDB_GhostTables.sql
index 91468f1..cb48e88 100644
--- a/scripts-available/CDB_GhostTables.sql
+++ b/scripts-available/CDB_GhostTables.sql
@@ -53,7 +53,7 @@ AS $$
     username TEXT;
     db_name TEXT;
   BEGIN
-    EXECUTE 'SELECT CDB_Username();' INTO username;
+    EXECUTE 'SELECT cartodb.CDB_Username();' INTO username;
     EXECUTE 'SELECT current_database();' INTO db_name;
 
     PERFORM cartodb._CDB_LinkGhostTables(username, db_name, event_name);
diff --git a/scripts-available/CDB_Username.sql b/scripts-available/CDB_Username.sql
index 9c6a5bc..71dcfa6 100644
--- a/scripts-available/CDB_Username.sql
+++ b/scripts-available/CDB_Username.sql
@@ -1,6 +1,6 @@
 -- Returns the cartodb username of the current PostgreSQL session
-CREATE OR REPLACE FUNCTION CDB_Username()
+CREATE OR REPLACE FUNCTION cartodb.CDB_Username()
 RETURNS text
 AS $$
-  SELECT CDB_Conf_GetConf(CONCAT('api_keys_', session_user))->>'username';
+  SELECT cartodb.CDB_Conf_GetConf(CONCAT('api_keys_', session_user))->>'username';
 $$ LANGUAGE SQL STABLE PARALLEL SAFE SECURITY DEFINER;