Establish conventions about global object names used in regression tests.

To ensure that "make installcheck" can be used safely against an existing
installation, we need to be careful about what global object names
(database, role, and tablespace names) we use; otherwise we might
accidentally clobber important objects.  There's been a weak consensus that
test databases should have names including "regression", and that test role
names should start with "regress_", but we didn't have any particular rule
about tablespace names; and neither of the other rules was followed with
any consistency either.

This commit moves us a long way towards having a hard-and-fast rule that
regression test databases must have names including "regression", and that
test role and tablespace names must start with "regress_".  It's not
completely there because I did not touch some test cases in rolenames.sql
that test creation of special role names like "session_user".  That will
require some rethinking of exactly what we want to test, whereas the intent
of this patch is just to hit all the cases in which the needed renamings
are cosmetic.

There is no enforcement mechanism in this patch either, but if we don't
add one we can expect that the tests will soon be violating the convention
again.  Again, that's not such a cosmetic change and it will require
discussion.  (But I did use a quick-hack enforcement patch to find these
cases.)

Discussion: <16638.1468620817@sss.pgh.pa.us>

10 files changed, 170 insertions, 170 deletions

diff --git a/contrib/dblink/expected/dblink.out b/contrib/dblink/expected/dblink.out
index 950f7ed1918..5acaaf225a9 100644
--- a/contrib/dblink/expected/dblink.out
+++ b/contrib/dblink/expected/dblink.out
@@ -814,7 +814,7 @@ SELECT dblink_disconnect('dtest1');
 (1 row)
 
 -- test foreign data wrapper functionality
-CREATE ROLE dblink_regression_test;
+CREATE ROLE regress_dblink_user;
 DO $d$
     BEGIN
         EXECUTE $$CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
@@ -828,9 +828,9 @@ CREATE USER MAPPING FOR public SERVER fdtest
 ERROR:  invalid option "server"
 HINT:  Valid options in this context are: user, password
 CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (user :'USER');
-GRANT USAGE ON FOREIGN SERVER fdtest TO dblink_regression_test;
-GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TO dblink_regression_test;
-SET SESSION AUTHORIZATION dblink_regression_test;
+GRANT USAGE ON FOREIGN SERVER fdtest TO regress_dblink_user;
+GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TO regress_dblink_user;
+SET SESSION AUTHORIZATION regress_dblink_user;
 -- should fail
 SELECT dblink_connect('myconn', 'fdtest');
 ERROR:  password is required
@@ -859,9 +859,9 @@ SELECT * FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[])
 (11 rows)
 
 \c - -
-REVOKE USAGE ON FOREIGN SERVER fdtest FROM dblink_regression_test;
-REVOKE EXECUTE ON FUNCTION dblink_connect_u(text, text) FROM dblink_regression_test;
-DROP USER dblink_regression_test;
+REVOKE USAGE ON FOREIGN SERVER fdtest FROM regress_dblink_user;
+REVOKE EXECUTE ON FUNCTION dblink_connect_u(text, text) FROM regress_dblink_user;
+DROP USER regress_dblink_user;
 DROP USER MAPPING FOR public SERVER fdtest;
 DROP SERVER fdtest;
 -- test asynchronous notifications
diff --git a/contrib/dblink/sql/dblink.sql b/contrib/dblink/sql/dblink.sql
index 0ebfbd2b913..681cf6a6e87 100644
--- a/contrib/dblink/sql/dblink.sql
+++ b/contrib/dblink/sql/dblink.sql
@@ -394,7 +394,7 @@ SELECT dblink_error_message('dtest1');
 SELECT dblink_disconnect('dtest1');
 
 -- test foreign data wrapper functionality
-CREATE ROLE dblink_regression_test;
+CREATE ROLE regress_dblink_user;
 DO $d$
     BEGIN
         EXECUTE $$CREATE SERVER fdtest FOREIGN DATA WRAPPER dblink_fdw
@@ -408,10 +408,10 @@ CREATE USER MAPPING FOR public SERVER fdtest
   OPTIONS (server 'localhost');  -- fail, can't specify server here
 CREATE USER MAPPING FOR public SERVER fdtest OPTIONS (user :'USER');
 
-GRANT USAGE ON FOREIGN SERVER fdtest TO dblink_regression_test;
-GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TO dblink_regression_test;
+GRANT USAGE ON FOREIGN SERVER fdtest TO regress_dblink_user;
+GRANT EXECUTE ON FUNCTION dblink_connect_u(text, text) TO regress_dblink_user;
 
-SET SESSION AUTHORIZATION dblink_regression_test;
+SET SESSION AUTHORIZATION regress_dblink_user;
 -- should fail
 SELECT dblink_connect('myconn', 'fdtest');
 -- should succeed
@@ -419,9 +419,9 @@ SELECT dblink_connect_u('myconn', 'fdtest');
 SELECT * FROM dblink('myconn','SELECT * FROM foo') AS t(a int, b text, c text[]);
 
 \c - -
-REVOKE USAGE ON FOREIGN SERVER fdtest FROM dblink_regression_test;
-REVOKE EXECUTE ON FUNCTION dblink_connect_u(text, text) FROM dblink_regression_test;
-DROP USER dblink_regression_test;
+REVOKE USAGE ON FOREIGN SERVER fdtest FROM regress_dblink_user;
+REVOKE EXECUTE ON FUNCTION dblink_connect_u(text, text) FROM regress_dblink_user;
+DROP USER regress_dblink_user;
 DROP USER MAPPING FOR public SERVER fdtest;
 DROP SERVER fdtest;
 
