Rename master_update_node and master_remove_node in tests

src/test/regress/expected/add_coordinator.out

@@ -1,16 +1,16 @@
 --
 -- ADD_COORDINATOR
 --
-SELECT master_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset
+SELECT citus_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset
 -- adding the same node again should return the existing nodeid
-SELECT master_add_node('localhost', :master_port, groupid => 0) = :master_nodeid;
+SELECT citus_add_node('localhost', :master_port, groupid => 0) = :master_nodeid;
  ?column?
 ---------------------------------------------------------------------
  t
 (1 row)
 
 -- adding another node with groupid=0 should error out
-SELECT master_add_node('localhost', 12345, groupid => 0) = :master_nodeid;
+SELECT citus_add_node('localhost', 12345, groupid => 0) = :master_nodeid;
 ERROR:  group 0 already has a primary node
 -- start_metadata_sync_to_node() for coordinator should raise a notice
 SELECT start_metadata_sync_to_node('localhost', :master_port);

src/test/regress/expected/alter_database_owner.out

@@ -37,8 +37,8 @@ $$);
 (2 rows)
 
 -- remove a node to verify addition later
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -72,7 +72,7 @@ $$);
 -- turn off propagation to verify it does _not_ propagate to new nodes when turned off
 SET citus.enable_alter_database_owner TO off;
 -- add back second node to verify the owner of the database was set accordingly
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -94,14 +94,14 @@ $$);
 
 -- turn on propagation to verify it does propagate to new nodes when enabled
 SET citus.enable_alter_database_owner TO on;
-SELECT master_remove_node('localhost', :worker_2_port); -- remove so we can re add with propagation on
+SELECT citus_remove_node('localhost', :worker_2_port); -- remove so we can re add with propagation on
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 -- add back second node to verify the owner of the database was set accordingly
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/alter_role_propagation.out

@@ -23,8 +23,8 @@ SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit,  rolcr
  (localhost,57638,t,"(postgres,t,t,t,t,t,t,t,66,md568701dc40be546e0357027fb0109338c,2032)")
 (2 rows)
 
