diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 59a8d3c5fe94..6789cd477b35 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -517,7 +517,7 @@ static void igmp_show_interfaces(struct pim_instance *pim, struct vty *vty,
 					now - igmp->sock_creation);
 			pim_time_timer_to_hhmmss(query_hhmmss,
 						 sizeof(query_hhmmss),
-						 igmp->t_igmp_query_timer);
+						 igmp->t_query_timer);
 
 			if (uj) {
 				json_row = json_object_new_object();
@@ -527,7 +527,7 @@ static void igmp_show_interfaces(struct pim_instance *pim, struct vty *vty,
 				json_object_int_add(json_row, "version",
 						    pim_ifp->igmp_version);
 
-				if (igmp->t_igmp_query_timer) {
+				if (igmp->t_query_timer) {
 					json_object_boolean_true_add(json_row,
 								     "querier");
 					json_object_string_add(json_row,
@@ -556,8 +556,7 @@ static void igmp_show_interfaces(struct pim_instance *pim, struct vty *vty,
 					inet_ntop(AF_INET, &igmp->ifaddr, buf,
 						  sizeof(buf)),
 					pim_ifp->igmp_version,
-					igmp->t_igmp_query_timer ? "local"
-								 : "other",
+					igmp->t_query_timer ? "local" : "other",
 					&igmp->querier_addr, query_hhmmss,
 					uptime);
 			}
@@ -617,7 +616,7 @@ static void igmp_show_interfaces_single(struct pim_instance *pim,
 					now - igmp->sock_creation);
 			pim_time_timer_to_hhmmss(query_hhmmss,
 						 sizeof(query_hhmmss),
-						 igmp->t_igmp_query_timer);
+						 igmp->t_query_timer);
 			pim_time_timer_to_hhmmss(other_hhmmss,
 						 sizeof(other_hhmmss),
 						 igmp->t_other_querier_timer);
@@ -661,9 +660,9 @@ static void igmp_show_interfaces_single(struct pim_instance *pim,
 				json_object_string_add(json_row, "upTime",
 						       uptime);
 				json_object_string_add(json_row, "querier",
-						       igmp->t_igmp_query_timer
-						       ? "local"
-						       : "other");
+						       igmp->t_query_timer
+							       ? "local"
+							       : "other");
 				json_object_string_addf(json_row, "querierIp",
 							"%pI4",
 							&igmp->querier_addr);
@@ -734,8 +733,8 @@ static void igmp_show_interfaces_single(struct pim_instance *pim,
 				vty_out(vty, "Querier\n");
 				vty_out(vty, "-------\n");
 				vty_out(vty, "Querier     : %s\n",
-					igmp->t_igmp_query_timer ? "local"
-					: "other");
+					igmp->t_query_timer ? "local"
+							    : "other");
 				vty_out(vty, "QuerierIp   : %pI4",
 					&igmp->querier_addr);
 				if (pim_ifp->primary_address.s_addr
@@ -3462,7 +3461,7 @@ static void igmp_show_groups(struct pim_instance *pim, struct vty *vty, bool uj)
 				json_object_string_add(json_group, "group",
 						       group_str);
 
-				if (grp->igmp_version == 3)
+				if (grp->version == 3)
 					json_object_string_add(
 						json_group, "mode",
 						grp->group_filtermode_isexcl
@@ -3477,23 +3476,24 @@ static void igmp_show_groups(struct pim_instance *pim, struct vty *vty, bool uj)
 						grp->group_source_list)
 							       : 0);
 				json_object_int_add(json_group, "version",
-						    grp->igmp_version);
+						    grp->version);
 				json_object_string_add(json_group, "uptime",
 						       uptime);
 				json_object_array_add(json_groups, json_group);
 			} else {
 				vty_out(vty, "%-16s %-15s %4s %8s %4d %d %8s\n",
 					ifp->name, group_str,
-					grp->igmp_version == 3
+					grp->version == 3
 						? (grp->group_filtermode_isexcl
 							   ? "EXCL"
 							   : "INCL")
 						: "----",
 					hhmmss,
-					grp->group_source_list ? listcount(
-						grp->group_source_list)
-							       : 0,
-					grp->igmp_version, uptime);
+					grp->group_source_list
+						? listcount(
+							  grp->group_source_list)
+						: 0,
+					grp->version, uptime);
 			}
 		} /* scan igmp groups */
 	}	  /* scan interfaces */
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index c632a1c95400..d6da9a1940b8 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -147,7 +147,7 @@ static int pim_igmp_other_querier_expire(struct thread *t)
 
 	igmp = THREAD_ARG(t);
 
