diff --git a/mysql-test/suite/rpl_raft/r/rpl_raft_wait_for_ack.result b/mysql-test/suite/rpl_raft/r/rpl_raft_wait_for_ack.result
index df5fc5d0074b..67ff4224ff66 100644
--- a/mysql-test/suite/rpl_raft/r/rpl_raft_wait_for_ack.result
+++ b/mysql-test/suite/rpl_raft/r/rpl_raft_wait_for_ack.result
@@ -59,9 +59,9 @@ include/sync_slave_sql_with_master.inc
 select @@global.raft_signal_async_dump_threads;
 @@global.raft_signal_async_dump_threads
 AFTER_CONSENSUS
-set @@global.rpl_raft_debug_sync_point = 'replicationDone';
+set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
 insert into t1 values(1);
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
 select * from t1;
@@ -75,7 +75,7 @@ a
 select * from t1;
 a
 1
-set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
 set @@global.rpl_raft_debug_sync_point = '';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
@@ -95,9 +95,9 @@ a
 select @@global.raft_signal_async_dump_threads;
 @@global.raft_signal_async_dump_threads
 AFTER_CONSENSUS
-set @@global.rpl_raft_debug_sync_point = 'replicationDone';
+set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
 insert into t1 values(2);
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
 include/sync_slave_sql_with_master.inc
 select * from t1;
 a
@@ -113,7 +113,7 @@ a
 select * from t1;
 a
 1
-set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
 set @@global.rpl_raft_debug_sync_point = '';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
@@ -137,9 +137,9 @@ a
 2
 "Case 3: Test AFTER_ENGINE_COMMIT on leader"
 set @@global.raft_signal_async_dump_threads = AFTER_ENGINE_COMMIT;
-set @@global.rpl_raft_debug_sync_point = 'updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point = 'UpdateConsensusApplied';
 insert into t1 values(3);
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for UpdateConsensusApplied';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
 select * from t1;
@@ -161,7 +161,7 @@ a
 1
 2
 3
-set @@global.rpl_raft_debug_sync_point_action = 'continue updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point_action = 'continue UpdateConsensusApplied';
 set @@global.rpl_raft_debug_sync_point = '';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
@@ -188,9 +188,9 @@ a
 set @@global.raft_signal_async_dump_threads = AFTER_CONSENSUS;
 "Case 4: Test AFTER_ENGINE_COMMIT on follower"
 set @@global.raft_signal_async_dump_threads = AFTER_ENGINE_COMMIT;
-set @@global.rpl_raft_debug_sync_point = 'updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point = 'UpdateConsensusApplied';
 insert into t1 values(4);
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for UpdateConsensusApplied';
 include/sync_slave_sql_with_master.inc
 select * from t1;
 a
@@ -215,7 +215,7 @@ a
 1
 2
 3
-set @@global.rpl_raft_debug_sync_point_action = 'continue updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point_action = 'continue UpdateConsensusApplied';
 set @@global.rpl_raft_debug_sync_point = '';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
@@ -248,9 +248,9 @@ a
 set @@global.raft_signal_async_dump_threads = AFTER_CONSENSUS;
 "Case 5: Check if rotation is handled correctly on leader"
 flush binary logs;
-set @@global.rpl_raft_debug_sync_point = 'replicationDone';
+set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
 insert into t1 values(5);
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
@@ -281,7 +281,7 @@ a
 3
 4
 5
-set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
 set @@global.rpl_raft_debug_sync_point = '';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
@@ -317,9 +317,9 @@ a
 5
 "Case 6: Check if rotation is handled correctly on follower"
 flush binary logs;
-set @@global.rpl_raft_debug_sync_point = 'replicationDone';
+set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
 insert into t1 values(6);
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
 select * from t1;
@@ -352,7 +352,7 @@ a
 3
 4
 5
-set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
 set @@global.rpl_raft_debug_sync_point = '';
 include/sync_slave_sql_with_master.inc
 include/sync_slave_sql_with_master.inc
diff --git a/mysql-test/suite/rpl_raft/t/rpl_raft_wait_for_ack.test b/mysql-test/suite/rpl_raft/t/rpl_raft_wait_for_ack.test
index b39b973fe10a..cd3c2c57e075 100644
--- a/mysql-test/suite/rpl_raft/t/rpl_raft_wait_for_ack.test
+++ b/mysql-test/suite/rpl_raft/t/rpl_raft_wait_for_ack.test
@@ -50,16 +50,16 @@ echo "Case 1: Test AFTER_CONSENSUS on leader";
 connection server_1;
 # Should be AFTER_CONSENSUS
 select @@global.raft_signal_async_dump_threads;
-# Wait before executing replicationDone i.e. before commit hook
-set @@global.rpl_raft_debug_sync_point = 'replicationDone';
+# Wait before executing ReplicationDoneCallback i.e. before commit hook
+set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
 
 # Execute a trx on the leader
 connection server_1_1;
 send insert into t1 values(1);
 
-# Wait till we've reached the beginning of replicationDone
+# Wait till we've reached the beginning of ReplicationDoneCallback
 connection server_1;
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
 
 # Sync both raft nodes
 let $sync_slave_connection= server_2;
@@ -80,9 +80,9 @@ select * from t1;
 connection server_5;
 select * from t1;
 
-# Continue replicationDone
+# Continue ReplicationDoneCallback
 connection server_1;
-set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
 set @@global.rpl_raft_debug_sync_point = '';
 
 connection server_1_1;
@@ -113,16 +113,16 @@ echo "Case 2: Test AFTER_CONSENSUS on follower";
 connection server_2;
 # Should be AFTER_CONSENSUS
 select @@global.raft_signal_async_dump_threads;
