diff --git a/include/Base_HostGroups_Manager.h b/include/Base_HostGroups_Manager.h
index 22c8c6b43..945b9ea82 100644
--- a/include/Base_HostGroups_Manager.h
+++ b/include/Base_HostGroups_Manager.h
@@ -550,7 +550,7 @@ enum READ_ONLY_SERVER_T {
 	ROS_HOSTNAME = 0,
 	ROS_PORT,
 	ROS_READONLY,
-	ROS__SIZE
+	ROS_SIZE_
 };
 
 enum REPLICATION_LAG_SERVER_T {
@@ -559,7 +559,7 @@ enum REPLICATION_LAG_SERVER_T {
 	RLS_PORT,
 	RLS_CURRENT_REPLICATION_LAG,
 	RLS_OVERRIDE_REPLICATION_LAG,
-	RLS__SIZE
+	RLS_SIZE_
 };
 
 /**
diff --git a/include/MySQL_HostGroups_Manager.h b/include/MySQL_HostGroups_Manager.h
index de3414a97..a326d2d45 100644
--- a/include/MySQL_HostGroups_Manager.h
+++ b/include/MySQL_HostGroups_Manager.h
@@ -466,7 +466,7 @@ enum READ_ONLY_SERVER_T {
 	ROS_HOSTNAME = 0,
 	ROS_PORT,
 	ROS_READONLY,
-	ROS__SIZE
+	ROS_SIZE_
 };
 
 enum REPLICATION_LAG_SERVER_T {
@@ -475,7 +475,7 @@ enum REPLICATION_LAG_SERVER_T {
 	RLS_PORT,
 	RLS_CURRENT_REPLICATION_LAG,
 	RLS_OVERRIDE_REPLICATION_LAG,
-	RLS__SIZE
+	RLS_SIZE_
 };
 
 /**
diff --git a/include/PgSQL_HostGroups_Manager.h b/include/PgSQL_HostGroups_Manager.h
index 54f41b618..3a65b228f 100644
--- a/include/PgSQL_HostGroups_Manager.h
+++ b/include/PgSQL_HostGroups_Manager.h
@@ -355,7 +355,7 @@ enum PgSQL_READ_ONLY_SERVER_T {
 	PG_ROS_HOSTNAME = 0,
 	PG_ROS_PORT,
 	PG_ROS_READONLY,
-	PG_ROS__SIZE
+	PG_ROS_SIZE_
 };
 
 enum PgSQL_REPLICATION_LAG_SERVER_T {
@@ -363,7 +363,7 @@ enum PgSQL_REPLICATION_LAG_SERVER_T {
 	PG_RLS_ADDRESS,
 	PG_RLS_PORT,
 	PG_RLS_CURRENT_REPLICATION_LAG,
-	PG_RLS__SIZE
+	PG_RLS_SIZE_
 };
 
 /**