-	assert(!igmp->t_igmp_query_timer);
+	assert(!igmp->t_query_timer);
 
 	if (PIM_DEBUG_IGMP_TRACE) {
 		char ifaddr_str[INET_ADDRSTRLEN];
@@ -199,7 +199,7 @@ void pim_igmp_other_querier_timer_on(struct gm_sock *igmp)
 	} else {
 		/*
 		  We are the current querier, then stop sending general queries:
-		  igmp->t_igmp_query_timer = NULL;
+		  igmp->t_query_timer = NULL;
 		*/
 		pim_igmp_general_query_off(igmp);
 	}
@@ -208,7 +208,7 @@ void pim_igmp_other_querier_timer_on(struct gm_sock *igmp)
 	  Since this socket is starting the other-querier-present timer,
 	  there should not be periodic query timer for this socket.
 	 */
-	assert(!igmp->t_igmp_query_timer);
+	assert(!igmp->t_query_timer);
 
 	/*
 	  RFC 3376: 8.5. Other Querier Present Interval
@@ -660,7 +660,7 @@ void pim_igmp_general_query_on(struct gm_sock *igmp)
 			startup_mode ? "startup" : "non-startup", igmp->fd);
 	}
 	thread_add_timer(router->master, pim_igmp_general_query, igmp,
-			 query_interval, &igmp->t_igmp_query_timer);
+			 query_interval, &igmp->t_query_timer);
 }
 
 void pim_igmp_general_query_off(struct gm_sock *igmp)
@@ -668,7 +668,7 @@ void pim_igmp_general_query_off(struct gm_sock *igmp)
 	assert(igmp);
 
 	if (PIM_DEBUG_IGMP_TRACE) {
-		if (igmp->t_igmp_query_timer) {
+		if (igmp->t_query_timer) {
 			char ifaddr_str[INET_ADDRSTRLEN];
 			pim_inet4_dump("<ifaddr?>", igmp->ifaddr, ifaddr_str,
 				       sizeof(ifaddr_str));
@@ -677,7 +677,7 @@ void pim_igmp_general_query_off(struct gm_sock *igmp)
 				ifaddr_str, igmp->fd, igmp->interface->name);
 		}
 	}
-	THREAD_OFF(igmp->t_igmp_query_timer);
+	THREAD_OFF(igmp->t_query_timer);
 }
 
 /* Issue IGMP general query */
