diff --git a/test/data/gws-direct.json b/test/data/gws-direct.json
index a4aa9f64562250e5e4a16fc795117f741720e49f..8fcb50564dd4687b74ff105e62423d75501e999c 100644
--- a/test/data/gws-direct.json
+++ b/test/data/gws-direct.json
@@ -8,7 +8,7 @@
         "community": "gn2nocT3st",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "discards_in": "1.3.6.1.2.1.2.2.1.13.533",
               "discards_out": "1.3.6.1.2.1.2.2.1.19.533",
@@ -17,28 +17,28 @@
             }
           },
           {
-            "name": "b",
+            "tag": "b",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.531",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.531"
             }
           },
           {
-            "name": "c",
+            "tag": "c",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.525",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.525"
             }
           },
           {
-            "name": "d",
+            "tag": "d",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.553",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.553"
             }
           },
           {
-            "name": "e",
+            "tag": "e",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.563",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.563"
@@ -57,14 +57,14 @@
         "community": "gn2nocT3st",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.611",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.611"
             }
           },
           {
-            "name": "b",
+            "tag": "b",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.589",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.589"
@@ -83,7 +83,7 @@
         "community": "atlas1453",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.35",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.35"
@@ -102,7 +102,7 @@
         "community": "atlas1453",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.48",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.48"
@@ -121,7 +121,7 @@
         "community": "atlas1453",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.155",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.155"
@@ -140,7 +140,7 @@
         "community": "atlas1453",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.148",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.148"
@@ -159,35 +159,35 @@
         "community": "atlas1453",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.1487",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.1487"
             }
           },
           {
-            "name": "b",
+            "tag": "b",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.1488",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.1488"
             }
           },
           {
-            "name": "c",
+            "tag": "c",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.1489",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.1489"
             }
           },
           {
-            "name": "d",
+            "tag": "d",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.760",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.760"
             }
           },
           {
-            "name": "e",
+            "tag": "e",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.796",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.796"
@@ -206,7 +206,7 @@
         "community": "dante",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.531",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.531"
@@ -225,7 +225,7 @@
         "community": "dante",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.9",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.9"
@@ -244,7 +244,7 @@
         "community": "geant-mon-telia",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.263",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.263"
@@ -263,7 +263,7 @@
         "community": "atlas1453",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.675",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.675"
@@ -276,7 +276,7 @@
         "community": "atlas1453",
         "interfaces": [
           {
-            "name": "a",
+            "tag": "a",
             "counters": {
               "traffic_in": "1.3.6.1.2.1.31.1.1.1.6.677",
               "traffic_out": "1.3.6.1.2.1.31.1.1.1.10.677"