-SELECT master_remove_node('localhost', :worker_1_port);
+SELECT citus_remove_node('localhost', :worker_1_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -41,7 +41,7 @@ SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit,  rolcr
  (localhost,57638,t,"(postgres,t,t,t,t,t,t,t,0,md53e559cc1fcf0c70f1f8e05c9a79c3133,2052)")
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -83,8 +83,8 @@ SELECT run_command_on_workers('SHOW enable_hashagg');
 (2 rows)
 
 -- remove 1 node to verify settings are copied when the node gets added back
-SELECT master_remove_node('localhost', :worker_1_port);
+SELECT citus_remove_node('localhost', :worker_1_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -119,7 +119,7 @@ ALTER ROLE ALL SET public.myguc TO "Hello, World";
 -- test for configuration values that should not be downcased even when unquoted
 ALTER ROLE CURRENT_USER SET lc_messages TO 'C';
 -- add worker and check all settings are copied
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -247,14 +247,14 @@ DROP DATABASE "REGRESSION";
 -- make sure alter role set is not propagated when the feature is deliberately turned off
 SET citus.enable_alter_role_set_propagation TO off;
 -- remove 1 node to verify settings are NOT copied when the node gets added back
-SELECT master_remove_node('localhost', :worker_1_port);
+SELECT citus_remove_node('localhost', :worker_1_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 ALTER ROLE ALL SET enable_hashjoin TO FALSE;
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/alter_table_set_access_method.out

@@ -429,7 +429,7 @@ ORDER BY conname;
 
 -- test different table types
 SET client_min_messages to WARNING;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId := 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId := 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -801,7 +801,7 @@ DEBUG:  pathlist hook for columnar table am
 RESET client_min_messages;
 SET client_min_messages TO WARNING;
 DROP SCHEMA alter_table_set_access_method CASCADE;
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/auto_undist_citus_local.out

@@ -5,7 +5,7 @@ CREATE SCHEMA drop_fkey_cascade;
 SET search_path TO drop_fkey_cascade;
 SET client_min_messages TO WARNING;
 SET citus.next_shard_id TO 1810000;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/citus_local_dist_joins.out

@@ -1,7 +1,7 @@
 CREATE SCHEMA citus_local_dist_joins;
 SET search_path TO citus_local_dist_joins;
 SET client_min_messages to ERROR;
-SELECT master_add_node('localhost', :master_port, groupId => 0) AS coordinator_nodeid \gset
+SELECT citus_add_node('localhost', :master_port, groupId => 0) AS coordinator_nodeid \gset
 CREATE TABLE citus_local(key int, value text);
 SELECT citus_add_local_table_to_metadata('citus_local');
  citus_add_local_table_to_metadata
@@ -499,8 +499,8 @@ DEBUG:  Plan XXX query after replacing subqueries and CTEs: SELECT count(*) AS c
 
 SET client_min_messages to ERROR;
 DROP TABLE citus_local;
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/citus_local_table_triggers.out

@@ -7,7 +7,7 @@ CREATE SCHEMA citus_local_table_triggers;
 SET search_path TO citus_local_table_triggers;
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/citus_local_tables.out

@@ -10,7 +10,7 @@ SET search_path TO citus_local_tables_test_schema;
 ---------------------------------------------------------------------
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -26,12 +26,12 @@ SELECT citus_add_local_table_to_metadata('citus_local_table_1');
 (1 row)
 
 -- try to remove coordinator and observe failure as there exist a citus local table
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
 ERROR:  cannot remove the primary node of a node group which has shard placements
 DROP TABLE citus_local_table_1;
 NOTICE:  executing the command locally: DROP TABLE IF EXISTS citus_local_tables_test_schema.citus_local_table_1_xxxxx CASCADE
 -- this should work now as the citus local table is dropped
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -43,7 +43,7 @@ SELECT citus_add_local_table_to_metadata('citus_local_table_1');
 ERROR:  could not find the coordinator node in metadata as it is not added as a worker
 -- let coordinator have citus local tables again for next tests
 set client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/citus_local_tables_mx.out

@@ -7,7 +7,7 @@ CREATE SCHEMA citus_local_tables_mx;
 SET search_path TO citus_local_tables_mx;
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/citus_local_tables_queries.out

@@ -7,7 +7,7 @@ CREATE SCHEMA citus_local_table_queries;
 SET search_path TO citus_local_table_queries;
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/citus_local_tables_queries_mx.out

@@ -7,7 +7,7 @@ CREATE SCHEMA citus_local_table_queries_mx;
 SET search_path TO citus_local_table_queries_mx;
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/columnar_citus_integration.out

@@ -830,7 +830,7 @@ SELECT compression FROM columnar.options WHERE regclass = 'table_option_referenc
 DROP TABLE table_option_reference, table_option_reference_2;
 SET citus.shard_replication_factor TO 1;
 -- test options on a citus local table
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -1061,7 +1061,7 @@ SELECT compression FROM columnar.options WHERE regclass = 'table_option_citus_lo
 (1 row)
 
 DROP TABLE table_option_citus_local, table_option_citus_local_2;
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/coordinator_shouldhaveshards.out

@@ -4,7 +4,7 @@ SET search_path TO coordinator_shouldhaveshards;
 SET citus.next_shard_id TO 1503000;
 -- idempotently add node to allow this test to run without add_coordinator
 SET client_min_messages TO WARNING;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/create_citus_local_table_cascade.out

@@ -5,7 +5,7 @@ CREATE SCHEMA citus_add_local_table_to_metadata_cascade;
 SET search_path TO citus_add_local_table_to_metadata_cascade;
 SET client_min_messages to ERROR;
 -- ensure that coordinator is added to pg_dist_node
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/create_ref_dist_from_citus_local.out

@@ -5,7 +5,7 @@ CREATE SCHEMA create_ref_dist_from_citus_local;
 SET search_path TO create_ref_dist_from_citus_local;
 SET client_min_messages to ERROR;
 -- ensure that coordinator is added to pg_dist_node
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/escape_extension_name.out

@@ -32,7 +32,7 @@ SELECT run_command_on_workers($$SELECT count(*) FROM pg_extension WHERE extname
 (2 rows)
 
 -- show that extension recreation on new nodes works also fine with extension names that require escaping
-SELECT 1 from master_remove_node('localhost', :worker_2_port);
+SELECT 1 from citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -49,7 +49,7 @@ WHERE name = 'uuid-ossp'
 \gset
 :uuid_present_command;
 -- and add the other node
-SELECT 1 from master_add_node('localhost', :worker_2_port);
+SELECT 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/escape_extension_name_0.out

@@ -38,7 +38,7 @@ SELECT run_command_on_workers($$SELECT count(*) FROM pg_extension WHERE extname
 (2 rows)
 
 -- show that extension recreation on new nodes works also fine with extension names that require escaping
-SELECT 1 from master_remove_node('localhost', :worker_2_port);
+SELECT 1 from citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -60,7 +60,7 @@ WHERE name = 'uuid-ossp'
 (1 row)
 
 -- and add the other node
-SELECT 1 from master_add_node('localhost', :worker_2_port);
+SELECT 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/failure_add_disable_node.out

@@ -1,5 +1,5 @@
 --
--- failure_add_disable_node tests master_add_node, master_remove_node
+-- failure_add_disable_node tests citus_add_node, citus_remove_node
 -- master_activate_node for failures.
 -- master_disable_node and master_add_inactive_node can not be
 -- tested as they don't create network activity
@@ -122,14 +122,14 @@ ORDER BY placementid;
   200000 |          1
 (1 row)
 
--- master_remove_node fails when there are shards on that worker
+-- citus_remove_node fails when there are shards on that worker
-SELECT master_remove_node('localhost', :worker_2_proxy_port);
+SELECT citus_remove_node('localhost', :worker_2_proxy_port);
 ERROR:  cannot remove the last worker node because there are reference tables and it would cause data loss on reference tables
 HINT:  To proceed, either drop the reference tables or use undistribute_table() function to convert them to local tables
 -- drop event table and re-run remove
 DROP TABLE event_table;
-SELECT master_remove_node('localhost', :worker_2_proxy_port);
+SELECT citus_remove_node('localhost', :worker_2_proxy_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -160,8 +160,8 @@ SELECT master_add_inactive_node('localhost', :worker_2_proxy_port);
                         3
 (1 row)
 
-SELECT master_remove_node('localhost', :worker_2_proxy_port);
+SELECT citus_remove_node('localhost', :worker_2_proxy_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -182,8 +182,8 @@ SELECT citus.mitmproxy('conn.allow()');
 
 (1 row)
 
-SELECT master_add_node('localhost', :worker_2_proxy_port);
+SELECT citus_add_node('localhost', :worker_2_proxy_port);
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                4
 (1 row)
@@ -212,8 +212,8 @@ SELECT citus.mitmproxy('conn.allow()');
 
 (1 row)
 
-SELECT master_add_node('localhost', :worker_1_port);
+SELECT citus_add_node('localhost', :worker_1_port);
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                1
 (1 row)

src/test/regress/expected/failure_setup.out

@@ -5,14 +5,14 @@ SELECT citus.mitmproxy('conn.allow()');
 (1 row)
 
 -- add the workers
-SELECT master_add_node('localhost', :worker_1_port);
+SELECT citus_add_node('localhost', :worker_1_port);
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                1
 (1 row)
 
-SELECT master_add_node('localhost', :worker_2_proxy_port);  -- an mitmproxy which forwards to the second worker
+SELECT citus_add_node('localhost', :worker_2_proxy_port);  -- an mitmproxy which forwards to the second worker
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                2
 (1 row)

src/test/regress/expected/fkeys_between_local_ref.out

@@ -12,7 +12,7 @@ WHERE tablename=logicalrelid::regclass::text AND
       partmethod = 'n' AND repmodel = 's';
 -- remove coordinator if it is added to pg_dist_node and test
 -- behavior when coordinator is not added to metadata
-SELECT COUNT(master_remove_node(nodename, nodeport)) < 2
+SELECT COUNT(citus_remove_node(nodename, nodeport)) < 2
 FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:master_port;
  ?column?
 ---------------------------------------------------------------------
@@ -59,7 +59,7 @@ select create_reference_table('ref2');
 
 drop table if exists ref, ref2, other cascade;
 -- add coordinator to pg_dist_node for rest of the tests
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/follower_single_node.out

@@ -7,7 +7,7 @@ SET search_path TO single_node;
 SET citus.shard_count TO 4;
 SET citus.shard_replication_factor TO 1;
 SET citus.next_shard_id TO 93630500;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -238,7 +238,7 @@ ERROR:  node group 0 does not have a secondary node
 -- should work this time
 \c -reuse-previous=off regression - - :master_port
 SET search_path TO single_node;
-SELECT 1 FROM master_add_node('localhost', :follower_master_port, groupid => 0, noderole => 'secondary');
+SELECT 1 FROM citus_add_node('localhost', :follower_master_port, groupid => 0, noderole => 'secondary');
  ?column?
 ---------------------------------------------------------------------
         1
@@ -392,14 +392,14 @@ SET search_path TO single_node;
 SET client_min_messages TO WARNING;
 DROP SCHEMA single_node CASCADE;
 -- Remove the coordinator again
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
 -- Remove the secondary coordinator again
-SELECT 1 FROM master_remove_node('localhost', :follower_master_port);
+SELECT 1 FROM citus_remove_node('localhost', :follower_master_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/grant_on_schema_propagation.out

@@ -214,8 +214,8 @@ SELECT run_command_on_coordinator_and_workers('DROP SCHEMA non_dist_schema');
 -- test if the grantors are propagated correctly
 -- first remove one of the worker nodes
 SET citus.shard_replication_factor TO 1;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -257,7 +257,7 @@ SELECT nspname, nspacl FROM pg_namespace WHERE nspname = 'grantor_schema' ORDER
 
 \c - - - :master_port
 -- add the previously removed node
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -361,8 +361,8 @@ SELECT run_command_on_coordinator_and_workers('DROP SCHEMA dist_schema CASCADE')
 -- test grants on public schema
 -- first remove one of the worker nodes
 SET citus.shard_replication_factor TO 1;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -396,7 +396,7 @@ SELECT nspname, nspacl FROM pg_namespace WHERE nspname = 'public' ORDER BY nspna
 
 \c - - - :master_port
 -- add the previously removed node
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out

@@ -16,7 +16,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -42,7 +42,7 @@ nodeport|success|result
    57637|t      |    10
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -68,7 +68,7 @@ step s2-copy-to-reference-table:
  COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5';
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -91,7 +91,7 @@ nodeport|success|result
    57637|t      |    10
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -114,7 +114,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -140,7 +140,7 @@ nodeport|success|result
    57637|t      |     6
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -166,7 +166,7 @@ step s2-insert-to-reference-table:
  INSERT INTO test_reference_table VALUES (6);
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -189,7 +189,7 @@ nodeport|success|result
    57637|t      |     6
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -212,7 +212,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -239,7 +239,7 @@ nodeport|success|result
    57637|t      |     1
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -265,7 +265,7 @@ step s2-ddl-on-reference-table:
  CREATE INDEX reference_index ON test_reference_table(test_id);
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -289,7 +289,7 @@ nodeport|success|result
    57637|t      |     1
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -312,7 +312,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -345,7 +345,7 @@ nodeport|success|result
    57638|t      |     1
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -376,7 +376,7 @@ create_reference_table
 (1 row)
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -400,7 +400,7 @@ nodeport|success|result
    57637|t      |     1
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -420,7 +420,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -446,7 +446,7 @@ nodeport|success|result
    57637|t      |     5
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -469,7 +469,7 @@ step s2-copy-to-reference-table:
  COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5';
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -492,7 +492,7 @@ nodeport|success|result
    57637|t      |     5
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -512,7 +512,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -538,7 +538,7 @@ nodeport|success|result
    57637|t      |     1
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -561,7 +561,7 @@ step s2-insert-to-reference-table:
  INSERT INTO test_reference_table VALUES (6);
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -584,7 +584,7 @@ nodeport|success|result
    57637|t      |     1
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -604,7 +604,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -631,7 +631,7 @@ nodeport|success|result
    57637|t      |     1
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -654,7 +654,7 @@ step s2-ddl-on-reference-table:
  CREATE INDEX reference_index ON test_reference_table(test_id);
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -678,7 +678,7 @@ nodeport|success|result
    57637|t      |     1
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -698,7 +698,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -731,7 +731,7 @@ nodeport|success|result
    57638|t      |     1
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -759,7 +759,7 @@ create_reference_table
 (1 row)
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -783,7 +783,7 @@ nodeport|success|result
    57637|t      |     1
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -803,7 +803,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -831,7 +831,7 @@ nodeport|success|result
    57638|t      |     5
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -854,7 +854,7 @@ step s2-copy-to-reference-table:
  COPY test_reference_table FROM PROGRAM 'echo 1 && echo 2 && echo 3 && echo 4 && echo 5';
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -879,7 +879,7 @@ nodeport|success|result
    57638|t      |     5
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -899,7 +899,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -927,7 +927,7 @@ nodeport|success|result
    57638|t      |     1
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -950,7 +950,7 @@ step s2-insert-to-reference-table:
  INSERT INTO test_reference_table VALUES (6);
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -975,7 +975,7 @@ nodeport|success|result
    57638|t      |     1
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -995,7 +995,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1023,7 +1023,7 @@ nodeport|success|result
    57638|t      |     1
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -1046,7 +1046,7 @@ step s2-ddl-on-reference-table:
  CREATE INDEX reference_index ON test_reference_table(test_id);
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -1071,7 +1071,7 @@ nodeport|success|result
    57638|t      |     1
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -1091,7 +1091,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1124,7 +1124,7 @@ nodeport|success|result
    57638|t      |     1
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -1152,7 +1152,7 @@ create_reference_table
 (1 row)
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -1177,7 +1177,7 @@ nodeport|success|result
    57638|t      |     1
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -1194,7 +1194,7 @@ step s1-do-not-replicate-on-activate:
  SET citus.replicate_reference_tables_on_activate TO off;
 
 step s1-add-second-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1227,7 +1227,7 @@ replicate_reference_tables
 step s2-commit:
  COMMIT;
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 

src/test/regress/expected/isolation_add_remove_node.out

@@ -10,7 +10,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -18,13 +18,13 @@ step s1-add-node-1:
 (1 row)
 
 step s2-remove-node-1:
- SELECT * FROM master_remove_node('localhost', 57637);
+ SELECT * FROM citus_remove_node('localhost', 57637);
  <waiting ...>
 step s1-commit: 
  COMMIT;
 
 step s2-remove-node-1: <... completed>
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -36,7 +36,7 @@ nodename|nodeport|isactive
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 (0 rows)
 
@@ -51,7 +51,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -59,7 +59,7 @@ step s1-add-node-1:
 (1 row)
 
 step s2-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s1-commit: 
  COMMIT;
@@ -79,7 +79,7 @@ localhost|   57637|t
 localhost|   57638|t
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -96,7 +96,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -104,7 +104,7 @@ step s1-add-node-1:
 (1 row)
 
 step s2-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
  <waiting ...>
 step s1-commit: 
  COMMIT;
@@ -123,7 +123,7 @@ nodename |nodeport|isactive
 localhost|   57637|t
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -139,7 +139,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -147,7 +147,7 @@ step s1-add-node-1:
 (1 row)
 
 step s2-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s1-abort: 
  ABORT;
@@ -166,7 +166,7 @@ nodename |nodeport|isactive
 localhost|   57638|t
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -182,7 +182,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -190,7 +190,7 @@ step s1-add-node-1:
 (1 row)
 
 step s2-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
  <waiting ...>
 step s1-abort: 
  ABORT;
@@ -209,7 +209,7 @@ nodename |nodeport|isactive
 localhost|   57637|t
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -222,7 +222,7 @@ starting permutation: s1-add-node-1 s1-add-node-2 s1-begin s1-remove-node-1 s2-r
 (1 row)
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -230,7 +230,7 @@ step s1-add-node-1:
 (1 row)
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -241,21 +241,21 @@ step s1-begin:
  BEGIN;
 
 step s1-remove-node-1:
- SELECT * FROM master_remove_node('localhost', 57637);
+ SELECT * FROM citus_remove_node('localhost', 57637);
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 step s2-remove-node-2:
- SELECT * FROM master_remove_node('localhost', 57638);
+ SELECT * FROM citus_remove_node('localhost', 57638);
  <waiting ...>
 step s1-commit: 
  COMMIT;
 
 step s2-remove-node-2: <... completed>
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -267,7 +267,7 @@ nodename|nodeport|isactive
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 (0 rows)
 
@@ -279,7 +279,7 @@ starting permutation: s1-add-node-1 s1-begin s1-remove-node-1 s2-remove-node-1 s
 (1 row)
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -290,15 +290,15 @@ step s1-begin:
  BEGIN;
 
 step s1-remove-node-1:
- SELECT * FROM master_remove_node('localhost', 57637);
+ SELECT * FROM citus_remove_node('localhost', 57637);
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 step s2-remove-node-1:
- SELECT * FROM master_remove_node('localhost', 57637);
+ SELECT * FROM citus_remove_node('localhost', 57637);
  <waiting ...>
 step s1-commit: 
  COMMIT;
@@ -312,7 +312,7 @@ nodename|nodeport|isactive
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 (0 rows)
 
@@ -324,7 +324,7 @@ starting permutation: s1-add-node-1 s1-begin s1-activate-node-1 s2-activate-node
 (1 row)
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -362,7 +362,7 @@ nodename |nodeport|isactive
 localhost|   57637|t
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -375,7 +375,7 @@ starting permutation: s1-add-node-1 s1-begin s1-disable-node-1 s2-disable-node-1
 (1 row)
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -413,7 +413,7 @@ nodename |nodeport|isactive
 localhost|   57637|f
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -464,7 +464,7 @@ nodename |nodeport|isactive
 localhost|   57637|t
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -515,7 +515,7 @@ nodename |nodeport|isactive
 localhost|   57637|f
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -528,7 +528,7 @@ starting permutation: s1-add-node-1 s1-begin s1-disable-node-1 s2-activate-node-
 (1 row)
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -566,7 +566,7 @@ nodename |nodeport|isactive
 localhost|   57637|t
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -579,7 +579,7 @@ starting permutation: s1-add-node-1 s1-begin s1-activate-node-1 s2-disable-node-
 (1 row)
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -617,7 +617,7 @@ nodename |nodeport|isactive
 localhost|   57637|f
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -668,7 +668,7 @@ nodename |nodeport|isactive
 localhost|   57637|t
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -719,7 +719,7 @@ nodename |nodeport|isactive
 localhost|   57637|f
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -770,7 +770,7 @@ nodename |nodeport|isactive
 localhost|   57637|f
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -783,7 +783,7 @@ starting permutation: s1-add-node-1 s1-begin s1-disable-node-1 s2-disable-node-1
 (1 row)
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -821,7 +821,7 @@ nodename |nodeport|isactive
 localhost|   57637|f
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/isolation_cluster_management.out

@@ -2,8 +2,8 @@ Parsed test spec with 1 sessions
 
 starting permutation: s1a
 step s1a:
-    SELECT 1 FROM master_add_node('localhost', 57637);
+    SELECT 1 FROM citus_add_node('localhost', 57637);
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------

src/test/regress/expected/isolation_create_citus_local_table.out

@@ -14,7 +14,7 @@ step s1-commit: COMMIT;
 step s2-create-citus-local-table-1: <... completed>
 ERROR:  relation "citus_local_table_1_xxxxxxx" is a shard relation
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -34,7 +34,7 @@ step s1-commit: COMMIT;
 step s2-create-citus-local-table-3: <... completed>
 ERROR:  relation "citus_local_table_3_xxxxxxx" is a shard relation
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -58,7 +58,7 @@ citus_add_local_table_to_metadata
 (1 row)
 
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -81,7 +81,7 @@ a
 (0 rows)
 
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -100,7 +100,7 @@ step s2-update: UPDATE citus_local_table_1 SET a=1 WHERE a=2; <waiting ...>
 step s1-commit: COMMIT;
 step s2-update: <... completed>
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -119,7 +119,7 @@ step s2-truncate: TRUNCATE citus_local_table_1; <waiting ...>
 step s1-commit: COMMIT;
 step s2-truncate: <... completed>
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -144,7 +144,7 @@ step s2-fkey-to-another: ALTER TABLE citus_local_table_1 ADD CONSTRAINT fkey_c_t
 step s1-commit: COMMIT;
 step s2-fkey-to-another: <... completed>
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -159,12 +159,12 @@ citus_add_local_table_to_metadata
 
 (1 row)
 
-step s2-remove-coordinator: SELECT master_remove_node('localhost', 57636); <waiting ...>
+step s2-remove-coordinator: SELECT citus_remove_node('localhost', 57636); <waiting ...>
 step s1-commit: COMMIT;
 step s2-remove-coordinator: <... completed>
 ERROR:  cannot remove the primary node of a node group which has shard placements
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -179,7 +179,7 @@ step s1-commit: COMMIT;
 step s2-create-citus-local-table-1: <... completed>
 ERROR:  cannot add local table to metadata, relation does not exist
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -198,7 +198,7 @@ citus_add_local_table_to_metadata
 (1 row)
 
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -221,7 +221,7 @@ citus_add_local_table_to_metadata
 (1 row)
 
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -230,8 +230,8 @@ master_remove_node
 starting permutation: s1-begin s2-begin s1-remove-coordinator s2-create-citus-local-table-1 s1-commit s2-commit
 step s1-begin: BEGIN;
 step s2-begin: BEGIN;
-step s1-remove-coordinator: SELECT master_remove_node('localhost', 57636);
+step s1-remove-coordinator: SELECT citus_remove_node('localhost', 57636);
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -241,21 +241,21 @@ step s1-commit: COMMIT;
 step s2-create-citus-local-table-1: <... completed>
 ERROR:  could not find the coordinator node in metadata as it is not added as a worker
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 (0 rows)
 
 
 starting permutation: s1-remove-coordinator s1-begin s2-begin s1-add-coordinator s2-create-citus-local-table-1 s1-commit s2-commit
-step s1-remove-coordinator: SELECT master_remove_node('localhost', 57636);
+step s1-remove-coordinator: SELECT citus_remove_node('localhost', 57636);
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 step s1-begin: BEGIN;
 step s2-begin: BEGIN;
-step s1-add-coordinator: SELECT 1 FROM master_add_node('localhost', 57636, 0);
+step s1-add-coordinator: SELECT 1 FROM citus_add_node('localhost', 57636, 0);
 ?column?
 ---------------------------------------------------------------------
        1
@@ -270,7 +270,7 @@ citus_add_local_table_to_metadata
 (1 row)
 
 step s2-commit: COMMIT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/isolation_create_restore_point.out

@@ -232,9 +232,9 @@ step s1-begin:
  SET citus.multi_shard_commit_protocol TO '2pc';
 
 step s1-remove-node:
- SELECT master_remove_node('localhost', 9999);
+ SELECT citus_remove_node('localhost', 9999);
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/isolation_create_table_vs_add_remove_node.out

@@ -10,7 +10,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -57,7 +57,7 @@ x|y
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -74,7 +74,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -121,7 +121,7 @@ x|y
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -148,7 +148,7 @@ create_distributed_table
 (1 row)
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -184,7 +184,7 @@ x|y
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -198,7 +198,7 @@ localhost|    57637
 (1 row)
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -209,9 +209,9 @@ step s1-begin:
  BEGIN;
 
 step s1-remove-node-2:
- SELECT * FROM master_remove_node('localhost', 57638);
+ SELECT * FROM citus_remove_node('localhost', 57638);
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -256,7 +256,7 @@ x|y
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -269,7 +269,7 @@ localhost|    57637
 (1 row)
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -280,9 +280,9 @@ step s1-begin:
  BEGIN;
 
 step s1-remove-node-2:
- SELECT * FROM master_remove_node('localhost', 57638);
+ SELECT * FROM citus_remove_node('localhost', 57638);
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -327,7 +327,7 @@ x|y
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -341,7 +341,7 @@ localhost|    57637
 (1 row)
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -363,7 +363,7 @@ create_distributed_table
 (1 row)
 
 step s1-remove-node-2:
- SELECT * FROM master_remove_node('localhost', 57638);
+ SELECT * FROM citus_remove_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -395,7 +395,7 @@ x|y
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -409,7 +409,7 @@ localhost|    57637
 (1 row)
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -420,9 +420,9 @@ step s1-begin:
  BEGIN;
 
 step s1-remove-node-2:
- SELECT * FROM master_remove_node('localhost', 57638);
+ SELECT * FROM citus_remove_node('localhost', 57638);
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -442,7 +442,7 @@ step s2-select:
  SELECT * FROM dist_table;
 
 ERROR:  relation "dist_table" does not exist
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -455,7 +455,7 @@ localhost|    57637
 (1 row)
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -477,7 +477,7 @@ create_distributed_table
 (1 row)
 
 step s1-remove-node-2:
- SELECT * FROM master_remove_node('localhost', 57638);
+ SELECT * FROM citus_remove_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -491,7 +491,7 @@ x|y
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -505,7 +505,7 @@ localhost|    57637
 (1 row)
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -516,9 +516,9 @@ step s1-begin:
  BEGIN;
 
 step s1-remove-node-2:
- SELECT * FROM master_remove_node('localhost', 57638);
+ SELECT * FROM citus_remove_node('localhost', 57638);
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -550,7 +550,7 @@ x|y
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -563,7 +563,7 @@ localhost|    57637
 (1 row)
 
 step s1-add-node-2:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -590,7 +590,7 @@ create_distributed_table
 (1 row)
 
 step s1-remove-node-2:
- SELECT * FROM master_remove_node('localhost', 57638);
+ SELECT * FROM citus_remove_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -604,7 +604,7 @@ x|y
 ---------------------------------------------------------------------
 (0 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 

src/test/regress/expected/isolation_ensure_dependency_activate_node.out

@@ -7,7 +7,7 @@ starting permutation: s1-print-distributed-objects s1-begin s1-add-worker s2-pub
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -19,7 +19,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -66,7 +66,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -75,7 +75,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -153,7 +153,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -167,7 +167,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s1-add-work
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -179,7 +179,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -226,7 +226,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -238,7 +238,7 @@ step s2-begin:
  BEGIN;
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -319,7 +319,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -333,7 +333,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s2-public-s
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -345,7 +345,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -392,7 +392,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -418,7 +418,7 @@ create_distributed_table
 (1 row)
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -485,7 +485,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -499,7 +499,7 @@ starting permutation: s1-print-distributed-objects s1-begin s1-add-worker s2-cre
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -511,7 +511,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -558,7 +558,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -567,7 +567,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -647,7 +647,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -661,7 +661,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s1-add-work
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -673,7 +673,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -720,7 +720,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -732,7 +732,7 @@ step s2-begin:
  BEGIN;
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -815,7 +815,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -829,7 +829,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s2-create-s
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -841,7 +841,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -888,7 +888,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -915,7 +915,7 @@ create_distributed_table
 (1 row)
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -983,7 +983,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -997,7 +997,7 @@ starting permutation: s1-print-distributed-objects s2-create-schema s1-begin s2-
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -1009,7 +1009,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1056,7 +1056,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -1075,7 +1075,7 @@ step s3-begin:
  BEGIN;
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1172,7 +1172,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -1186,7 +1186,7 @@ starting permutation: s1-print-distributed-objects s1-add-worker s2-create-schem
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -1198,7 +1198,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1245,13 +1245,13 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1354,7 +1354,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -1368,7 +1368,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s3-begin s1
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -1380,7 +1380,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1427,7 +1427,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -1442,7 +1442,7 @@ step s3-begin:
  BEGIN;
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1545,7 +1545,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -1559,7 +1559,7 @@ starting permutation: s1-print-distributed-objects s1-begin s1-add-worker s2-pub
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -1571,7 +1571,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1618,7 +1618,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -1627,7 +1627,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1698,7 +1698,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -1712,7 +1712,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-public-schema s2-
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -1724,7 +1724,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1771,7 +1771,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -1786,7 +1786,7 @@ step s2-create-type:
  CREATE TYPE tt1 AS (a int, b int);
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1850,7 +1850,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -1864,7 +1864,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-begin s2-create-s
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -1876,7 +1876,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -1923,7 +1923,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -1953,7 +1953,7 @@ create_distributed_table
 (1 row)
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -2022,7 +2022,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -2036,7 +2036,7 @@ starting permutation: s1-print-distributed-objects s1-begin s1-add-worker s2-pub
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -2048,7 +2048,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -2095,7 +2095,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -2104,7 +2104,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -2195,7 +2195,7 @@ run_command_on_workers
 (localhost,57638,t,1)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -2209,7 +2209,7 @@ starting permutation: s1-print-distributed-objects s1-begin s2-public-schema s2-
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -2221,7 +2221,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -2268,7 +2268,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -2303,7 +2303,7 @@ wait_until_metadata_sync
 (1 row)
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -2375,7 +2375,7 @@ run_command_on_workers
 (localhost,57638,t,1)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -2389,7 +2389,7 @@ starting permutation: s1-print-distributed-objects s2-begin s2-create-schema s2-
 (1 row)
 
 step s1-print-distributed-objects:
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
     -- print if the schema has been created
@@ -2401,7 +2401,7 @@ step s1-print-distributed-objects:
     -- print if the function has been created
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -2448,7 +2448,7 @@ run_command_on_workers
 (localhost,57638,t,0)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -2484,7 +2484,7 @@ step s1-begin:
     BEGIN;
 
 step s1-add-worker:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -2557,7 +2557,7 @@ run_command_on_workers
 (localhost,57638,t,1)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 

src/test/regress/expected/isolation_extension_commands.out

@@ -5,7 +5,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -54,7 +54,7 @@ run_command_on_workers
 (localhost,57638,t,public)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -66,7 +66,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -115,7 +115,7 @@ run_command_on_workers
 (localhost,57638,t,public)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -124,7 +124,7 @@ master_remove_node
 
 starting permutation: s1-add-node-1 s1-begin s1-remove-node-1 s2-drop-extension s1-commit s1-print
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -135,7 +135,7 @@ step s1-begin:
  BEGIN;
 
 step s1-remove-node-1:
- SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM citus_remove_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -180,7 +180,7 @@ run_command_on_workers
 (localhost,57638,t,"")
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -191,7 +191,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -240,7 +240,7 @@ run_command_on_workers
 (localhost,57638,t,schema1)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -252,7 +252,7 @@ step s1-begin:
  BEGIN;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -300,7 +300,7 @@ run_command_on_workers
 (localhost,57638,t,"")
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -309,7 +309,7 @@ master_remove_node
 
 starting permutation: s1-add-node-1 s1-create-extension-with-schema2 s1-begin s1-remove-node-1 s2-alter-extension-set-schema3 s1-commit s1-print
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -323,7 +323,7 @@ step s1-begin:
  BEGIN;
 
 step s1-remove-node-1:
- SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM citus_remove_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -369,7 +369,7 @@ run_command_on_workers
 (localhost,57638,t,schema3)
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -377,7 +377,7 @@ master_remove_node
 
 starting permutation: s1-add-node-1 s2-drop-extension s1-begin s1-remove-node-1 s2-create-extension-with-schema1 s1-commit s1-print
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -391,7 +391,7 @@ step s1-begin:
  BEGIN;
 
 step s1-remove-node-1:
- SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM citus_remove_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -437,7 +437,7 @@ run_command_on_workers
 (localhost,57638,t,schema1)
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -445,7 +445,7 @@ master_remove_node
 
 starting permutation: s2-add-node-1 s2-drop-extension s2-remove-node-1 s2-begin s2-create-extension-version-11 s1-add-node-1 s2-commit s1-print
 step s2-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -456,7 +456,7 @@ step s2-drop-extension:
  drop extension seg;
 
 step s2-remove-node-1:
- SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM citus_remove_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -470,7 +470,7 @@ step s2-create-extension-version-11:
  CREATE extension seg VERSION "1.1";
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -515,7 +515,7 @@ run_command_on_workers
 (localhost,57638,t,"")
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -527,7 +527,7 @@ step s2-drop-extension:
  drop extension seg;
 
 step s2-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -538,7 +538,7 @@ step s2-create-extension-version-11:
  CREATE extension seg VERSION "1.1";
 
 step s2-remove-node-1:
- SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM citus_remove_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -552,7 +552,7 @@ step s2-alter-extension-update-to-version-12:
  ALTER extension seg update to "1.2";
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -598,7 +598,7 @@ run_command_on_workers
 (localhost,57638,t,public)
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -607,7 +607,7 @@ master_remove_node
 
 starting permutation: s2-add-node-1 s2-begin s2-drop-extension s1-remove-node-1 s2-commit s1-print
 step s2-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -621,7 +621,7 @@ step s2-drop-extension:
  drop extension seg;
 
 step s1-remove-node-1:
- SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM citus_remove_node('localhost', 57637);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -663,7 +663,7 @@ run_command_on_workers
 (localhost,57638,t,"")
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -677,7 +677,7 @@ step s2-create-extension-with-schema1:
  CREATE extension seg with schema schema1;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -722,7 +722,7 @@ run_command_on_workers
 (localhost,57638,t,"")
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -734,7 +734,7 @@ step s2-drop-extension:
  drop extension seg;
 
 step s2-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -751,7 +751,7 @@ step s2-alter-extension-version-13:
  ALTER extension seg update to "1.3";
 
 step s1-remove-node-1:
- SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM citus_remove_node('localhost', 57637);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -794,7 +794,7 @@ run_command_on_workers
 (localhost,57638,t,schema2)
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -805,7 +805,7 @@ step s2-drop-extension:
  drop extension seg;
 
 step s2-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -819,7 +819,7 @@ step s2-create-extension-version-11:
  CREATE extension seg VERSION "1.1";
 
 step s1-remove-node-1:
- SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM citus_remove_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -861,7 +861,7 @@ run_command_on_workers
 (localhost,57638,t,"")
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -872,7 +872,7 @@ step s2-drop-extension:
  drop extension seg;
 
 step s2-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -883,7 +883,7 @@ step s2-create-extension-version-11:
  CREATE extension seg VERSION "1.1";
 
 step s2-remove-node-1:
- SELECT 1 FROM master_remove_node('localhost', 57637);
+ SELECT 1 FROM citus_remove_node('localhost', 57637);
 
 ?column?
 ---------------------------------------------------------------------
@@ -897,7 +897,7 @@ step s2-drop-extension:
  drop extension seg;
 
 step s1-add-node-1:
- SELECT 1 FROM master_add_node('localhost', 57637);
+ SELECT 1 FROM citus_add_node('localhost', 57637);
  <waiting ...>
 step s2-commit: 
  COMMIT;
@@ -942,7 +942,7 @@ run_command_on_workers
 (localhost,57638,t,"")
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 

src/test/regress/expected/isolation_master_update_node.out

@@ -24,7 +24,7 @@ master_update_node
 (1 row)
 
 step s2-abort: ABORT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -60,7 +60,7 @@ server closed the connection unexpectedly
 	This probably means the server terminated abnormally
 	before or while processing the request.
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 

src/test/regress/expected/isolation_master_update_node_0.out

@@ -20,7 +20,7 @@ master_update_node
 
 
 step s2-abort: ABORT;
-master_remove_node
+citus_remove_node
 
 
 
@@ -49,7 +49,7 @@ WARNING: this step had a leftover error message
 FATAL:  terminating connection due to administrator command
 SSL connection has been closed unexpectedly
 
-master_remove_node
+citus_remove_node
 
 
 

src/test/regress/expected/isolation_master_update_node_1.out

@@ -24,7 +24,7 @@ master_update_node
 (1 row)
 
 step s2-abort: ABORT;
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -59,7 +59,7 @@ FATAL:  terminating connection due to administrator command
 FATAL:  terminating connection due to administrator command
 SSL connection has been closed unexpectedly
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 

src/test/regress/expected/isolation_replicate_reference_tables_to_coordinator.out

@@ -53,7 +53,7 @@ step s1-end:
 step s2-end:
     END;
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -118,7 +118,7 @@ step s2-end:
 step s1-end:
     END;
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -160,7 +160,7 @@ step s1-end:
 step s2-end:
     END;
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/isolation_shouldhaveshards.out

@@ -7,7 +7,7 @@ starting permutation: s1-add-second-node s1-begin s2-begin s2-create-distributed
 (1 row)
 
 step s1-add-second-node:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -57,7 +57,7 @@ nodeport|count
    57638|    2
 (2 rows)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -71,7 +71,7 @@ starting permutation: s1-add-second-node s1-begin s2-begin s1-noshards s2-create
 (1 row)
 
 step s1-add-second-node:
- SELECT 1 FROM master_add_node('localhost', 57638);
+ SELECT 1 FROM citus_add_node('localhost', 57638);
 
 ?column?
 ---------------------------------------------------------------------
@@ -120,7 +120,7 @@ nodeport|count
    57638|    4
 (1 row)
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 
@@ -162,7 +162,7 @@ master_update_node
 step s2-commit:
  COMMIT;
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -199,7 +199,7 @@ ERROR:  node at "localhost:xxxxx" does not exist
 step s1-commit:
  COMMIT;
 
-master_remove_node
+citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/local_shard_copy.out

@@ -3,7 +3,7 @@ SET search_path TO local_shard_copy;
 SET client_min_messages TO DEBUG;
 SET citus.next_shard_id TO 1570000;
 SET citus.replicate_reference_tables_on_activate TO off;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupid := 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupid := 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/local_shard_utility_command_execution.out

@@ -13,7 +13,7 @@ CREATE SCHEMA local_commands_test_schema;
 SET search_path TO local_commands_test_schema;
 -- let coordinator have distributed table shards/placements
 set client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/mixed_relkind_tests.out

@@ -6,7 +6,7 @@ CREATE SCHEMA mixed_relkind_tests;
 SET search_path TO mixed_relkind_tests;
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages TO ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/multi_cluster_management.out

@@ -4,7 +4,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART 1;
 SET citus.enable_object_propagation TO off; -- prevent object propagation on add node during setup
 -- Tests functions related to cluster membership
 -- add the nodes to the cluster
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -12,7 +12,7 @@ DETAIL:  distributed objects are only kept in sync when citus.enable_object_prop
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -29,8 +29,8 @@ SELECT master_get_active_worker_nodes();
 (2 rows)
 
 -- try to add a node that is already in the cluster
-SELECT * FROM master_add_node('localhost', :worker_1_port);
+SELECT * FROM citus_add_node('localhost', :worker_1_port);
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                1
 (1 row)
@@ -44,8 +44,8 @@ SELECT master_get_active_worker_nodes();
 (2 rows)
 
 -- try to remove a node (with no placements)
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -58,7 +58,7 @@ SELECT master_get_active_worker_nodes();
 (1 row)
 
 -- try to disable a node with no placements see that node is removed
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -117,7 +117,7 @@ SELECT shardid, shardstate, nodename, nodeport FROM pg_dist_shard_placement WHER
 (8 rows)
 
 -- try to remove a node with active placements and see that node removal is failed
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
 ERROR:  cannot remove the primary node of a node group which has shard placements
 HINT:  To proceed, either drop the distributed tables or use undistribute_table() function to convert them to local tables
 SELECT master_get_active_worker_nodes();
@@ -184,10 +184,10 @@ NOTICE:  not propagating CREATE ROLE/USER commands to worker nodes
 HINT:  Connect to worker nodes directly to manually create all necessary users and roles.
 GRANT EXECUTE ON FUNCTION master_activate_node(text,int) TO node_metadata_user;
 GRANT EXECUTE ON FUNCTION master_add_inactive_node(text,int,int,noderole,name) TO node_metadata_user;
-GRANT EXECUTE ON FUNCTION master_add_node(text,int,int,noderole,name) TO node_metadata_user;
+GRANT EXECUTE ON FUNCTION citus_add_node(text,int,int,noderole,name) TO node_metadata_user;
 GRANT EXECUTE ON FUNCTION master_add_secondary_node(text,int,text,int,name) TO node_metadata_user;
 GRANT EXECUTE ON FUNCTION master_disable_node(text,int) TO node_metadata_user;
-GRANT EXECUTE ON FUNCTION master_remove_node(text,int) TO node_metadata_user;
+GRANT EXECUTE ON FUNCTION citus_remove_node(text,int) TO node_metadata_user;
 GRANT EXECUTE ON FUNCTION master_update_node(int,text,int,bool,int) TO node_metadata_user;
 -- Removing public schema from pg_dist_object because it breaks the next tests
 DELETE FROM citus.pg_dist_object WHERE objid = 'public'::regnamespace::oid;
@@ -199,10 +199,10 @@ SELECT 1 FROM master_activate_node('localhost', :worker_2_port + 1);
 ERROR:  permission denied for function master_activate_node
 SELECT 1 FROM master_disable_node('localhost', :worker_2_port + 1);
 ERROR:  permission denied for function master_disable_node
-SELECT 1 FROM master_remove_node('localhost', :worker_2_port + 1);
+SELECT 1 FROM citus_remove_node('localhost', :worker_2_port + 1);
-ERROR:  permission denied for function master_remove_node
+ERROR:  permission denied for function citus_remove_node
-SELECT 1 FROM master_add_node('localhost', :worker_2_port + 1);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port + 1);
-ERROR:  permission denied for function master_add_node
+ERROR:  permission denied for function citus_add_node
 SELECT 1 FROM master_add_secondary_node('localhost', :worker_2_port + 2, 'localhost', :worker_2_port);
 ERROR:  permission denied for function master_add_secondary_node
 SELECT master_update_node(nodeid, 'localhost', :worker_2_port + 3) FROM pg_dist_node WHERE nodeport = :worker_2_port;
@@ -231,13 +231,13 @@ SELECT 1 FROM master_disable_node('localhost', :worker_2_port + 1);
         1
 (1 row)
 
-SELECT 1 FROM master_remove_node('localhost', :worker_2_port + 1);
+SELECT 1 FROM citus_remove_node('localhost', :worker_2_port + 1);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port + 1);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port + 1);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -287,7 +287,7 @@ DETAIL:  distributed objects are only kept in sync when citus.enable_object_prop
 (1 row)
 
 -- try to remove a node with active placements and see that node removal is failed
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
 ERROR:  cannot remove the primary node of a node group which has shard placements
 HINT:  To proceed, either drop the distributed tables or use undistribute_table() function to convert them to local tables
 -- mark all placements in the candidate node as inactive
@@ -307,7 +307,7 @@ SELECT shardid, shardstate, nodename, nodeport FROM pg_dist_shard_placement WHER
 (8 rows)
 
 -- try to remove a node with only inactive placements and see that removal still fails
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
 ERROR:  cannot remove the primary node of a node group which has shard placements
 HINT:  To proceed, either drop the distributed tables or use undistribute_table() function to convert them to local tables
 SELECT master_get_active_worker_nodes();
@@ -380,8 +380,8 @@ SELECT logicalrelid, shardid, shardstate, nodename, nodeport FROM pg_dist_shard_
 
 SELECT * INTO removed_placements FROM pg_dist_placement WHERE shardstate = 4;
 -- try to remove a node with only to be deleted placements and see that removal succeeds
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -392,10 +392,10 @@ SELECT master_get_active_worker_nodes();
  (localhost,57637)
 (1 row)
 
-SELECT master_add_node('localhost', :worker_2_port, groupId := :worker_2_group);
+SELECT citus_add_node('localhost', :worker_2_port, groupId := :worker_2_group);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                7
 (1 row)
@@ -403,7 +403,7 @@ DETAIL:  distributed objects are only kept in sync when citus.enable_object_prop
 -- put removed placements back for testing purposes(in practice we wouldn't have only old placements for a shard)
 INSERT INTO pg_dist_placement SELECT * FROM removed_placements;
 -- clean-up
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -422,23 +422,23 @@ DELETE FROM pg_dist_node WHERE nodeport=:worker_2_port;
 SELECT * FROM cluster_management_test;
 ERROR:  there is a shard placement in node group 3 but there are no nodes in that group
 -- clean-up
-SELECT master_add_node('localhost', :worker_2_port) AS new_node \gset
+SELECT citus_add_node('localhost', :worker_2_port) AS new_node \gset
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
 SELECT groupid AS new_group FROM pg_dist_node WHERE nodeid = :new_node \gset
 UPDATE pg_dist_placement SET groupid = :new_group WHERE groupid = :worker_2_group;
 -- test that you are allowed to remove secondary nodes even if there are placements
-SELECT 1 FROM master_add_node('localhost', 9990, groupid => :new_group, noderole => 'secondary');
+SELECT 1 FROM citus_add_node('localhost', 9990, groupid => :new_group, noderole => 'secondary');
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
 ERROR:  cannot remove the primary node of a node group which has shard placements
 HINT:  To proceed, either drop the distributed tables or use undistribute_table() function to convert them to local tables
-SELECT master_remove_node('localhost', 9990);
+SELECT citus_remove_node('localhost', 9990);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -446,8 +446,8 @@ SELECT master_remove_node('localhost', 9990);
 -- clean-up
 DROP TABLE cluster_management_test;
 -- check that adding/removing nodes are propagated to nodes with metadata
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -458,7 +458,7 @@ SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
 
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -474,8 +474,8 @@ SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodep
 (1 row)
 
 \c - - - :master_port
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -496,7 +496,7 @@ NOTICE:  dropping metadata on the node (localhost,57637)
 
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -514,9 +514,9 @@ SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodep
 SET citus.enable_object_propagation TO off; -- prevent object propagation on add node during setup
 -- check that removing two nodes in the same transaction works
 SELECT
-	master_remove_node('localhost', :worker_1_port),
+	citus_remove_node('localhost', :worker_1_port),
-	master_remove_node('localhost', :worker_2_port);
+	citus_remove_node('localhost', :worker_2_port);
- master_remove_node | master_remove_node
+ citus_remove_node | citus_remove_node
 ---------------------------------------------------------------------
                     |
 (1 row)
@@ -529,13 +529,13 @@ SELECT count(1) FROM pg_dist_node;
 
 -- check that adding two nodes in the same transaction works
 SELECT
-	master_add_node('localhost', :worker_1_port),
+	citus_add_node('localhost', :worker_1_port),
-	master_add_node('localhost', :worker_2_port);
+	citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
- master_add_node | master_add_node
+ citus_add_node | citus_add_node
 ---------------------------------------------------------------------
               12 |              13
 (1 row)
@@ -549,13 +549,13 @@ SELECT * FROM pg_dist_node ORDER BY nodeid;
 
 -- check that mixed add/remove node commands work fine inside transaction
 BEGIN;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -563,8 +563,8 @@ DETAIL:  distributed objects are only kept in sync when citus.enable_object_prop
         1
 (1 row)
 
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -582,7 +582,7 @@ SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
 (1 row)
 
 BEGIN;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -590,13 +590,13 @@ DETAIL:  distributed objects are only kept in sync when citus.enable_object_prop
         1
 (1 row)
 
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -620,14 +620,14 @@ SELECT nodename, nodeport FROM pg_dist_node WHERE nodename='localhost' AND nodep
 
 \c - - - :master_port
 SET citus.enable_object_propagation TO off; -- prevent object propagation on add node during setup
-SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 
 (2 rows)
 
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -635,7 +635,7 @@ DETAIL:  distributed objects are only kept in sync when citus.enable_object_prop
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -645,14 +645,14 @@ DETAIL:  distributed objects are only kept in sync when citus.enable_object_prop
 
 -- check that a distributed table can be created after adding a node in a transaction
 SET citus.shard_count TO 4;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 BEGIN;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
  ?column?
@@ -713,21 +713,21 @@ NOTICE:  dropping metadata on the node (localhost,57638)
 (1 row)
 
 -- check that you can't add a primary to a non-default cluster
-SELECT master_add_node('localhost', 9999, nodecluster => 'olap');
+SELECT citus_add_node('localhost', 9999, nodecluster => 'olap');
 ERROR:  primaries must be added to the default cluster
 -- check that you can't add more than one primary to a group
 SELECT groupid AS worker_1_group FROM pg_dist_node WHERE nodeport = :worker_1_port \gset
-SELECT master_add_node('localhost', 9999, groupid => :worker_1_group, noderole => 'primary');
+SELECT citus_add_node('localhost', 9999, groupid => :worker_1_group, noderole => 'primary');
 ERROR:  group 14 already has a primary node
 -- check that you can add secondaries and unavailable nodes to a group
 SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset
-SELECT 1 FROM master_add_node('localhost', 9998, groupid => :worker_1_group, noderole => 'secondary');
+SELECT 1 FROM citus_add_node('localhost', 9998, groupid => :worker_1_group, noderole => 'secondary');
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', 9997, groupid => :worker_1_group, noderole => 'unavailable');
+SELECT 1 FROM citus_add_node('localhost', 9997, groupid => :worker_1_group, noderole => 'unavailable');
  ?column?
 ---------------------------------------------------------------------
         1
@@ -759,8 +759,8 @@ SELECT master_disable_node('localhost', 9999);
 
 (1 row)
 
-SELECT master_remove_node('localhost', 9999);
+SELECT citus_remove_node('localhost', 9999);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -785,21 +785,21 @@ ERROR:  new row for relation "pg_dist_node" violates check constraint "primaries
 DETAIL:  Failing row contains (17, 14, localhost, 57637, default, f, t, primary, olap, f, t).
 -- check that you /can/ add a secondary node to a non-default cluster
 SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset
-SELECT master_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> 'olap');
+SELECT citus_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary', nodecluster=> 'olap');
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
               26
 (1 row)
 
 -- check that super-long cluster names are truncated
-SELECT master_add_node('localhost', 8887, groupid => :worker_1_group, noderole => 'secondary', nodecluster=>
+SELECT citus_add_node('localhost', 8887, groupid => :worker_1_group, noderole => 'secondary', nodecluster=>
 	'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.'
 	'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.'
 	'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.'
 	'thisisasixtyfourcharacterstringrepeatedfourtimestomake256chars.'
 	'overflow'
 );
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
               27
 (1 row)

src/test/regress/expected/multi_drop_extension.out

@@ -23,7 +23,7 @@ BEGIN;
   SET search_path TO public;
   CREATE EXTENSION citus;
   SET citus.replicate_reference_tables_on_activate TO OFF;
-  SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+  SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -82,13 +82,13 @@ CREATE OR REPLACE FUNCTION pg_catalog.master_create_worker_shards(table_name tex
     AS 'citus', $$master_create_worker_shards$$
     LANGUAGE C STRICT;
 -- re-add the nodes to the cluster
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/multi_extension.out

@@ -214,7 +214,7 @@ SELECT * FROM multi_extension.print_extension_changes();
                  | function mark_tables_colocated(regclass,regclass[]) void
                  | function master_activate_node(text,integer) integer
                  | function master_add_inactive_node(text,integer,integer,noderole,name) integer
-                 | function master_add_node(text,integer,integer,noderole,name) integer
+                 | function citus_add_node(text,integer,integer,noderole,name) integer
                  | function master_add_secondary_node(text,integer,text,integer,name) integer
                  | function master_append_table_to_shard(bigint,text,text,integer) real
                  | function master_apply_delete_command(text) integer
@@ -241,7 +241,7 @@ SELECT * FROM multi_extension.print_extension_changes();
                  | function master_modify_multiple_shards(text) integer
                  | function master_move_shard_placement(bigint,text,integer,text,integer,citus.shard_transfer_mode) void
                  | function master_remove_distributed_table_metadata_from_workers(regclass,text,text) void
-                 | function master_remove_node(text,integer) void
+                 | function citus_remove_node(text,integer) void
                  | function master_remove_partition_metadata(regclass,text,text) void
                  | function master_run_on_worker(text[],integer[],text[],boolean) SETOF record
                  | function master_set_node_property(text,integer,text,boolean) void
@@ -492,8 +492,8 @@ SELECT * FROM multi_extension.print_extension_changes();
 -- Test downgrade to 9.4-1 from 9.5-1
 ALTER EXTENSION citus UPDATE TO '9.5-1';
 BEGIN;
-  SELECT master_add_node('localhost', :master_port, groupId=>0);
+  SELECT citus_add_node('localhost', :master_port, groupId=>0);
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                1
 (1 row)
@@ -1053,7 +1053,7 @@ HINT:  You can manually create a database and its extensions on workers.
 \c another
 CREATE EXTENSION citus;
 SET citus.enable_object_propagation TO off; -- prevent distributed transactions during add node
-SELECT FROM master_add_node('localhost', :worker_1_port);
+SELECT FROM citus_add_node('localhost', :worker_1_port);
 WARNING:  citus.enable_object_propagation is off, not creating distributed objects on worker
 DETAIL:  distributed objects are only kept in sync when citus.enable_object_propagation is set to on. Newly activated nodes will not get these objects created
 --

src/test/regress/expected/multi_follower_dml.out

@@ -6,7 +6,7 @@ SELECT create_distributed_table('the_table', 'a');
 
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -273,8 +273,8 @@ ERROR:  there is a shard placement in node group 0 but there are no nodes in tha
 DROP TABLE the_table;
 DROP TABLE reference_table;
 DROP TABLE citus_local_table;
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/multi_follower_select_statements.out

@@ -1,12 +1,12 @@
 \c - - - :master_port
 -- do some setup
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -78,7 +78,7 @@ SELECT * FROM the_table;
 ERROR:  node group does not have a secondary node
 -- add the secondary nodes and try again, the SELECT statement should work this time
 \c -reuse-previous=off regression - - :master_port
-SELECT 1 FROM master_add_node('localhost', :follower_worker_1_port,
+SELECT 1 FROM citus_add_node('localhost', :follower_worker_1_port,
   groupid => (SELECT groupid FROM pg_dist_node WHERE nodeport = :worker_1_port),
   noderole => 'secondary');
  ?column?
@@ -86,7 +86,7 @@ SELECT 1 FROM master_add_node('localhost', :follower_worker_1_port,
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :follower_worker_2_port,
+SELECT 1 FROM citus_add_node('localhost', :follower_worker_2_port,
   groupid => (SELECT groupid FROM pg_dist_node WHERE nodeport = :worker_2_port),
   noderole => 'secondary');
  ?column?

src/test/regress/expected/multi_metadata_sync.out

@@ -204,8 +204,8 @@ SELECT count(*) FROM pg_dist_node WHERE hasmetadata=true;
 
 -- Ensure it works when run on a secondary node
 SELECT groupid AS worker_1_group FROM pg_dist_node WHERE nodeport = :worker_1_port \gset
-SELECT master_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary');
+SELECT citus_add_node('localhost', 8888, groupid => :worker_1_group, noderole => 'secondary');
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                4
 (1 row)
@@ -1187,8 +1187,8 @@ CREATE TABLE pg_dist_partition_temp AS SELECT * FROM pg_dist_partition;
 DELETE FROM pg_dist_placement;
 DELETE FROM pg_dist_partition;
 SELECT groupid AS old_worker_2_group FROM pg_dist_node WHERE nodeport = :worker_2_port \gset
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -1216,8 +1216,8 @@ SELECT create_distributed_table('mx_table', 'a');
 (1 row)
 
 \c - postgres - :master_port
-SELECT master_add_node('localhost', :worker_2_port);
+SELECT citus_add_node('localhost', :worker_2_port);
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                6
 (1 row)
@@ -1398,7 +1398,7 @@ SELECT * FROM pg_dist_shard_placement WHERE shardid=:ref_table_shardid;
 ---------------------------------------------------------------------
 (0 rows)
 
--- Check that master_add_node propagates the metadata about new placements of a reference table
+-- Check that citus_add_node propagates the metadata about new placements of a reference table
 \c - - - :master_port
 SELECT groupid AS old_worker_2_group
   FROM pg_dist_node WHERE nodeport = :worker_2_port \gset
@@ -1406,8 +1406,8 @@ CREATE TABLE tmp_placement AS
   SELECT * FROM pg_dist_placement WHERE groupid = :old_worker_2_group;
 DELETE FROM pg_dist_placement
   WHERE groupid = :old_worker_2_group;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -1437,9 +1437,9 @@ WHERE logicalrelid='mx_ref'::regclass;
 (1 row)
 
 \c - - - :master_port
-SELECT master_add_node('localhost', :worker_2_port);
+SELECT citus_add_node('localhost', :worker_2_port);
 NOTICE:  Replicating reference table "mx_ref" to the node localhost:xxxxx
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                7
 (1 row)
@@ -1571,7 +1571,7 @@ HINT:  If the node is up, wait until metadata gets synced to it and try again.
 ALTER TABLE dist_table_1 ADD COLUMN b int;
 ERROR:  localhost:xxxxx is a metadata node, but is out of sync
 HINT:  If the node is up, wait until metadata gets synced to it and try again.
-SELECT master_add_node('localhost', :master_port, groupid => 0);
+SELECT citus_add_node('localhost', :master_port, groupid => 0);
 ERROR:  localhost:xxxxx is a metadata node, but is out of sync
 HINT:  If the node is up, wait until metadata gets synced to it and try again.
 SELECT master_disable_node('localhost', :worker_1_port);
@@ -1582,10 +1582,10 @@ SELECT master_disable_node('localhost', :worker_2_port);
 ERROR:  Disabling localhost:xxxxx failed
 DETAIL:  localhost:xxxxx is a metadata node, but is out of sync
 HINT:  If you are using MX, try stop_metadata_sync_to_node(hostname, port) for nodes that are down before disabling them.
-SELECT master_remove_node('localhost', :worker_1_port);
+SELECT citus_remove_node('localhost', :worker_1_port);
 ERROR:  localhost:xxxxx is a metadata node, but is out of sync
 HINT:  If the node is up, wait until metadata gets synced to it and try again.
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
 ERROR:  localhost:xxxxx is a metadata node, but is out of sync
 HINT:  If the node is up, wait until metadata gets synced to it and try again.
 -- master_update_node should succeed
@@ -1611,8 +1611,8 @@ SELECT pg_reload_conf();
 (1 row)
 
 UPDATE pg_dist_node SET metadatasynced=true WHERE nodeport=:worker_1_port;
-SELECT master_add_node('localhost', :worker_2_port);
+SELECT citus_add_node('localhost', :worker_2_port);
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                7
 (1 row)

src/test/regress/expected/multi_mx_add_coordinator.out

@@ -16,7 +16,7 @@ SELECT run_command_on_workers('CREATE USER reprefuser WITH LOGIN');
 SET citus.enable_alter_role_propagation TO ON;
 -- alter role for other than the extension owner works in enterprise, output differs accordingly
 ALTER ROLE reprefuser WITH CREATEDB;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -302,8 +302,8 @@ alter table distributed_table ALTER COLUMN value_1 TYPE bigint;
 alter table distributed_table ALTER COLUMN value_1 TYPE int;
 SET client_min_messages TO error;
 DROP TABLE distributed_table, referece_table, local_fkey_table;
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/multi_mx_function_table_reference.out

@@ -25,8 +25,8 @@ SELECT start_metadata_sync_to_node('localhost', :worker_2_port);
 -- SET client_min_messages TO log;
 -- remove worker 2, so we can add it after we have created some functions that caused
 -- problems
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -60,7 +60,7 @@ SELECT create_distributed_function('zoop(int)', '$1');
 (1 row)
 
 -- now add the worker back, this triggers function distribution which should not fail.
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -167,7 +167,7 @@ drop cascades to function my_group_id()
 -- make sure the worker is added at the end irregardless of anything failing to not make
 -- subsequent tests fail as well. All artifacts created during this test should have been
 -- dropped by the drop cascade above.
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/multi_mx_node_metadata.out

@@ -42,7 +42,7 @@ begin
  end loop;
 end$$ LANGUAGE plpgsql;
 -- add a node to the cluster
-SELECT master_add_node('localhost', :worker_1_port) As nodeid_1 \gset
+SELECT citus_add_node('localhost', :worker_1_port) As nodeid_1 \gset
 SELECT nodeid, nodename, nodeport, hasmetadata, metadatasynced FROM pg_dist_node;
  nodeid | nodename  | nodeport | hasmetadata | metadatasynced
 ---------------------------------------------------------------------
@@ -349,7 +349,7 @@ SELECT create_reference_table('some_ref_table');
 
 INSERT INTO some_ref_table (a) SELECT i FROM generate_series(0,10)i;
 BEGIN;
-	SELECT master_add_node('localhost', :worker_2_port) AS nodeid_2 \gset
+	SELECT citus_add_node('localhost', :worker_2_port) AS nodeid_2 \gset
 	SELECT 1 FROM start_metadata_sync_to_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
@@ -806,8 +806,8 @@ SELECT run_command_on_workers('CREATE DATABASE db_to_drop');
 CREATE EXTENSION citus;
 \c db_to_drop - - :master_port
 CREATE EXTENSION citus;
-SELECT master_add_node('localhost', :worker_1_port);
+SELECT citus_add_node('localhost', :worker_1_port);
- master_add_node
+ citus_add_node
 ---------------------------------------------------------------------
                1
 (1 row)
@@ -848,7 +848,7 @@ NOTICE:  drop cascades to default value for column a of table reference_table
 DROP TABLE ref_table;
 DROP TABLE reference_table;
 TRUNCATE pg_dist_colocation;
-SELECT count(*) FROM (SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node) t;
+SELECT count(*) FROM (SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node) t;
  count
 ---------------------------------------------------------------------
      2

src/test/regress/expected/multi_remove_node_reference_table.out

@@ -1,7 +1,7 @@
 --
 -- MULTI_REMOVE_NODE_REFERENCE_TABLE
 --
--- Tests that check the metadata after master_remove_node.
+-- Tests that check the metadata after citus_remove_node.
 SET citus.next_shard_id TO 1380000;
 SET citus.replicate_reference_tables_on_activate TO off;
 ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 1380000;
@@ -18,7 +18,7 @@ SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
 (1 row)
 
 -- remove non-existing node
-SELECT master_remove_node('localhost', 55555);
+SELECT citus_remove_node('localhost', 55555);
 ERROR:  node at "localhost:xxxxx" does not exist
 -- remove a node with no reference tables
 -- verify node exist before removal
@@ -37,8 +37,8 @@ SELECT create_distributed_table('recovery_test','x');
 (1 row)
 
 DROP TABLE recovery_test;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -63,10 +63,10 @@ SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
 (1 row)
 
 -- re-add the node for next tests
-SELECT master_add_node('localhost', :worker_2_port) AS worker_2_nodeid \gset
+SELECT citus_add_node('localhost', :worker_2_port) AS worker_2_nodeid \gset
 SELECT groupid AS worker_2_group FROM pg_dist_node WHERE nodeid=:worker_2_nodeid \gset
 -- add a secondary to check we don't attempt to replicate the table to it
-SELECT 1 FROM master_add_node('localhost', 9000, groupid=>:worker_2_group, noderole=>'secondary');
+SELECT 1 FROM citus_add_node('localhost', 9000, groupid=>:worker_2_group, noderole=>'secondary');
  ?column?
 ---------------------------------------------------------------------
         1
@@ -81,7 +81,7 @@ SELECT create_reference_table('remove_node_reference_table');
 (1 row)
 
 -- make sure when we add a secondary we don't attempt to add placements to it
-SELECT 1 FROM master_add_node('localhost', 9001, groupid=>:worker_2_group, noderole=>'secondary');
+SELECT 1 FROM citus_add_node('localhost', 9001, groupid=>:worker_2_group, noderole=>'secondary');
  ?column?
 ---------------------------------------------------------------------
         1
@@ -126,8 +126,8 @@ SELECT count(*) FROM pg_dist_placement WHERE groupid = :worker_2_group;
 (1 row)
 
 -- make sure when we remove a secondary we don't remove any placements
-SELECT master_remove_node('localhost', 9001);
+SELECT citus_remove_node('localhost', 9001);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -138,7 +138,7 @@ SELECT count(*) FROM pg_dist_placement WHERE groupid = :worker_2_group;
      1
 (1 row)
 
--- status before master_remove_node
+-- status before citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -186,13 +186,13 @@ WHERE
 (1 row)
 
 \c - - - :master_port
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
--- status after master_remove_node
+-- status after citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -220,7 +220,7 @@ WHERE colocationid IN
           1 |                -1 |                      0
 (1 row)
 
-SELECT master_remove_node('localhost', :worker_1_port);
+SELECT citus_remove_node('localhost', :worker_1_port);
 ERROR:  cannot remove the last worker node because there are reference tables and it would cause data loss on reference tables
 HINT:  To proceed, either drop the reference tables or use undistribute_table() function to convert them to local tables
 \c - - - :worker_1_port
@@ -243,10 +243,10 @@ WHERE
 \c - - - :master_port
 SET citus.replicate_reference_tables_on_activate TO off;
 -- remove same node twice
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
 ERROR:  node at "localhost:xxxxx" does not exist
 -- re-add the node for next tests
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -259,21 +259,21 @@ SELECT master_disable_node('localhost', :worker_2_port);
 
 (1 row)
 
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 -- re-add the node for the next test
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
 -- remove node in a transaction and ROLLBACK
--- status before master_remove_node
+-- status before citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -320,14 +320,14 @@ WHERE
 
 \c - - - :master_port
 BEGIN;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 ROLLBACK;
--- status after master_remove_node
+-- status after citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -374,7 +374,7 @@ WHERE
 
 \c - - - :master_port
 -- remove node in a transaction and COMMIT
--- status before master_remove_node
+-- status before citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -421,14 +421,14 @@ WHERE
 
 \c - - - :master_port
 BEGIN;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 COMMIT;
--- status after master_remove_node
+-- status after citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -476,14 +476,14 @@ WHERE
 \c - - - :master_port
 SET citus.replicate_reference_tables_on_activate TO off;
 -- re-add the node for next tests
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
 -- test inserting a value then removing a node in a transaction
--- status before master_remove_node
+-- status before citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -531,14 +531,14 @@ WHERE
 \c - - - :master_port
 BEGIN;
 INSERT INTO remove_node_reference_table VALUES(1);
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 COMMIT;
--- status after master_remove_node
+-- status after citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -599,14 +599,14 @@ SELECT * FROM remove_node_reference_table;
 \c - - - :master_port
 SET citus.replicate_reference_tables_on_activate TO off;
 -- re-add the node for next tests
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
 -- test executing DDL command then removing a node in a transaction
--- status before master_remove_node
+-- status before citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -654,14 +654,14 @@ WHERE
 \c - - - :master_port
 BEGIN;
 ALTER TABLE remove_node_reference_table ADD column2 int;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 COMMIT;
--- status after master_remove_node
+-- status after citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -718,14 +718,14 @@ SELECT "Column", "Type", "Modifiers" FROM table_desc WHERE relid='public.remove_
 (2 rows)
 
 -- re-add the node for next tests
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
 -- test DROP table after removing a node in a transaction
--- status before master_remove_node
+-- status before citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -754,15 +754,15 @@ WHERE colocationid IN
 (1 row)
 
 BEGIN;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 DROP TABLE remove_node_reference_table;
 COMMIT;
--- status after master_remove_node
+-- status after citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -785,7 +785,7 @@ SELECT * FROM pg_dist_colocation WHERE colocationid = 1380000;
 (0 rows)
 
 -- re-add the node for next tests
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -808,7 +808,7 @@ SELECT create_reference_table('remove_node_reference_table_schema.table1');
 
 (1 row)
 
--- status before master_remove_node
+-- status before citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -862,13 +862,13 @@ ORDER BY
 (2 rows)
 
 \c - - - :master_port
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
--- status after master_remove_node
+-- status after citus_remove_node
 SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
  count
 ---------------------------------------------------------------------
@@ -916,7 +916,7 @@ WHERE
 \c - - - :master_port
 SET citus.replicate_reference_tables_on_activate TO off;
 -- re-add the node for next tests
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/multi_replicate_reference_table.out

@@ -15,8 +15,8 @@ SELECT * FROM pg_dist_shard_placement WHERE shardid BETWEEN 1370000 AND 1380000;
 -- remove a node for testing purposes
 CREATE TABLE tmp_shard_placement AS SELECT * FROM pg_dist_shard_placement WHERE nodeport = :worker_2_port;
 DELETE FROM pg_dist_shard_placement WHERE nodeport = :worker_2_port;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -29,7 +29,7 @@ SELECT COUNT(*) FROM pg_dist_node WHERE nodeport = :worker_2_port;
      0
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -54,8 +54,8 @@ WHERE
 (0 rows)
 
 -- test adding new node with a reference table which does not have any healthy placement
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -75,7 +75,7 @@ SELECT create_reference_table('replicate_reference_table_unhealthy');
 (1 row)
 
 UPDATE pg_dist_shard_placement SET shardstate = 3 WHERE shardid = 1370000;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -108,7 +108,7 @@ SELECT create_reference_table('replicate_reference_table_valid');
 
 (1 row)
 
--- status before master_add_node
+-- status before citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -131,13 +131,13 @@ WHERE colocationid IN
           1 |                -1 |                      0 |                           0
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
--- status after master_add_node
+-- status after citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -161,7 +161,7 @@ WHERE colocationid IN
 (1 row)
 
 -- test add same node twice
--- status before master_add_node
+-- status before citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -184,13 +184,13 @@ WHERE colocationid IN
           1 |                -1 |                      0 |                           0
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
--- status after master_add_node
+-- status after citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -215,8 +215,8 @@ WHERE colocationid IN
 
 DROP TABLE replicate_reference_table_valid;
 -- test replicating a reference table when a new node added in TRANSACTION + ROLLBACK
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -228,7 +228,7 @@ SELECT create_reference_table('replicate_reference_table_rollback');
 
 (1 row)
 
--- status before master_add_node
+-- status before citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -251,14 +251,14 @@ WHERE colocationid IN
 (1 row)
 
 BEGIN;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
 ROLLBACK;
--- status after master_add_node
+-- status after citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -289,7 +289,7 @@ SELECT create_reference_table('replicate_reference_table_commit');
 
 (1 row)
 
--- status before master_add_node
+-- status before citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -312,14 +312,14 @@ WHERE colocationid IN
 (1 row)
 
 BEGIN;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
 COMMIT;
--- status after master_add_node
+-- status after citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -343,8 +343,8 @@ WHERE colocationid IN
 
 DROP TABLE replicate_reference_table_commit;
 -- test adding new node + upgrading another hash distributed table to reference table + creating new reference table in TRANSACTION
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -359,7 +359,7 @@ SELECT create_reference_table('replicate_reference_table_reference_one');
 SET citus.shard_count TO 1;
 SET citus.shard_replication_factor TO 1;
 CREATE TABLE replicate_reference_table_reference_two(column1 int);
--- status before master_add_node
+-- status before citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -394,7 +394,7 @@ ORDER BY logicalrelid;
 (1 row)
 
 SET client_min_messages TO WARNING;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -407,7 +407,7 @@ SELECT create_reference_table('replicate_reference_table_reference_two');
 (1 row)
 
 RESET client_min_messages;
--- status after master_add_node
+-- status after citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -448,8 +448,8 @@ ORDER BY
 DROP TABLE replicate_reference_table_reference_one;
 DROP TABLE replicate_reference_table_reference_two;
 -- test inserting a value then adding a new node in a transaction
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -463,7 +463,7 @@ SELECT create_reference_table('replicate_reference_table_insert');
 
 BEGIN;
 INSERT INTO replicate_reference_table_insert VALUES(1);
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 ERROR:  cannot open new connections after the first modification command within a transaction
 ROLLBACK;
 DROP TABLE replicate_reference_table_insert;
@@ -478,7 +478,7 @@ SELECT create_reference_table('replicate_reference_table_copy');
 SET citus.enable_local_execution = 'off';
 BEGIN;
 COPY replicate_reference_table_copy FROM STDIN;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 ERROR:  cannot open new connections after the first modification command within a transaction
 ROLLBACK;
 RESET citus.enable_local_execution;
@@ -493,7 +493,7 @@ SELECT create_reference_table('replicate_reference_table_ddl');
 
 BEGIN;
 ALTER TABLE replicate_reference_table_ddl ADD column2 int;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 ERROR:  cannot open new connections after the first modification command within a transaction
 ROLLBACK;
 DROP TABLE replicate_reference_table_ddl;
@@ -505,7 +505,7 @@ SELECT create_reference_table('replicate_reference_table_drop');
 
 (1 row)
 
--- status before master_add_node
+-- status before citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -528,7 +528,7 @@ WHERE colocationid IN
 (1 row)
 
 BEGIN;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -536,7 +536,7 @@ SELECT 1 FROM master_add_node('localhost', :worker_2_port);
 
 DROP TABLE replicate_reference_table_drop;
 COMMIT;
--- status after master_add_node
+-- status after citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -554,8 +554,8 @@ SELECT * FROM pg_dist_colocation WHERE colocationid = 1370009;
 (0 rows)
 
 -- test adding a node while there is a reference table at another schema
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -568,7 +568,7 @@ SELECT create_reference_table('replicate_reference_table_schema.table1');
 
 (1 row)
 
--- status before master_add_node
+-- status before citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -590,13 +590,13 @@ WHERE colocationid IN
           1 |                -1 |                      0 |                           0
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
--- status after master_add_node
+-- status after citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -621,8 +621,8 @@ WHERE colocationid IN
 DROP TABLE replicate_reference_table_schema.table1;
 DROP SCHEMA replicate_reference_table_schema CASCADE;
 -- test adding a node when there are foreign keys between reference tables
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -638,7 +638,7 @@ SELECT create_reference_table('ref_table_1'),
                         |                        |
 (1 row)
 
--- status before master_add_node
+-- status before citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -650,13 +650,13 @@ ORDER BY shardid, nodeport;
 ---------------------------------------------------------------------
 (0 rows)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
--- status after master_add_node
+-- status after citus_add_node
 SELECT
     shardid, shardstate, shardlength, nodename, nodeport
 FROM
@@ -678,8 +678,8 @@ SELECT run_command_on_workers('select count(*) from pg_constraint where contype=
 
 DROP TABLE ref_table_1, ref_table_2, ref_table_3;
 -- do some tests with inactive node
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -741,7 +741,7 @@ ORDER BY 1,4,5;
  1370014 |          1 |           0 | localhost |    57637
 (1 row)
 
-SELECT 1 FROM master_remove_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -755,7 +755,7 @@ SELECT create_reference_table('ref_table');
 (1 row)
 
 INSERT INTO ref_table SELECT * FROM generate_series(1, 10);
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -831,7 +831,7 @@ SET client_min_messages TO WARNING;
 SELECT shardid AS ref_table_shard FROM pg_dist_shard WHERE logicalrelid = 'ref_table'::regclass \gset
 SELECT count(*) AS ref_table_placements FROM pg_dist_shard_placement WHERE shardid = :ref_table_shard \gset
 -- remove reference table replica from worker 2
-SELECT 1 FROM master_remove_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -851,7 +851,7 @@ SELECT create_distributed_table('range_table', 'a', 'range');
 
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -876,16 +876,16 @@ SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shard
 (1 row)
 
 DROP TABLE range_table;
-SELECT 1 FROM master_remove_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
 -- test setting citus.replicate_reference_tables_on_activate to on
--- master_add_node
+-- citus_add_node
 SET citus.replicate_reference_tables_on_activate TO on;
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -898,7 +898,7 @@ SELECT count(*) - :ref_table_placements FROM pg_dist_shard_placement WHERE shard
 (1 row)
 
 -- master_activate_node
-SELECT 1 FROM master_remove_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -937,13 +937,13 @@ SELECT min(result) = max(result) AS consistent FROM run_command_on_placements('r
 -- test that metadata is synced when master_copy_shard_placement replicates
 -- reference table shards
 SET citus.replicate_reference_tables_on_activate TO off;
-SELECT 1 FROM master_remove_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -976,13 +976,13 @@ WHERE nodeport=:worker_1_port;
 (1 row)
 
 -- test that metadata is synced on replicate_reference_tables
-SELECT 1 FROM master_remove_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -1040,8 +1040,8 @@ NOTICE:  dropping metadata on the node (localhost,57637)
 --
 SET citus.replicate_reference_tables_on_activate TO off;
 SET citus.shard_replication_factor TO 1;
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -1054,7 +1054,7 @@ SELECT create_reference_table('ref');
 (1 row)
 
 CREATE TABLE test (x int, y int references ref(a));
-select 1 FROM master_add_node('localhost', :worker_2_port);
+select 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -1077,7 +1077,7 @@ DECLARE
 BEGIN
 errors_received := 0;
         BEGIN
-		SELECT master_add_node('invalid-node-name', 9999);
+		SELECT citus_add_node('invalid-node-name', 9999);
         EXCEPTION WHEN OTHERS THEN
                 IF SQLERRM LIKE 'connection to the remote node%%' THEN
                         errors_received := errors_received + 1;

src/test/regress/expected/multi_row_router_insert.out

@@ -6,7 +6,7 @@ SET citus.log_local_commands TO ON;
 CREATE SCHEMA multi_row_router_insert;
 SET search_path TO multi_row_router_insert;
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/multi_sequence_default.out

@@ -789,8 +789,8 @@ SELECT stop_metadata_sync_to_node('localhost', :worker_1_port);
 
 (1 row)
 
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/multi_table_ddl.out

@@ -78,13 +78,13 @@ SELECT * FROM pg_dist_shard_placement;
 DROP EXTENSION citus;
 CREATE EXTENSION citus;
 -- re-add the nodes to the cluster
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
  ?column?
 ---------------------------------------------------------------------
         1
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/multi_transaction_recovery.out

@@ -4,7 +4,7 @@ SET citus.next_shard_id TO 1220000;
 -- verify we recover transactions which do DML on coordinator placements
 -- properly.
 SET client_min_messages TO ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -503,7 +503,7 @@ DROP TABLE test_recovery;
 DROP TABLE test_recovery_single;
 DROP TABLE test_2pcskip;
 DROP TABLE test_reference;
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/multi_transactional_drop_shards.out

@@ -656,7 +656,7 @@ ORDER BY
 \c - - - :master_port
 SET client_min_messages TO WARNING;
 -- try using the coordinator as a worker and then dropping the table
-SELECT 1 FROM master_add_node('localhost', :master_port);
+SELECT 1 FROM citus_add_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -671,8 +671,8 @@ SELECT create_distributed_table('citus_local', 'id');
 
 INSERT INTO citus_local (k) VALUES (2);
 DROP TABLE citus_local;
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/multi_unsupported_worker_operations.out

@@ -192,7 +192,7 @@ SELECT count(1) FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432;
      0
 (1 row)
 
--- master_remove_node
+-- citus_remove_node
 \c - - - :master_port
 DROP INDEX mx_test_uniq_index;
 SELECT 1 FROM master_add_inactive_node('localhost', 5432);
@@ -202,7 +202,7 @@ SELECT 1 FROM master_add_inactive_node('localhost', 5432);
 (1 row)
 
 \c - - - :worker_1_port
-SELECT master_remove_node('localhost', 5432);
+SELECT citus_remove_node('localhost', 5432);
 ERROR:  operation is not allowed on this node
 HINT:  Connect to the coordinator and run it again.
 SELECT count(1) FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432;
@@ -212,8 +212,8 @@ SELECT count(1) FROM pg_dist_node WHERE nodename='localhost' AND nodeport=5432;
 (1 row)
 
 \c - - - :master_port
-SELECT master_remove_node('localhost', 5432);
+SELECT citus_remove_node('localhost', 5432);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/mx_coordinator_shouldhaveshards.out

@@ -2,7 +2,7 @@ CREATE SCHEMA mx_coordinator_shouldhaveshards;
 SET search_path TO mx_coordinator_shouldhaveshards;
 SET citus.shard_replication_factor to 1;
 SET client_min_messages TO WARNING;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -170,8 +170,8 @@ SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhavesha
 
 SET client_min_messages TO ERROR;
 DROP SCHEMA mx_coordinator_shouldhaveshards CASCADE;
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/mx_regular_user.out

@@ -1,7 +1,7 @@
 CREATE SCHEMA "Mx Regular User";
 SET search_path TO "Mx Regular User";
 -- add coordinator in idempotent way
-SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/propagate_extension_commands.out

@@ -146,7 +146,7 @@ DROP EXTENSION seg CASCADE;
 -- but as we have only 2 ports in postgresql tests, let's remove one of the nodes first
 -- before remove, first remove the existing relations (due to the other tests)
 DROP SCHEMA "extension'test" CASCADE;
-SELECT 1 from master_remove_node('localhost', :worker_2_port);
+SELECT 1 from citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -240,7 +240,7 @@ SELECT run_command_on_workers($$SELECT extversion FROM pg_extension WHERE extnam
 (1 row)
 
 -- and add the other node
-SELECT 1 from master_add_node('localhost', :worker_2_port);
+SELECT 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -390,7 +390,7 @@ CREATE SCHEMA "extension'test";
 -- use  a schema name with escape character
 SET search_path TO "extension'test";
 -- remove the node, we'll add back again
-SELECT 1 from master_remove_node('localhost', :worker_2_port);
+SELECT 1 from citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -421,7 +421,7 @@ BEGIN;
 
 COMMIT;
 -- add the node back
-SELECT 1 from master_add_node('localhost', :worker_2_port);
+SELECT 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/propagate_extension_commands_1.out

@@ -146,7 +146,7 @@ DROP EXTENSION seg CASCADE;
 -- but as we have only 2 ports in postgresql tests, let's remove one of the nodes first
 -- before remove, first remove the existing relations (due to the other tests)
 DROP SCHEMA "extension'test" CASCADE;
-SELECT 1 from master_remove_node('localhost', :worker_2_port);
+SELECT 1 from citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -239,7 +239,7 @@ SELECT run_command_on_workers($$SELECT extversion FROM pg_extension WHERE extnam
 (1 row)
 
 -- and add the other node
-SELECT 1 from master_add_node('localhost', :worker_2_port);
+SELECT 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -389,7 +389,7 @@ CREATE SCHEMA "extension'test";
 -- use  a schema name with escape character
 SET search_path TO "extension'test";
 -- remove the node, we'll add back again
-SELECT 1 from master_remove_node('localhost', :worker_2_port);
+SELECT 1 from citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -420,7 +420,7 @@ BEGIN;
 
 COMMIT;
 -- add the node back
-SELECT 1 from master_add_node('localhost', :worker_2_port);
+SELECT 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/ref_citus_local_fkeys.out

@@ -7,7 +7,7 @@ CREATE SCHEMA ref_citus_local_fkeys;
 SET search_path TO ref_citus_local_fkeys;
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -130,7 +130,7 @@ NOTICE:  executing the command locally: DROP TABLE IF EXISTS ref_citus_local_fke
 -- first remove worker_2 to test the behavior when replicating a
 -- reference table that has a foreign key to a citus local table
 -- to a new node
-SELECT 1 FROM master_remove_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -197,7 +197,7 @@ ERROR:  insert or update on table "reference_table_1506007" violates foreign key
 -- enable the worker_2 to show that we don't try to set up the foreign keys
 -- between reference tables and citus local tables in worker_2 placements of
 -- the reference tables
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 NOTICE:  Replicating reference table "reference_table" to the node localhost:xxxxx
  ?column?
 ---------------------------------------------------------------------

src/test/regress/expected/remove_coordinator.out

@@ -1,6 +1,6 @@
 -- removing coordinator from pg_dist_node should update pg_dist_colocation
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/replicate_reference_tables_to_coordinator.out

@@ -496,14 +496,14 @@ ALTER TABLE squares DROP COLUMN b;
 NOTICE:  executing the command locally: SELECT worker_apply_shard_ddl_command (8000000, 'replicate_ref_to_coordinator', 'ALTER TABLE squares DROP COLUMN b;')
 -- verify that we replicate the reference tables that are distributed before
 -- adding the coordinator as a worker.
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
 
 -- add the coordinator as a worker node and verify that the reference tables are replicated
-SELECT master_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset
+SELECT citus_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset
 NOTICE:  Replicating reference table "squares" to the node localhost:xxxxx
 NOTICE:  Replicating reference table "numbers" to the node localhost:xxxxx
 -- clean-up

src/test/regress/expected/shard_rebalancer.out

@@ -19,7 +19,7 @@ SELECT create_distributed_table('dist_table_test', 'a');
 CREATE TABLE postgres_table_test(a int primary key);
 -- make sure that all rebalance operations works fine when
 -- reference tables are replicated to the coordinator
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId=>0);
 NOTICE:  Replicating reference table "ref_table_test" to the node localhost:xxxxx
  ?column?
 ---------------------------------------------------------------------
@@ -2074,7 +2074,7 @@ SELECT * from master_set_node_property('localhost', :worker_2_port, 'shouldhaves
 
 DROP TABLE tab;
 -- we don't need the coordinator on pg_dist_node anymore
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2103,7 +2103,7 @@ SELECT create_reference_table('ref_table');
 
 (1 row)
 
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId=>0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2133,7 +2133,7 @@ SELECT count(*) FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE lo
      3
 (1 row)
 
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2147,7 +2147,7 @@ SELECT master_create_distributed_table('rebalance_test_table', 'int_column', 'ap
 (1 row)
 
 CALL create_unbalanced_shards('rebalance_test_table');
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId=>0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId=>0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2173,7 +2173,7 @@ SELECT count(*) FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE lo
 (1 row)
 
 DROP TABLE dist_table_test_3, rebalance_test_table, ref_table;
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2188,7 +2188,7 @@ CREATE TABLE r1 (a int PRIMARY KEY, b int);
 CREATE TABLE r2 (a int, b int);
 -- we remove worker 2 before creating the tables, this will allow us to have an active
 -- node without the reference tables
-SELECT 1 from master_remove_node('localhost', :worker_2_port);
+SELECT 1 from citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2215,7 +2215,7 @@ SELECT create_reference_table('r2');
 -- add data so to actually copy data when forcing logical replication for reference tables
 INSERT INTO r1 VALUES (1,2), (3,4);
 INSERT INTO r2 VALUES (1,2), (3,4);
-SELECT 1 from master_add_node('localhost', :worker_2_port);
+SELECT 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2239,7 +2239,7 @@ SELECT count(*) FROM pg_dist_partition;
 
 -- verify a system having only reference tables will copy the reference tables when
 -- executing the rebalancer
-SELECT 1 from master_remove_node('localhost', :worker_2_port);
+SELECT 1 from citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2252,7 +2252,7 @@ SELECT create_reference_table('r1');
 
 (1 row)
 
-SELECT 1 from master_add_node('localhost', :worker_2_port);
+SELECT 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2292,7 +2292,7 @@ DROP TABLE r1;
 -- lastly we need to verify that reference tables are copied before the replication factor
 -- of other tables is increased. Without the copy of reference tables the replication might
 -- fail.
-SELECT 1 from master_remove_node('localhost', :worker_2_port);
+SELECT 1 from citus_remove_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2312,7 +2312,7 @@ SELECT create_reference_table('r1');
 
 (1 row)
 
-SELECT 1 from master_add_node('localhost', :worker_2_port);
+SELECT 1 from citus_add_node('localhost', :worker_2_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/single_node.out

@@ -19,7 +19,7 @@ SELECT 1 FROM master_disable_node('localhost', :master_port);
 ERROR:  Disabling localhost:xxxxx failed
 DETAIL:  cannot change "isactive" field of the coordinator node
 RESET client_min_messages;
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -47,8 +47,8 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met
 
 DROP TABLE ref;
 -- remove the coordinator to try again with create_reference_table
-SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0;
+SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0;
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -68,8 +68,8 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met
 
 DROP TABLE loc;
 -- remove the coordinator to try again with create_distributed_table
-SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0;
+SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0;
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -103,8 +103,8 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met
 
 DROP TABLE test;
 -- remove the coordinator to try again
-SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0;
+SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE groupid = 0;
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)
@@ -136,12 +136,12 @@ SELECT groupid, nodename, nodeport, isactive, shouldhaveshards, hasmetadata, met
 (1 row)
 
 -- cannot add workers with specific IP as long as I have a placeholder coordinator record
-SELECT 1 FROM master_add_node('127.0.0.1', :worker_1_port);
+SELECT 1 FROM citus_add_node('127.0.0.1', :worker_1_port);
 ERROR:  cannot add a worker node when the coordinator hostname is set to localhost
 DETAIL:  Worker nodes need to be able to connect to the coordinator to transfer data.
 HINT:  Use SELECT citus_set_coordinator_host('<hostname>') to configure the coordinator hostname
 -- adding localhost workers is ok
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
 NOTICE:  shards are still on the coordinator after adding the new node
 HINT:  Use SELECT rebalance_table_shards(); to balance shards data between workers and coordinator or SELECT citus_drain_node('localhost',57636); to permanently move shards away from the coordinator.
  ?column?
@@ -149,7 +149,7 @@ HINT:  Use SELECT rebalance_table_shards(); to balance shards data between worke
         1
 (1 row)
 
-SELECT 1 FROM master_remove_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_remove_node('localhost', :worker_1_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -163,7 +163,7 @@ SELECT 1 FROM citus_set_coordinator_host('127.0.0.1');
 (1 row)
 
 -- adding workers with specific IP is ok now
-SELECT 1 FROM master_add_node('127.0.0.1', :worker_1_port);
+SELECT 1 FROM citus_add_node('127.0.0.1', :worker_1_port);
 NOTICE:  shards are still on the coordinator after adding the new node
 HINT:  Use SELECT rebalance_table_shards(); to balance shards data between workers and coordinator or SELECT citus_drain_node('127.0.0.1',57636); to permanently move shards away from the coordinator.
  ?column?
@@ -171,7 +171,7 @@ HINT:  Use SELECT rebalance_table_shards(); to balance shards data between worke
         1
 (1 row)
 
-SELECT 1 FROM master_remove_node('127.0.0.1', :worker_1_port);
+SELECT 1 FROM citus_remove_node('127.0.0.1', :worker_1_port);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -2102,13 +2102,13 @@ SELECT pg_reload_conf();
 -- suppress notices
 SET client_min_messages TO error;
 -- cannot remove coordinator since a reference table exists on coordinator and no other worker nodes are added
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
 ERROR:  cannot remove the last worker node because there are reference tables and it would cause data loss on reference tables
 HINT:  To proceed, either drop the reference tables or use undistribute_table() function to convert them to local tables
 -- Cleanup
 DROP SCHEMA single_node CASCADE;
 -- Remove the coordinator again
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/single_node_truncate.out

@@ -136,7 +136,7 @@ DROP TABLE ref, dist, citus_local;
 DROP VIEW table_sizes;
 DROP SCHEMA single_node_truncate CASCADE;
 -- Remove the coordinator
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/tableam.out

@@ -132,7 +132,7 @@ SELECT * FROM master_get_table_ddl_events('test_ref');
 -- replicate to coordinator
 SET client_min_messages TO WARNING;
 \set VERBOSIY terse
-SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0);
  ?column?
 ---------------------------------------------------------------------
         1
@@ -144,8 +144,8 @@ WARNING:  fake_scan_getnextslot
 DETAIL:  from localhost:xxxxx
 ERROR:  fake_tuple_delete not implemented
 CONTEXT:  while executing command on localhost:xxxxx
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
- master_remove_node
+ citus_remove_node
 ---------------------------------------------------------------------
 
 (1 row)

src/test/regress/expected/undistribute_table_cascade.out

@@ -5,7 +5,7 @@ CREATE SCHEMA undistribute_table_cascade;
 SET search_path TO undistribute_table_cascade;
 SET client_min_messages to ERROR;
 -- remove coordinator if it is added to pg_dist_node
-SELECT COUNT(master_remove_node(nodename, nodeport)) < 2
+SELECT COUNT(citus_remove_node(nodename, nodeport)) < 2
 FROM pg_dist_node WHERE nodename='localhost' AND nodeport=:master_port;
  ?column?
 ---------------------------------------------------------------------
@@ -37,7 +37,7 @@ BEGIN;
 
 ROLLBACK;
 -- ensure that coordinator is added to pg_dist_node
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/undistribute_table_cascade_mx.out

@@ -6,7 +6,7 @@ CREATE SCHEMA undistribute_table_cascade_mx;
 SET search_path TO undistribute_table_cascade_mx;
 SET client_min_messages to ERROR;
 -- ensure that coordinator is added to pg_dist_node
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
  ?column?
 ---------------------------------------------------------------------
         1

src/test/regress/expected/upgrade_list_citus_objects.out

@@ -139,7 +139,7 @@ ORDER BY 1;
  function lock_shard_resources(integer,bigint[])
  function master_activate_node(text,integer)
  function master_add_inactive_node(text,integer,integer,noderole,name)
- function master_add_node(text,integer,integer,noderole,name)
+ function citus_add_node(text,integer,integer,noderole,name)
  function master_add_secondary_node(text,integer,text,integer,name)
  function master_append_table_to_shard(bigint,text,text,integer)
  function master_apply_delete_command(text)
@@ -154,7 +154,7 @@ ORDER BY 1;
  function master_get_table_metadata(text)
  function master_move_shard_placement(bigint,text,integer,text,integer,citus.shard_transfer_mode)
  function master_remove_distributed_table_metadata_from_workers(regclass,text,text)
- function master_remove_node(text,integer)
+ function citus_remove_node(text,integer)
  function master_remove_partition_metadata(regclass,text,text)
  function master_run_on_worker(text[],integer[],text[],boolean)
  function master_set_node_property(text,integer,text,boolean)

src/test/regress/expected/upgrade_list_citus_objects_0.out

@@ -128,7 +128,7 @@ ORDER BY 1;
  function lock_shard_resources(integer,bigint[])
  function master_activate_node(text,integer)
  function master_add_inactive_node(text,integer,integer,noderole,name)
- function master_add_node(text,integer,integer,noderole,name)
+ function citus_add_node(text,integer,integer,noderole,name)
  function master_add_secondary_node(text,integer,text,integer,name)
  function master_append_table_to_shard(bigint,text,text,integer)
  function master_apply_delete_command(text)
@@ -143,7 +143,7 @@ ORDER BY 1;
  function master_get_table_metadata(text)
  function master_move_shard_placement(bigint,text,integer,text,integer,citus.shard_transfer_mode)
  function master_remove_distributed_table_metadata_from_workers(regclass,text,text)
- function master_remove_node(text,integer)
+ function citus_remove_node(text,integer)
  function master_remove_partition_metadata(regclass,text,text)
  function master_run_on_worker(text[],integer[],text[],boolean)
  function master_set_node_property(text,integer,text,boolean)

src/test/regress/multi_1_schedule

@@ -266,7 +266,7 @@ test: multi_foreign_key_relation_graph
 
 # ----------
 # multi_replicate_reference_table tests replicating reference tables to new nodes after we add new nodes
-# multi_remove_node_reference_table tests metadata changes after master_remove_node
+# multi_remove_node_reference_table tests metadata changes after citus_remove_node
 # ----------
 test: multi_replicate_reference_table
 test: multi_remove_node_reference_table

src/test/regress/multi_schedule_hyperscale

@@ -214,7 +214,7 @@ test: multi_foreign_key
 # ----------
 #  tests for upgrade_reference_table UDF
 #  tests replicating reference tables to new nodes after we add new nodes
-#  tests metadata changes after master_remove_node
+#  tests metadata changes after citus_remove_node
 # ----------
 
 # --------

src/test/regress/spec/isolation_add_node_vs_reference_table_operations.spec

@@ -3,7 +3,7 @@
 setup
 {
 	SET citus.shard_replication_factor to 1;
-	SELECT 1 FROM master_add_node('localhost', 57637);
+	SELECT 1 FROM citus_add_node('localhost', 57637);
 
 	CREATE TABLE test_reference_table (test_id integer);
 	CREATE TABLE test_reference_table_2 (test_id integer);
@@ -19,7 +19,7 @@ teardown
 	DROP TABLE IF EXISTS test_reference_table;
 	DROP TABLE IF EXISTS test_reference_table_2;
 	DROP TABLE IF EXISTS test_table;
-	SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+	SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
 }
 
 session "s1"
@@ -41,7 +41,7 @@ step "s1-do-not-replicate-on-activate"
 
 step "s1-add-second-worker"
 {
-	SELECT 1 FROM master_add_node('localhost', 57638);
+	SELECT 1 FROM citus_add_node('localhost', 57638);
 }
 
 step "s1-drop-reference-table"

src/test/regress/spec/isolation_add_remove_node.spec

@@ -5,7 +5,7 @@ setup
 
 teardown
 {
-	SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+	SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
 }
 
 session "s1"
@@ -17,12 +17,12 @@ step "s1-begin"
 
 step "s1-add-node-1"
 {
-	SELECT 1 FROM master_add_node('localhost', 57637);
+	SELECT 1 FROM citus_add_node('localhost', 57637);
 }
 
 step "s1-add-node-2"
 {
-	SELECT 1 FROM master_add_node('localhost', 57638);
+	SELECT 1 FROM citus_add_node('localhost', 57638);
 }
 
 step "s1-add-inactive-1"
@@ -42,7 +42,7 @@ step "s1-disable-node-1"
 
 step "s1-remove-node-1"
 {
-	SELECT * FROM master_remove_node('localhost', 57637);
+	SELECT * FROM citus_remove_node('localhost', 57637);
 }
 
 step "s1-abort"
@@ -64,12 +64,12 @@ session "s2"
 
 step "s2-add-node-1"
 {
-	SELECT 1 FROM master_add_node('localhost', 57637);
+	SELECT 1 FROM citus_add_node('localhost', 57637);
 }
 
 step "s2-add-node-2"
 {
-	SELECT 1 FROM master_add_node('localhost', 57638);
+	SELECT 1 FROM citus_add_node('localhost', 57638);
 }
 
 step "s2-activate-node-1"
@@ -84,12 +84,12 @@ step "s2-disable-node-1"
 
 step "s2-remove-node-1"
 {
-	SELECT * FROM master_remove_node('localhost', 57637);
+	SELECT * FROM citus_remove_node('localhost', 57637);
 }
 
 step "s2-remove-node-2"
 {
-	SELECT * FROM master_remove_node('localhost', 57638);
+	SELECT * FROM citus_remove_node('localhost', 57638);
 }
 
 // session 1 adds a node, session 2 removes it, should be ok

src/test/regress/spec/isolation_cluster_management.spec

@@ -1,8 +1,8 @@
 session "s1"
 step "s1a"
 {
-    SELECT 1 FROM master_add_node('localhost', 57637);
+    SELECT 1 FROM citus_add_node('localhost', 57637);
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
 }
 
 permutation "s1a"

src/test/regress/spec/isolation_create_citus_local_table.spec

@@ -1,6 +1,6 @@
 setup
 {
-    SELECT 1 FROM master_add_node('localhost', 57636, 0);
+    SELECT 1 FROM citus_add_node('localhost', 57636, 0);
   	CREATE TABLE citus_local_table_1(a int);
     CREATE TABLE citus_local_table_2(a int unique);
 
@@ -13,7 +13,7 @@ teardown
 	  DROP TABLE IF EXISTS citus_local_table_1, citus_local_table_2 CASCADE;
     DROP SCHEMA IF EXISTS another_schema CASCADE;
     -- remove coordinator only if it is added to pg_dist_node
-    SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node WHERE nodeport=57636;
+    SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node WHERE nodeport=57636;
 }
 
 session "s1"
@@ -24,8 +24,8 @@ step "s1-create-citus-local-table-3" { SELECT citus_add_local_table_to_metadata(
 step "s1-drop-table" { DROP TABLE citus_local_table_1; }
 step "s1-delete" { DELETE FROM citus_local_table_1 WHERE a=2; }
 step "s1-select" { SELECT * FROM citus_local_table_1; }
-step "s1-remove-coordinator" { SELECT master_remove_node('localhost', 57636); }
+step "s1-remove-coordinator" { SELECT citus_remove_node('localhost', 57636); }
-step "s1-add-coordinator" { SELECT 1 FROM master_add_node('localhost', 57636, 0); }
+step "s1-add-coordinator" { SELECT 1 FROM citus_add_node('localhost', 57636, 0); }
 step "s1-commit" { COMMIT; }
 step "s1-rollback" { ROLLBACK; }
 
@@ -39,7 +39,7 @@ step "s2-select" { SELECT * FROM citus_local_table_1; }
 step "s2-update" { UPDATE citus_local_table_1 SET a=1 WHERE a=2; }
 step "s2-truncate" { TRUNCATE citus_local_table_1; }
 step "s2-fkey-to-another" { ALTER TABLE citus_local_table_1 ADD CONSTRAINT fkey_c_to_c FOREIGN KEY(a) REFERENCES citus_local_table_2(a); }
-step "s2-remove-coordinator" { SELECT master_remove_node('localhost', 57636); }
+step "s2-remove-coordinator" { SELECT citus_remove_node('localhost', 57636); }
 step "s2-commit" { COMMIT; }
 
 
@@ -57,7 +57,7 @@ permutation "s1-begin" "s2-begin" "s1-create-citus-local-table-1" "s2-update" "s
 permutation "s1-begin" "s2-begin" "s1-create-citus-local-table-1" "s2-truncate" "s1-commit" "s2-commit"
 // Foreign key creation should succeed as it will be blocked until first session creates citus local table
 permutation "s2-create-citus-local-table-2" "s1-begin" "s2-begin" "s1-create-citus-local-table-1" "s2-fkey-to-another" "s1-commit" "s2-commit"
-// master_remove_node should first block and then fail
+// citus_remove_node should first block and then fail
 permutation "s1-begin" "s2-begin" "s1-create-citus-local-table-1" "s2-remove-coordinator" "s1-commit" "s2-commit"
 
 
@@ -68,7 +68,7 @@ permutation "s1-begin" "s2-begin" "s1-drop-table" "s2-create-citus-local-table-1
 // Any modifying queries, DML commands and SELECT will block
 permutation "s1-begin" "s2-begin" "s1-delete" "s2-create-citus-local-table-1" "s1-commit" "s2-commit"
 permutation "s1-begin" "s2-begin" "s1-select" "s2-create-citus-local-table-1" "s1-commit" "s2-commit"
-// citus_add_local_table_to_metadata should block on master_remove_node and then fail
+// citus_add_local_table_to_metadata should block on citus_remove_node and then fail
 permutation "s1-begin" "s2-begin" "s1-remove-coordinator" "s2-create-citus-local-table-1" "s1-commit" "s2-commit"
-// citus_add_local_table_to_metadata should block on master_add_node and then succeed
+// citus_add_local_table_to_metadata should block on citus_add_node and then succeed
 permutation "s1-remove-coordinator" "s1-begin" "s2-begin" "s1-add-coordinator" "s2-create-citus-local-table-1" "s1-commit" "s2-commit"

src/test/regress/spec/isolation_create_restore_point.spec

@@ -117,7 +117,7 @@ step "s1-add-node"
 
 step "s1-remove-node"
 {
-	SELECT master_remove_node('localhost', 9999);
+	SELECT citus_remove_node('localhost', 9999);
 }
 
 step "s1-commit"
@@ -163,10 +163,10 @@ permutation "s1-begin" "s1-recover" "s2-create-restore" "s1-commit"
 // verify that citus_create_restore_point is blocked by concurrent DROP TABLE
 permutation "s1-begin" "s1-drop" "s2-create-restore" "s1-commit"
 
-// verify that citus_create_restore_point is blocked by concurrent master_add_node
+// verify that citus_create_restore_point is blocked by concurrent citus_add_node
 permutation "s1-begin" "s1-add-node" "s2-create-restore" "s1-commit"
 
-// verify that citus_create_restore_point is blocked by concurrent master_remove_node
+// verify that citus_create_restore_point is blocked by concurrent citus_remove_node
 permutation "s1-begin" "s1-remove-node" "s2-create-restore" "s1-commit"
 
 // verify that citus_create_restore_point is blocked by concurrent citus_create_restore_point

src/test/regress/spec/isolation_create_table_vs_add_remove_node.spec

@@ -1,6 +1,6 @@
 setup
 {
-	SELECT 1 FROM master_add_node('localhost', 57637);
+	SELECT 1 FROM citus_add_node('localhost', 57637);
 	SELECT * FROM master_get_active_worker_nodes() ORDER BY node_name, node_port;
 }
 
@@ -8,7 +8,7 @@ teardown
 {
 	DROP TABLE IF EXISTS dist_table;
 
-	SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+	SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
 }
 
 session "s1"
@@ -20,12 +20,12 @@ step "s1-begin"
 
 step "s1-add-node-2"
 {
-	SELECT 1 FROM master_add_node('localhost', 57638);
+	SELECT 1 FROM citus_add_node('localhost', 57638);
 }
 
 step "s1-remove-node-2"
 {
-	SELECT * FROM master_remove_node('localhost', 57638);
+	SELECT * FROM citus_remove_node('localhost', 57638);
 }
 
 step "s1-abort"

src/test/regress/spec/isolation_ensure_dependency_activate_node.spec

@@ -7,15 +7,15 @@ setup
     LANGUAGE C STRICT VOLATILE
     AS 'citus', $$wait_until_metadata_sync$$;
 
-    SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+    SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
-    SELECT 1 FROM master_add_node('localhost', 57637);
+    SELECT 1 FROM citus_add_node('localhost', 57637);
 }
 
 // ensure that both nodes exists for the remaining of the isolation tests
 teardown
 {
-    SELECT 1 FROM master_add_node('localhost', 57637);
+    SELECT 1 FROM citus_add_node('localhost', 57637);
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
 
     -- schema drops are not cascaded
     SELECT run_command_on_workers($$DROP SCHEMA IF EXISTS myschema CASCADE;$$);
@@ -30,7 +30,7 @@ teardown
     DROP TYPE IF EXISTS tt1 CASCADE;
     DROP FUNCTION IF EXISTS add(INT,INT) CASCADE;
 
-    SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+    SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
 }
 
 session "s1"
@@ -42,7 +42,7 @@ step "s1-begin"
 
 step "s1-add-worker"
 {
-	SELECT 1 FROM master_add_node('localhost', 57638);
+	SELECT 1 FROM citus_add_node('localhost', 57638);
 }
 
 step "s1-commit"
@@ -54,7 +54,7 @@ step "s1-commit"
 // on that node as well. After counting objects is done we remove the node again.
 step "s1-print-distributed-objects"
 {
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
 
     -- print an overview of all distributed objects
     SELECT pg_identify_object_as_address(classid, objid, objsubid) FROM citus.pg_dist_object ORDER BY 1;
@@ -71,7 +71,7 @@ step "s1-print-distributed-objects"
     SELECT count(*) FROM pg_proc WHERE proname='add';
     SELECT run_command_on_workers($$SELECT count(*) FROM pg_proc WHERE proname='add';$$);
 
-    SELECT master_remove_node('localhost', 57638);
+    SELECT citus_remove_node('localhost', 57638);
 }
 
 session "s2"

src/test/regress/spec/isolation_extension_commands.spec

@@ -1,6 +1,6 @@
 setup
 {
-	SELECT 1 FROM master_add_node('localhost', 57638);
+	SELECT 1 FROM citus_add_node('localhost', 57638);
 
 	create schema if not exists schema1;
 	create schema if not exists schema2;
@@ -9,7 +9,7 @@ setup
 
 teardown
 {
-  SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+  SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
 }
 
 session "s1"
@@ -21,12 +21,12 @@ step "s1-begin"
 
 step "s1-add-node-1"
 {
-	SELECT 1 FROM master_add_node('localhost', 57637);
+	SELECT 1 FROM citus_add_node('localhost', 57637);
 }
 
 step "s1-remove-node-1"
 {
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+	SELECT 1 FROM citus_remove_node('localhost', 57637);
 }
 
 step "s1-commit"
@@ -57,7 +57,7 @@ step "s2-begin"
 
 step "s2-add-node-1"
 {
-	SELECT 1 FROM master_add_node('localhost', 57637);
+	SELECT 1 FROM citus_add_node('localhost', 57637);
 }
 
 step "s2-create-extension-version-11"
@@ -102,7 +102,7 @@ step "s2-commit"
 
 step "s2-remove-node-1"
 {
-	SELECT 1 FROM master_remove_node('localhost', 57637);
+	SELECT 1 FROM citus_remove_node('localhost', 57637);
 }
 
 // master_//_node vs extension command

src/test/regress/spec/isolation_master_update_node.spec

@@ -1,7 +1,7 @@
 setup
 {
-    SELECT 1 FROM master_add_node('localhost', 57637);
+    SELECT 1 FROM citus_add_node('localhost', 57637);
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
 
     CREATE TABLE t1(a int);
     SELECT create_distributed_table('t1','a');
@@ -12,7 +12,7 @@ teardown
     DROP TABLE t1;
 
     -- remove the nodes again
-    SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+    SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
 }
 
 session "s1"

src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec

@@ -3,7 +3,7 @@ setup
   SELECT citus_internal.replace_isolation_tester_func();
   SELECT citus_internal.refresh_isolation_tester_prepared_statement();
 
-  SELECT master_add_node('localhost', 57636);
+  SELECT citus_add_node('localhost', 57636);
 
   CREATE TABLE ref_table(a int primary key);
   SELECT create_reference_table('ref_table');
@@ -17,7 +17,7 @@ teardown
 {
   SELECT citus_internal.restore_isolation_tester_func();
   DROP TABLE ref_table, dist_table;
-  SELECT master_remove_node('localhost', 57636);
+  SELECT citus_remove_node('localhost', 57636);
 }
 
 session "s1"

src/test/regress/spec/isolation_shard_rebalancer.spec

@@ -1,7 +1,7 @@
 setup
 {
-	SELECT 1 FROM master_add_node('localhost', 57637);
+	SELECT 1 FROM citus_add_node('localhost', 57637);
-	SELECT 1 FROM master_add_node('localhost', 57638);
+	SELECT 1 FROM citus_add_node('localhost', 57638);
 	CREATE TABLE colocated1 (test_id integer NOT NULL, data text);
 	SELECT create_distributed_table('colocated1', 'test_id', 'hash', 'none');
 	CREATE TABLE colocated2 (test_id integer NOT NULL, data text);

src/test/regress/spec/isolation_shard_rebalancer_progress.spec

@@ -5,7 +5,7 @@ setup
 	select setval('pg_dist_shardid_seq', GREATEST(1500000, nextval('pg_dist_shardid_seq')));
 	SET citus.shard_count TO 4;
 	SET citus.shard_replication_factor TO 1;
-	SELECT 1 FROM master_add_node('localhost', 57637);
+	SELECT 1 FROM citus_add_node('localhost', 57637);
 	SELECT master_set_node_property('localhost', 57638, 'shouldhaveshards', false);
 	CREATE TABLE colocated1 (test_id integer NOT NULL, data text);
 	SELECT create_distributed_table('colocated1', 'test_id', 'hash', 'none');

src/test/regress/spec/isolation_shouldhaveshards.spec

@@ -2,20 +2,20 @@
 // add single one of the nodes for the purpose of the test
 setup
 {
-	SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+	SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
-	SELECT 1 FROM master_add_node('localhost', 57637);
+	SELECT 1 FROM citus_add_node('localhost', 57637);
 }
 
 teardown
 {
     DROP TABLE IF EXISTS t1 CASCADE;
-	SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+	SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
 }
 
 session "s1"
 
 step "s1-add-second-node" {
-	SELECT 1 FROM master_add_node('localhost', 57638);
+	SELECT 1 FROM citus_add_node('localhost', 57638);
 }
 
 step "s1-begin"

src/test/regress/spec/isolation_update_node.spec

@@ -1,14 +1,14 @@
 setup
 {
-    SELECT 1 FROM master_add_node('localhost', 57637);
+    SELECT 1 FROM citus_add_node('localhost', 57637);
-    SELECT 1 FROM master_add_node('localhost', 57638);
+    SELECT 1 FROM citus_add_node('localhost', 57638);
 
     SELECT nodeid, nodename, nodeport from pg_dist_node;
 }
 
 teardown
 {
-    SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+    SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
     SELECT nodeid, nodename, nodeport from pg_dist_node;
 }
 

src/test/regress/spec/isolation_update_node_lock_writes.spec

@@ -1,6 +1,6 @@
 setup
 {
-    SELECT 1 FROM master_add_node('localhost', 57637);
+    SELECT 1 FROM citus_add_node('localhost', 57637);
 
     SET citus.shard_replication_factor TO 1;
     CREATE TABLE update_node(id integer primary key, f1 text);
@@ -12,7 +12,7 @@ teardown
     RESET citus.shard_replication_factor;
     DROP TABLE update_node CASCADE;
 
-    SELECT master_remove_node(nodename, nodeport) FROM pg_dist_node;
+    SELECT citus_remove_node(nodename, nodeport) FROM pg_dist_node;
     SELECT nodeid, nodename, nodeport from pg_dist_node;
 }
 

src/test/regress/sql/add_coordinator.sql

@@ -2,13 +2,13 @@
 -- ADD_COORDINATOR
 --
 
-SELECT master_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset
+SELECT citus_add_node('localhost', :master_port, groupid => 0) AS master_nodeid \gset
 
 -- adding the same node again should return the existing nodeid
-SELECT master_add_node('localhost', :master_port, groupid => 0) = :master_nodeid;
+SELECT citus_add_node('localhost', :master_port, groupid => 0) = :master_nodeid;
 
 -- adding another node with groupid=0 should error out
-SELECT master_add_node('localhost', 12345, groupid => 0) = :master_nodeid;
+SELECT citus_add_node('localhost', 12345, groupid => 0) = :master_nodeid;
 
 -- start_metadata_sync_to_node() for coordinator should raise a notice
 SELECT start_metadata_sync_to_node('localhost', :master_port);

src/test/regress/sql/alter_database_owner.sql

@@ -19,7 +19,7 @@ SELECT run_command_on_workers($$
 $$);
 
 -- remove a node to verify addition later
-SELECT master_remove_node('localhost', :worker_2_port);
+SELECT citus_remove_node('localhost', :worker_2_port);
 
 -- verify we can change the owner of a database
 ALTER DATABASE regression OWNER TO database_owner_1;
@@ -44,7 +44,7 @@ $$);
 SET citus.enable_alter_database_owner TO off;
 
 -- add back second node to verify the owner of the database was set accordingly
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 
 -- list the owners of the current database on all nodes, should reflect on newly added node
 SELECT run_command_on_workers($$
@@ -57,10 +57,10 @@ $$);
 
 -- turn on propagation to verify it does propagate to new nodes when enabled
 SET citus.enable_alter_database_owner TO on;
-SELECT master_remove_node('localhost', :worker_2_port); -- remove so we can re add with propagation on
+SELECT citus_remove_node('localhost', :worker_2_port); -- remove so we can re add with propagation on
 
 -- add back second node to verify the owner of the database was set accordingly
-SELECT 1 FROM master_add_node('localhost', :worker_2_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_2_port);
 
 -- list the owners of the current database on all nodes, should reflect on newly added node
 SELECT run_command_on_workers($$

src/test/regress/sql/alter_role_propagation.sql

@@ -9,11 +9,11 @@ SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit,  rolcr
 ALTER ROLE CURRENT_USER WITH CONNECTION LIMIT 66 VALID UNTIL '2032-05-05' PASSWORD 'password456';
 SELECT row(rolname, rolsuper, rolinherit,  rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = 'alter_role_1';
 SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit,  rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = current_user$$);
-SELECT master_remove_node('localhost', :worker_1_port);
+SELECT citus_remove_node('localhost', :worker_1_port);
 ALTER ROLE CURRENT_USER WITH CONNECTION LIMIT 0 VALID UNTIL '2052-05-05' PASSWORD 'password789';
 SELECT row(rolname, rolsuper, rolinherit,  rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = 'alter_role_1';
 SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit,  rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = current_user$$);
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
 SELECT row(rolname, rolsuper, rolinherit,  rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = 'alter_role_1';
 SELECT run_command_on_workers($$SELECT row(rolname, rolsuper, rolinherit,  rolcreaterole, rolcreatedb, rolcanlogin, rolreplication, rolbypassrls, rolconnlimit, rolpassword, EXTRACT (year FROM rolvaliduntil)) FROM pg_authid WHERE rolname = current_user$$);
 
@@ -24,7 +24,7 @@ SELECT run_command_on_workers('SHOW enable_indexonlyscan');
 SELECT run_command_on_workers('SHOW enable_hashagg');
 
 -- remove 1 node to verify settings are copied when the node gets added back
-SELECT master_remove_node('localhost', :worker_1_port);
+SELECT citus_remove_node('localhost', :worker_1_port);
 
 -- change a setting for all users
 ALTER ROLE ALL SET enable_hashjoin TO FALSE;
@@ -45,7 +45,7 @@ ALTER ROLE ALL SET public.myguc TO "Hello, World";
 ALTER ROLE CURRENT_USER SET lc_messages TO 'C';
 
 -- add worker and check all settings are copied
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
 SELECT run_command_on_workers('SHOW enable_hashjoin');
 SELECT run_command_on_workers('SHOW enable_indexonlyscan');
 SELECT run_command_on_workers('SHOW enable_hashagg');
@@ -83,9 +83,9 @@ DROP DATABASE "REGRESSION";
 -- make sure alter role set is not propagated when the feature is deliberately turned off
 SET citus.enable_alter_role_set_propagation TO off;
 -- remove 1 node to verify settings are NOT copied when the node gets added back
-SELECT master_remove_node('localhost', :worker_1_port);
+SELECT citus_remove_node('localhost', :worker_1_port);
 ALTER ROLE ALL SET enable_hashjoin TO FALSE;
-SELECT 1 FROM master_add_node('localhost', :worker_1_port);
+SELECT 1 FROM citus_add_node('localhost', :worker_1_port);
 SELECT run_command_on_workers('SHOW enable_hashjoin');
 ALTER ROLE ALL RESET enable_hashjoin;
 SELECT run_command_on_workers('SHOW enable_hashjoin');

src/test/regress/sql/alter_table_set_access_method.sql

@@ -160,7 +160,7 @@ ORDER BY conname;
 
 -- test different table types
 SET client_min_messages to WARNING;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId := 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId := 0);
 SET client_min_messages to DEFAULT;
 CREATE TABLE table_type_dist (a INT);
 SELECT create_distributed_table('table_type_dist', 'a');
@@ -266,4 +266,4 @@ RESET client_min_messages;
 
 SET client_min_messages TO WARNING;
 DROP SCHEMA alter_table_set_access_method CASCADE;
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);

src/test/regress/sql/auto_undist_citus_local.sql

@@ -6,7 +6,7 @@ SET search_path TO drop_fkey_cascade;
 SET client_min_messages TO WARNING;
 SET citus.next_shard_id TO 1810000;
 
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
 
 -- show that DROP CONSTRAINT cascades to undistributing citus_local_table
 CREATE TABLE citus_local_table(l1 int);

src/test/regress/sql/citus_local_dist_joins.sql

@@ -2,7 +2,7 @@ CREATE SCHEMA citus_local_dist_joins;
 SET search_path TO citus_local_dist_joins;
 
 SET client_min_messages to ERROR;
-SELECT master_add_node('localhost', :master_port, groupId => 0) AS coordinator_nodeid \gset
+SELECT citus_add_node('localhost', :master_port, groupId => 0) AS coordinator_nodeid \gset
 
 
 CREATE TABLE citus_local(key int, value text);
@@ -253,6 +253,6 @@ USING (key);
 
 SET client_min_messages to ERROR;
 DROP TABLE citus_local;
-SELECT master_remove_node('localhost', :master_port);
+SELECT citus_remove_node('localhost', :master_port);
 \set VERBOSITY terse
 DROP SCHEMA citus_local_dist_joins CASCADE;

src/test/regress/sql/citus_local_table_triggers.sql

@@ -10,7 +10,7 @@ SET search_path TO citus_local_table_triggers;
 
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
 RESET client_min_messages;
 
 CREATE TABLE dummy_reference_table(a int unique, b int);

src/test/regress/sql/citus_local_tables.sql

@@ -14,7 +14,7 @@ SET search_path TO citus_local_tables_test_schema;
 
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
 RESET client_min_messages;
 
 CREATE TABLE citus_local_table_1 (a int);
@@ -23,12 +23,12 @@ CREATE TABLE citus_local_table_1 (a int);
 SELECT citus_add_local_table_to_metadata('citus_local_table_1');
 
 -- try to remove coordinator and observe failure as there exist a citus local table
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
 
 DROP TABLE citus_local_table_1;
 
 -- this should work now as the citus local table is dropped
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
 
 CREATE TABLE citus_local_table_1 (a int primary key);
 
@@ -37,7 +37,7 @@ SELECT citus_add_local_table_to_metadata('citus_local_table_1');
 
 -- let coordinator have citus local tables again for next tests
 set client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
 RESET client_min_messages;
 
 BEGIN;

src/test/regress/sql/citus_local_tables_mx.sql

@@ -10,7 +10,7 @@ SET search_path TO citus_local_tables_mx;
 
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
 RESET client_min_messages;
 
 --------------

src/test/regress/sql/citus_local_tables_queries.sql

@@ -10,7 +10,7 @@ SET search_path TO citus_local_table_queries;
 
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
 RESET client_min_messages;
 
 CREATE TABLE dummy_reference_table(a int unique, b int);

src/test/regress/sql/citus_local_tables_queries_mx.sql

@@ -10,7 +10,7 @@ SET search_path TO citus_local_table_queries_mx;
 
 -- ensure that coordinator is added to pg_dist_node
 SET client_min_messages to ERROR;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
 RESET client_min_messages;
 
 -- start metadata sync to worker 1

src/test/regress/sql/columnar_citus_integration.sql

@@ -305,7 +305,7 @@ DROP TABLE table_option_reference, table_option_reference_2;
 SET citus.shard_replication_factor TO 1;
 
 -- test options on a citus local table
-SELECT 1 FROM master_add_node('localhost', :master_port, groupId => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupId => 0);
 CREATE TABLE table_option_citus_local (a int, b text) USING columnar;
 SELECT citus_add_local_table_to_metadata('table_option_citus_local');
 
@@ -401,7 +401,7 @@ SELECT * FROM pg_dist_partition WHERE logicalrelid = 'table_option_citus_local':
 SELECT compression FROM columnar.options WHERE regclass = 'table_option_citus_local'::regclass;
 
 DROP TABLE table_option_citus_local, table_option_citus_local_2;
-SELECT 1 FROM master_remove_node('localhost', :master_port);
+SELECT 1 FROM citus_remove_node('localhost', :master_port);
 
 -- verify reference table with no columns can be created
 -- https://github.com/citusdata/citus/issues/4608

src/test/regress/sql/coordinator_shouldhaveshards.sql

@@ -6,7 +6,7 @@ SET citus.next_shard_id TO 1503000;
 
 -- idempotently add node to allow this test to run without add_coordinator
 SET client_min_messages TO WARNING;
-SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
+SELECT 1 FROM citus_add_node('localhost', :master_port, groupid => 0);
 RESET client_min_messages;
 
 SELECT 1 FROM master_set_node_property('localhost', :master_port, 'shouldhaveshards', true);