diff --git a/src/backend/distributed/operations/shard_cleaner.c b/src/backend/distributed/operations/shard_cleaner.c
index f8e8d851b..d2123298d 100644
--- a/src/backend/distributed/operations/shard_cleaner.c
+++ b/src/backend/distributed/operations/shard_cleaner.c
@@ -20,14 +20,14 @@
 
 
 /* declarations for dynamic loading */
-PG_FUNCTION_INFO_V1(master_defer_delete_shards);
+PG_FUNCTION_INFO_V1(citus_delete_marked_shards);
 
 
 static int DropMarkedShards(void);
 
 
 /*
- * master_defer_delete_shards implements a user-facing UDF to deleter orphaned shards that
+ * citus_delete_marked_shards implements a user-facing UDF to deleter orphaned shards that
  * are still haning around in the system. These shards are orphaned by previous actions
  * that were not directly able to delete the placements eg. shard moving or dropping of a
  * distributed table while one of the data nodes was not online.
@@ -39,7 +39,7 @@ static int DropMarkedShards(void);
  * The function takes no arguments and runs cluster wide
  */
 Datum
-master_defer_delete_shards(PG_FUNCTION_ARGS)
+citus_delete_marked_shards(PG_FUNCTION_ARGS)
 {
 	CheckCitusVersion(ERROR);
 	EnsureCoordinator();
diff --git a/src/backend/distributed/sql/citus--10.0-3--10.1-1.sql b/src/backend/distributed/sql/citus--10.0-3--10.1-1.sql
index f48d84169..7f0bb9088 100644
--- a/src/backend/distributed/sql/citus--10.0-3--10.1-1.sql
+++ b/src/backend/distributed/sql/citus--10.0-3--10.1-1.sql
@@ -6,3 +6,4 @@
 #include "udfs/worker_partitioned_relation_size/10.1-1.sql"
 #include "udfs/worker_partitioned_table_size/10.1-1.sql"
 #include "udfs/citus_finish_pg_upgrade/10.1-1.sql"
+#include "udfs/citus_delete_marked_shards/10.1-1.sql"
diff --git a/src/backend/distributed/sql/udfs/citus_delete_marked_shards/10.1-1.sql b/src/backend/distributed/sql/udfs/citus_delete_marked_shards/10.1-1.sql
new file mode 100644
index 000000000..9250135de
--- /dev/null
+++ b/src/backend/distributed/sql/udfs/citus_delete_marked_shards/10.1-1.sql
@@ -0,0 +1,6 @@
+CREATE OR REPLACE FUNCTION citus_delete_marked_shards()
+    RETURNS int
+    LANGUAGE C STRICT
+    AS 'citus', $$citus_delete_marked_shards$$;
+COMMENT ON FUNCTION citus_delete_marked_shards()
+    IS 'remove orphaned shards';
\ No newline at end of file
diff --git a/src/backend/distributed/sql/udfs/citus_delete_marked_shards/latest.sql b/src/backend/distributed/sql/udfs/citus_delete_marked_shards/latest.sql
new file mode 100644
index 000000000..9250135de
--- /dev/null
+++ b/src/backend/distributed/sql/udfs/citus_delete_marked_shards/latest.sql
@@ -0,0 +1,6 @@
+CREATE OR REPLACE FUNCTION citus_delete_marked_shards()
+    RETURNS int
+    LANGUAGE C STRICT
+    AS 'citus', $$citus_delete_marked_shards$$;
+COMMENT ON FUNCTION citus_delete_marked_shards()
+    IS 'remove orphaned shards';
\ No newline at end of file
diff --git a/src/test/regress/expected/multi_test_helpers_superuser.out b/src/test/regress/expected/multi_test_helpers_superuser.out
index cfc3cf02b..01676131c 100644
--- a/src/test/regress/expected/multi_test_helpers_superuser.out
+++ b/src/test/regress/expected/multi_test_helpers_superuser.out
@@ -1,9 +1,3 @@
-CREATE OR REPLACE FUNCTION master_defer_delete_shards()
-    RETURNS int
-    LANGUAGE C STRICT
-    AS 'citus', $$master_defer_delete_shards$$;
-COMMENT ON FUNCTION master_defer_delete_shards()
-    IS 'remove orphaned shards';
 CREATE OR REPLACE FUNCTION wait_until_metadata_sync(timeout INTEGER DEFAULT 15000)
     RETURNS void
     LANGUAGE C STRICT
diff --git a/src/test/regress/expected/shard_move_deferred_delete.out b/src/test/regress/expected/shard_move_deferred_delete.out
index ddb2be9d8..3f9826aef 100644
--- a/src/test/regress/expected/shard_move_deferred_delete.out
+++ b/src/test/regress/expected/shard_move_deferred_delete.out
@@ -42,8 +42,8 @@ $cmd$);
 (2 rows)
 
 -- execute delayed removal
-SELECT public.master_defer_delete_shards();
- master_defer_delete_shards
+SELECT public.citus_delete_marked_shards();
+ citus_delete_marked_shards
 ---------------------------------------------------------------------
                           1
 (1 row)
diff --git a/src/test/regress/sql/multi_test_helpers_superuser.sql b/src/test/regress/sql/multi_test_helpers_superuser.sql
index 4026c2f00..0bd360b12 100644
--- a/src/test/regress/sql/multi_test_helpers_superuser.sql
+++ b/src/test/regress/sql/multi_test_helpers_superuser.sql
@@ -1,10 +1,3 @@
-CREATE OR REPLACE FUNCTION master_defer_delete_shards()
-    RETURNS int
-    LANGUAGE C STRICT
-    AS 'citus', $$master_defer_delete_shards$$;
-COMMENT ON FUNCTION master_defer_delete_shards()
-    IS 'remove orphaned shards';
-
 CREATE OR REPLACE FUNCTION wait_until_metadata_sync(timeout INTEGER DEFAULT 15000)
     RETURNS void
     LANGUAGE C STRICT
diff --git a/src/test/regress/sql/shard_move_deferred_delete.sql b/src/test/regress/sql/shard_move_deferred_delete.sql
index 1d5d38ffa..f52701e4e 100644
--- a/src/test/regress/sql/shard_move_deferred_delete.sql
+++ b/src/test/regress/sql/shard_move_deferred_delete.sql
@@ -28,7 +28,7 @@ SELECT run_command_on_workers($cmd$
 $cmd$);
 
 -- execute delayed removal
-SELECT public.master_defer_delete_shards();
+SELECT public.citus_delete_marked_shards();
 
 -- we expect the shard to be on only the second worker
 SELECT run_command_on_workers($cmd$