diff --git a/src/backend/distributed/metadata/node_metadata.c b/src/backend/distributed/metadata/node_metadata.c
index e857e1dda..c66b0d3e2 100644
--- a/src/backend/distributed/metadata/node_metadata.c
+++ b/src/backend/distributed/metadata/node_metadata.c
@@ -524,7 +524,7 @@ citus_disable_node(PG_FUNCTION_ARGS)
 	TransactionModifiedNodeMetadata = true;
 
 	/*
-	 * We have not propagated the metadata changes yet, make sure that all the
+	 * We have not propagated the node metadata changes yet, make sure that all the
 	 * active nodes get the metadata updates. We defer this operation to the
 	 * background worker to make it possible disabling nodes when multiple nodes
 	 * are down.
@@ -537,7 +537,7 @@ citus_disable_node(PG_FUNCTION_ARGS)
 	 */
 	if (UnsetMetadataSyncedForAll())
 	{
-		TriggerMetadataSyncOnCommit();
+		TriggerNodeMetadataSyncOnCommit();
 	}
 
 	PG_RETURN_VOID();
@@ -1321,7 +1321,7 @@ citus_update_node(PG_FUNCTION_ARGS)
 	 */
 	if (UnsetMetadataSyncedForAll())
 	{
-		TriggerMetadataSyncOnCommit();
+		TriggerNodeMetadataSyncOnCommit();
 	}
 
 	if (handle != NULL)
diff --git a/src/backend/distributed/test/metadata_sync.c b/src/backend/distributed/test/metadata_sync.c
index 667c43c2a..b1c8a095c 100644
--- a/src/backend/distributed/test/metadata_sync.c
+++ b/src/backend/distributed/test/metadata_sync.c
@@ -159,7 +159,7 @@ wait_until_metadata_sync(PG_FUNCTION_ARGS)
 Datum
 trigger_metadata_sync(PG_FUNCTION_ARGS)
 {
-	TriggerMetadataSyncOnCommit();
+	TriggerNodeMetadataSyncOnCommit();
 	PG_RETURN_VOID();
 }
 
diff --git a/src/backend/distributed/transaction/transaction_management.c b/src/backend/distributed/transaction/transaction_management.c
index ccd3a4e58..0337411cb 100644
--- a/src/backend/distributed/transaction/transaction_management.c
+++ b/src/backend/distributed/transaction/transaction_management.c
@@ -115,8 +115,8 @@ AllowedDistributionColumn AllowedDistributionColumnValue;
 /* if disabled, distributed statements in a function may run as separate transactions */
 bool FunctionOpensTransactionBlock = true;
 
-/* if true, we should trigger metadata sync on commit */
-bool MetadataSyncOnCommit = false;
+/* if true, we should trigger node metadata sync on commit */
+bool NodeMetadataSyncOnCommit = false;
 
 
 /* transaction management functions */
@@ -288,11 +288,11 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
 
 			/*
 			 * Changes to catalog tables are now visible to the metadata sync
-			 * daemon, so we can trigger metadata sync if necessary.
+			 * daemon, so we can trigger node metadata sync if necessary.
 			 */
-			if (MetadataSyncOnCommit)
+			if (NodeMetadataSyncOnCommit)
 			{
-				TriggerMetadataSync(MyDatabaseId);
+				TriggerNodeMetadataSync(MyDatabaseId);
 			}
 
 			ResetGlobalVariables();
@@ -554,7 +554,7 @@ ResetGlobalVariables()
 	activeSetStmts = NULL;
 	ShouldCoordinatedTransactionUse2PC = false;
 	TransactionModifiedNodeMetadata = false;
