diff --git a/client/sql/20_table_augmentation.sql b/client/sql/20_table_augmentation.sql
index 16a595b..d626773 100644
--- a/client/sql/20_table_augmentation.sql
+++ b/client/sql/20_table_augmentation.sql
@@ -1,5 +1,5 @@
-CREATE TYPE ds_fdw_metadata as (schemaname text, tabname text, servername text);
-CREATE TYPE ds_return_metadata as (colnames text[], coltypes text[]);
+CREATE TYPE cdb_dataservices_client.ds_fdw_metadata as (schemaname text, tabname text, servername text);
+CREATE TYPE cdb_dataservices_client.ds_return_metadata as (colnames text[], coltypes text[]);
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_client.OBS_ProcessTable(table_name text, output_table_name text, params json)
 RETURNS boolean AS $$
diff --git a/server/extension/sql/125_data_observatory_table_augment.sql b/server/extension/sql/125_data_observatory_table_augment.sql
index ba32c3c..bfe0cb6 100644
--- a/server/extension/sql/125_data_observatory_table_augment.sql
+++ b/server/extension/sql/125_data_observatory_table_augment.sql
@@ -1,5 +1,5 @@
-CREATE TYPE ds_fdw_metadata as (schemaname text, tabname text, servername text);
-CREATE TYPE ds_return_metadata as (colnames text[], coltypes text[]);
+CREATE TYPE cdb_dataservices_server.ds_fdw_metadata as (schemaname text, tabname text, servername text);
+CREATE TYPE cdb_dataservices_server.ds_return_metadata as (colnames text[], coltypes text[]);
 
 
 CREATE OR REPLACE FUNCTION cdb_dataservices_server.OBS_ConnectUserTable(username text, useruuid text, input_schema text, dbname text, table_name text)