Index: lib/libpfctl/libpfctl.h
===================================================================
--- lib/libpfctl/libpfctl.h
+++ lib/libpfctl/libpfctl.h
@@ -81,9 +81,9 @@
 	uid_t			 cuid;
 	pid_t			 cpid;
 
-	counter_u64_t		 states_cur;
-	counter_u64_t		 states_tot;
-	counter_u64_t		 src_nodes;
+	uint64_t		 states_cur;
+	uint64_t		 states_tot;
+	uint64_t		 src_nodes;
 
 	u_int16_t		 return_icmp;
 	u_int16_t		 return_icmp6;
@@ -129,10 +129,6 @@
 		struct pf_addr		addr;
 		u_int16_t		port;
 	}			divert;
-
-	uint64_t		 u_states_cur;
-	uint64_t		 u_states_tot;
-	uint64_t		 u_src_nodes;
 };
 
 TAILQ_HEAD(pfctl_rulequeue, pfctl_rule);
Index: lib/libpfctl/libpfctl.c
===================================================================
--- lib/libpfctl/libpfctl.c
+++ lib/libpfctl/libpfctl.c
@@ -367,9 +367,9 @@
 
 	pf_nvdivert_to_divert(nvlist_get_nvlist(nvl, "divert"), rule);
 
-	rule->u_states_cur = nvlist_get_number(nvl, "states_cur");
-	rule->u_states_tot = nvlist_get_number(nvl, "states_tot");
-	rule->u_src_nodes = nvlist_get_number(nvl, "src_nodes");
+	rule->states_cur = nvlist_get_number(nvl, "states_cur");
+	rule->states_tot = nvlist_get_number(nvl, "states_tot");
+	rule->src_nodes = nvlist_get_number(nvl, "src_nodes");
 }
 
 int
Index: sbin/pfctl/pfctl.c
===================================================================
--- sbin/pfctl/pfctl.c
+++ sbin/pfctl/pfctl.c
@@ -891,12 +891,12 @@
 			    (unsigned long long)(rule->packets[0] +
 			    rule->packets[1]),
 			    (unsigned long long)(rule->bytes[0] +
-			    rule->bytes[1]), (uintmax_t)rule->u_states_cur);
+			    rule->bytes[1]), (uintmax_t)rule->states_cur);
 		if (!(opts & PF_OPT_DEBUG))
 			printf("  [ Inserted: uid %u pid %u "
 			    "State Creations: %-6ju]\n",
 			    (unsigned)rule->cuid, (unsigned)rule->cpid,
-			    (uintmax_t)rule->u_states_tot);
+			    (uintmax_t)rule->states_tot);
 	}
 }
 
@@ -1012,7 +1012,7 @@
 				    (unsigned long long)rule.bytes[0],
 				    (unsigned long long)rule.packets[1],
 				    (unsigned long long)rule.bytes[1],
-				    (uintmax_t)rule.u_states_tot);
+				    (uintmax_t)rule.states_tot);
 			}
 			break;
 		case PFCTL_SHOW_RULES: