Refactor enum session_stat with improved naming conventions

16 files changed, 473 insertions, 401 deletions

diff --git a/include/stellar/session.h b/include/stellar/session.h
index 976ffca..675296d 100644
--- a/include/stellar/session.h
+++ b/include/stellar/session.h
@@ -54,59 +54,60 @@ enum closing_reason
 enum session_stat
 {
     // raw packet
-    STAT_RAW_PKTS_RX,
-    STAT_RAW_BYTES_RX,
+    STAT_RAW_PACKETS_RECEIVED,
+    STAT_RAW_BYTES_RECEIVED,
 
-    STAT_RAW_PKTS_TX,
-    STAT_RAW_BYTES_TX,
+    STAT_RAW_PACKETS_TRANSMITTED,
+    STAT_RAW_BYTES_TRANSMITTED,
 
-    STAT_RAW_PKTS_DROP,
-    STAT_RAW_BYTES_DROP,
+    STAT_RAW_PACKETS_DROPPED,
+    STAT_RAW_BYTES_DROPPED,
 
-    STAT_DUP_PKTS_BYPASS,
-    STAT_DUP_BYTES_BYPASS,
+    STAT_DUPLICATE_PACKETS_BYPASS,
+    STAT_DUPLICATE_BYTES_BYPASS,
 
-    STAT_INJ_PKTS_FAIL,  // TODO
-    STAT_INJ_PKTS_SUSS,  // TODO
-    STAT_INJ_BYTES_SUSS, // TODO
+    // injected packet
+    STAT_INJECTED_PACKETS_FAILED,
+    STAT_INJECTED_PACKETS_SUCCESS,
+    STAT_INJECTED_BYTES_SUCCESS,
 
     // control packet
-    STAT_CTRL_PKTS_RX,  // TODO
-    STAT_CTRL_BYTES_RX, // TODO
+    STAT_CONTROL_PACKETS_RECEIVED, // TODO
+    STAT_CONTROL_BYTES_RECEIVED,   // TODO
 
-    STAT_CTRL_PKTS_TX,
-    STAT_CTRL_BYTES_TX,
+    STAT_CONTROL_PACKETS_TRANSMITTED,
+    STAT_CONTROL_BYTES_TRANSMITTED,
 
-    STAT_CTRL_PKTS_DROP,
-    STAT_CTRL_BYTES_DROP,
+    STAT_CONTROL_PACKETS_DROPPED,
+    STAT_CONTROL_BYTES_DROPPED,
 
     // TCP segment
-    STAT_TCP_SEGS_RX,
-    STAT_TCP_PLDS_RX,
+    STAT_TCP_SEGMENTS_RECEIVED,
+    STAT_TCP_PAYLOADS_RECEIVED,
 
-    STAT_TCP_SEGS_EXPIRED,
-    STAT_TCP_PLDS_EXPIRED,
+    STAT_TCP_SEGMENTS_EXPIRED,
+    STAT_TCP_PAYLOADS_EXPIRED,
 
-    STAT_TCP_SEGS_RETRANSMIT,
-    STAT_TCP_PLDS_RETRANSMIT,
+    STAT_TCP_SEGMENTS_RETRANSMIT,
+    STAT_TCP_PAYLOADS_RETRANSMIT,
 
-    STAT_TCP_SEGS_OVERLAP,
-    STAT_TCP_PLDS_OVERLAP,
+    STAT_TCP_SEGMENTS_OVERLAP,
+    STAT_TCP_PAYLOADS_OVERLAP,
 
-    STAT_TCP_SEGS_NOSPACE,
-    STAT_TCP_PLDS_NOSPACE,
+    STAT_TCP_SEGMENTS_NOSPACE,
+    STAT_TCP_PAYLOADS_NOSPACE,
 
-    STAT_TCP_SEGS_INORDER,
-    STAT_TCP_PLDS_INORDER,
+    STAT_TCP_SEGMENTS_INORDER,
+    STAT_TCP_PAYLOADS_INORDER,
 
-    STAT_TCP_SEGS_REORDERED,
-    STAT_TCP_PLDS_REORDERED,
+    STAT_TCP_SEGMENTS_REORDERED,
+    STAT_TCP_PAYLOADS_REORDERED,
 
-    STAT_TCP_SEGS_BUFFERED,
-    STAT_TCP_PLDS_BUFFERED,
+    STAT_TCP_SEGMENTS_BUFFERED,
+    STAT_TCP_PAYLOADS_BUFFERED,
 
-    STAT_TCP_SEGS_RELEASED,
-    STAT_TCP_PLDS_RELEASED,
+    STAT_TCP_SEGMENTS_RELEASED,
+    STAT_TCP_PAYLOADS_RELEASED,
 
     MAX_STAT,
 };
@@ -120,7 +121,7 @@ enum session_timestamp
 
 struct session;
 
-int session_has_dup_traffic(const struct session *sess);
+int session_has_duplicate_traffic(const struct session *sess);
 enum session_type session_get_type(const struct session *sess);
 enum session_state session_get_state(const struct session *sess);
 enum closing_reason session_get_closing_reason(const struct session *sess);
diff --git a/src/session/session.cpp b/src/session/session.cpp
index ff7bb55..0f5c20b 100644
--- a/src/session/session.cpp
+++ b/src/session/session.cpp
@@ -105,12 +105,12 @@ enum session_type session_get_type(const struct session *sess)
     return sess->type;
 }
 
-void session_set_dup_traffic(struct session *sess)
+void session_set_duplicate_traffic(struct session *sess)
 {
     sess->dup = 1;
 }
 
-int session_has_dup_traffic(const struct session *sess)
+int session_has_duplicate_traffic(const struct session *sess)
 {
     return sess->dup;
 }
@@ -219,8 +219,8 @@ struct tcp_segment *session_get_tcp_segment(struct session *sess)
         struct tcp_segment *seg = tcp_reassembly_pop(half->assembler);
         if (seg)
         {
-            session_inc_stat(sess, dir, STAT_TCP_SEGS_REORDERED, 1);
-            session_inc_stat(sess, dir, STAT_TCP_PLDS_REORDERED, seg->len);
+            session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_REORDERED, 1);
+            session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_REORDERED, seg->len);
 
             sess->mgr_stat->nr_tcp_seg_reorded++;
         }