@@ -745,14 +745,14 @@ static void sock_close(struct gm_sock *igmp)
 	pim_igmp_general_query_off(igmp);
 
 	if (PIM_DEBUG_IGMP_TRACE_DETAIL) {
-		if (igmp->t_igmp_read) {
+		if (igmp->t_gm_read) {
 			zlog_debug(
 				"Cancelling READ event on IGMP socket %pI4 fd=%d on interface %s",
 				&igmp->ifaddr, igmp->fd,
 				igmp->interface->name);
 		}
 	}
-	THREAD_OFF(igmp->t_igmp_read);
+	THREAD_OFF(igmp->t_gm_read);
 
 	if (close(igmp->fd)) {
 		flog_err(
@@ -859,8 +859,8 @@ void igmp_group_delete_empty_include(struct gm_group *group)
 
 void igmp_sock_free(struct gm_sock *igmp)
 {
-	assert(!igmp->t_igmp_read);
-	assert(!igmp->t_igmp_query_timer);
+	assert(!igmp->t_gm_read);
+	assert(!igmp->t_query_timer);
 	assert(!igmp->t_other_querier_timer);
 
 	XFREE(MTYPE_PIM_IGMP_SOCKET, igmp);
@@ -973,8 +973,8 @@ static struct gm_sock *igmp_sock_new(int fd, struct in_addr ifaddr,
 	igmp->interface = ifp;
 	igmp->ifaddr = ifaddr;
 	igmp->querier_addr = ifaddr;
-	igmp->t_igmp_read = NULL;
-	igmp->t_igmp_query_timer = NULL;
+	igmp->t_gm_read = NULL;
+	igmp->t_query_timer = NULL;
 	igmp->t_other_querier_timer = NULL; /* no other querier present */
 	igmp->querier_robustness_variable =
 		pim_ifp->igmp_default_robustness_variable;
@@ -1039,7 +1039,7 @@ static void igmp_read_on(struct gm_sock *igmp)
 			   igmp->fd);
 	}
 	thread_add_read(router->master, pim_igmp_read, igmp, igmp->fd,
-			&igmp->t_igmp_read);
+			&igmp->t_gm_read);
 }
 
 struct gm_sock *pim_igmp_sock_add(struct list *igmp_sock_list,
@@ -1240,7 +1240,7 @@ struct gm_group *igmp_add_group_by_addr(struct gm_sock *igmp,
 	group->last_igmp_v1_report_dsec = -1;
 	group->last_igmp_v2_report_dsec = -1;
 	group->group_creation = pim_time_monotonic_sec();
-	group->igmp_version = IGMP_DEFAULT_VERSION;
+	group->version = IGMP_DEFAULT_VERSION;
 
 	/* initialize new group as INCLUDE {empty} */
 	group->group_filtermode_isexcl = 0; /* 0=INCLUDE, 1=EXCLUDE */
diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h
index 0a7e0605a50a..3e084e717e19 100644
--- a/pimd/pim_igmp.h
+++ b/pimd/pim_igmp.h
@@ -88,9 +88,9 @@ struct gm_sock {
 	struct in_addr ifaddr;
 	time_t sock_creation;
 
-	struct thread *t_igmp_read; /* read: IGMP sockets */
+	struct thread *t_gm_read; /* read: IGMP or MLD sockets */
 	struct thread
-		*t_igmp_query_timer; /* timer: issue IGMP general queries */
+		*t_query_timer; /* timer: issue IGMP or MLD general queries */
 	struct thread *t_other_querier_timer; /* timer: other querier present */
 	struct in_addr querier_addr;	  /* IP address of the querier */
 	int querier_query_interval;	   /* QQI */
@@ -172,8 +172,7 @@ struct gm_group {
 	   since sources have their counters) */
 	int group_specific_query_retransmit_count;
 
-	/* compatibility mode - igmp v1, v2 or v3 */
-	int igmp_version;
+	int version;
 
 	struct in_addr group_addr;
 	int group_filtermode_isexcl;    /* 0=INCLUDE, 1=EXCLUDE */
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 614213bfa526..c62d50d1b282 100644
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -679,7 +679,7 @@ void igmpv3_report_isex(struct gm_sock *igmp, struct in_addr from,
 	/* So we can display how we learned the group in our show command output
 	 */
 	if (from_igmp_v2_report)
-		group->igmp_version = 2;
+		group->version = 2;
 
 	if (group->group_filtermode_isexcl) {
 		/* EXCLUDE mode */
diff --git a/pimd/pim_nb_config.c b/pimd/pim_nb_config.c
index 9b79646dafba..94e271012add 100644
--- a/pimd/pim_nb_config.c
+++ b/pimd/pim_nb_config.c
@@ -400,26 +400,26 @@ static void igmp_sock_query_reschedule(struct gm_sock *igmp)
 	if (igmp->mtrace_only)
 		return;
 
-	if (igmp->t_igmp_query_timer) {
+	if (igmp->t_query_timer) {
 		/* other querier present */
-		assert(igmp->t_igmp_query_timer);
+		assert(igmp->t_query_timer);
 		assert(!igmp->t_other_querier_timer);
 
 		pim_igmp_general_query_off(igmp);
 		pim_igmp_general_query_on(igmp);
 
-		assert(igmp->t_igmp_query_timer);
+		assert(igmp->t_query_timer);
 		assert(!igmp->t_other_querier_timer);
 	} else {
 		/* this is the querier */
 
-		assert(!igmp->t_igmp_query_timer);
+		assert(!igmp->t_query_timer);
 		assert(igmp->t_other_querier_timer);
 
 		pim_igmp_other_querier_timer_off(igmp);
 		pim_igmp_other_querier_timer_on(igmp);
 
-		assert(!igmp->t_igmp_query_timer);
+		assert(!igmp->t_query_timer);
 		assert(igmp->t_other_querier_timer);
 	}
 }