diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out
index 9d77d6e850..07e06e5bf7 100644
--- a/contrib/postgres_fdw/expected/postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw.out
@@ -9267,12 +9267,12 @@ SELECT * FROM postgres_fdw_get_connections() ORDER BY 1;
 -- =============================================================================
 -- test case for having multiple cached connections for a foreign server
 -- =============================================================================
-CREATE ROLE multi_conn_user1 SUPERUSER;
-CREATE ROLE multi_conn_user2 SUPERUSER;
-CREATE USER MAPPING FOR multi_conn_user1 SERVER loopback;
-CREATE USER MAPPING FOR multi_conn_user2 SERVER loopback;
--- Will cache loopback connection with user mapping for multi_conn_user1
-SET ROLE multi_conn_user1;
+CREATE ROLE regress_multi_conn_user1 SUPERUSER;
+CREATE ROLE regress_multi_conn_user2 SUPERUSER;
+CREATE USER MAPPING FOR regress_multi_conn_user1 SERVER loopback;
+CREATE USER MAPPING FOR regress_multi_conn_user2 SERVER loopback;
+-- Will cache loopback connection with user mapping for regress_multi_conn_user1
+SET ROLE regress_multi_conn_user1;
 SELECT 1 FROM ft1 LIMIT 1;
  ?column? 
 ----------
@@ -9280,8 +9280,8 @@ SELECT 1 FROM ft1 LIMIT 1;
 (1 row)
 
 RESET ROLE;
--- Will cache loopback connection with user mapping for multi_conn_user2
-SET ROLE multi_conn_user2;
+-- Will cache loopback connection with user mapping for regress_multi_conn_user2
+SET ROLE regress_multi_conn_user2;
 SELECT 1 FROM ft1 LIMIT 1;
  ?column? 
 ----------
@@ -9312,10 +9312,10 @@ SELECT * FROM postgres_fdw_get_connections() ORDER BY 1;
 (0 rows)
 
 -- Clean up
-DROP USER MAPPING FOR multi_conn_user1 SERVER loopback;
-DROP USER MAPPING FOR multi_conn_user2 SERVER loopback;
-DROP ROLE multi_conn_user1;
-DROP ROLE multi_conn_user2;
+DROP USER MAPPING FOR regress_multi_conn_user1 SERVER loopback;
+DROP USER MAPPING FOR regress_multi_conn_user2 SERVER loopback;
+DROP ROLE regress_multi_conn_user1;
+DROP ROLE regress_multi_conn_user2;
 -- ===================================================================
 -- batch insert
 -- ===================================================================
diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql
index 62382d1a55..647192cf6a 100644
--- a/contrib/postgres_fdw/sql/postgres_fdw.sql
+++ b/contrib/postgres_fdw/sql/postgres_fdw.sql
@@ -2801,18 +2801,18 @@ SELECT * FROM postgres_fdw_get_connections() ORDER BY 1;
 -- =============================================================================
 -- test case for having multiple cached connections for a foreign server
 -- =============================================================================
-CREATE ROLE multi_conn_user1 SUPERUSER;
-CREATE ROLE multi_conn_user2 SUPERUSER;
-CREATE USER MAPPING FOR multi_conn_user1 SERVER loopback;
-CREATE USER MAPPING FOR multi_conn_user2 SERVER loopback;
+CREATE ROLE regress_multi_conn_user1 SUPERUSER;
+CREATE ROLE regress_multi_conn_user2 SUPERUSER;
+CREATE USER MAPPING FOR regress_multi_conn_user1 SERVER loopback;
+CREATE USER MAPPING FOR regress_multi_conn_user2 SERVER loopback;
 
--- Will cache loopback connection with user mapping for multi_conn_user1
-SET ROLE multi_conn_user1;
+-- Will cache loopback connection with user mapping for regress_multi_conn_user1
+SET ROLE regress_multi_conn_user1;
 SELECT 1 FROM ft1 LIMIT 1;
 RESET ROLE;
 
--- Will cache loopback connection with user mapping for multi_conn_user2
-SET ROLE multi_conn_user2;
+-- Will cache loopback connection with user mapping for regress_multi_conn_user2
+SET ROLE regress_multi_conn_user2;
 SELECT 1 FROM ft1 LIMIT 1;
 RESET ROLE;
 
@@ -2827,10 +2827,10 @@ SELECT postgres_fdw_disconnect('loopback');
 SELECT * FROM postgres_fdw_get_connections() ORDER BY 1;
 
 -- Clean up
-DROP USER MAPPING FOR multi_conn_user1 SERVER loopback;
-DROP USER MAPPING FOR multi_conn_user2 SERVER loopback;
-DROP ROLE multi_conn_user1;
-DROP ROLE multi_conn_user2;
+DROP USER MAPPING FOR regress_multi_conn_user1 SERVER loopback;
+DROP USER MAPPING FOR regress_multi_conn_user2 SERVER loopback;
+DROP ROLE regress_multi_conn_user1;
+DROP ROLE regress_multi_conn_user2;
 
 -- ===================================================================
 -- batch insert