@@ -246,8 +246,8 @@ void session_free_tcp_segment(struct session *sess, struct tcp_segment *seg)
     }
     else
     {
-        session_inc_stat(sess, dir, STAT_TCP_SEGS_RELEASED, 1);
-        session_inc_stat(sess, dir, STAT_TCP_PLDS_RELEASED, seg->len);
+        session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_RELEASED, 1);
+        session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_RELEASED, seg->len);
         sess->mgr_stat->nr_tcp_seg_released++;
 
         tcp_segment_free(seg);
@@ -464,7 +464,7 @@ int session_to_json(struct session *sess, char *buff, int size)
     used += snprintf(buff + used, size - used, "\"type\":\"%s\",", session_type_to_str(session_get_type(sess)));
     used += snprintf(buff + used, size - used, "\"state\":\"%s\",", session_state_to_str(session_get_state(sess)));
     used += snprintf(buff + used, size - used, "\"closing_reason\":\"%s\",", closing_reason_to_str(session_get_closing_reason(sess)));
-    used += snprintf(buff + used, size - used, "\"dup_traffic\":%d,", session_has_dup_traffic(sess));
+    used += snprintf(buff + used, size - used, "\"duplicate_traffic\":%d,", session_has_duplicate_traffic(sess));
     used += snprintf(buff + used, size - used, "\"current_packet\":\"%p\",", session_get_current_packet(sess));
 
     const char *str[] = {"c2s", "s2c"};
@@ -478,39 +478,39 @@ int session_to_json(struct session *sess, char *buff, int size)
             memset(flags, 0, sizeof(flags));
             tcp_flags_to_str(sess->tcp_halfs[dir[i]].flags, flags, sizeof(flags));
             used += snprintf(buff + used, size - used, "\"%s_tcp_flags\":\"%s\",", str[i], flags);