diff --git a/contrib/file_fdw/input/file_fdw.source b/contrib/file_fdw/input/file_fdw.source
index 35db4af0824..685561fc2a0 100644
--- a/contrib/file_fdw/input/file_fdw.source
+++ b/contrib/file_fdw/input/file_fdw.source
@@ -3,37 +3,37 @@
 --
 
 -- Clean up in case a prior regression run failed
-SET client_min_messages TO 'error';
-DROP ROLE IF EXISTS file_fdw_superuser, file_fdw_user, no_priv_user;
+SET client_min_messages TO 'warning';
+DROP ROLE IF EXISTS regress_file_fdw_superuser, regress_file_fdw_user, regress_no_priv_user;
 RESET client_min_messages;
 
-CREATE ROLE file_fdw_superuser LOGIN SUPERUSER; -- is a superuser
-CREATE ROLE file_fdw_user LOGIN;                -- has priv and user mapping
-CREATE ROLE no_priv_user LOGIN;                 -- has priv but no user mapping
+CREATE ROLE regress_file_fdw_superuser LOGIN SUPERUSER; -- is a superuser
+CREATE ROLE regress_file_fdw_user LOGIN;                -- has priv and user mapping
+CREATE ROLE regress_no_priv_user LOGIN;                 -- has priv but no user mapping
 
 -- Install file_fdw
 CREATE EXTENSION file_fdw;
 
--- file_fdw_superuser owns fdw-related objects
-SET ROLE file_fdw_superuser;
+-- regress_file_fdw_superuser owns fdw-related objects
+SET ROLE regress_file_fdw_superuser;
 CREATE SERVER file_server FOREIGN DATA WRAPPER file_fdw;
 
 -- privilege tests
-SET ROLE file_fdw_user;
+SET ROLE regress_file_fdw_user;
 CREATE FOREIGN DATA WRAPPER file_fdw2 HANDLER file_fdw_handler VALIDATOR file_fdw_validator;   -- ERROR
 CREATE SERVER file_server2 FOREIGN DATA WRAPPER file_fdw;   -- ERROR
-CREATE USER MAPPING FOR file_fdw_user SERVER file_server;   -- ERROR
+CREATE USER MAPPING FOR regress_file_fdw_user SERVER file_server;   -- ERROR
 
-SET ROLE file_fdw_superuser;
-GRANT USAGE ON FOREIGN SERVER file_server TO file_fdw_user;
+SET ROLE regress_file_fdw_superuser;
+GRANT USAGE ON FOREIGN SERVER file_server TO regress_file_fdw_user;
 
-SET ROLE file_fdw_user;
-CREATE USER MAPPING FOR file_fdw_user SERVER file_server;
+SET ROLE regress_file_fdw_user;
+CREATE USER MAPPING FOR regress_file_fdw_user SERVER file_server;
 
 -- create user mappings and grant privilege to test users
-SET ROLE file_fdw_superuser;
-CREATE USER MAPPING FOR file_fdw_superuser SERVER file_server;
-CREATE USER MAPPING FOR no_priv_user SERVER file_server;
+SET ROLE regress_file_fdw_superuser;
+CREATE USER MAPPING FOR regress_file_fdw_superuser SERVER file_server;
+CREATE USER MAPPING FOR regress_no_priv_user SERVER file_server;
 
 -- validator tests
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'xml');  -- ERROR
@@ -66,7 +66,7 @@ CREATE FOREIGN TABLE agg_text (
 	b	float4
 ) SERVER file_server
 OPTIONS (format 'text', filename '@abs_srcdir@/data/agg.data', delimiter '	', null '\N');
