diff --git a/contrib/babelfishpg_tsql/sql/sys_functions.sql b/contrib/babelfishpg_tsql/sql/sys_functions.sql
index 5817a23702..ae695d3700 100644
--- a/contrib/babelfishpg_tsql/sql/sys_functions.sql
+++ b/contrib/babelfishpg_tsql/sql/sys_functions.sql
@@ -1066,7 +1066,7 @@ END;
 $BODY$
 LANGUAGE 'plpgsql' STABLE;
 
-CREATE OR REPLACE FUNCTION typeproperty(
+CREATE OR REPLACE FUNCTION sys.typeproperty(
     typename sys.VARCHAR,
     property sys.VARCHAR
     )
diff --git a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--3.3.0--3.4.0.sql b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--3.3.0--3.4.0.sql
index b78713d9e2..b3d62e6562 100644
--- a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--3.3.0--3.4.0.sql
+++ b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--3.3.0--3.4.0.sql
@@ -637,7 +637,7 @@ CREATE OR REPLACE VIEW information_schema_tsql.key_column_usage AS
 	;
 GRANT SELECT ON information_schema_tsql.key_column_usage TO PUBLIC;
 
-CREATE OR REPLACE FUNCTION typeproperty(
+CREATE OR REPLACE FUNCTION sys.typeproperty(
     typename sys.VARCHAR,
     property sys.VARCHAR
     )
diff --git a/test/JDBC/expected/sys-table_types-dep-vu-cleanup.out b/test/JDBC/expected/sys-table_types-dep-vu-cleanup.out
index b591d0dff6..85748d61de 100644
--- a/test/JDBC/expected/sys-table_types-dep-vu-cleanup.out
+++ b/test/JDBC/expected/sys-table_types-dep-vu-cleanup.out
@@ -1,5 +1,6 @@
 drop procedure sys_table_types_dep_vu_prepare_p1
 drop function sys_table_types_dep_vu_prepare_f1
 drop view sys_table_types_dep_vu_prepare_v1
+drop view sys_table_types_dep_vu_prepare_v2
 drop type sys_table_types_dep_vu_prepare_tt
 GO
diff --git a/test/JDBC/expected/sys-table_types-dep-vu-prepare.out b/test/JDBC/expected/sys-table_types-dep-vu-prepare.out
index 20bfa9efbd..455735cb76 100644
--- a/test/JDBC/expected/sys-table_types-dep-vu-prepare.out
+++ b/test/JDBC/expected/sys-table_types-dep-vu-prepare.out
@@ -17,3 +17,7 @@ GO
 create view sys_table_types_dep_vu_prepare_v1 as
     select count(*) from sys.table_types where name = 'sys_table_types_dep_vu_prepare_tt'
 GO
+
+create view sys_table_types_dep_vu_prepare_v2 as
+    select is_nullable from sys.table_types where name = 'sys_table_types_dep_vu_prepare_tt'
+GO
diff --git a/test/JDBC/expected/sys-table_types-dep-vu-verify.out b/test/JDBC/expected/sys-table_types-dep-vu-verify.out
index 6f08278187..09bfe2aeec 100644
--- a/test/JDBC/expected/sys-table_types-dep-vu-verify.out
+++ b/test/JDBC/expected/sys-table_types-dep-vu-verify.out
@@ -22,3 +22,11 @@ int
 1
 ~~END~~
 
+
+select * from sys_table_types_dep_vu_prepare_v2
+GO
+~~START~~
+bit
+0
+~~END~~
+
diff --git a/test/JDBC/expected/sys-types-dep-vu-prepare.out b/test/JDBC/expected/sys-types-dep-vu-prepare.out
index b42877e088..15c810fcf0 100644
--- a/test/JDBC/expected/sys-types-dep-vu-prepare.out
+++ b/test/JDBC/expected/sys-types-dep-vu-prepare.out
@@ -23,3 +23,6 @@ CREATE VIEW sys_types_dep_vu_prepare_v1 AS
     SELECT count(*) FROM sys.types WHERE name = 'sys_types_dep_vu_prepare_ty1'
 GO
 
+CREATE VIEW sys_types_dep_vu_prepare_v2 AS
+    SELECT is_nullable FROM sys.types WHERE name = 'sys_types_dep_vu_prepare_ty1'
+GO
diff --git a/test/JDBC/expected/sys-types-dep-vu-verify.out b/test/JDBC/expected/sys-types-dep-vu-verify.out
index 44b3224b58..77a89e2263 100644
--- a/test/JDBC/expected/sys-types-dep-vu-verify.out
+++ b/test/JDBC/expected/sys-types-dep-vu-verify.out
@@ -24,3 +24,11 @@ int
 1
 ~~END~~
 
+
+SELECT * FROM sys_types_dep_vu_prepare_v2
+GO
+~~START~~
+bit
+1
+~~END~~
+
diff --git a/test/JDBC/input/views/sys-table_types-dep-vu-cleanup.mix b/test/JDBC/input/views/sys-table_types-dep-vu-cleanup.mix
index a7dd837bd0..69f4311226 100644
--- a/test/JDBC/input/views/sys-table_types-dep-vu-cleanup.mix
+++ b/test/JDBC/input/views/sys-table_types-dep-vu-cleanup.mix
@@ -1,5 +1,6 @@
 drop procedure sys_table_types_dep_vu_prepare_p1
 drop function sys_table_types_dep_vu_prepare_f1
 drop view sys_table_types_dep_vu_prepare_v1
+drop view sys_table_types_dep_vu_prepare_v2
 drop type sys_table_types_dep_vu_prepare_tt
 GO
\ No newline at end of file
diff --git a/test/JDBC/input/views/sys-table_types-dep-vu-prepare.mix b/test/JDBC/input/views/sys-table_types-dep-vu-prepare.mix
index 20bfa9efbd..042cad1086 100644
--- a/test/JDBC/input/views/sys-table_types-dep-vu-prepare.mix
+++ b/test/JDBC/input/views/sys-table_types-dep-vu-prepare.mix
@@ -17,3 +17,7 @@ GO
 create view sys_table_types_dep_vu_prepare_v1 as
     select count(*) from sys.table_types where name = 'sys_table_types_dep_vu_prepare_tt'
 GO
+
+create view sys_table_types_dep_vu_prepare_v2 as
+    select is_nullable from sys.table_types where name = 'sys_table_types_dep_vu_prepare_tt'
+GO
\ No newline at end of file
diff --git a/test/JDBC/input/views/sys-table_types-dep-vu-verify.mix b/test/JDBC/input/views/sys-table_types-dep-vu-verify.mix
index 3eccab8cf9..fae666481b 100644
--- a/test/JDBC/input/views/sys-table_types-dep-vu-verify.mix
+++ b/test/JDBC/input/views/sys-table_types-dep-vu-verify.mix
@@ -7,3 +7,6 @@ GO
 
 select * from sys_table_types_dep_vu_prepare_v1
 GO
+
+select * from sys_table_types_dep_vu_prepare_v2
+GO
\ No newline at end of file
diff --git a/test/JDBC/input/views/sys-types-dep-vu-prepare.sql b/test/JDBC/input/views/sys-types-dep-vu-prepare.sql
index b42877e088..b383ca3ef7 100644
--- a/test/JDBC/input/views/sys-types-dep-vu-prepare.sql
+++ b/test/JDBC/input/views/sys-types-dep-vu-prepare.sql
@@ -23,3 +23,6 @@ CREATE VIEW sys_types_dep_vu_prepare_v1 AS
     SELECT count(*) FROM sys.types WHERE name = 'sys_types_dep_vu_prepare_ty1'
 GO
 
+CREATE VIEW sys_types_dep_vu_prepare_v2 AS
+    SELECT is_nullable FROM sys.types WHERE name = 'sys_types_dep_vu_prepare_ty1'
+GO
\ No newline at end of file
diff --git a/test/JDBC/input/views/sys-types-dep-vu-verify.sql b/test/JDBC/input/views/sys-types-dep-vu-verify.sql
index 4752ee5513..7493093776 100644
--- a/test/JDBC/input/views/sys-types-dep-vu-verify.sql
+++ b/test/JDBC/input/views/sys-types-dep-vu-verify.sql
@@ -9,3 +9,6 @@ GO
 
 SELECT * FROM sys_types_dep_vu_prepare_v1
 GO
+
+SELECT * FROM sys_types_dep_vu_prepare_v2
+GO