-            used += snprintf(buff + used, size - used, "\"%s_tcp_segs_rx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGS_RX));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_plds_rx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PLDS_RX));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_segs_expired\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGS_EXPIRED));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_plds_expired\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PLDS_EXPIRED));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_segs_overlap\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGS_OVERLAP));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_plds_overlap\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PLDS_OVERLAP));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_segs_nospace\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGS_NOSPACE));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_plds_nospace\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PLDS_NOSPACE));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_segs_inorder\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGS_INORDER));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_plds_inorder\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PLDS_INORDER));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_segs_reordered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGS_REORDERED));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_plds_reordered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PLDS_REORDERED));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_segs_buffered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGS_BUFFERED));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_plds_buffered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PLDS_BUFFERED));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_segs_released\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGS_RELEASED));
-            used += snprintf(buff + used, size - used, "\"%s_tcp_plds_released\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PLDS_RELEASED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_segments_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_RECEIVED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_RECEIVED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_segments_expired\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_EXPIRED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_expired\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_EXPIRED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_segments_overlap\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_OVERLAP));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_overlap\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_OVERLAP));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_segments_nospace\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_NOSPACE));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_nospace\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_NOSPACE));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_segments_inorder\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_INORDER));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_inorder\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_INORDER));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_segments_reordered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_REORDERED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_reordered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_REORDERED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_segments_buffered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_BUFFERED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_buffered\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_BUFFERED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_segments_released\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_SEGMENTS_RELEASED));
+            used += snprintf(buff + used, size - used, "\"%s_tcp_payloads_released\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_TCP_PAYLOADS_RELEASED));
         }
 
         used += snprintf(buff + used, size - used, "\"%s_1st_pkt\":\"%p\",", str[i], session_get_first_packet(sess, dir[i]));
-        used += snprintf(buff + used, size - used, "\"%s_raw_pkts_rx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PKTS_RX));
-        used += snprintf(buff + used, size - used, "\"%s_raw_bytes_rx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_RX));
-        used += snprintf(buff + used, size - used, "\"%s_raw_pkts_tx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PKTS_TX));
-        used += snprintf(buff + used, size - used, "\"%s_raw_bytes_tx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_TX));
-        used += snprintf(buff + used, size - used, "\"%s_raw_pkts_drop\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PKTS_DROP));
-        used += snprintf(buff + used, size - used, "\"%s_raw_bytes_drop\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_DROP));
-        used += snprintf(buff + used, size - used, "\"%s_dup_pkts_bypass\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_DUP_PKTS_BYPASS));
-        used += snprintf(buff + used, size - used, "\"%s_dup_bytes_bypass\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_DUP_BYTES_BYPASS));
-        used += snprintf(buff + used, size - used, "\"%s_ctrl_pkts_rx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CTRL_PKTS_RX));
-        used += snprintf(buff + used, size - used, "\"%s_ctrl_bytes_rx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CTRL_BYTES_RX));
-        used += snprintf(buff + used, size - used, "\"%s_ctrl_pkts_tx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CTRL_PKTS_TX));
-        used += snprintf(buff + used, size - used, "\"%s_ctrl_bytes_tx\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CTRL_BYTES_TX));
-        used += snprintf(buff + used, size - used, "\"%s_ctrl_pkts_drop\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CTRL_PKTS_DROP));
-        used += snprintf(buff + used, size - used, "\"%s_ctrl_bytes_drop\":%" PRIu64 "", str[i], session_get_stat(sess, dir[i], STAT_CTRL_BYTES_DROP));
+        used += snprintf(buff + used, size - used, "\"%s_raw_packets_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PACKETS_RECEIVED));
+        used += snprintf(buff + used, size - used, "\"%s_raw_bytes_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_RECEIVED));
+        used += snprintf(buff + used, size - used, "\"%s_raw_packets_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PACKETS_TRANSMITTED));
+        used += snprintf(buff + used, size - used, "\"%s_raw_bytes_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_TRANSMITTED));
+        used += snprintf(buff + used, size - used, "\"%s_raw_packets_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_PACKETS_DROPPED));
+        used += snprintf(buff + used, size - used, "\"%s_raw_bytes_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_RAW_BYTES_DROPPED));
+        used += snprintf(buff + used, size - used, "\"%s_duplicate_packets_bypass\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_DUPLICATE_PACKETS_BYPASS));
+        used += snprintf(buff + used, size - used, "\"%s_duplicate_bytes_bypass\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_DUPLICATE_BYTES_BYPASS));
+        used += snprintf(buff + used, size - used, "\"%s_control_packets_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_PACKETS_RECEIVED));
+        used += snprintf(buff + used, size - used, "\"%s_control_bytes_received\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_BYTES_RECEIVED));
+        used += snprintf(buff + used, size - used, "\"%s_control_packets_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_PACKETS_TRANSMITTED));
+        used += snprintf(buff + used, size - used, "\"%s_control_bytes_transmitted\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_BYTES_TRANSMITTED));
+        used += snprintf(buff + used, size - used, "\"%s_control_packets_dropped\":%" PRIu64 ",", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_PACKETS_DROPPED));
+        used += snprintf(buff + used, size - used, "\"%s_control_bytes_dropped\":%" PRIu64 "", str[i], session_get_stat(sess, dir[i], STAT_CONTROL_BYTES_DROPPED));
 
         if (i == 0)
         {
diff --git a/src/session/session_manager.cpp b/src/session/session_manager.cpp
index 8e5a6ef..91c2918 100644
--- a/src/session/session_manager.cpp
+++ b/src/session/session_manager.cpp
@@ -234,8 +234,8 @@ static void tcp_clean(struct session_manager *mgr, struct session *sess)
      {
           while ((seg = tcp_reassembly_expire(c2s_ssembler, UINT64_MAX)))
           {
-               session_inc_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_RELEASED, 1);
-               session_inc_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_RELEASED, seg->len);
+               session_inc_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_RELEASED, 1);
+               session_inc_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_RELEASED, seg->len);
                mgr->stat.nr_tcp_seg_released++;
                tcp_segment_free(seg);
           }
@@ -245,8 +245,8 @@ static void tcp_clean(struct session_manager *mgr, struct session *sess)
      {
           while ((seg = tcp_reassembly_expire(s2c_ssembler, UINT64_MAX)))
           {
-               session_inc_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_RELEASED, 1);
-               session_inc_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_RELEASED, seg->len);
+               session_inc_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_RELEASED, 1);
+               session_inc_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_RELEASED, seg->len);
                mgr->stat.nr_tcp_seg_released++;
                tcp_segment_free(seg);
           }
@@ -294,12 +294,12 @@ static void tcp_update(struct session_manager *mgr, struct session *sess, enum f
      {
           if (len)
           {
-               session_inc_stat(sess, dir, STAT_TCP_SEGS_RX, 1);
-               session_inc_stat(sess, dir, STAT_TCP_PLDS_RX, len);
+               session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_RECEIVED, 1);
+               session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_RECEIVED, len);
                mgr->stat.nr_tcp_seg_received++;
 
-               session_inc_stat(sess, dir, STAT_TCP_SEGS_INORDER, 1);
-               session_inc_stat(sess, dir, STAT_TCP_PLDS_INORDER, len);
+               session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_INORDER, 1);
+               session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_INORDER, len);
                mgr->stat.nr_tcp_seg_inorder++;
 
                half->in_order.data = tcp_layer->pld_ptr;
@@ -317,12 +317,12 @@ static void tcp_update(struct session_manager *mgr, struct session *sess, enum f
      seg = tcp_reassembly_expire(half->assembler, now);
      if (seg)
      {
-          session_inc_stat(sess, dir, STAT_TCP_SEGS_EXPIRED, 1);
-          session_inc_stat(sess, dir, STAT_TCP_PLDS_EXPIRED, seg->len);
+          session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_EXPIRED, 1);
+          session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_EXPIRED, seg->len);
           mgr->stat.nr_tcp_seg_expired++;
 
-          session_inc_stat(sess, dir, STAT_TCP_SEGS_RELEASED, 1);
-          session_inc_stat(sess, dir, STAT_TCP_PLDS_RELEASED, seg->len);
+          session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_RELEASED, 1);
+          session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_RELEASED, seg->len);
           mgr->stat.nr_tcp_seg_released++;
 
           tcp_segment_free(seg);
@@ -330,16 +330,16 @@ static void tcp_update(struct session_manager *mgr, struct session *sess, enum f
 
      if (len)
      {
-          session_inc_stat(sess, dir, STAT_TCP_SEGS_RX, 1);
-          session_inc_stat(sess, dir, STAT_TCP_PLDS_RX, len);
+          session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_RECEIVED, 1);
+          session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_RECEIVED, len);
           mgr->stat.nr_tcp_seg_received++;
 
           uint32_t rcv_nxt = tcp_reassembly_get_recv_next(half->assembler);
           // in order
           if (half->seq == rcv_nxt)
           {
-               session_inc_stat(sess, dir, STAT_TCP_SEGS_INORDER, 1);
-               session_inc_stat(sess, dir, STAT_TCP_PLDS_INORDER, len);
+               session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_INORDER, 1);
+               session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_INORDER, len);
                mgr->stat.nr_tcp_seg_inorder++;
 
                half->in_order.data = tcp_layer->pld_ptr;
@@ -349,8 +349,8 @@ static void tcp_update(struct session_manager *mgr, struct session *sess, enum f
           // retransmission
           else if (uint32_before(uint32_add(half->seq, len), rcv_nxt))
           {
-               session_inc_stat(sess, dir, STAT_TCP_SEGS_RETRANSMIT, 1);
-               session_inc_stat(sess, dir, STAT_TCP_PLDS_RETRANSMIT, len);
+               session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_RETRANSMIT, 1);
+               session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_RETRANSMIT, len);
                mgr->stat.nr_tcp_seg_retransmit++;
           }
           else if ((seg = tcp_segment_new(half->seq, tcp_layer->pld_ptr, len)))
@@ -358,28 +358,29 @@ static void tcp_update(struct session_manager *mgr, struct session *sess, enum f
                switch (tcp_reassembly_push(half->assembler, seg, now))
                {
                case -2:
-                    session_inc_stat(sess, dir, STAT_TCP_SEGS_RETRANSMIT, 1);
-                    session_inc_stat(sess, dir, STAT_TCP_PLDS_RETRANSMIT, len);
+                    session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_RETRANSMIT, 1);
+                    session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_RETRANSMIT, len);
                     mgr->stat.nr_tcp_seg_retransmit++;
                     tcp_segment_free(seg);
+                    break;
                case -1:
-                    session_inc_stat(sess, dir, STAT_TCP_SEGS_NOSPACE, 1);
-                    session_inc_stat(sess, dir, STAT_TCP_PLDS_NOSPACE, len);
+                    session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_NOSPACE, 1);
+                    session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_NOSPACE, len);
                     mgr->stat.nr_tcp_seg_no_space++;
                     tcp_segment_free(seg);
                     break;
                case 0:
-                    session_inc_stat(sess, dir, STAT_TCP_SEGS_BUFFERED, 1);
-                    session_inc_stat(sess, dir, STAT_TCP_PLDS_BUFFERED, len);
+                    session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_BUFFERED, 1);
+                    session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_BUFFERED, len);
                     mgr->stat.nr_tcp_seg_buffered++;
                     break;
                case 1:
-                    session_inc_stat(sess, dir, STAT_TCP_SEGS_OVERLAP, 1);
-                    session_inc_stat(sess, dir, STAT_TCP_PLDS_OVERLAP, len);
+                    session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_OVERLAP, 1);
+                    session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_OVERLAP, len);
                     mgr->stat.nr_tcp_seg_overlap++;
 
-                    session_inc_stat(sess, dir, STAT_TCP_SEGS_BUFFERED, 1);
-                    session_inc_stat(sess, dir, STAT_TCP_PLDS_BUFFERED, len);
+                    session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_BUFFERED, 1);
+                    session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_BUFFERED, len);
                     mgr->stat.nr_tcp_seg_buffered++;
                     break;
                default:
@@ -389,8 +390,8 @@ static void tcp_update(struct session_manager *mgr, struct session *sess, enum f
           }
           else
           {
-               session_inc_stat(sess, dir, STAT_TCP_SEGS_NOSPACE, 1);
-               session_inc_stat(sess, dir, STAT_TCP_PLDS_NOSPACE, len);
+               session_inc_stat(sess, dir, STAT_TCP_SEGMENTS_NOSPACE, 1);
+               session_inc_stat(sess, dir, STAT_TCP_PAYLOADS_NOSPACE, len);
                mgr->stat.nr_tcp_seg_no_space++;
           }
      }
@@ -472,12 +473,12 @@ static int duplicated_packet_bypass(struct session_manager *mgr, struct session
      }
 
      enum flow_direction dir = identify_direction_by_history(sess, key);
-     if (session_get_stat(sess, dir, STAT_RAW_PKTS_RX) < 3 || session_has_dup_traffic(sess))
+     if (session_get_stat(sess, dir, STAT_RAW_PACKETS_RECEIVED) < 3 || session_has_duplicate_traffic(sess))
      {
           if (duplicated_packet_filter_lookup(mgr->dup_pkt_filter, pkt, now))
           {
-               session_inc_stat(sess, dir, STAT_DUP_PKTS_BYPASS, 1);
-               session_inc_stat(sess, dir, STAT_DUP_BYTES_BYPASS, packet_get_len(pkt));
+               session_inc_stat(sess, dir, STAT_DUPLICATE_PACKETS_BYPASS, 1);
+               session_inc_stat(sess, dir, STAT_DUPLICATE_BYTES_BYPASS, packet_get_len(pkt));
                switch (session_get_type(sess))
                {
                case SESSION_TYPE_TCP:
@@ -490,7 +491,7 @@ static int duplicated_packet_bypass(struct session_manager *mgr, struct session
                     assert(0);
                     break;
                }
-               session_set_dup_traffic(sess);
+               session_set_duplicate_traffic(sess);
                return 1;
           }
           else
@@ -559,8 +560,8 @@ static void session_update(struct session *sess, enum session_state next_state,
           }
      }
 
-     session_inc_stat(sess, dir, STAT_RAW_PKTS_RX, 1);
-     session_inc_stat(sess, dir, STAT_RAW_BYTES_RX, packet_get_len(pkt));
+     session_inc_stat(sess, dir, STAT_RAW_PACKETS_RECEIVED, 1);
+     session_inc_stat(sess, dir, STAT_RAW_BYTES_RECEIVED, packet_get_len(pkt));
 
      if (!session_get_first_packet(sess, dir))
      {
diff --git a/src/session/session_priv.h b/src/session/session_priv.h
index 20aaa29..81372c1 100644
--- a/src/session/session_priv.h
+++ b/src/session/session_priv.h
@@ -85,7 +85,7 @@ void session_set_direction(struct session *sess, enum session_direction dir);
 void session_set_flow_direction(struct session *sess, enum flow_direction dir);
 void session_set_state(struct session *sess, enum session_state state);
 void session_set_type(struct session *sess, enum session_type type);
-void session_set_dup_traffic(struct session *sess);
+void session_set_duplicate_traffic(struct session *sess);
 void session_set_closing_reason(struct session *sess, enum closing_reason reason);
 void session_inc_stat(struct session *sess, enum flow_direction dir, enum session_stat stat, uint64_t val);
 void session_set_timestamp(struct session *sess, enum session_timestamp type, uint64_t value);
diff --git a/src/session/test/gtest_case_tcp_fast_open.cpp b/src/session/test/gtest_case_tcp_fast_open.cpp
index 4424f6e..9615513 100644
--- a/src/session/test/gtest_case_tcp_fast_open.cpp
+++ b/src/session/test/gtest_case_tcp_fast_open.cpp
@@ -322,12 +322,12 @@ TEST(CASE, TCP_FAST_OPEN)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 280);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 280);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -336,43 +336,43 @@ TEST(CASE, TCP_FAST_OPEN)
     EXPECT_TRUE(session_get_first_packet(sess, FLOW_DIRECTION_S2C) == NULL);
 
     // TCP Segment
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_RX) == 166);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_EXPIRED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_EXPIRED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_RETRANSMIT) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_RETRANSMIT) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_OVERLAP) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_OVERLAP) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_NOSPACE) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_NOSPACE) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_INORDER) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_INORDER) == 166);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_REORDERED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_REORDERED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_BUFFERED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_BUFFERED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_RELEASED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PLDS_RELEASED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_RECEIVED) == 166);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_EXPIRED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_EXPIRED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_RETRANSMIT) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_RETRANSMIT) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_OVERLAP) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_OVERLAP) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_NOSPACE) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_NOSPACE) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_INORDER) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_INORDER) == 166);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_REORDERED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_REORDERED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_BUFFERED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_BUFFERED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_RELEASED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_PAYLOADS_RELEASED) == 0);
 
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_EXPIRED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_EXPIRED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_RETRANSMIT) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_RETRANSMIT) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_OVERLAP) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_OVERLAP) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_NOSPACE) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_NOSPACE) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_INORDER) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_INORDER) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_REORDERED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_REORDERED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_BUFFERED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_BUFFERED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_RELEASED) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PLDS_RELEASED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_EXPIRED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_EXPIRED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_RETRANSMIT) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_RETRANSMIT) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_OVERLAP) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_OVERLAP) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_NOSPACE) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_NOSPACE) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_INORDER) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_INORDER) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_REORDERED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_REORDERED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_BUFFERED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_BUFFERED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_RELEASED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_PAYLOADS_RELEASED) == 0);
 
     session_print(sess);
 
