diff --git a/src/backend/distributed/commands/citus_global_signal.c b/src/backend/distributed/commands/citus_global_signal.c
index 8f33f91b7..05b210ee2 100644
--- a/src/backend/distributed/commands/citus_global_signal.c
+++ b/src/backend/distributed/commands/citus_global_signal.c
@@ -22,8 +22,8 @@
 
 static bool CitusSignalBackend(uint64 globalPID, uint64 timeout, int sig);
 
-PG_FUNCTION_INFO_V1(pg_cancel_backend);
-PG_FUNCTION_INFO_V1(pg_terminate_backend);
+PG_FUNCTION_INFO_V1(citus_cancel_backend);
+PG_FUNCTION_INFO_V1(citus_terminate_backend);
 
 /*
  * pg_cancel_backend overrides the Postgres' pg_cancel_backend to cancel
@@ -34,7 +34,7 @@ PG_FUNCTION_INFO_V1(pg_terminate_backend);
  * pg_cancel_backend function is used.
  */
 Datum
-pg_cancel_backend(PG_FUNCTION_ARGS)
+citus_cancel_backend(PG_FUNCTION_ARGS)
 {
 	CheckCitusVersion(ERROR);
 
@@ -57,7 +57,7 @@ pg_cancel_backend(PG_FUNCTION_ARGS)
  * pg_terminate_backend function is used.
  */
 Datum
-pg_terminate_backend(PG_FUNCTION_ARGS)
+citus_terminate_backend(PG_FUNCTION_ARGS)
 {
 	CheckCitusVersion(ERROR);
 
diff --git a/src/backend/distributed/sql/citus--11.0-4--11.1-1.sql b/src/backend/distributed/sql/citus--11.0-4--11.1-1.sql
index 86b60cef1..a5a78fa87 100644
--- a/src/backend/distributed/sql/citus--11.0-4--11.1-1.sql
+++ b/src/backend/distributed/sql/citus--11.0-4--11.1-1.sql
@@ -105,3 +105,8 @@ GRANT SELECT ON pg_catalog.pg_dist_operationid_seq TO public;
 CREATE SEQUENCE citus.pg_dist_cleanup_recordid_seq;
 ALTER SEQUENCE citus.pg_dist_cleanup_recordid_seq SET SCHEMA pg_catalog;
 GRANT SELECT ON pg_catalog.pg_dist_cleanup_recordid_seq TO public;
+
+-- We recreate these two UDF from 11.0-1 on purpose, because we changed their
+-- old definition. By recreating it here upgrades also pick up the new changes.
+#include "udfs/pg_cancel_backend/11.0-1.sql"
+#include "udfs/pg_terminate_backend/11.0-1.sql"
diff --git a/src/backend/distributed/sql/udfs/pg_cancel_backend/11.0-1.sql b/src/backend/distributed/sql/udfs/pg_cancel_backend/11.0-1.sql
index 3a355aa6d..f6bb3feb7 100644
--- a/src/backend/distributed/sql/udfs/pg_cancel_backend/11.0-1.sql
+++ b/src/backend/distributed/sql/udfs/pg_cancel_backend/11.0-1.sql
@@ -3,7 +3,7 @@ DROP FUNCTION IF EXISTS pg_catalog.pg_cancel_backend(global_pid bigint) CASCADE;
 CREATE OR REPLACE FUNCTION pg_catalog.pg_cancel_backend(global_pid bigint)
     RETURNS BOOL
     LANGUAGE C
-AS 'MODULE_PATHNAME', $$pg_cancel_backend$$;
+AS 'MODULE_PATHNAME', $$citus_cancel_backend$$;
 
 COMMENT ON FUNCTION pg_catalog.pg_cancel_backend(global_pid bigint)
     IS 'cancels a Citus query which might be on any node in the Citus cluster';
diff --git a/src/backend/distributed/sql/udfs/pg_cancel_backend/latest.sql b/src/backend/distributed/sql/udfs/pg_cancel_backend/latest.sql
index 3a355aa6d..f6bb3feb7 100644
--- a/src/backend/distributed/sql/udfs/pg_cancel_backend/latest.sql
+++ b/src/backend/distributed/sql/udfs/pg_cancel_backend/latest.sql
@@ -3,7 +3,7 @@ DROP FUNCTION IF EXISTS pg_catalog.pg_cancel_backend(global_pid bigint) CASCADE;
 CREATE OR REPLACE FUNCTION pg_catalog.pg_cancel_backend(global_pid bigint)
     RETURNS BOOL
     LANGUAGE C
-AS 'MODULE_PATHNAME', $$pg_cancel_backend$$;
+AS 'MODULE_PATHNAME', $$citus_cancel_backend$$;
 
 COMMENT ON FUNCTION pg_catalog.pg_cancel_backend(global_pid bigint)
     IS 'cancels a Citus query which might be on any node in the Citus cluster';
diff --git a/src/backend/distributed/sql/udfs/pg_terminate_backend/11.0-1.sql b/src/backend/distributed/sql/udfs/pg_terminate_backend/11.0-1.sql
index 9b9798b76..231dceec0 100644
--- a/src/backend/distributed/sql/udfs/pg_terminate_backend/11.0-1.sql
+++ b/src/backend/distributed/sql/udfs/pg_terminate_backend/11.0-1.sql
@@ -3,7 +3,7 @@ DROP FUNCTION IF EXISTS pg_catalog.pg_terminate_backend(global_pid bigint, timeo
 CREATE OR REPLACE FUNCTION pg_catalog.pg_terminate_backend(global_pid bigint, timeout bigint DEFAULT 0)
     RETURNS BOOL
     LANGUAGE C
-AS 'MODULE_PATHNAME', $$pg_terminate_backend$$;
+AS 'MODULE_PATHNAME', $$citus_terminate_backend$$;
 
 COMMENT ON FUNCTION pg_catalog.pg_terminate_backend(global_pid bigint, timeout bigint)
     IS 'terminates a Citus query which might be on any node in the Citus cluster';
diff --git a/src/backend/distributed/sql/udfs/pg_terminate_backend/latest.sql b/src/backend/distributed/sql/udfs/pg_terminate_backend/latest.sql
index 9b9798b76..231dceec0 100644
--- a/src/backend/distributed/sql/udfs/pg_terminate_backend/latest.sql
+++ b/src/backend/distributed/sql/udfs/pg_terminate_backend/latest.sql
@@ -3,7 +3,7 @@ DROP FUNCTION IF EXISTS pg_catalog.pg_terminate_backend(global_pid bigint, timeo
 CREATE OR REPLACE FUNCTION pg_catalog.pg_terminate_backend(global_pid bigint, timeout bigint DEFAULT 0)
     RETURNS BOOL
     LANGUAGE C
-AS 'MODULE_PATHNAME', $$pg_terminate_backend$$;
+AS 'MODULE_PATHNAME', $$citus_terminate_backend$$;
 
 COMMENT ON FUNCTION pg_catalog.pg_terminate_backend(global_pid bigint, timeout bigint)
     IS 'terminates a Citus query which might be on any node in the Citus cluster';