diff --git a/src/backend/cdb/cdbutil.c b/src/backend/cdb/cdbutil.c
index f732368d725..a241549662d 100644
--- a/src/backend/cdb/cdbutil.c
+++ b/src/backend/cdb/cdbutil.c
@@ -122,7 +122,7 @@ typedef struct HostPrimaryCountEntry
  *
  * In phase 2 of 2PC, current xact has been marked to TRANS_COMMIT/ABORT,
  * COMMIT_PREPARED or ABORT_PREPARED DTM are performed, if they failed,
- * dispather disconnect and destroy all gangs and fetch the latest segment
+ * dispatcher disconnect and destroy all gangs and fetch the latest segment
  * configurations to do RETRY_COMMIT_PREPARED or RETRY_ABORT_PREPARED,
  * however, postgres disallow catalog lookups outside of xacts.
  *
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 9ba76564998..47cc7f733e2 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -210,7 +210,7 @@ cluster(ParseState *pstate, ClusterStmt *stmt, bool isTopLevel)
 		table_close(rel, NoLock);
 
 		/* Do the job. */
-		/* GPDB_14_MERGE_FIXME: do we need the return value of cluster_rel to dispath ? */
+		/* GPDB_14_MERGE_FIXME: do we need the return value of cluster_rel to dispatch ? */
 		cluster_rel(tableOid, indexOid, &params);
 
 		if (Gp_role == GP_ROLE_DISPATCH)
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 7ce61a9ab9e..53c1bf7d338 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -2312,12 +2312,12 @@ create_projection_plan(PlannerInfo *root, ProjectionPath *best_path, int flags)
 	 * https://github.com/greenplum-db/gpdb/issues/9874 for more
 	 * detailed info.
 	 */
-	if (root->config->gp_enable_direct_dispatch && best_path->direct_dispath_contentIds)
+	if (root->config->gp_enable_direct_dispatch && best_path->direct_dispatch_contentIds)
 	{
 		DirectDispatchInfo dispatchInfo;
 
 		dispatchInfo.isDirectDispatch = true;
-		dispatchInfo.contentIds = best_path->direct_dispath_contentIds;
+		dispatchInfo.contentIds = best_path->direct_dispatch_contentIds;
 		dispatchInfo.haveProcessedAnyCalculations = true;
 
 		MergeDirectDispatchCalculationInfo(&root->curSlice->directDispatch, &dispatchInfo);
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 871a7b1b35f..0347fe5030c 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -2092,7 +2092,7 @@ set_append_path_locus(PlannerInfo *root, Path *pathnode, RelOptInfo *rel,
 				 * gp_execution_segment() = <segid> here, so we should update
 				 * direct dispatch info when creating plan.
 				 */
-				((ProjectionPath *) subpath)->direct_dispath_contentIds = list_make1_int(gp_session_id % numsegments);
+				((ProjectionPath *) subpath)->direct_dispatch_contentIds = list_make1_int(gp_session_id % numsegments);
 
 				CdbPathLocus_MakeStrewn(&(subpath->locus),
 				                        numsegments,
diff --git a/src/include/cdb/cdbtm.h b/src/include/cdb/cdbtm.h
index 2bf259a8744..dc05e1a79dd 100644
--- a/src/include/cdb/cdbtm.h
+++ b/src/include/cdb/cdbtm.h
@@ -217,7 +217,7 @@ typedef struct TMGXACT
 	* When first assigning and fetching gxid, using this to keep
 	* atomic and then assign/fetch gxid with its value.
 	* Only use this on QD when necessary as QE's gxid and
-	* DistributedSnapshot is dispathed from QD.
+	* DistributedSnapshot is dispatched from QD.
 	*/
 	pg_atomic_uint64 			atomic_gxid;
 #endif
diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h
index b81b5020089..b02a2ccf0c1 100644
--- a/src/include/nodes/pathnodes.h
+++ b/src/include/nodes/pathnodes.h
@@ -2133,7 +2133,7 @@ typedef struct ProjectionPath
 	 * CDB: projection with qual gp_execution_segment() = <segid>,
 	 * for such case we should consider update directdispatch info.
 	 */
-	List	   *direct_dispath_contentIds;
+	List	   *direct_dispatch_contentIds;
 } ProjectionPath;
 
 typedef struct RuntimeFilterPath