diff --git a/VERSION b/VERSION
index e90bfef..73e93bb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.10.4
\ No newline at end of file
+3.10.5
\ No newline at end of file
diff --git a/agent/src/stats_collection.cc b/agent/src/stats_collection.cc
index 16934ae..5524daf 100644
--- a/agent/src/stats_collection.cc
+++ b/agent/src/stats_collection.cc
@@ -232,19 +232,18 @@
             {
                 //std::cout << "Interface statistics retrieved"
                 //          << " intf_id:" << intf_id << std::endl;
-
                 port_stats->set_rx_bytes(nni_stats.data.rx_bytes);
-                port_stats->set_rx_packets(nni_stats.data.rx_packets);
-                port_stats->set_rx_ucast_packets(nni_stats.data.rx_ucast_packets);
-                port_stats->set_rx_mcast_packets(nni_stats.data.rx_mcast_packets);
-                port_stats->set_rx_bcast_packets(nni_stats.data.rx_bcast_packets);
-                port_stats->set_rx_error_packets(nni_stats.data.rx_error_packets);
+                port_stats->set_rx_frames(nni_stats.data.rx_packets);
+                port_stats->set_rx_ucast_frames(nni_stats.data.rx_ucast_packets);
+                port_stats->set_rx_mcast_frames(nni_stats.data.rx_mcast_packets);
+                port_stats->set_rx_bcast_frames(nni_stats.data.rx_bcast_packets);
+                port_stats->set_rx_error_frames(nni_stats.data.rx_error_packets);
                 port_stats->set_tx_bytes(nni_stats.data.tx_bytes);
-                port_stats->set_tx_packets(nni_stats.data.tx_packets);
-                port_stats->set_tx_ucast_packets(nni_stats.data.tx_ucast_packets);
-                port_stats->set_tx_mcast_packets(nni_stats.data.tx_mcast_packets);
-                port_stats->set_tx_bcast_packets(nni_stats.data.tx_bcast_packets);
-                port_stats->set_tx_error_packets(nni_stats.data.tx_error_packets);
+                port_stats->set_tx_frames(nni_stats.data.tx_packets);
+                port_stats->set_tx_ucast_frames(nni_stats.data.tx_ucast_packets);
+                port_stats->set_tx_mcast_frames(nni_stats.data.tx_mcast_packets);
+                port_stats->set_tx_bcast_frames(nni_stats.data.tx_bcast_packets);
+                port_stats->set_tx_error_frames(nni_stats.data.tx_error_packets);
 
             } else {
                 OPENOLT_LOG(ERROR, openolt_log_id,  "Failed to retrieve port statistics, intf_id %d, intf_type %d, err = %s\n",
diff --git a/agent/src/translation.cc b/agent/src/translation.cc
index 03cd0a1..20291b5 100644
--- a/agent/src/translation.cc
+++ b/agent/src/translation.cc
@@ -20,7 +20,7 @@
 int interface_key_to_port_no(bcmolt_interface_id intf_id, 
         bcmolt_interface_type intf_type) {
     if (intf_type == BCMOLT_INTERFACE_TYPE_NNI) {
-        return (0x1 << 20) + intf_id;
+        return (0x1 << 24) + intf_id;
     }
     if (intf_type == BCMOLT_INTERFACE_TYPE_PON) {
         return (0x2 << 28) + intf_id;