diff --git a/src/session/test/gtest_filter_tcp_dupkt.cpp b/src/session/test/gtest_filter_tcp_dupkt.cpp
index 06e2db2..bbee9a6 100644
--- a/src/session/test/gtest_filter_tcp_dupkt.cpp
+++ b/src/session/test/gtest_filter_tcp_dupkt.cpp
@@ -74,7 +74,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SYN_DUP)
     // new session
     sess = session_manager_new_session(mgr, &pkt, 1);
     EXPECT_TRUE(sess);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
@@ -89,7 +89,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SYN_DUP)
     EXPECT_TRUE(sess);
     // update session
     EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == -1);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 1);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 1);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 1);
@@ -107,7 +107,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SYN_DUP)
     EXPECT_TRUE(sess);
     // update session
     EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 1);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 1);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 1);
@@ -137,7 +137,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SYNACK_DUP)
     // new session
     sess = session_manager_new_session(mgr, &pkt, 1);
     EXPECT_TRUE(sess);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
@@ -152,7 +152,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SYNACK_DUP)
     EXPECT_TRUE(sess);
     // update session
     EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == -1);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 1);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 1);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 1);
@@ -170,7 +170,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SYNACK_DUP)
     EXPECT_TRUE(sess);
     // update session
     EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 1);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 1);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 1);
@@ -201,7 +201,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SKIP)
     // new session
     sess = session_manager_new_session(mgr, &pkt, 1);
     EXPECT_TRUE(sess);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
@@ -218,7 +218,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SKIP)
     EXPECT_TRUE(sess);
     // update session
     EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
@@ -235,7 +235,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SKIP)
     EXPECT_TRUE(sess);
     // update session
     EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
@@ -250,7 +250,7 @@ TEST(TCP_DUPKT_FILTER_ENABLE, SKIP)
     EXPECT_TRUE(sess);
     // update session
     EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 3) == 0);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
@@ -283,7 +283,7 @@ TEST(TCP_DUPKT_FILTER_DISABLE, SYN_DUP)
     // new session
     sess = session_manager_new_session(mgr, &pkt, 1);
     EXPECT_TRUE(sess);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
@@ -298,7 +298,7 @@ TEST(TCP_DUPKT_FILTER_DISABLE, SYN_DUP)
     EXPECT_TRUE(sess);
     // update session
     EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
@@ -331,7 +331,7 @@ TEST(TCP_DUPKT_FILTER_DISABLE, SYNACK_DUP)
     // new session
     sess = session_manager_new_session(mgr, &pkt, 1);
     EXPECT_TRUE(sess);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
@@ -346,7 +346,7 @@ TEST(TCP_DUPKT_FILTER_DISABLE, SYNACK_DUP)
     EXPECT_TRUE(sess);
     // update session
     EXPECT_TRUE(session_manager_update_session(mgr, sess, &pkt, 2) == 0);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     stat = session_manager_stat(mgr);
     EXPECT_TRUE(stat);
     EXPECT_TRUE(stat->nr_tcp_pkts_duped_bypass == 0);