-	MetadataSyncOnCommit = false;
+	NodeMetadataSyncOnCommit = false;
 	InTopLevelDelegatedFunctionCall = false;
 	ResetWorkerErrorIndication();
 	memset(&AllowedDistributionColumnValue, 0,
@@ -800,14 +800,14 @@ MaybeExecutingUDF(void)
 
 
 /*
- * TriggerMetadataSyncOnCommit sets a flag to do metadata sync on commit.
- * This is because new metadata only becomes visible to the metadata sync
- * daemon after commit happens.
+ * TriggerNodeMetadataSyncOnCommit sets a flag to do node metadata sync
+ * on commit. This is because new metadata only becomes visible to the
+ * metadata sync daemon after commit happens.
  */
 void
-TriggerMetadataSyncOnCommit(void)
+TriggerNodeMetadataSyncOnCommit(void)
 {
-	MetadataSyncOnCommit = true;
+	NodeMetadataSyncOnCommit = true;
 }
 
 
diff --git a/src/backend/distributed/utils/maintenanced.c b/src/backend/distributed/utils/maintenanced.c
index 940764235..36d4b0b6e 100644
--- a/src/backend/distributed/utils/maintenanced.c
+++ b/src/backend/distributed/utils/maintenanced.c
@@ -86,7 +86,7 @@ typedef struct MaintenanceDaemonDBData
 	Oid userOid;
 	pid_t workerPid;
 	bool daemonStarted;
-	bool triggerMetadataSync;
+	bool triggerNodeMetadataSync;
 	Latch *latch; /* pointer to the background worker's latch */
 } MaintenanceDaemonDBData;
 
@@ -233,7 +233,7 @@ InitializeMaintenanceDaemonBackend(void)
 		dbData->daemonStarted = true;
 		dbData->userOid = extensionOwner;
 		dbData->workerPid = 0;
-		dbData->triggerMetadataSync = false;
+		dbData->triggerNodeMetadataSync = false;
 		LWLockRelease(&MaintenanceDaemonControl->lock);
 
 		pid_t pid;
@@ -926,11 +926,11 @@ StopMaintenanceDaemon(Oid databaseId)
 
 
 /*
- * TriggerMetadataSync triggers the maintenance daemon to do a metadata sync for
- * the given database.
+ * TriggerMetadataSync triggers the maintenance daemon to do
+ * a node metadata sync for the given database.
  */
 void
-TriggerMetadataSync(Oid databaseId)
+TriggerNodeMetadataSync(Oid databaseId)
 {
 	bool found = false;
 
@@ -942,7 +942,7 @@ TriggerMetadataSync(Oid databaseId)
 		HASH_FIND, &found);
 	if (found)
 	{
-		dbData->triggerMetadataSync = true;
+		dbData->triggerNodeMetadataSync = true;
 
 		/* set latch to wake-up the maintenance loop */
 		SetLatch(dbData->latch);
@@ -961,8 +961,8 @@ MetadataSyncTriggeredCheckAndReset(MaintenanceDaemonDBData *dbData)
 {
 	LWLockAcquire(&MaintenanceDaemonControl->lock, LW_EXCLUSIVE);
 
-	bool metadataSyncTriggered = dbData->triggerMetadataSync;
-	dbData->triggerMetadataSync = false;
+	bool metadataSyncTriggered = dbData->triggerNodeMetadataSync;
+	dbData->triggerNodeMetadataSync = false;
 
 	LWLockRelease(&MaintenanceDaemonControl->lock);
 
diff --git a/src/include/distributed/maintenanced.h b/src/include/distributed/maintenanced.h
index 7ff42674f..c5002021d 100644
--- a/src/include/distributed/maintenanced.h
+++ b/src/include/distributed/maintenanced.h
@@ -22,7 +22,7 @@
 extern double DistributedDeadlockDetectionTimeoutFactor;
 
 extern void StopMaintenanceDaemon(Oid databaseId);
-extern void TriggerMetadataSync(Oid databaseId);
+extern void TriggerNodeMetadataSync(Oid databaseId);
 extern void InitializeMaintenanceDaemon(void);
 extern void InitializeMaintenanceDaemonBackend(void);
 extern bool LockCitusExtension(void);
diff --git a/src/include/distributed/transaction_management.h b/src/include/distributed/transaction_management.h
index 5ff34e21a..2c958d041 100644
--- a/src/include/distributed/transaction_management.h
+++ b/src/include/distributed/transaction_management.h
@@ -131,7 +131,7 @@ extern void InitializeTransactionManagement(void);
 /* other functions */
 extern List * ActiveSubXactContexts(void);
 extern StringInfo BeginAndSetDistributedTransactionIdCommand(void);
-extern void TriggerMetadataSyncOnCommit(void);
+extern void TriggerNodeMetadataSyncOnCommit(void);
 
 
 #endif /*  TRANSACTION_MANAGMENT_H */