diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
index a4de9c8bcbd66bb05aaf29f1fa24958d1c9c5991..62f95e427c906097282d7ce55bb44dbc8ab5e0fa 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.json
@@ -76,19 +76,7 @@
       "vendor": "Intel"
     },
     {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.26.5",
-      "kavlan": false,
-      "mac": "7c:d3:0a:bf:38:d8",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "chartreuse2-1-bmc.grenoble.grid5000.fr"
-    },
-    {
-      "device": "eno2",
+      "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
       "firmware_version": "0x8000095e, 18.5.18",
@@ -103,6 +91,18 @@
       "sriov": true,
       "sriov_totalvfs": 63,
       "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.5",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:38:d8",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse2-1-bmc.grenoble.grid5000.fr"
     }
   ],
   "nodeset": "chartreuse2",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
index d2bfc3323818f4134bcd3e8abb3e98e892ecd9e7..7adff7e1e301e925da5af61b27f3678c2bcce09d 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.json
@@ -76,19 +76,7 @@
       "vendor": "Intel"
     },
     {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.26.6",
-      "kavlan": false,
-      "mac": "7c:d3:0a:bf:40:28",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "chartreuse2-2-bmc.grenoble.grid5000.fr"
-    },
-    {
-      "device": "eno2",
+      "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
       "firmware_version": "0x8000095e, 18.5.18",
@@ -103,6 +91,18 @@
       "sriov": true,
       "sriov_totalvfs": 63,
       "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.6",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:40:28",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse2-2-bmc.grenoble.grid5000.fr"
     }
   ],
   "nodeset": "chartreuse2",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
index 9f84ba23eae6cfd01a294b8929a6d4487a3f4272..1acec5f6925d1b532df296edea494e95913c792d 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.json
@@ -76,19 +76,7 @@
       "vendor": "Intel"
     },
     {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.26.7",
-      "kavlan": false,
-      "mac": "7c:d3:0a:bf:41:0c",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "chartreuse2-3-bmc.grenoble.grid5000.fr"
-    },
-    {
-      "device": "eno2",
+      "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
       "firmware_version": "0x8000095e, 18.5.18",
@@ -103,6 +91,18 @@
       "sriov": true,
       "sriov_totalvfs": 63,
       "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.7",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:41:0c",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse2-3-bmc.grenoble.grid5000.fr"
     }
   ],
   "nodeset": "chartreuse2",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
index 033e736499a927c9fab48215d531ad2dd67fb1ca..a07a6c0598edca98541e5d87ffb4aafca65d0bf7 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.json
@@ -76,19 +76,7 @@
       "vendor": "Intel"
     },
     {
-      "device": "bmc",
-      "enabled": true,
-      "interface": "Ethernet",
-      "ip": "172.17.26.8",
-      "kavlan": false,
-      "mac": "7c:d3:0a:bf:3f:f2",
-      "management": true,
-      "mountable": false,
-      "mounted": false,
-      "network_address": "chartreuse2-4-bmc.grenoble.grid5000.fr"
-    },
-    {
-      "device": "eno2",
+      "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
       "firmware_version": "0x8000095e, 18.5.18",
@@ -103,6 +91,18 @@
       "sriov": true,
       "sriov_totalvfs": 63,
       "vendor": "Intel"
+    },
+    {
+      "device": "bmc",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "172.17.26.8",
+      "kavlan": false,
+      "mac": "7c:d3:0a:bf:3f:f2",
+      "management": true,
+      "mountable": false,
+      "mounted": false,
+      "network_address": "chartreuse2-4-bmc.grenoble.grid5000.fr"
     }
   ],
   "nodeset": "chartreuse2",
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
index f64a743ce2e935ae2e6c124396c2f1b505c08797..a719bea54fb2742dbb13f4a5793c143d3798440a 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/chartreuse2.yaml
@@ -26,7 +26,7 @@ nodes:
         enabled: true
         mountable: true
         mounted: true
-      eno2:
+      eth1:
         enabled: false
         mountable: false
         mounted: false
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
index 2ee1c2f8999cd2cdeef66c30bc7821b4de683d2a..7afeb44f74f4712f1049c1b3450b2b4b31ad7bbc 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-1.yaml
@@ -36,7 +36,7 @@ chartreuse2-1:
       ip: 172.17.26.5
       mac: 7c:d3:0a:bf:38:d8
       management: true
-    eno2:
+    eth1:
       driver: ixgbe
       firmware_version: 0x8000095e, 18.5.18
       interface: Ethernet
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
index d17181688446e6e9bf4e8b0148d026153721930f..c89accfb22cfcaef1cf80728f87590271f7cb04b 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-2.yaml
@@ -36,7 +36,7 @@ chartreuse2-2:
       ip: 172.17.26.6
       mac: 7c:d3:0a:bf:40:28
       management: true
-    eno2:
+    eth1:
       driver: ixgbe
       firmware_version: 0x8000095e, 18.5.18
       interface: Ethernet
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
index 83dea645e99c463858dad7c0f6405fdb0933b043..123672288f488de7a5c4c5a345eee97c699d36bc 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-3.yaml
@@ -36,7 +36,7 @@ chartreuse2-3:
       ip: 172.17.26.7
       mac: 7c:d3:0a:bf:41:0c
       management: true
-    eno2:
+    eth1:
       driver: ixgbe
       firmware_version: 0x8000095e, 18.5.18
       interface: Ethernet
diff --git a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
index 517821b9a0409073cd0890b12fdedda0a2de7f54..b142cf4dd75e51c017b4fc1ca6feda64922af26a 100644
--- a/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/chartreuse2/nodes/chartreuse2-4.yaml
@@ -36,7 +36,7 @@ chartreuse2-4:
       ip: 172.17.26.8
       mac: 7c:d3:0a:bf:3f:f2
       management: true
-    eno2:
+    eth1:
       driver: ixgbe
       firmware_version: 0x8000095e, 18.5.18
       interface: Ethernet