diff --git a/src/session/test/gtest_state_tcp_active_to_closing.cpp b/src/session/test/gtest_state_tcp_active_to_closing.cpp
index 5766d3b..34513f8 100644
--- a/src/session/test/gtest_state_tcp_active_to_closing.cpp
+++ b/src/session/test/gtest_state_tcp_active_to_closing.cpp
@@ -120,12 +120,12 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_FIN_FIN)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_CLIENT_FIN);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 145 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 145 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -206,12 +206,12 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_RST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_CLIENT_RST);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 145 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 145 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -292,12 +292,12 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_RST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_SERVER_RST);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 145);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 145);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -418,12 +418,12 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_C2S_HALF_CLOSED_TIMEOUT)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_CLIENT_FIN);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 145 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 145 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -497,12 +497,12 @@ TEST(TCP_ACTIVE_TO_CLOSING, BY_S2C_HALF_CLOSED_TIMEOUT)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_SERVER_FIN);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 145);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 145);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
diff --git a/src/session/test/gtest_state_tcp_init_to_opening.cpp b/src/session/test/gtest_state_tcp_init_to_opening.cpp
index 39a891f..75b94b1 100644
--- a/src/session/test/gtest_state_tcp_init_to_opening.cpp
+++ b/src/session/test/gtest_state_tcp_init_to_opening.cpp
@@ -79,12 +79,12 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -156,12 +156,12 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -244,12 +244,12 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -343,12 +343,12 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_SYNACK_ACK)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -438,12 +438,12 @@ TEST(TCP_INIT_TO_OPENING, BY_SYN_RETRANSMISSION)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 78);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 78);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -534,12 +534,12 @@ TEST(TCP_INIT_TO_OPENING, BY_SYNACK_RETRANSMISSION)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -622,12 +622,12 @@ TEST(TCP_INIT_TO_OPENING, BY_C2S_ASMMETRIC)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -710,12 +710,12 @@ TEST(TCP_INIT_TO_OPENING, BY_S2C_ASMMETRIC)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
diff --git a/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp b/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp
index c18f6f0..7452f9e 100644
--- a/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp
+++ b/src/session/test/gtest_state_tcp_init_to_opening_to_active_to_closing_to_closed.cpp
@@ -75,12 +75,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -106,12 +106,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -137,12 +137,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -168,12 +168,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66 + 145);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66 + 145);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -199,12 +199,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66 + 145);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66 + 145);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -230,12 +230,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66 + 145);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 66 + 1354);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66 + 145);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 66 + 1354);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -261,12 +261,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66 + 145);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 66 + 1354 + 385);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66 + 145);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 66 + 1354 + 385);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -292,12 +292,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66 + 145 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 66 + 1354 + 385);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66 + 145 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 66 + 1354 + 385);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -323,12 +323,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_CLIENT_FIN);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66 + 145 + 66 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 66 + 1354 + 385);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66 + 145 + 66 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 66 + 1354 + 385);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -354,12 +354,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_CLIENT_FIN);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66 + 145 + 66 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 66 + 1354 + 385 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1 + 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66 + 145 + 66 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 66 + 1354 + 385 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -385,12 +385,12 @@ TEST(TCP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING_TO_CLOSED, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_CLIENT_FIN);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66 + 145 + 66 + 66 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 66 + 1354 + 385 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1 + 1 + 1 + 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1 + 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66 + 145 + 66 + 66 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 66 + 1354 + 385 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1 + 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1 + 1 + 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
diff --git a/src/session/test/gtest_state_tcp_opening_to_active.cpp b/src/session/test/gtest_state_tcp_opening_to_active.cpp
index 06b310b..bd1d247 100644
--- a/src/session/test/gtest_state_tcp_opening_to_active.cpp
+++ b/src/session/test/gtest_state_tcp_opening_to_active.cpp
@@ -89,12 +89,12 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYN_C2S_DATA)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 145);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 145);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -177,12 +177,12 @@ TEST(TCP_OPENING_TO_ACTIVE, BY_SYNACK_S2C_DATA)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74 + 1354);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74 + 1354);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
diff --git a/src/session/test/gtest_state_tcp_opening_to_closing.cpp b/src/session/test/gtest_state_tcp_opening_to_closing.cpp
index ffa47f7..dd98937 100644
--- a/src/session/test/gtest_state_tcp_opening_to_closing.cpp
+++ b/src/session/test/gtest_state_tcp_opening_to_closing.cpp
@@ -101,12 +101,12 @@ TEST(TCP_OPENING_TO_CLOSING, BY_FIN_FIN)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_CLIENT_FIN);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -195,12 +195,12 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_RST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_CLIENT_RST);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -289,12 +289,12 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_RST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_SERVER_RST);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -432,12 +432,12 @@ TEST(TCP_OPENING_TO_CLOSING, BY_HANDSHAKE_TIMEOUT)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -531,12 +531,12 @@ TEST(TCP_OPENING_TO_CLOSING, BY_DATA_TIMEOUT)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -619,12 +619,12 @@ TEST(TCP_OPENING_TO_CLOSING, BY_C2S_HALF_FIN)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_CLIENT_FIN);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78 + 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 + 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78 + 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 + 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -706,12 +706,12 @@ TEST(TCP_OPENING_TO_CLOSING, BY_S2C_HALF_FIN)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_CLOSING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_TCP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == CLOSING_BY_SERVER_FIN);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 78);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 66);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 78);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 66);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
diff --git a/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp b/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp
index 1e000d5..74dda84 100644
--- a/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp
+++ b/src/session/test/gtest_state_udp_init_to_opening_to_active_to_closing.cpp
@@ -74,12 +74,12 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -104,12 +104,12 @@ TEST(UDP_INIT_TO_OPENING_TO_ACTIVE_TO_CLOSING, TEST)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_ACTIVE);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 550);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 550);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
diff --git a/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp b/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp
index 58a9523..74ca0dc 100644
--- a/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp
+++ b/src/session/test/gtest_state_udp_init_to_opening_to_closing.cpp
@@ -79,12 +79,12 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_C2S)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_C2S);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 74);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 74);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
@@ -157,12 +157,12 @@ TEST(UDP_INIT_TO_OPENING_TO_CLOSING, BY_S2C)
     EXPECT_TRUE(session_get_tuple_direction(sess) == FLOW_DIRECTION_S2C);
     EXPECT_TRUE(session_get_state(sess) == SESSION_STATE_OPENING);
     EXPECT_TRUE(session_get_type(sess) == SESSION_TYPE_UDP);
-    EXPECT_TRUE(session_has_dup_traffic(sess) == 0);
+    EXPECT_TRUE(session_has_duplicate_traffic(sess) == 0);
     EXPECT_TRUE(session_get_closing_reason(sess) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RX) == 550);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 0);
-    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_BYTES_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_BYTES_RECEIVED) == 550);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 0);
+    EXPECT_TRUE(session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1);
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_START));
     EXPECT_TRUE(session_get_timestamp(sess, SESSION_TIMESTAMP_LAST));
     EXPECT_TRUE(session_get_current_packet(sess) == &pkt);