-# Wait before executing replicationDone
-set @@global.rpl_raft_debug_sync_point = 'replicationDone';
+# Wait before executing ReplicationDoneCallback
+set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
 
 # Execute a trx on the leader
 connection server_1;
 insert into t1 values(2);
 
-# Wait till we've reached the beginning of replicationDone
+# Wait till we've reached the beginning of ReplicationDoneCallback
 connection server_2;
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
 
 # Sync server3
 let $sync_slave_connection= server_3;
@@ -141,9 +141,9 @@ select * from t1;
 connection server_5;
 select * from t1;
 
-# Continue replicationDone
+# Continue ReplicationDoneCallback
 connection server_2;
-set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
 set @@global.rpl_raft_debug_sync_point = '';
 
 connection server_1;
@@ -173,16 +173,16 @@ echo "Case 3: Test AFTER_ENGINE_COMMIT on leader";
 
 connection server_1;
 set @@global.raft_signal_async_dump_threads = AFTER_ENGINE_COMMIT;
-# Wait before executing updateConsensusApplied i.e. after commit
-set @@global.rpl_raft_debug_sync_point = 'updateConsensusApplied';
+# Wait before executing UpdateConsensusApplied i.e. after commit
+set @@global.rpl_raft_debug_sync_point = 'UpdateConsensusApplied';
 
 # Execute a trx on the leader
 connection server_1_1;
 send insert into t1 values(3);
 
-# Wait till we've reached the beginning of replicationDone
+# Wait till we've reached the beginning of ReplicationDoneCallback
 connection server_1;
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for UpdateConsensusApplied';
 
 # Sync both raft nodes
 let $sync_slave_connection= server_2;
@@ -203,9 +203,9 @@ select * from t1;
 connection server_5;
 select * from t1;
 
-# Continue replicationDone
+# Continue ReplicationDoneCallback
 connection server_1;
-set @@global.rpl_raft_debug_sync_point_action = 'continue updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point_action = 'continue UpdateConsensusApplied';
 set @@global.rpl_raft_debug_sync_point = '';
 
 connection server_1_1;
@@ -236,16 +236,16 @@ echo "Case 4: Test AFTER_ENGINE_COMMIT on follower";
 
 connection server_2;
 set @@global.raft_signal_async_dump_threads = AFTER_ENGINE_COMMIT;
-# Wait before executing updateConsensusApplied
-set @@global.rpl_raft_debug_sync_point = 'updateConsensusApplied';
+# Wait before executing UpdateConsensusApplied
+set @@global.rpl_raft_debug_sync_point = 'UpdateConsensusApplied';
 
 # Execute a trx on the leader
 connection server_1;
 insert into t1 values(4);
 
-# Wait till we've reached the beginning of replicationDone
+# Wait till we've reached the beginning of ReplicationDoneCallback
 connection server_2;
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for UpdateConsensusApplied';
 
 # Sync server3
 let $sync_slave_connection= server_3;
@@ -264,9 +264,9 @@ select * from t1;
 connection server_5;
 select * from t1;
 
-# Continue replicationDone
+# Continue ReplicationDoneCallback
 connection server_2;
-set @@global.rpl_raft_debug_sync_point_action = 'continue updateConsensusApplied';
+set @@global.rpl_raft_debug_sync_point_action = 'continue UpdateConsensusApplied';
 set @@global.rpl_raft_debug_sync_point = '';
 
 connection server_1;
@@ -300,16 +300,16 @@ echo "Case 5: Check if rotation is handled correctly on leader";
 connection server_1;
 # Rotate raft log
 flush binary logs;
-# Wait before executing replicationDone i.e. before commit hook
-set @@global.rpl_raft_debug_sync_point = 'replicationDone';
+# Wait before executing ReplicationDoneCallback i.e. before commit hook
+set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
 
 # Execute a trx on the leader
 connection server_1_1;
 send insert into t1 values(5);
 
-# Wait till we've reached the beginning of replicationDone
+# Wait till we've reached the beginning of ReplicationDoneCallback
 connection server_1;
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
 
 let $sync_slave_connection= server_2;
 source include/sync_slave_sql_with_master.inc;
@@ -337,9 +337,9 @@ select * from t1;
 connection server_5;
 select * from t1;
 
-# Continue replicationDone
+# Continue ReplicationDoneCallback
 connection server_1;
-set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
 set @@global.rpl_raft_debug_sync_point = '';
 
 connection server_1_1;
@@ -374,16 +374,16 @@ connection server_1;
 # Rotate raft logs
 flush binary logs;
 connection server_2;
-# Wait before executing replicationDone
-set @@global.rpl_raft_debug_sync_point = 'replicationDone';
+# Wait before executing ReplicationDoneCallback
+set @@global.rpl_raft_debug_sync_point = 'ReplicationDoneCallback';
 
 # Execute a trx on the leader
 connection server_1;
 insert into t1 values(6);
 
-# Wait till we've reached the beginning of replicationDone
+# Wait till we've reached the beginning of ReplicationDoneCallback
 connection server_2;
-set @@global.rpl_raft_debug_sync_point_action = 'wait_for replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'wait_for ReplicationDoneCallback';
 
 let $sync_slave_connection= server_3;
 source include/sync_slave_sql_with_master.inc;
@@ -409,9 +409,9 @@ select * from t1;
 connection server_5;
 select * from t1;
 
-# Continue replicationDone
+# Continue ReplicationDoneCallback
 connection server_2;
-set @@global.rpl_raft_debug_sync_point_action = 'continue replicationDone';
+set @@global.rpl_raft_debug_sync_point_action = 'continue ReplicationDoneCallback';
 set @@global.rpl_raft_debug_sync_point = '';
 
 # Sync all servers