diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
index e3ed4f837aff0b00043522c52a564aecb4cf2344..4401cbd10e1b4afe8413f039c418ee06e9e5a72d 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.json
@@ -59,7 +59,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
-      "name": "eno113",
+      "name": "eno1",
       "network_address": "yeti-1.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
@@ -78,7 +78,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno114",
+      "name": "eno2",
       "vendor": "Intel"
     },
     {
@@ -93,7 +93,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno115",
+      "name": "eno3",
       "vendor": "Intel"
     },
     {
@@ -108,7 +108,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno116",
+      "name": "eno4",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
index 998060a476dc2272dc33a6d2e8443949efa105fe..b1fbee35b0ba0a180195c7f0c9dab6902be168ef 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.json
@@ -59,7 +59,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
-      "name": "eno113",
+      "name": "eno1",
       "network_address": "yeti-2.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
@@ -78,7 +78,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno114",
+      "name": "eno2",
       "vendor": "Intel"
     },
     {
@@ -93,7 +93,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno115",
+      "name": "eno3",
       "vendor": "Intel"
     },
     {
@@ -108,7 +108,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno116",
+      "name": "eno4",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
index 974b5f34aec8b176803ddb2349b51f71483743cd..201f09ed483797d550d87aef9709b7ad53e7131f 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.json
@@ -59,7 +59,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
-      "name": "eno113",
+      "name": "eno1",
       "network_address": "yeti-3.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
@@ -78,7 +78,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno114",
+      "name": "eno2",
       "vendor": "Intel"
     },
     {
@@ -93,7 +93,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno115",
+      "name": "eno3",
       "vendor": "Intel"
     },
     {
@@ -108,7 +108,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno116",
+      "name": "eno4",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
index acf6f911d9e6dcd4d8bfa4ab320c172fab6fef90..af4022833c4278b8c2c011a61e5fe2a787c99390 100644
--- a/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
+++ b/data/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.json
@@ -59,7 +59,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": true,
       "mounted": true,
-      "name": "eno113",
+      "name": "eno1",
       "network_address": "yeti-4.grenoble.grid5000.fr",
       "rate": 10000000000,
       "switch": "gw",
@@ -78,7 +78,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno114",
+      "name": "eno2",
       "vendor": "Intel"
     },
     {
@@ -93,7 +93,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno115",
+      "name": "eno3",
       "vendor": "Intel"
     },
     {
@@ -108,7 +108,7 @@
       "model": "Ethernet Controller X710 for 10GbE SFP+",
       "mountable": false,
       "mounted": false,
-      "name": "eno116",
+      "name": "eno4",
       "vendor": "Intel"
     },
     {
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
index 3ed87feededd7c8e0a48d2795b928ff2bc6cafd2..720880a64adc16593cb61ae5203644b73406982c 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -29,7 +29,7 @@ yeti-1:
       mac: 24:6e:96:91:1e:b0
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno113
+      name: eno1
       rate: 10000000000
       vendor: Intel
     eth1:
@@ -39,7 +39,7 @@ yeti-1:
       mac: 24:6e:96:91:1e:b2
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno114
+      name: eno2
       vendor: Intel
     eth2:
       driver: i40e
@@ -48,7 +48,7 @@ yeti-1:
       mac: 24:6e:96:91:1e:b4
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno115
+      name: eno3
       vendor: Intel
     eth3:
       driver: i40e
@@ -57,7 +57,7 @@ yeti-1:
       mac: 24:6e:96:91:1e:b6
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno116
+      name: eno4
       vendor: Intel
     ib0:
       driver: hfi1
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
index dfddc3e0b3491b419e62895d68f1c96f5fedb606..a45a31f0329b1669de28909b15eac9b659900915 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -29,7 +29,7 @@ yeti-2:
       mac: 24:6e:96:91:2b:50
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno113
+      name: eno1
       rate: 10000000000
       vendor: Intel
     eth1:
@@ -39,7 +39,7 @@ yeti-2:
       mac: 24:6e:96:91:2b:52
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno114
+      name: eno2
       vendor: Intel
     eth2:
       driver: i40e
@@ -48,7 +48,7 @@ yeti-2:
       mac: 24:6e:96:91:2b:54
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno115
+      name: eno3
       vendor: Intel
     eth3:
       driver: i40e
@@ -57,7 +57,7 @@ yeti-2:
       mac: 24:6e:96:91:2b:56
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno116
+      name: eno4
       vendor: Intel
     ib0:
       driver: hfi1
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
index bbdd7a27547015d132f8247dd34e7b3c603c8ae8..c47233129e2be932ee68bf244e269c91add740b8 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -29,7 +29,7 @@ yeti-3:
       mac: 24:6e:96:91:4c:90
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno113
+      name: eno1
       rate: 10000000000
       vendor: Intel
     eth1:
@@ -39,7 +39,7 @@ yeti-3:
       mac: 24:6e:96:91:4c:92
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno114
+      name: eno2
       vendor: Intel
     eth2:
       driver: i40e
@@ -48,7 +48,7 @@ yeti-3:
       mac: 24:6e:96:91:4c:94
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno115
+      name: eno3
       vendor: Intel
     eth3:
       driver: i40e
@@ -57,7 +57,7 @@ yeti-3:
       mac: 24:6e:96:91:4c:96
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno116
+      name: eno4
       vendor: Intel
     ib0:
       driver: hfi1
diff --git a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
index f7d77929ab6406eaa9db17b7958cec50b2c41b7a..72d6f5ec50e2dffdc88c2204c9583dcd52be08fc 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -29,7 +29,7 @@ yeti-4:
       mac: 24:6e:96:91:1d:b0
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno113
+      name: eno1
       rate: 10000000000
       vendor: Intel
     eth1:
@@ -39,7 +39,7 @@ yeti-4:
       mac: 24:6e:96:91:1d:b2
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno114
+      name: eno2
       vendor: Intel
     eth2:
       driver: i40e
@@ -48,7 +48,7 @@ yeti-4:
       mac: 24:6e:96:91:1d:b4
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno115
+      name: eno3
       vendor: Intel
     eth3:
       driver: i40e
@@ -57,7 +57,7 @@ yeti-4:
       mac: 24:6e:96:91:1d:b6
       management: false
       model: Ethernet Controller X710 for 10GbE SFP+
-      name: eno116
+      name: eno4
       vendor: Intel
     ib0:
       driver: hfi1
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index cc4c1212d8e32f16ef26cdb13c5e27e6c19511e9..63b28249a13b107433b63f2d0f326310414173d5 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -154,10 +154,10 @@ uvb:
   eno1: eth0
   eno2: eth1
 yeti:
-  eno113: eth0
-  eno114: eth1
-  eno115: eth2
-  eno116: eth3
+  eno1: eth0
+  eno2: eth1
+  eno3: eth2
+  eno4: eth3
 
 #Manual entries for nodes which mapping is different from cluster default
 granduc-12: