diff --git a/scripts-available/CDB_Overviews.sql b/scripts-available/CDB_Overviews.sql
index 2eafbf1..216c294 100644
--- a/scripts-available/CDB_Overviews.sql
+++ b/scripts-available/CDB_Overviews.sql
@@ -66,7 +66,7 @@ AS $$
     FROM
       @extschema@._CDB_UserTablesInSchema(), unnest(tables) base_table
     WHERE
-      schema_name = _cdb_schema_name(base_table)
+      schema_name = @extschema@._cdb_schema_name(base_table)
       AND @extschema@._CDB_IsOverviewTableOf((SELECT relname FROM pg_class WHERE oid=base_table), table_name)
     ORDER BY base_table, z;
 $$ LANGUAGE SQL STABLE PARALLEL SAFE;
diff --git a/scripts-available/CDB_TableMetadata.sql b/scripts-available/CDB_TableMetadata.sql
index 849359e..4d68831 100644
--- a/scripts-available/CDB_TableMetadata.sql
+++ b/scripts-available/CDB_TableMetadata.sql
@@ -124,7 +124,7 @@ DROP TRIGGER IF EXISTS table_modified ON @extschema@.CDB_TableMetadata;
 --       oid (regclass) to its name
 CREATE TRIGGER table_modified AFTER INSERT OR UPDATE
 ON @extschema@.CDB_TableMetadata FOR EACH ROW EXECUTE PROCEDURE
- _CDB_TableMetadata_Updated();
+    @extschema@._CDB_TableMetadata_Updated();
 
 
 -- similar to TOUCH(1) in unix filesystems but for table in cdb_tablemetadata