diff --git a/src/stellar/inject.cpp b/src/stellar/inject.cpp
index 88696d3..bfae487 100644
--- a/src/stellar/inject.cpp
+++ b/src/stellar/inject.cpp
@@ -308,7 +308,7 @@ int stellar_inject_tcp_flags(const struct session *sess, enum flow_direction inj
 
     if (session_get_type(sess) != SESSION_TYPE_TCP)
     {
-        session_inc_stat((struct session *)sess, inject_dir, STAT_INJ_PKTS_FAIL, 1);
+        session_inc_stat((struct session *)sess, inject_dir, STAT_INJECTED_PACKETS_FAILED, 1);
         INJECT_PACKET_LOG_ERROR("session %ld is not a TCP session, cannot inject TCP RST", session_get_id(sess));
         return -1;
     }
@@ -316,7 +316,7 @@ int stellar_inject_tcp_flags(const struct session *sess, enum flow_direction inj
     const struct packet *pkt = session_get_first_packet(sess, inject_dir);
     if (pkt == NULL)
     {
-        session_inc_stat((struct session *)sess, inject_dir, STAT_INJ_PKTS_FAIL, 1);
+        session_inc_stat((struct session *)sess, inject_dir, STAT_INJECTED_PACKETS_FAILED, 1);
         INJECT_PACKET_LOG_ERROR("session %ld has no %s first packet, cannot inject TCP RST", session_get_id(sess), flow_direction_to_str(inject_dir));
         return -1;
     }
@@ -332,7 +332,7 @@ int stellar_inject_tcp_flags(const struct session *sess, enum flow_direction inj
     if (len <= 0)
     {
         INJECT_PACKET_LOG_ERROR("session %ld build TCP %s RST packet failed, %s", session_get_id(sess), flow_direction_to_str(inject_dir), strerror(len));
-        session_inc_stat((struct session *)sess, inject_dir, STAT_INJ_PKTS_FAIL, 1);
+        session_inc_stat((struct session *)sess, inject_dir, STAT_INJECTED_PACKETS_FAILED, 1);
         return -1;
     }
 
@@ -347,14 +347,14 @@ int stellar_inject_tcp_flags(const struct session *sess, enum flow_direction inj
     packet_set_origin_ctx(&inj_pkt, &meta);
     if (packet_io_inject(runtime->packet_io, thr_idx, &inj_pkt, 1) == 1)
     {
-        session_inc_stat((struct session *)sess, inject_dir, STAT_INJ_PKTS_SUSS, 1);
-        session_inc_stat((struct session *)sess, inject_dir, STAT_INJ_BYTES_SUSS, len);
+        session_inc_stat((struct session *)sess, inject_dir, STAT_INJECTED_PACKETS_SUCCESS, 1);
+        session_inc_stat((struct session *)sess, inject_dir, STAT_INJECTED_BYTES_SUCCESS, len);
         return 0;
     }
     else
     {
         INJECT_PACKET_LOG_ERROR("session %ld inject TCP %s RST packet failed, packet I/O nospace", session_get_id(sess), flow_direction_to_str(inject_dir));
-        session_inc_stat((struct session *)sess, inject_dir, STAT_INJ_PKTS_FAIL, 1);
+        session_inc_stat((struct session *)sess, inject_dir, STAT_INJECTED_PACKETS_FAILED, 1);
         return -1;
     }
 }
diff --git a/src/stellar/stellar.cpp b/src/stellar/stellar.cpp
index 8cd8573..ee33fc6 100644
--- a/src/stellar/stellar.cpp
+++ b/src/stellar/stellar.cpp
@@ -18,27 +18,23 @@ static void update_session_stat(struct session *sess, struct packet *pkt)
 {
     if (sess)
     {
-        enum session_stat stat_pkt;
-        enum session_stat stat_byte;
         enum flow_direction dir = session_get_flow_direction(sess);
         int is_ctrl = packet_is_ctrl(pkt);
         switch (packet_get_action(pkt))
         {
         case PACKET_ACTION_DROP:
-            stat_pkt = is_ctrl ? STAT_CTRL_PKTS_DROP : STAT_RAW_PKTS_DROP;
-            stat_byte = is_ctrl ? STAT_CTRL_BYTES_DROP : STAT_RAW_BYTES_DROP;
+            session_inc_stat(sess, dir, (is_ctrl ? STAT_CONTROL_PACKETS_DROPPED : STAT_RAW_PACKETS_DROPPED), 1);
+            session_inc_stat(sess, dir, (is_ctrl ? STAT_CONTROL_BYTES_DROPPED : STAT_RAW_BYTES_DROPPED), packet_get_len(pkt));
             break;
         case PACKET_ACTION_FORWARD:
+            session_inc_stat(sess, dir, (is_ctrl ? STAT_CONTROL_PACKETS_TRANSMITTED : STAT_RAW_PACKETS_TRANSMITTED), 1);
+            session_inc_stat(sess, dir, (is_ctrl ? STAT_CONTROL_BYTES_TRANSMITTED : STAT_RAW_BYTES_TRANSMITTED), packet_get_len(pkt));
             break;
-            stat_pkt = is_ctrl ? STAT_CTRL_PKTS_TX : STAT_RAW_PKTS_TX;
-            stat_byte = is_ctrl ? STAT_CTRL_BYTES_TX : STAT_RAW_BYTES_TX;
         default:
             assert(0);
             break;
         }
 
-        session_inc_stat(sess, dir, stat_pkt, 1);
-        session_inc_stat(sess, dir, stat_byte, packet_get_len(pkt));
         session_set_current_packet(sess, NULL);
         session_set_flow_direction(sess, FLOW_DIRECTION_NONE);
     }
diff --git a/src/stellar/test/gtest_inject_packet.cpp b/src/stellar/test/gtest_inject_packet.cpp
index f3d28d7..c462e77 100644
--- a/src/stellar/test/gtest_inject_packet.cpp
+++ b/src/stellar/test/gtest_inject_packet.cpp
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <netinet/tcp.h>
 
+#include "logo.h"
 #include "config.h"
 #include "timestamp.h"
 #include "id_generator.h"
@@ -24,47 +25,57 @@ static void inject_tcp_rst(struct session *sess)
     {
     case 1:
         // recv SYN packet
-        if (session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 && session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 0)
+        if (session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 &&
+            session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 0)
         {
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_C2S, TH_RST | TH_ACK) == 0);
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_S2C, TH_RST | TH_ACK) == -1);
-            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv SYN packet", session_get_id(sess), session_get_tuple_str(sess));
+            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv SYN packet",
+                                           session_get_id(sess), session_get_tuple_str(sess));
         }
         break;
     case 2:
         // recv SYN-ACK packet
-        if (session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 1 && session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1)
+        if (session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 1 &&
+            session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1)
         {
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_C2S, TH_RST | TH_ACK) == 0);
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_S2C, TH_RST | TH_ACK) == 0);
-            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv SYN-ACK packet", session_get_id(sess), session_get_tuple_str(sess));
+            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv SYN-ACK packet",
+                                           session_get_id(sess), session_get_tuple_str(sess));
         }
         break;
     case 3:
         // recv sub-ACK packet
-        if (session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PKTS_RX) == 2 && session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PKTS_RX) == 1)
+        if (session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_RAW_PACKETS_RECEIVED) == 2 &&
+            session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_RAW_PACKETS_RECEIVED) == 1)
         {
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_C2S, TH_RST | TH_ACK) == 0);
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_S2C, TH_RST | TH_ACK) == 0);
-            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv sub-ACK packet", session_get_id(sess), session_get_tuple_str(sess));
+            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv sub-ACK packet",
+                                           session_get_id(sess), session_get_tuple_str(sess));
         }
         break;
     case 4:
         // recv C2S Payload
-        if (session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_INJ_PKTS_SUSS) == 0 && session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGS_RX) == 1)
+        if (session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_INJECTED_PACKETS_SUCCESS) == 0 &&
+            session_get_stat(sess, FLOW_DIRECTION_C2S, STAT_TCP_SEGMENTS_RECEIVED) == 1)
         {
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_C2S, TH_RST | TH_ACK) == 0);
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_S2C, TH_RST | TH_ACK) == 0);
-            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv C2S first payload packet", session_get_id(sess), session_get_tuple_str(sess));
+            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv C2S first payload packet",
+                                           session_get_id(sess), session_get_tuple_str(sess));
         }
         break;
     case 5:
         // recv S2C Payload
-        if (session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_INJ_PKTS_SUSS) == 0 && session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGS_RX) == 1)
+        if (session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_INJECTED_PACKETS_SUCCESS) == 0 &&
+            session_get_stat(sess, FLOW_DIRECTION_S2C, STAT_TCP_SEGMENTS_RECEIVED) == 1)
         {
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_C2S, TH_RST | TH_ACK) == 0);
             EXPECT_TRUE(stellar_inject_tcp_flags(sess, FLOW_DIRECTION_S2C, TH_RST | TH_ACK) == 0);
-            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv S2C first payload packet", session_get_id(sess), session_get_tuple_str(sess));
+            GMOCK_PLUGIN_MANAGER_LOG_DEBUG("=> inject TCP RST for session %u %s on recv S2C first payload packet",
+                                           session_get_id(sess), session_get_tuple_str(sess));
         }
         break;
     default:
@@ -146,23 +157,98 @@ void plugin_manager_dispatch_packet(struct plugin_manager *mgr, struct packet *p
 static const char *log_config_file = "./conf/log.toml";
 static const char *stellar_config_file = "./conf/stellar.toml";
 
-int gmock_main(int argc, char **argv)
+static void signal_handler(int signo)
+{
+    if (signo == SIGINT)
+    {
+        STELLAR_LOG_STATE("SIGINT received, notify threads to exit !!!");
+        ATOMIC_SET(&runtime->need_exit, 1);
+    }
+
+    if (signo == SIGQUIT)
+    {
+        STELLAR_LOG_STATE("SIGQUIT received, notify threads to exit !!!");
+        ATOMIC_SET(&runtime->need_exit, 1);
+    }
+
+    if (signo == SIGTERM)
+    {
+        STELLAR_LOG_STATE("SIGTERM received, notify threads to exit !!!");
+        ATOMIC_SET(&runtime->need_exit, 1);
+    }
+
+    if (signo == SIGHUP)
+    {
+        STELLAR_LOG_STATE("SIGHUP received, reload log level !!!");
+        log_reload_level(log_config_file);
+    }
+}
+
+int main(int argc, char **argv)
 {
-    int run_time_ms = atoi(argv[0]);
     timestamp_update();
-    EXPECT_TRUE(log_init(log_config_file) == 0);
-    EXPECT_TRUE(stellar_load_config(stellar_config_file, config) == 0);
-    EXPECT_TRUE(id_generator_init(config->dev_opts.base, config->dev_opts.offset) == 0);
+
+    signal(SIGINT, signal_handler);
+    signal(SIGQUIT, signal_handler);
+    signal(SIGTERM, signal_handler);
+    signal(SIGHUP, signal_handler);
+
+    if (log_init(log_config_file) != 0)
+    {
+        STELLAR_LOG_ERROR("unable to init log");
+        goto error_out;
+    }
+    STELLAR_LOG_STATE("start stellar (version: %s)\n %s", __stellar_version, logo_str);
+
+    if (stellar_load_config(stellar_config_file, config) != 0)
+    {
+        STELLAR_LOG_ERROR("unable to load config file");
+        goto error_out;
+    }
+    stellar_print_config(config);
+    STELLAR_LOG_DEBUG("sizeof(struct session) = %lu bytes", sizeof(struct session));
+
+    if (id_generator_init(config->dev_opts.base, config->dev_opts.offset) != 0)
+    {
+        STELLAR_LOG_ERROR("unable to init id generator");
+        goto error_out;
+    }
+
     runtime->stat = stellar_stat_new(config->io_opts.nr_threads);
-    EXPECT_TRUE(runtime->stat);
+    if (runtime->stat == NULL)
+    {
+        STELLAR_LOG_ERROR("unable to create stellar stat");
+        goto error_out;
+    }
+
     runtime->plug_mgr = plugin_manager_new();
-    EXPECT_TRUE(runtime->plug_mgr);
+    if (runtime->plug_mgr == NULL)
+    {
+        STELLAR_LOG_ERROR("unable to create plugin manager");
+        goto error_out;
+    }
+
     runtime->packet_io = packet_io_new(&config->io_opts);
-    EXPECT_TRUE(runtime->packet_io);
-    EXPECT_TRUE(stellar_thread_init(runtime, config) == 0);
-    EXPECT_TRUE(stellar_thread_run(runtime, config) == 0);
+    if (runtime->packet_io == NULL)
+    {
+        STELLAR_LOG_ERROR("unable to create packet io");
+        goto error_out;
+    }
+
+    if (stellar_thread_init(runtime, config) != 0)
+    {
+        STELLAR_LOG_ERROR("unable to init thread context");
+        goto error_out;
+    }
+
+    if (stellar_thread_run(runtime, config) != 0)
+    {
+        STELLAR_LOG_ERROR("unable to create worker thread");
+        goto error_out;
+    }
+
     runtime->stat_last_output_ts = timestamp_get_msec();
-    for (int i = 0; i < run_time_ms; i++)
+    while (!ATOMIC_READ(&runtime->need_exit))
     {
         timestamp_update();
         if (timestamp_get_msec() - runtime->stat_last_output_ts > 2000)
@@ -172,27 +258,15 @@ int gmock_main(int argc, char **argv)
         }
         usleep(1000); // 1ms
     }
-    ATOMIC_SET(&runtime->need_exit, 1);
+
+error_out:
     stellar_thread_join(runtime, config);
     stellar_thread_clean(runtime, config);
     packet_io_free(runtime->packet_io);
     plugin_manager_free(runtime->plug_mgr);
     stellar_stat_free(runtime->stat);
+    STELLAR_LOG_STATE("stellar exit !!!\n");
     log_free();
 
     return 0;
-}
-
-#if 1
-TEST(INJECT, TCP_RST)
-{
-    char *argv[] = {"30000"}; // 30 seconds
-    EXPECT_TRUE(gmock_main(1, argv) == 0);
-}
-#endif
-
-int main(int argc, char **argv)
-{
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
+}
\ No newline at end of file