diff --git a/include/MySQL_Thread.h b/include/MySQL_Thread.h
index f5c87c798..316d4e459 100644
--- a/include/MySQL_Thread.h
+++ b/include/MySQL_Thread.h
@@ -548,7 +548,7 @@ class MySQL_Threads_Handler
 		bool log_mysql_warnings_enabled;
 		int data_packets_history_size;
 		int handle_warnings;
-		int recover_replication_lag_shunned_servers_on_commit;
+		int evaluate_replication_lag_on_servers_load;
 	} variables;
 	struct {
 		unsigned int mirror_sessions_current;
diff --git a/include/proxysql_structs.h b/include/proxysql_structs.h
index 58444b585..86141a917 100644
--- a/include/proxysql_structs.h
+++ b/include/proxysql_structs.h
@@ -866,7 +866,7 @@ __thread bool mysql_thread___enable_load_data_local_infile;
 __thread int mysql_thread___client_host_cache_size;
 __thread int mysql_thread___client_host_error_counts;
 __thread int mysql_thread___handle_warnings;
-__thread int mysql_thread___recover_replication_lag_shunned_servers_on_commit;
+__thread int mysql_thread___evaluate_replication_lag_on_servers_load;
 
 /* variables used for Query Cache */
 __thread int mysql_thread___query_cache_size_MB;
@@ -1035,7 +1035,7 @@ extern __thread bool mysql_thread___enable_load_data_local_infile;
 extern __thread int mysql_thread___client_host_cache_size;
 extern __thread int mysql_thread___client_host_error_counts;
 extern __thread int mysql_thread___handle_warnings;
-extern __thread int mysql_thread___recover_replication_lag_shunned_servers_on_commit;
+extern __thread int mysql_thread___evaluate_replication_lag_on_servers_load;
 
 /* variables used for Query Cache */
 extern __thread int mysql_thread___query_cache_size_MB;
diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp
index 704e2e355..e41b45b1b 100644
--- a/lib/MySQL_HostGroups_Manager.cpp
+++ b/lib/MySQL_HostGroups_Manager.cpp
@@ -2028,7 +2028,7 @@ bool MySQL_HostGroups_Manager::commit(
 				}
 				if (atoi(r->fields[5])!=atoi(r->fields[15])) {
 					bool change_server_status = true;
-					if (GloMTH->variables.recover_replication_lag_shunned_servers_on_commit == 1) {
+					if (GloMTH->variables.evaluate_replication_lag_on_servers_load == 1) {
 						if (mysrvc->status == MYSQL_SERVER_STATUS_SHUNNED_REPLICATION_LAG && // currently server is shunned due to replication lag
 							(MySerStatus)atoi(r->fields[15]) == MYSQL_SERVER_STATUS_ONLINE) { // new server status is online
 							if (mysrvc->cur_replication_lag != -2) { // Master server? Seconds_Behind_Master column is not present
diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp
index 21367778d..bf8de66bc 100644
--- a/lib/MySQL_Thread.cpp
+++ b/lib/MySQL_Thread.cpp
@@ -432,7 +432,7 @@ static char * mysql_thread_variables_names[]= {
 	(char *)"query_cache_stores_empty_result",
 	(char *)"data_packets_history_size",
 	(char *)"handle_warnings",
-	(char *)"recover_replication_lag_shunned_servers_on_commit",
+	(char *)"evaluate_replication_lag_on_servers_load",
 	NULL
 };
 
@@ -897,7 +897,7 @@ MySQL_Threads_Handler::MySQL_Threads_Handler() {
 	variables.client_host_cache_size=0;
 	variables.client_host_error_counts=0;
 	variables.handle_warnings=1;
-	variables.recover_replication_lag_shunned_servers_on_commit=1;
+	variables.evaluate_replication_lag_on_servers_load=1;
 	variables.connect_retries_on_failure=10;
 	variables.connection_delay_multiplex_ms=0;
 	variables.connection_max_age_ms=0;
@@ -2081,7 +2081,7 @@ char ** MySQL_Threads_Handler::get_variables_list() {
 		VariablesPointers_int["client_host_cache_size"]        = make_tuple(&variables.client_host_cache_size,        0,      1024*1024, false);
 		VariablesPointers_int["client_host_error_counts"]      = make_tuple(&variables.client_host_error_counts,      0,      1024*1024, false);
 		VariablesPointers_int["handle_warnings"]			   = make_tuple(&variables.handle_warnings,				  0,			  1, false);
-		VariablesPointers_int["recover_replication_lag_shunned_servers_on_commit"] = make_tuple(&variables.recover_replication_lag_shunned_servers_on_commit, 0, 1, false);
+		VariablesPointers_int["evaluate_replication_lag_on_servers_load"] = make_tuple(&variables.evaluate_replication_lag_on_servers_load, 0, 1, false);
 
 		// logs
 		VariablesPointers_int["auditlog_filesize"]     = make_tuple(&variables.auditlog_filesize,    1024*1024, 1*1024*1024*1024, false);
@@ -4010,7 +4010,7 @@ void MySQL_Thread::refresh_variables() {
 	mysql_thread___client_host_cache_size=GloMTH->get_variable_int((char *)"client_host_cache_size");
 	mysql_thread___client_host_error_counts=GloMTH->get_variable_int((char *)"client_host_error_counts");
 	mysql_thread___handle_warnings=GloMTH->get_variable_int((char*)"handle_warnings");
-	mysql_thread___recover_replication_lag_shunned_servers_on_commit=GloMTH->get_variable_int((char*)"recover_replication_lag_shunned_servers_on_commit");
+	mysql_thread___evaluate_replication_lag_on_servers_load=GloMTH->get_variable_int((char*)"evaluate_replication_lag_on_servers_load");
 #ifdef DEBUG
 	mysql_thread___session_debug=(bool)GloMTH->get_variable_int((char *)"session_debug");
 #endif /* DEBUG */