diff --git a/src/backend/distributed/shardsplit/shardsplit_decoder.c b/src/backend/distributed/shardsplit/shardsplit_decoder.c
index 137e48cc0..90213d2f4 100644
--- a/src/backend/distributed/shardsplit/shardsplit_decoder.c
+++ b/src/backend/distributed/shardsplit/shardsplit_decoder.c
@@ -1,10 +1,8 @@
 /*-------------------------------------------------------------------------
  *
- * pgoutput.c
+ * shardsplit_decoder.c
  *		Logical Replication output plugin
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
- *
  * IDENTIFICATION
  *		  src/backend/distributed/shardsplit/shardsplit_decoder.c
  *
diff --git a/src/backend/distributed/shardsplit/shardsplit_shared_memory.c b/src/backend/distributed/shardsplit/shardsplit_shared_memory.c
index 58cca6cd1..d98c08d08 100644
--- a/src/backend/distributed/shardsplit/shardsplit_shared_memory.c
+++ b/src/backend/distributed/shardsplit/shardsplit_shared_memory.c
@@ -19,7 +19,7 @@
 #include "utils/memutils.h"
 
 const char *SharedMemoryNameForHandleManagement =
-	"SHARED_MEMORY_FOR_SPLIT_SHARD_HANDLE_MANAGEMENT";
+	"Shard memory handle for shard split";
 
 static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
 
diff --git a/src/backend/distributed/sql/citus--11.0-2--11.1-1.sql b/src/backend/distributed/sql/citus--11.0-2--11.1-1.sql
index e3667acf4..0b1475e1e 100644
--- a/src/backend/distributed/sql/citus--11.0-2--11.1-1.sql
+++ b/src/backend/distributed/sql/citus--11.0-2--11.1-1.sql
@@ -10,4 +10,4 @@ DROP FUNCTION pg_catalog.worker_repartition_cleanup(bigint);
 #include "../../columnar/sql/columnar--11.0-2--11.1-1.sql"
 #include "udfs/citus_split_shard_by_split_points/11.0-2.sql"
 #include "udfs/worker_split_copy/11.0-2.sql"
-#include "udfs/split_shard_replication_setup/11.0-2.sql"
+#include "udfs/worker_split_shard_replication_setup/11.0-2.sql"
diff --git a/src/backend/distributed/sql/udfs/split_shard_replication_setup/11.0-2.sql b/src/backend/distributed/sql/udfs/worker_split_shard_replication_setup/11.0-2.sql
similarity index 100%
rename from src/backend/distributed/sql/udfs/split_shard_replication_setup/11.0-2.sql
rename to src/backend/distributed/sql/udfs/worker_split_shard_replication_setup/11.0-2.sql
diff --git a/src/backend/distributed/sql/udfs/split_shard_replication_setup/latest.sql b/src/backend/distributed/sql/udfs/worker_split_shard_replication_setup/latest.sql
similarity index 100%
rename from src/backend/distributed/sql/udfs/split_shard_replication_setup/latest.sql
rename to src/backend/distributed/sql/udfs/worker_split_shard_replication_setup/latest.sql
diff --git a/src/test/regress/expected/split_shard_replication_colocated_setup.out b/src/test/regress/expected/split_shard_replication_colocated_setup.out
index 65688fa74..bfb493a79 100644
--- a/src/test/regress/expected/split_shard_replication_colocated_setup.out
+++ b/src/test/regress/expected/split_shard_replication_colocated_setup.out
@@ -69,8 +69,13 @@ SELECT worker_split_shard_replication_setup(ARRAY[
     ROW(4, 6, '0', '2147483647', :worker_2_node)::citus.split_shard_info,
     ROW(7, 8, '-2147483648', '-1', :worker_2_node)::citus.split_shard_info,
     ROW(7, 9, '0', '2147483647', :worker_2_node)::citus.split_shard_info
-    ]) AS shared_memory_id \gset
+    ]);
 WARNING:  As a part of split shard workflow,unexpectedly found a valid shared memory handle while storing a new one.
+ worker_split_shard_replication_setup
+---------------------------------------------------------------------
+
+(1 row)
+
 SELECT relowner AS table_owner_one FROM pg_class WHERE relname='table_first' \gset
 SELECT relowner AS table_owner_two FROM pg_class WHERE relname='table_second' \gset
 SELECT slot_name AS slot_for_first_owner FROM pg_create_logical_replication_slot(FORMAT('citus_split_%s_%s', :worker_2_node, :table_owner_one), 'citus') \gset
diff --git a/src/test/regress/expected/split_shard_replication_setup.out b/src/test/regress/expected/split_shard_replication_setup.out
index 1b8b2cf07..8a229ced9 100644
--- a/src/test/regress/expected/split_shard_replication_setup.out
+++ b/src/test/regress/expected/split_shard_replication_setup.out
@@ -47,7 +47,12 @@ CREATE PUBLICATION pub1 FOR TABLE table_to_split_1, table_to_split_2, table_to_s
 SELECT  worker_split_shard_replication_setup(ARRAY[
     ROW(1, 2, '-2147483648', '-1', :worker_2_node)::citus.split_shard_info,
     ROW(1, 3, '0', '2147483647', :worker_2_node)::citus.split_shard_info
-    ]) AS shared_memory_id \gset
+    ]);
+ worker_split_shard_replication_setup
+---------------------------------------------------------------------
+
+(1 row)
+
 SELECT slot_name FROM pg_create_logical_replication_slot(FORMAT('citus_split_%s_10', :worker_2_node), 'citus') \gset
 -- Create subscription at worker2 with copy_data to 'false' and derived replication slot name
 \c - - - :worker_2_port
diff --git a/src/test/regress/expected/split_shard_replication_setup_local.out b/src/test/regress/expected/split_shard_replication_setup_local.out
index bfdade34a..f873b6cc3 100644
--- a/src/test/regress/expected/split_shard_replication_setup_local.out
+++ b/src/test/regress/expected/split_shard_replication_setup_local.out
@@ -13,7 +13,12 @@ CREATE PUBLICATION pub1 for table table_to_split_1, table_to_split_2, table_to_s
 SELECT worker_split_shard_replication_setup(ARRAY[
     ROW(1, 2, '-2147483648', '-1', :worker_1_node)::citus.split_shard_info,
     ROW(1, 3, '0', '2147483647', :worker_1_node)::citus.split_shard_info
-    ]) AS shared_memory_id \gset
+    ]);
+ worker_split_shard_replication_setup
+---------------------------------------------------------------------
+
+(1 row)
+
 SELECT slot_name AS local_slot FROM pg_create_logical_replication_slot(FORMAT('citus_split_%s_10', :worker_1_node), 'citus') \gset
 -- Create subscription at worker1 with copy_data to 'false' a
 BEGIN;
diff --git a/src/test/regress/expected/split_shard_replication_setup_remote_local.out b/src/test/regress/expected/split_shard_replication_setup_remote_local.out
index 0920afa29..56f757d84 100644
--- a/src/test/regress/expected/split_shard_replication_setup_remote_local.out
+++ b/src/test/regress/expected/split_shard_replication_setup_remote_local.out
@@ -11,8 +11,13 @@ CREATE PUBLICATION pub1 FOR TABLE table_to_split_1, table_to_split_2, table_to_s
 SELECT  worker_split_shard_replication_setup(ARRAY[
     ROW(1, 2, '-2147483648', '-1', :worker_1_node)::citus.split_shard_info,
     ROW(1, 3, '0', '2147483647', :worker_2_node)::citus.split_shard_info
-    ]) AS shared_memory_id \gset
+    ]);
 WARNING:  As a part of split shard workflow,unexpectedly found a valid shared memory handle while storing a new one.
+ worker_split_shard_replication_setup
+---------------------------------------------------------------------
+
+(1 row)
+
 SELECT slot_name AS slot_for_worker1 FROM pg_create_logical_replication_slot(FORMAT('citus_split_%s_10', :worker_1_node), 'citus') \gset
 SELECT slot_name AS slot_for_worker2 FROM pg_create_logical_replication_slot(FORMAT('citus_split_%s_10', :worker_2_node), 'citus') \gset
 -- Create subscription at worker1 with copy_data to 'false' and 'slot_for_worker1'
diff --git a/src/test/regress/sql/split_shard_replication_colocated_setup.sql b/src/test/regress/sql/split_shard_replication_colocated_setup.sql
index 0f973a666..6addcd983 100644
--- a/src/test/regress/sql/split_shard_replication_colocated_setup.sql
+++ b/src/test/regress/sql/split_shard_replication_colocated_setup.sql
@@ -71,7 +71,7 @@ SELECT worker_split_shard_replication_setup(ARRAY[
     ROW(4, 6, '0', '2147483647', :worker_2_node)::citus.split_shard_info,
     ROW(7, 8, '-2147483648', '-1', :worker_2_node)::citus.split_shard_info,
     ROW(7, 9, '0', '2147483647', :worker_2_node)::citus.split_shard_info
-    ]) AS shared_memory_id \gset
+    ]);
 
 SELECT relowner AS table_owner_one FROM pg_class WHERE relname='table_first' \gset
 SELECT relowner AS table_owner_two FROM pg_class WHERE relname='table_second' \gset
diff --git a/src/test/regress/sql/split_shard_replication_setup.sql b/src/test/regress/sql/split_shard_replication_setup.sql
index 446c451a8..52f0c290c 100644
--- a/src/test/regress/sql/split_shard_replication_setup.sql
+++ b/src/test/regress/sql/split_shard_replication_setup.sql
@@ -49,7 +49,7 @@ CREATE PUBLICATION pub1 FOR TABLE table_to_split_1, table_to_split_2, table_to_s
 SELECT  worker_split_shard_replication_setup(ARRAY[
     ROW(1, 2, '-2147483648', '-1', :worker_2_node)::citus.split_shard_info,
     ROW(1, 3, '0', '2147483647', :worker_2_node)::citus.split_shard_info
-    ]) AS shared_memory_id \gset
+    ]);
 
 SELECT slot_name FROM pg_create_logical_replication_slot(FORMAT('citus_split_%s_10', :worker_2_node), 'citus') \gset
 
diff --git a/src/test/regress/sql/split_shard_replication_setup_local.sql b/src/test/regress/sql/split_shard_replication_setup_local.sql
index cba85acaf..88fb13273 100644
--- a/src/test/regress/sql/split_shard_replication_setup_local.sql
+++ b/src/test/regress/sql/split_shard_replication_setup_local.sql
@@ -16,7 +16,7 @@ CREATE PUBLICATION pub1 for table table_to_split_1, table_to_split_2, table_to_s
 SELECT worker_split_shard_replication_setup(ARRAY[
     ROW(1, 2, '-2147483648', '-1', :worker_1_node)::citus.split_shard_info,
     ROW(1, 3, '0', '2147483647', :worker_1_node)::citus.split_shard_info
-    ]) AS shared_memory_id \gset
+    ]);
 
 SELECT slot_name AS local_slot FROM pg_create_logical_replication_slot(FORMAT('citus_split_%s_10', :worker_1_node), 'citus') \gset
 
diff --git a/src/test/regress/sql/split_shard_replication_setup_remote_local.sql b/src/test/regress/sql/split_shard_replication_setup_remote_local.sql
index 7e6a72bcd..6d5243a94 100644
--- a/src/test/regress/sql/split_shard_replication_setup_remote_local.sql
+++ b/src/test/regress/sql/split_shard_replication_setup_remote_local.sql
@@ -14,7 +14,7 @@ CREATE PUBLICATION pub1 FOR TABLE table_to_split_1, table_to_split_2, table_to_s
 SELECT  worker_split_shard_replication_setup(ARRAY[
     ROW(1, 2, '-2147483648', '-1', :worker_1_node)::citus.split_shard_info,
     ROW(1, 3, '0', '2147483647', :worker_2_node)::citus.split_shard_info
-    ]) AS shared_memory_id \gset
+    ]);
 
 SELECT slot_name AS slot_for_worker1 FROM pg_create_logical_replication_slot(FORMAT('citus_split_%s_10', :worker_1_node), 'citus') \gset
 SELECT slot_name AS slot_for_worker2 FROM pg_create_logical_replication_slot(FORMAT('citus_split_%s_10', :worker_2_node), 'citus') \gset