-GRANT SELECT ON agg_text TO file_fdw_user;
+GRANT SELECT ON agg_text TO regress_file_fdw_user;
 CREATE FOREIGN TABLE agg_csv (
 	a	int2,
 	b	float4
@@ -163,29 +163,29 @@ ALTER FOREIGN TABLE agg_csv NO INHERIT agg;
 DROP TABLE agg;
 
 -- privilege tests
-SET ROLE file_fdw_superuser;
+SET ROLE regress_file_fdw_superuser;
 SELECT * FROM agg_text ORDER BY a;
-SET ROLE file_fdw_user;
+SET ROLE regress_file_fdw_user;
 SELECT * FROM agg_text ORDER BY a;
-SET ROLE no_priv_user;
+SET ROLE regress_no_priv_user;
 SELECT * FROM agg_text ORDER BY a;   -- ERROR
-SET ROLE file_fdw_user;
+SET ROLE regress_file_fdw_user;
 \t on
 EXPLAIN (VERBOSE, COSTS FALSE) SELECT * FROM agg_text WHERE a > 0;
 \t off
 -- file FDW allows foreign tables to be accessed without user mapping
-DROP USER MAPPING FOR file_fdw_user SERVER file_server;
+DROP USER MAPPING FOR regress_file_fdw_user SERVER file_server;
 SELECT * FROM agg_text ORDER BY a;
 
 -- privilege tests for object
-SET ROLE file_fdw_superuser;
-ALTER FOREIGN TABLE agg_text OWNER TO file_fdw_user;
+SET ROLE regress_file_fdw_superuser;
+ALTER FOREIGN TABLE agg_text OWNER TO regress_file_fdw_user;
 ALTER FOREIGN TABLE agg_text OPTIONS (SET format 'text');
-SET ROLE file_fdw_user;
+SET ROLE regress_file_fdw_user;
 ALTER FOREIGN TABLE agg_text OPTIONS (SET format 'text');
-SET ROLE file_fdw_superuser;
+SET ROLE regress_file_fdw_superuser;
 
 -- cleanup
 RESET ROLE;
 DROP EXTENSION file_fdw CASCADE;
-DROP ROLE file_fdw_superuser, file_fdw_user, no_priv_user;
+DROP ROLE regress_file_fdw_superuser, regress_file_fdw_user, regress_no_priv_user;
diff --git a/contrib/file_fdw/output/file_fdw.source b/contrib/file_fdw/output/file_fdw.source
index 26f4999cd1d..6fa54409b95 100644
--- a/contrib/file_fdw/output/file_fdw.source
+++ b/contrib/file_fdw/output/file_fdw.source
@@ -2,34 +2,34 @@
 -- Test foreign-data wrapper file_fdw.
 --
 -- Clean up in case a prior regression run failed
-SET client_min_messages TO 'error';
-DROP ROLE IF EXISTS file_fdw_superuser, file_fdw_user, no_priv_user;
+SET client_min_messages TO 'warning';
+DROP ROLE IF EXISTS regress_file_fdw_superuser, regress_file_fdw_user, regress_no_priv_user;
 RESET client_min_messages;
-CREATE ROLE file_fdw_superuser LOGIN SUPERUSER; -- is a superuser
-CREATE ROLE file_fdw_user LOGIN;                -- has priv and user mapping
-CREATE ROLE no_priv_user LOGIN;                 -- has priv but no user mapping
+CREATE ROLE regress_file_fdw_superuser LOGIN SUPERUSER; -- is a superuser
+CREATE ROLE regress_file_fdw_user LOGIN;                -- has priv and user mapping
+CREATE ROLE regress_no_priv_user LOGIN;                 -- has priv but no user mapping
 -- Install file_fdw
 CREATE EXTENSION file_fdw;
--- file_fdw_superuser owns fdw-related objects
-SET ROLE file_fdw_superuser;
+-- regress_file_fdw_superuser owns fdw-related objects
+SET ROLE regress_file_fdw_superuser;
 CREATE SERVER file_server FOREIGN DATA WRAPPER file_fdw;
 -- privilege tests
-SET ROLE file_fdw_user;
+SET ROLE regress_file_fdw_user;
 CREATE FOREIGN DATA WRAPPER file_fdw2 HANDLER file_fdw_handler VALIDATOR file_fdw_validator;   -- ERROR
 ERROR:  permission denied to create foreign-data wrapper "file_fdw2"
 HINT:  Must be superuser to create a foreign-data wrapper.
 CREATE SERVER file_server2 FOREIGN DATA WRAPPER file_fdw;   -- ERROR
 ERROR:  permission denied for foreign-data wrapper file_fdw
-CREATE USER MAPPING FOR file_fdw_user SERVER file_server;   -- ERROR
+CREATE USER MAPPING FOR regress_file_fdw_user SERVER file_server;   -- ERROR
 ERROR:  permission denied for foreign server file_server
-SET ROLE file_fdw_superuser;
-GRANT USAGE ON FOREIGN SERVER file_server TO file_fdw_user;
-SET ROLE file_fdw_user;
-CREATE USER MAPPING FOR file_fdw_user SERVER file_server;
+SET ROLE regress_file_fdw_superuser;
+GRANT USAGE ON FOREIGN SERVER file_server TO regress_file_fdw_user;
+SET ROLE regress_file_fdw_user;
+CREATE USER MAPPING FOR regress_file_fdw_user SERVER file_server;
 -- create user mappings and grant privilege to test users
-SET ROLE file_fdw_superuser;
-CREATE USER MAPPING FOR file_fdw_superuser SERVER file_server;
-CREATE USER MAPPING FOR no_priv_user SERVER file_server;
+SET ROLE regress_file_fdw_superuser;
+CREATE USER MAPPING FOR regress_file_fdw_superuser SERVER file_server;
+CREATE USER MAPPING FOR regress_no_priv_user SERVER file_server;
 -- validator tests
 CREATE FOREIGN TABLE tbl () SERVER file_server OPTIONS (format 'xml');  -- ERROR
 ERROR:  COPY format "xml" not recognized
@@ -82,7 +82,7 @@ CREATE FOREIGN TABLE agg_text (
 	b	float4
 ) SERVER file_server
 OPTIONS (format 'text', filename '@abs_srcdir@/data/agg.data', delimiter '	', null '\N');
-GRANT SELECT ON agg_text TO file_fdw_user;
+GRANT SELECT ON agg_text TO regress_file_fdw_user;
 CREATE FOREIGN TABLE agg_csv (
 	a	int2,
 	b	float4
@@ -290,7 +290,7 @@ SELECT tableoid::regclass, * FROM agg FOR UPDATE;
 ALTER FOREIGN TABLE agg_csv NO INHERIT agg;
 DROP TABLE agg;
 -- privilege tests
-SET ROLE file_fdw_superuser;
+SET ROLE regress_file_fdw_superuser;
 SELECT * FROM agg_text ORDER BY a;
   a  |    b    
 -----+---------
@@ -300,7 +300,7 @@ SELECT * FROM agg_text ORDER BY a;
  100 |  99.097
 (4 rows)
 
-SET ROLE file_fdw_user;
+SET ROLE regress_file_fdw_user;
 SELECT * FROM agg_text ORDER BY a;
   a  |    b    
 -----+---------
@@ -310,10 +310,10 @@ SELECT * FROM agg_text ORDER BY a;
  100 |  99.097
 (4 rows)
 
-SET ROLE no_priv_user;
+SET ROLE regress_no_priv_user;
 SELECT * FROM agg_text ORDER BY a;   -- ERROR
 ERROR:  permission denied for relation agg_text
-SET ROLE file_fdw_user;
+SET ROLE regress_file_fdw_user;
 \t on
 EXPLAIN (VERBOSE, COSTS FALSE) SELECT * FROM agg_text WHERE a > 0;
  Foreign Scan on public.agg_text
@@ -323,7 +323,7 @@ EXPLAIN (VERBOSE, COSTS FALSE) SELECT * FROM agg_text WHERE a > 0;
 
 \t off
 -- file FDW allows foreign tables to be accessed without user mapping
-DROP USER MAPPING FOR file_fdw_user SERVER file_server;
+DROP USER MAPPING FOR regress_file_fdw_user SERVER file_server;
 SELECT * FROM agg_text ORDER BY a;
   a  |    b    
 -----+---------
@@ -334,22 +334,22 @@ SELECT * FROM agg_text ORDER BY a;
 (4 rows)
 
 -- privilege tests for object
-SET ROLE file_fdw_superuser;
-ALTER FOREIGN TABLE agg_text OWNER TO file_fdw_user;
+SET ROLE regress_file_fdw_superuser;
+ALTER FOREIGN TABLE agg_text OWNER TO regress_file_fdw_user;
 ALTER FOREIGN TABLE agg_text OPTIONS (SET format 'text');
-SET ROLE file_fdw_user;
+SET ROLE regress_file_fdw_user;
 ALTER FOREIGN TABLE agg_text OPTIONS (SET format 'text');
 ERROR:  only superuser can change options of a file_fdw foreign table
-SET ROLE file_fdw_superuser;
+SET ROLE regress_file_fdw_superuser;
 -- cleanup
 RESET ROLE;
 DROP EXTENSION file_fdw CASCADE;
 NOTICE:  drop cascades to 7 other objects
 DETAIL:  drop cascades to server file_server
-drop cascades to user mapping for file_fdw_superuser on server file_server
-drop cascades to user mapping for no_priv_user on server file_server
+drop cascades to user mapping for regress_file_fdw_superuser on server file_server
+drop cascades to user mapping for regress_no_priv_user on server file_server
 drop cascades to foreign table agg_text
 drop cascades to foreign table agg_csv
 drop cascades to foreign table agg_bad
 drop cascades to foreign table text_csv
-DROP ROLE file_fdw_superuser, file_fdw_user, no_priv_user;
+DROP ROLE regress_file_fdw_superuser, regress_file_fdw_user, regress_no_priv_user;
diff --git a/contrib/sepgsql/expected/alter.out b/contrib/sepgsql/expected/alter.out
index 4335d298fb9..fb2545fa5cc 100644
--- a/contrib/sepgsql/expected/alter.out
+++ b/contrib/sepgsql/expected/alter.out
@@ -3,9 +3,9 @@
 --
 -- clean-up in case a prior regression run failed
 SET client_min_messages TO 'warning';
-DROP DATABASE IF EXISTS regtest_sepgsql_test_database_1;
-DROP DATABASE IF EXISTS regtest_sepgsql_test_database;
-DROP USER IF EXISTS regtest_sepgsql_test_user;
+DROP DATABASE IF EXISTS sepgsql_test_regression_1;
+DROP DATABASE IF EXISTS sepgsql_test_regression;
+DROP USER IF EXISTS regress_sepgsql_test_user;
 RESET client_min_messages;
 SELECT sepgsql_getcon();	-- confirm client privilege
                       sepgsql_getcon                      
@@ -16,8 +16,8 @@ SELECT sepgsql_getcon();	-- confirm client privilege
 --
 -- CREATE Objects to be altered (with debug_audit being silent)
 --
-CREATE DATABASE regtest_sepgsql_test_database_1;
-CREATE USER regtest_sepgsql_test_user;
+CREATE DATABASE sepgsql_test_regression_1;
+CREATE USER regress_sepgsql_test_user;
 CREATE SCHEMA regtest_schema_1;
 CREATE SCHEMA regtest_schema_2;
 GRANT ALL ON SCHEMA regtest_schema_1 TO public;
@@ -39,32 +39,32 @@ SET client_min_messages = LOG;
 -- XXX: It should take db_xxx:{setattr} permission checks even if
 --      owner is not actually changed.
 --
-ALTER DATABASE regtest_sepgsql_test_database_1 OWNER TO regtest_sepgsql_test_user;
-LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="regtest_sepgsql_test_database_1"
-ALTER DATABASE regtest_sepgsql_test_database_1 OWNER TO regtest_sepgsql_test_user;
-LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="regtest_sepgsql_test_database_1"
-ALTER SCHEMA regtest_schema_1 OWNER TO regtest_sepgsql_test_user;
+ALTER DATABASE sepgsql_test_regression_1 OWNER TO regress_sepgsql_test_user;
+LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="sepgsql_test_regression_1"
+ALTER DATABASE sepgsql_test_regression_1 OWNER TO regress_sepgsql_test_user;
+LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="sepgsql_test_regression_1"
+ALTER SCHEMA regtest_schema_1 OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema_1"
-ALTER SCHEMA regtest_schema_1 OWNER TO regtest_sepgsql_test_user;
+ALTER SCHEMA regtest_schema_1 OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema_1"
-ALTER TABLE regtest_table_1 OWNER TO regtest_sepgsql_test_user;
+ALTER TABLE regtest_table_1 OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema_1"
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema_2"
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="public"
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema_1.regtest_table_1"
-ALTER TABLE regtest_table_1 OWNER TO regtest_sepgsql_test_user;
+ALTER TABLE regtest_table_1 OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_table name="regtest_schema_1.regtest_table_1"
-ALTER SEQUENCE regtest_seq_1 OWNER TO regtest_sepgsql_test_user;
+ALTER SEQUENCE regtest_seq_1 OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_seq_t:s0 tclass=db_sequence name="regtest_schema_1.regtest_seq_1"
-ALTER SEQUENCE regtest_seq_1 OWNER TO regtest_sepgsql_test_user;
+ALTER SEQUENCE regtest_seq_1 OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_seq_t:s0 tclass=db_sequence name="regtest_schema_1.regtest_seq_1"
-ALTER VIEW regtest_view_1 OWNER TO regtest_sepgsql_test_user;
+ALTER VIEW regtest_view_1 OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_view_t:s0 tclass=db_view name="regtest_schema_1.regtest_view_1"
-ALTER VIEW regtest_view_1 OWNER TO regtest_sepgsql_test_user;
+ALTER VIEW regtest_view_1 OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_view_t:s0 tclass=db_view name="regtest_schema_1.regtest_view_1"
-ALTER FUNCTION regtest_func_1(text) OWNER TO regtest_sepgsql_test_user;
+ALTER FUNCTION regtest_func_1(text) OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="regtest_schema_1.regtest_func_1(pg_catalog.text)"
-ALTER FUNCTION regtest_func_1(text) OWNER TO regtest_sepgsql_test_user;
+ALTER FUNCTION regtest_func_1(text) OWNER TO regress_sepgsql_test_user;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="regtest_schema_1.regtest_func_1(pg_catalog.text)"
 --
 -- ALTER xxx SET SCHEMA
@@ -88,8 +88,8 @@ LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_re
 --
 -- ALTER xxx RENAME TO
 --
-ALTER DATABASE regtest_sepgsql_test_database_1 RENAME TO regtest_sepgsql_test_database;
-LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="regtest_sepgsql_test_database_1"
+ALTER DATABASE sepgsql_test_regression_1 RENAME TO sepgsql_test_regression;
+LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="sepgsql_test_regression_1"
 ALTER SCHEMA regtest_schema_1 RENAME TO regtest_schema;
 LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema_1"
 ALTER TABLE regtest_table_1 RENAME TO regtest_table;
@@ -110,9 +110,9 @@ SET search_path = regtest_schema, regtest_schema_2, public;
 --
 -- misc ALTER commands
 --
-ALTER DATABASE regtest_sepgsql_test_database CONNECTION LIMIT 999;
-LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="regtest_sepgsql_test_database"
-ALTER DATABASE regtest_sepgsql_test_database SET search_path TO regtest_schema, public; -- not supported yet
+ALTER DATABASE sepgsql_test_regression CONNECTION LIMIT 999;
+LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="sepgsql_test_regression"
+ALTER DATABASE sepgsql_test_regression SET search_path TO regtest_schema, public; -- not supported yet
 ALTER TABLE regtest_table ADD COLUMN d float;
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema"
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema_2"
@@ -203,7 +203,7 @@ LOG:  SELinux: allowed { setattr } scontext=unconfined_u:unconfined_r:sepgsql_re
 --
 RESET sepgsql.debug_audit;
 RESET client_min_messages;
-DROP DATABASE regtest_sepgsql_test_database;
+DROP DATABASE sepgsql_test_regression;
 DROP SCHEMA regtest_schema CASCADE;
 NOTICE:  drop cascades to 3 other objects
 DETAIL:  drop cascades to table regtest_table_2
@@ -215,4 +215,4 @@ DETAIL:  drop cascades to table regtest_table
 drop cascades to sequence regtest_seq
 drop cascades to view regtest_view
 drop cascades to function regtest_func(text)
-DROP USER regtest_sepgsql_test_user;
+DROP USER regress_sepgsql_test_user;
diff --git a/contrib/sepgsql/expected/ddl.out b/contrib/sepgsql/expected/ddl.out
index 906c884a74d..c04b72fe887 100644
--- a/contrib/sepgsql/expected/ddl.out
+++ b/contrib/sepgsql/expected/ddl.out
@@ -3,8 +3,8 @@
 --
 -- clean-up in case a prior regression run failed
 SET client_min_messages TO 'warning';
-DROP DATABASE IF EXISTS regtest_sepgsql_test_database;
-DROP USER IF EXISTS regtest_sepgsql_test_user;
+DROP DATABASE IF EXISTS sepgsql_test_regression;
+DROP USER IF EXISTS regress_sepgsql_test_user;
 RESET client_min_messages;
 -- confirm required permissions using audit messages
 SELECT sepgsql_getcon();	-- confirm client privilege
@@ -18,14 +18,14 @@ SET client_min_messages = LOG;
 --
 -- CREATE Permission checks
 --
-CREATE DATABASE regtest_sepgsql_test_database;
+CREATE DATABASE sepgsql_test_regression;
 LOG:  SELinux: allowed { getattr } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_db_t:s0 tclass=db_database name="template1"
-LOG:  SELinux: allowed { create } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="regtest_sepgsql_test_database"
-CREATE USER regtest_sepgsql_test_user;
+LOG:  SELinux: allowed { create } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="sepgsql_test_regression"
+CREATE USER regress_sepgsql_test_user;
 CREATE SCHEMA regtest_schema;
 LOG:  SELinux: allowed { create } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema"
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="public"
-GRANT ALL ON SCHEMA regtest_schema TO regtest_sepgsql_test_user;
+GRANT ALL ON SCHEMA regtest_schema TO regress_sepgsql_test_user;
 SET search_path = regtest_schema, public;
 CREATE TABLE regtest_table (x serial primary key, y text);
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema"
@@ -101,7 +101,7 @@ CREATE AGGREGATE regtest_agg (
 LOG:  SELinux: allowed { add_name } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema"
 LOG:  SELinux: allowed { create } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="regtest_schema.regtest_agg(integer)"
 -- CREATE objects owned by others
-SET SESSION AUTHORIZATION regtest_sepgsql_test_user;
+SET SESSION AUTHORIZATION regress_sepgsql_test_user;
 SET search_path = regtest_schema, public;
 CREATE TABLE regtest_table_3 (x int, y serial);
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema"
@@ -248,7 +248,7 @@ LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regte
 LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="regtest_schema.regtest_table.ctid"
 LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="regtest_schema.regtest_table.x"
 LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="regtest_schema.regtest_table.z"
-DROP OWNED BY regtest_sepgsql_test_user;
+DROP OWNED BY regress_sepgsql_test_user;
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema"
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="public"
 LOG:  SELinux: allowed { remove_name } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema"
@@ -267,9 +267,9 @@ LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regte
 LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="regtest_schema.regtest_table_3.ctid"
 LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="regtest_schema.regtest_table_3.x"
 LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="regtest_schema.regtest_table_3.y"
-DROP DATABASE regtest_sepgsql_test_database;
-LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="regtest_sepgsql_test_database"
-DROP USER regtest_sepgsql_test_user;
+DROP DATABASE sepgsql_test_regression;
+LOG:  SELinux: allowed { drop } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_db_t:s0 tclass=db_database name="sepgsql_test_regression"
+DROP USER regress_sepgsql_test_user;
 DROP SCHEMA IF EXISTS regtest_schema CASCADE;
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=unconfined_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="regtest_schema"
 LOG:  SELinux: allowed { search } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0 tcontext=system_u:object_r:sepgsql_schema_t:s0 tclass=db_schema name="public"
diff --git a/contrib/sepgsql/sql/alter.sql b/contrib/sepgsql/sql/alter.sql
index 3682b3e92ad..0bd35279fa4 100644
--- a/contrib/sepgsql/sql/alter.sql
+++ b/contrib/sepgsql/sql/alter.sql
@@ -4,9 +4,9 @@
 
 -- clean-up in case a prior regression run failed
 SET client_min_messages TO 'warning';
-DROP DATABASE IF EXISTS regtest_sepgsql_test_database_1;
-DROP DATABASE IF EXISTS regtest_sepgsql_test_database;
-DROP USER IF EXISTS regtest_sepgsql_test_user;
+DROP DATABASE IF EXISTS sepgsql_test_regression_1;
+DROP DATABASE IF EXISTS sepgsql_test_regression;
+DROP USER IF EXISTS regress_sepgsql_test_user;
 RESET client_min_messages;
 
 -- @SECURITY-CONTEXT=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0
@@ -14,9 +14,9 @@ RESET client_min_messages;
 --
 -- CREATE Objects to be altered (with debug_audit being silent)
 --
-CREATE DATABASE regtest_sepgsql_test_database_1;
+CREATE DATABASE sepgsql_test_regression_1;
 
-CREATE USER regtest_sepgsql_test_user;
+CREATE USER regress_sepgsql_test_user;
 
 CREATE SCHEMA regtest_schema_1;
 CREATE SCHEMA regtest_schema_2;
@@ -49,18 +49,18 @@ SET client_min_messages = LOG;
 -- XXX: It should take db_xxx:{setattr} permission checks even if
 --      owner is not actually changed.
 --
-ALTER DATABASE regtest_sepgsql_test_database_1 OWNER TO regtest_sepgsql_test_user;
-ALTER DATABASE regtest_sepgsql_test_database_1 OWNER TO regtest_sepgsql_test_user;
-ALTER SCHEMA regtest_schema_1 OWNER TO regtest_sepgsql_test_user;
-ALTER SCHEMA regtest_schema_1 OWNER TO regtest_sepgsql_test_user;
-ALTER TABLE regtest_table_1 OWNER TO regtest_sepgsql_test_user;
-ALTER TABLE regtest_table_1 OWNER TO regtest_sepgsql_test_user;
-ALTER SEQUENCE regtest_seq_1 OWNER TO regtest_sepgsql_test_user;
-ALTER SEQUENCE regtest_seq_1 OWNER TO regtest_sepgsql_test_user;
-ALTER VIEW regtest_view_1 OWNER TO regtest_sepgsql_test_user;
-ALTER VIEW regtest_view_1 OWNER TO regtest_sepgsql_test_user;
-ALTER FUNCTION regtest_func_1(text) OWNER TO regtest_sepgsql_test_user;
-ALTER FUNCTION regtest_func_1(text) OWNER TO regtest_sepgsql_test_user;
+ALTER DATABASE sepgsql_test_regression_1 OWNER TO regress_sepgsql_test_user;
+ALTER DATABASE sepgsql_test_regression_1 OWNER TO regress_sepgsql_test_user;
+ALTER SCHEMA regtest_schema_1 OWNER TO regress_sepgsql_test_user;
+ALTER SCHEMA regtest_schema_1 OWNER TO regress_sepgsql_test_user;
+ALTER TABLE regtest_table_1 OWNER TO regress_sepgsql_test_user;
+ALTER TABLE regtest_table_1 OWNER TO regress_sepgsql_test_user;
+ALTER SEQUENCE regtest_seq_1 OWNER TO regress_sepgsql_test_user;
+ALTER SEQUENCE regtest_seq_1 OWNER TO regress_sepgsql_test_user;
+ALTER VIEW regtest_view_1 OWNER TO regress_sepgsql_test_user;
+ALTER VIEW regtest_view_1 OWNER TO regress_sepgsql_test_user;
+ALTER FUNCTION regtest_func_1(text) OWNER TO regress_sepgsql_test_user;
+ALTER FUNCTION regtest_func_1(text) OWNER TO regress_sepgsql_test_user;
 
 --
 -- ALTER xxx SET SCHEMA
@@ -73,7 +73,7 @@ ALTER FUNCTION regtest_func_1(text) SET SCHEMA regtest_schema_2;
 --
 -- ALTER xxx RENAME TO
 --
-ALTER DATABASE regtest_sepgsql_test_database_1 RENAME TO regtest_sepgsql_test_database;
+ALTER DATABASE sepgsql_test_regression_1 RENAME TO sepgsql_test_regression;
 ALTER SCHEMA regtest_schema_1 RENAME TO regtest_schema;
 ALTER TABLE regtest_table_1 RENAME TO regtest_table;
 ALTER SEQUENCE regtest_seq_1 RENAME TO regtest_seq;
@@ -85,8 +85,8 @@ SET search_path = regtest_schema, regtest_schema_2, public;
 --
 -- misc ALTER commands
 --
-ALTER DATABASE regtest_sepgsql_test_database CONNECTION LIMIT 999;
-ALTER DATABASE regtest_sepgsql_test_database SET search_path TO regtest_schema, public; -- not supported yet
+ALTER DATABASE sepgsql_test_regression CONNECTION LIMIT 999;
+ALTER DATABASE sepgsql_test_regression SET search_path TO regtest_schema, public; -- not supported yet
 
 ALTER TABLE regtest_table ADD COLUMN d float;
 ALTER TABLE regtest_table DROP COLUMN d;
@@ -130,7 +130,7 @@ ALTER SEQUENCE regtest_seq INCREMENT BY 10 START WITH 1000;
 --
 RESET sepgsql.debug_audit;
 RESET client_min_messages;
-DROP DATABASE regtest_sepgsql_test_database;
+DROP DATABASE sepgsql_test_regression;
 DROP SCHEMA regtest_schema CASCADE;
 DROP SCHEMA regtest_schema_2 CASCADE;
-DROP USER regtest_sepgsql_test_user;
+DROP USER regress_sepgsql_test_user;
diff --git a/contrib/sepgsql/sql/ddl.sql b/contrib/sepgsql/sql/ddl.sql
index c0de3f6b8c2..2fc66e4c370 100644
--- a/contrib/sepgsql/sql/ddl.sql
+++ b/contrib/sepgsql/sql/ddl.sql
@@ -4,8 +4,8 @@
 
 -- clean-up in case a prior regression run failed
 SET client_min_messages TO 'warning';
-DROP DATABASE IF EXISTS regtest_sepgsql_test_database;
-DROP USER IF EXISTS regtest_sepgsql_test_user;
+DROP DATABASE IF EXISTS sepgsql_test_regression;
+DROP USER IF EXISTS regress_sepgsql_test_user;
 RESET client_min_messages;
 
 -- confirm required permissions using audit messages
@@ -16,13 +16,13 @@ SET client_min_messages = LOG;
 --
 -- CREATE Permission checks
 --
-CREATE DATABASE regtest_sepgsql_test_database;
+CREATE DATABASE sepgsql_test_regression;
 
-CREATE USER regtest_sepgsql_test_user;
+CREATE USER regress_sepgsql_test_user;
 
 CREATE SCHEMA regtest_schema;
 
-GRANT ALL ON SCHEMA regtest_schema TO regtest_sepgsql_test_user;
+GRANT ALL ON SCHEMA regtest_schema TO regress_sepgsql_test_user;
 
 SET search_path = regtest_schema, public;
 
@@ -52,7 +52,7 @@ CREATE AGGREGATE regtest_agg (
 );
 
 -- CREATE objects owned by others
-SET SESSION AUTHORIZATION regtest_sepgsql_test_user;
+SET SESSION AUTHORIZATION regress_sepgsql_test_user;
 
 SET search_path = regtest_schema, public;
 
@@ -92,8 +92,8 @@ ALTER TABLE regtest_table_2 SET WITHOUT OIDS;
 
 DROP TABLE regtest_table;
 
-DROP OWNED BY regtest_sepgsql_test_user;
+DROP OWNED BY regress_sepgsql_test_user;
 
-DROP DATABASE regtest_sepgsql_test_database;
-DROP USER regtest_sepgsql_test_user;
+DROP DATABASE sepgsql_test_regression;
+DROP USER regress_sepgsql_test_user;
 DROP SCHEMA IF EXISTS regtest_schema CASCADE;
diff --git a/contrib/test_decoding/expected/permissions.out b/contrib/test_decoding/expected/permissions.out
index 212fd1df359..7175dcd5f62 100644
--- a/contrib/test_decoding/expected/permissions.out
+++ b/contrib/test_decoding/expected/permissions.out
@@ -1,12 +1,12 @@
 -- predictability
 SET synchronous_commit = on;
 -- setup
-CREATE ROLE lr_normal;
-CREATE ROLE lr_superuser SUPERUSER;
-CREATE ROLE lr_replication REPLICATION;
+CREATE ROLE regress_lr_normal;
+CREATE ROLE regress_lr_superuser SUPERUSER;
+CREATE ROLE regress_lr_replication REPLICATION;
 CREATE TABLE lr_test(data text);
 -- superuser can control replication
-SET ROLE lr_superuser;
+SET ROLE regress_lr_superuser;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
  ?column? 
 ----------
@@ -30,7 +30,7 @@ SELECT pg_drop_replication_slot('regression_slot');
 
 RESET ROLE;
 -- replication user can control replication
-SET ROLE lr_replication;
+SET ROLE regress_lr_replication;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
  ?column? 
 ----------
@@ -52,7 +52,7 @@ SELECT pg_drop_replication_slot('regression_slot');
 
 RESET ROLE;
 -- plain user *can't* can control replication
-SET ROLE lr_normal;
+SET ROLE regress_lr_normal;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 ERROR:  must be superuser or replication role to use replication slots
 INSERT INTO lr_test VALUES('lr_superuser_init');
@@ -63,7 +63,7 @@ SELECT pg_drop_replication_slot('regression_slot');
 ERROR:  must be superuser or replication role to use replication slots
 RESET ROLE;
 -- replication users can drop superuser created slots
-SET ROLE lr_superuser;
+SET ROLE regress_lr_superuser;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
  ?column? 
 ----------
@@ -71,7 +71,7 @@ SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_d
 (1 row)
 
 RESET ROLE;
-SET ROLE lr_replication;
+SET ROLE regress_lr_replication;
 SELECT pg_drop_replication_slot('regression_slot');
  pg_drop_replication_slot 
 --------------------------
@@ -80,7 +80,7 @@ SELECT pg_drop_replication_slot('regression_slot');
 
 RESET ROLE;
 -- normal users can't drop existing slots
-SET ROLE lr_superuser;
+SET ROLE regress_lr_superuser;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
  ?column? 
 ----------
@@ -88,12 +88,12 @@ SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_d
 (1 row)
 
 RESET ROLE;
-SET ROLE lr_normal;
+SET ROLE regress_lr_normal;
 SELECT pg_drop_replication_slot('regression_slot');
 ERROR:  must be superuser or replication role to use replication slots
 RESET ROLE;
 -- all users can see existing slots
-SET ROLE lr_superuser;
+SET ROLE regress_lr_superuser;
 SELECT slot_name, plugin FROM pg_replication_slots;
     slot_name    |    plugin     
 -----------------+---------------
@@ -101,7 +101,7 @@ SELECT slot_name, plugin FROM pg_replication_slots;
 (1 row)
 
 RESET ROLE;
-SET ROLE lr_replication;
+SET ROLE regress_lr_replication;
 SELECT slot_name, plugin FROM pg_replication_slots;
     slot_name    |    plugin     
 -----------------+---------------
@@ -109,7 +109,7 @@ SELECT slot_name, plugin FROM pg_replication_slots;
 (1 row)
 
 RESET ROLE;
-SET ROLE lr_normal;
+SET ROLE regress_lr_normal;
 SELECT slot_name, plugin FROM pg_replication_slots;
     slot_name    |    plugin     
 -----------------+---------------
@@ -124,7 +124,7 @@ SELECT pg_drop_replication_slot('regression_slot');
  
 (1 row)
 
-DROP ROLE lr_normal;
-DROP ROLE lr_superuser;
-DROP ROLE lr_replication;
+DROP ROLE regress_lr_normal;
+DROP ROLE regress_lr_superuser;
+DROP ROLE regress_lr_replication;
 DROP TABLE lr_test;
diff --git a/contrib/test_decoding/sql/permissions.sql b/contrib/test_decoding/sql/permissions.sql
index 8680c55771d..312b5145937 100644
--- a/contrib/test_decoding/sql/permissions.sql
+++ b/contrib/test_decoding/sql/permissions.sql
@@ -2,13 +2,13 @@
 SET synchronous_commit = on;
 
 -- setup
-CREATE ROLE lr_normal;
-CREATE ROLE lr_superuser SUPERUSER;
-CREATE ROLE lr_replication REPLICATION;
+CREATE ROLE regress_lr_normal;
+CREATE ROLE regress_lr_superuser SUPERUSER;
+CREATE ROLE regress_lr_replication REPLICATION;
 CREATE TABLE lr_test(data text);
 
 -- superuser can control replication
-SET ROLE lr_superuser;
+SET ROLE regress_lr_superuser;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 INSERT INTO lr_test VALUES('lr_superuser_init');
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
@@ -16,7 +16,7 @@ SELECT pg_drop_replication_slot('regression_slot');
 RESET ROLE;
 
 -- replication user can control replication
-SET ROLE lr_replication;
+SET ROLE regress_lr_replication;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 INSERT INTO lr_test VALUES('lr_superuser_init');
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
@@ -24,7 +24,7 @@ SELECT pg_drop_replication_slot('regression_slot');
 RESET ROLE;
 
 -- plain user *can't* can control replication
-SET ROLE lr_normal;
+SET ROLE regress_lr_normal;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 INSERT INTO lr_test VALUES('lr_superuser_init');
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
@@ -32,38 +32,38 @@ SELECT pg_drop_replication_slot('regression_slot');
 RESET ROLE;
 
 -- replication users can drop superuser created slots
-SET ROLE lr_superuser;
+SET ROLE regress_lr_superuser;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 RESET ROLE;
-SET ROLE lr_replication;
+SET ROLE regress_lr_replication;
 SELECT pg_drop_replication_slot('regression_slot');
 RESET ROLE;
 
 -- normal users can't drop existing slots
-SET ROLE lr_superuser;
+SET ROLE regress_lr_superuser;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 RESET ROLE;
-SET ROLE lr_normal;
+SET ROLE regress_lr_normal;
 SELECT pg_drop_replication_slot('regression_slot');
 RESET ROLE;
 
 -- all users can see existing slots
-SET ROLE lr_superuser;
+SET ROLE regress_lr_superuser;
 SELECT slot_name, plugin FROM pg_replication_slots;
 RESET ROLE;
 
-SET ROLE lr_replication;
+SET ROLE regress_lr_replication;
 SELECT slot_name, plugin FROM pg_replication_slots;
 RESET ROLE;
 
-SET ROLE lr_normal;
+SET ROLE regress_lr_normal;
 SELECT slot_name, plugin FROM pg_replication_slots;
 RESET ROLE;
 
 -- cleanup
 SELECT pg_drop_replication_slot('regression_slot');
 
-DROP ROLE lr_normal;
-DROP ROLE lr_superuser;
-DROP ROLE lr_replication;
+DROP ROLE regress_lr_normal;
+DROP ROLE regress_lr_superuser;
+DROP ROLE regress_lr_replication;
 DROP TABLE lr_test;