diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
index 30f76f45f414c47aadfd6db011a73008a3c02fc3..e09494bc5448c29c95d74483a562e05295cecb19 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.json
@@ -205,7 +205,7 @@
       "network_address": "paranoia-1-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/41",
+      "switch_port": "GigabitEthernet2/41",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
index 93ee6f5573aeaf10558ca97271e6a5a4f5751434..4074f5915bf0f44d1da876f8aa87361435ecb971 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.json
@@ -205,7 +205,7 @@
       "network_address": "paranoia-2-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/42",
+      "switch_port": "GigabitEthernet2/42",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
index 472fcb16bff48c29a160a0f48f84571b09126551..7f477c4569304cf7084eee263a0248805cd788a0 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.json
@@ -205,7 +205,7 @@
       "network_address": "paranoia-3-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/43",
+      "switch_port": "GigabitEthernet2/43",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
index 8b108dfeca8f58bba7e1da51118c3217cf471f6b..a25ac893669b388dc1cec1aec01491ea7a2f183c 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.json
@@ -205,7 +205,7 @@
       "network_address": "paranoia-4-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/44",
+      "switch_port": "GigabitEthernet2/44",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
index f7d875acf78bbaa8a80dc622a343d3f3e659ba92..9e2a94d0938aa6015734505ccc40fc7724a50357 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.json
@@ -205,7 +205,7 @@
       "network_address": "paranoia-5-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/45",
+      "switch_port": "GigabitEthernet2/45",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
index a0155e918cd6da595651bab14c42a9af69ed9cb7..37033ea46e7c7d5fa076401694e5c9efc730c246 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.json
@@ -205,7 +205,7 @@
       "network_address": "paranoia-6-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/46",
+      "switch_port": "GigabitEthernet2/46",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
index 8bfb7013fac4968d7a784a947c7c54e7e72d9542..3e195910149ef2ed4a99006efbeb2d34cd9b2a80 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.json
@@ -205,7 +205,7 @@
       "network_address": "paranoia-7-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/47",
+      "switch_port": "GigabitEthernet2/47",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
index 75ea67d3637c146a84d95bb3c102f4d3dbc92809..2b85ecbec0976bfe1888b242281ca651a5602d4c 100644
--- a/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
+++ b/data/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.json
@@ -205,7 +205,7 @@
       "network_address": "paranoia-8-eth2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi2/48",
+      "switch_port": "GigabitEthernet2/48",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
index 585361bb2752a47a2b52f47e497440811b89db8e..813a45610a84649ed56b69276ad29934dfddecb0 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-1.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/1",
+      "switch_port": "GigabitEthernet3/1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
index 6e25369022855bc6f2711fb730a382645fc63d7e..36dac2e13bf771018c85096384f3111288aff234 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-10.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/10",
+      "switch_port": "GigabitEthernet3/10",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
index 36005f32a2285f3e6d91e6155ea7d83108ccbf57..b6c8b5bab25c3be8e1a49a9d3d95147aa27a6394 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-11.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/11",
+      "switch_port": "GigabitEthernet3/11",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
index b9804867b41d3512c950052cbd4e6ad51450ff46..f87a5d4907417b556847d66068d0b4c81b04ca09 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-12.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/12",
+      "switch_port": "GigabitEthernet3/12",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
index ad71adff4794fb2e6cf28271369d1fdc34abc01c..365ffb16a381fb1d76658e06d542a872fc3a7780 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-13.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/13",
+      "switch_port": "GigabitEthernet3/13",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
index d4244676b76b1e53a0f805e831acffd599f44734..d9d398b8596f22808f6070607b09b46cc4f08eb3 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-16.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/15",
+      "switch_port": "GigabitEthernet3/15",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
index fc2133470f3b8840673d1352351abc6d00084a11..e9df96ecfb2669643b707dc8e1ffb483d429cf8d 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-18.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/16",
+      "switch_port": "GigabitEthernet3/16",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
index 01460d8d90f608c36bb2396792322a5ecf03cfe4..f2c33a8dab5ee43f910f66e549abe35f232065a9 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-19.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/17",
+      "switch_port": "GigabitEthernet3/17",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
index 2469985a44b29757d13df8b21a1bedaa907d6423..c016d67849b6012b967ab4e998a3a241e0efaa4b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/2",
+      "switch_port": "GigabitEthernet3/2",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
index 51ddc62d89c9106f68c29b4d88095727e02e5dd4..27bc9c44b71e57e718d9cd1184d4122a478249bd 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-20.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/18",
+      "switch_port": "GigabitEthernet3/18",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
index 74e93529ae4c8eebc2afa3fd2a5d83eb961a53e0..f3ec4f07adf16a7572b165e83dd5e8b641c17172 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-21.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/19",
+      "switch_port": "GigabitEthernet3/19",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
index c27c2a2b47282a4dff4de40e17678d908cf6a452..f1de61ecf9c58ca3000c50bd763eacfa53bc6bd0 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-24.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/20",
+      "switch_port": "GigabitEthernet3/20",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
index 77854956edd29f6813d598cbca6695219a7aadb6..e2bbc43ce8f62bd18b512157bd5527e38b096685 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-25.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/21",
+      "switch_port": "GigabitEthernet3/21",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
index 2b3c16f41ce143509502da7886b53d4d6f5eeebd..5bcffa3362d92e8872da89445762d8aea8a51445 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-3.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/3",
+      "switch_port": "GigabitEthernet3/3",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
index e457a006d5fdba49e5eb65e77d183557a3eb571a..c30a3b3a9fe2bfcaf6ea70b566a84ee39f1d5d0c 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-4.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/4",
+      "switch_port": "GigabitEthernet3/4",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
index 595bbfa66dde829b7c4825980ed76e579e0f54a4..e158329f2f58d30f2ce558a06e060f8c5540d946 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-5.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/5",
+      "switch_port": "GigabitEthernet3/5",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
index fcc903fb3e4e8d171015860ed5e0124225859b4d..bf8c479b2d03aeb72d36807d4b661b005efd01c9 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-6.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/6",
+      "switch_port": "GigabitEthernet3/6",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
index cb36480ac4c75cc9b176771bdb47174ba2fe02d9..e28b458d16e740073b079731297f001092bb4081 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-7.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/7",
+      "switch_port": "GigabitEthernet3/7",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
index 2430bde6d6d056a2bbec4ab7a0f3928b8f676a08..fdb0980272a421bcb1a8072b16ca5f4b94f9af26 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-8.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/8",
+      "switch_port": "GigabitEthernet3/8",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
index c0b7c5721052bcc06c948f8d1d687cc5a85d5317..39168913092a9374268a0e1dd982032610724626 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
@@ -86,7 +86,7 @@
       "network_address": "parapide-9.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi3/9",
+      "switch_port": "GigabitEthernet3/9",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
index 6192895436f0c7f691680d5ea7789a0a6a855022..79c6b8bf002f80fd9f9025a61a95c1748d59af71 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-1.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/1",
+      "switch_port": "GigabitEthernet4/1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
index a4577b611e0dd74b915c1a204bdb980c0e7366bf..8372b5cf8bcf1aa0de0682dbc23603189bb51a7c 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-11.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/5",
+      "switch_port": "GigabitEthernet4/5",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
index 1f218e474bbac3f2ce108712232db69ad134622f..4cdb8bbc1ae1fa0fd3435c3f0f48c930b2d5b618 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-12.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/6",
+      "switch_port": "GigabitEthernet4/6",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
index 0d8cac2dc3cb89f5f12caee60ba878e67e5848c3..d5d3b2dc284eeb1a7de1404c32295400a53cea01 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-13.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/7",
+      "switch_port": "GigabitEthernet4/7",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
index 81f6cec8ba746d1059b71ada9ca8167dce686f21..5b3f4736358d0f30904d12e9e8967b5a3be74db9 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-15.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/8",
+      "switch_port": "GigabitEthernet4/8",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
index cf4cdd9eed9b2d474087b82c01d07414649f3022..dadfbead82849e5414e606b69eae9796cf182e44 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-19.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/9",
+      "switch_port": "GigabitEthernet4/9",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
index 93d6fd29f8b1a5bb06bf30a1e6e3364cfa9eebe4..dcd91733ada7781f798ff0c960c88cba707736cc 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-2.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/2",
+      "switch_port": "GigabitEthernet4/2",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
index 6fa32a5d416c0b9803c9e555c595e34f70bc2ec7..425f0357ace88f6dcb152b21f43e55411051a62d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-20.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/10",
+      "switch_port": "GigabitEthernet4/10",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
index 514b21bbc83aefaf780c80408b902604e2dcab9e..a324f7331d8003003bb40fdb452d644c7694f922 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-21.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/11",
+      "switch_port": "GigabitEthernet4/11",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
index 38b80b68fb6ee0d87524f52f621c1b2fab6bcc23..139800b3dc05be607273a8c490fdaae0d6f64d25 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-22.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/12",
+      "switch_port": "GigabitEthernet4/12",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
index 7f7c1abf5bb8c9db33695a6ee70c3b78aae15568..2458810f0a0f2cfcaaf0e8ffa3037f30d2726553 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-25.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/13",
+      "switch_port": "GigabitEthernet4/13",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
index e8fea4f57b1bd54fcf78519204903216cdd37abb..0078a4248666c04c15c2b9078c10479766cbe2c9 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-28.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/14",
+      "switch_port": "GigabitEthernet4/14",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
index 30831486983168266896e843e1c824f5ff589010..3c70f7e259ab8be015f0aaefc27b2ff4c9fec9c7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-31.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/15",
+      "switch_port": "GigabitEthernet4/15",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
index 876c8436a584d725b0b0fc419031c6dcd4ba5a00..7ce87a644c6f18f03bacd233048acd27c1410606 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-32.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/16",
+      "switch_port": "GigabitEthernet4/16",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
index 9ab8f330f1f509626328d8a88ea5882b7ec763a9..97b984c9664317573876f160f6e67667ad7d3cfa 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-35.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/17",
+      "switch_port": "GigabitEthernet4/17",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
index 259f73ff88f5e2525e0efcb4ea4ff6ad3c0427a5..a9fc7db9859b2cdbaa70bb922c0e0d26157a39b1 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-38.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/18",
+      "switch_port": "GigabitEthernet4/18",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
index 003125c1d6402b5ff5e4984f5e2b6533d71c96a2..4240e0e234ef7c47d68ff1aa024f9d4ff73c6bff 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-8.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/3",
+      "switch_port": "GigabitEthernet4/3",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
index d7c4b7e4fa890d75d6edc57257e3c9c491c26651..6ca663cb44752b577e2bc1c30ba3ee2450ebd7de 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -103,7 +103,7 @@
       "network_address": "parapluie-9.rennes.grid5000.fr",
       "rate": 1000000000,
       "switch": "c6509",
-      "switch_port": "Gi4/4",
+      "switch_port": "GigabitEthernet4/4",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/rennes/network_equipments/c6509.json b/data/grid5000/sites/rennes/network_equipments/c6509.json
index b692e1c47a464b79d7a6987a8b3e386559209ffd..364a052ae2351a6d914aee2473f54f3c6e5fd204 100644
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ b/data/grid5000/sites/rennes/network_equipments/c6509.json
@@ -121,54 +121,54 @@
         {
           "kind": "node",
           "port": "eth2",
-          "snmp_name": "Gi2/41",
+          "snmp_name": "GigabitEthernet2/41",
           "uid": "paranoia-1"
         },
         {
           "kind": "node",
           "port": "eth2",
-          "snmp_name": "Gi2/42",
+          "snmp_name": "GigabitEthernet2/42",
           "uid": "paranoia-2"
         },
         {
           "kind": "node",
           "port": "eth2",
-          "snmp_name": "Gi2/43",
+          "snmp_name": "GigabitEthernet2/43",
           "uid": "paranoia-3"
         },
         {
           "kind": "node",
           "port": "eth2",
-          "snmp_name": "Gi2/44",
+          "snmp_name": "GigabitEthernet2/44",
           "uid": "paranoia-4"
         },
         {
           "kind": "node",
           "port": "eth2",
-          "snmp_name": "Gi2/45",
+          "snmp_name": "GigabitEthernet2/45",
           "uid": "paranoia-5"
         },
         {
           "kind": "node",
           "port": "eth2",
-          "snmp_name": "Gi2/46",
+          "snmp_name": "GigabitEthernet2/46",
           "uid": "paranoia-6"
         },
         {
           "kind": "node",
           "port": "eth2",
-          "snmp_name": "Gi2/47",
+          "snmp_name": "GigabitEthernet2/47",
           "uid": "paranoia-7"
         },
         {
           "kind": "node",
           "port": "eth2",
-          "snmp_name": "Gi2/48",
+          "snmp_name": "GigabitEthernet2/48",
           "uid": "paranoia-8"
         }
       ],
       "rate": 1000000000,
-      "snmp_pattern": "Gi%LINECARD%/%PORT%"
+      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     },
     {
       "backplane_bps": 40000000000,
@@ -181,79 +181,79 @@
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/1",
+          "snmp_name": "GigabitEthernet3/1",
           "uid": "parapide-1"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/2",
+          "snmp_name": "GigabitEthernet3/2",
           "uid": "parapide-2"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/3",
+          "snmp_name": "GigabitEthernet3/3",
           "uid": "parapide-3"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/4",
+          "snmp_name": "GigabitEthernet3/4",
           "uid": "parapide-4"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/5",
+          "snmp_name": "GigabitEthernet3/5",
           "uid": "parapide-5"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/6",
+          "snmp_name": "GigabitEthernet3/6",
           "uid": "parapide-6"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/7",
+          "snmp_name": "GigabitEthernet3/7",
           "uid": "parapide-7"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/8",
+          "snmp_name": "GigabitEthernet3/8",
           "uid": "parapide-8"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/9",
+          "snmp_name": "GigabitEthernet3/9",
           "uid": "parapide-9"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/10",
+          "snmp_name": "GigabitEthernet3/10",
           "uid": "parapide-10"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/11",
+          "snmp_name": "GigabitEthernet3/11",
           "uid": "parapide-11"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/12",
+          "snmp_name": "GigabitEthernet3/12",
           "uid": "parapide-12"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/13",
+          "snmp_name": "GigabitEthernet3/13",
           "uid": "parapide-13"
         },
         {
@@ -261,48 +261,48 @@
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/15",
+          "snmp_name": "GigabitEthernet3/15",
           "uid": "parapide-16"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/16",
+          "snmp_name": "GigabitEthernet3/16",
           "uid": "parapide-18"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/17",
+          "snmp_name": "GigabitEthernet3/17",
           "uid": "parapide-19"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/18",
+          "snmp_name": "GigabitEthernet3/18",
           "uid": "parapide-20"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/19",
+          "snmp_name": "GigabitEthernet3/19",
           "uid": "parapide-21"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/20",
+          "snmp_name": "GigabitEthernet3/20",
           "uid": "parapide-24"
         },
         {
           "kind": "node",
           "port": "eth0",
-          "snmp_name": "Gi3/21",
+          "snmp_name": "GigabitEthernet3/21",
           "uid": "parapide-25"
         }
       ],
       "rate": 1000000000,
-      "snmp_pattern": "Gi%LINECARD%/%PORT%"
+      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     },
     {
       "backplane_bps": 40000000000,
@@ -315,114 +315,114 @@
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/1",
+          "snmp_name": "GigabitEthernet4/1",
           "uid": "parapluie-1"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/2",
+          "snmp_name": "GigabitEthernet4/2",
           "uid": "parapluie-2"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/3",
+          "snmp_name": "GigabitEthernet4/3",
           "uid": "parapluie-8"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/4",
+          "snmp_name": "GigabitEthernet4/4",
           "uid": "parapluie-9"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/5",
+          "snmp_name": "GigabitEthernet4/5",
           "uid": "parapluie-11"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/6",
+          "snmp_name": "GigabitEthernet4/6",
           "uid": "parapluie-12"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/7",
+          "snmp_name": "GigabitEthernet4/7",
           "uid": "parapluie-13"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/8",
+          "snmp_name": "GigabitEthernet4/8",
           "uid": "parapluie-15"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/9",
+          "snmp_name": "GigabitEthernet4/9",
           "uid": "parapluie-19"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/10",
+          "snmp_name": "GigabitEthernet4/10",
           "uid": "parapluie-20"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/11",
+          "snmp_name": "GigabitEthernet4/11",
           "uid": "parapluie-21"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/12",
+          "snmp_name": "GigabitEthernet4/12",
           "uid": "parapluie-22"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/13",
+          "snmp_name": "GigabitEthernet4/13",
           "uid": "parapluie-25"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/14",
+          "snmp_name": "GigabitEthernet4/14",
           "uid": "parapluie-28"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/15",
+          "snmp_name": "GigabitEthernet4/15",
           "uid": "parapluie-31"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/16",
+          "snmp_name": "GigabitEthernet4/16",
           "uid": "parapluie-32"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/17",
+          "snmp_name": "GigabitEthernet4/17",
           "uid": "parapluie-35"
         },
         {
           "kind": "node",
           "port": "eth1",
-          "snmp_name": "Gi4/18",
+          "snmp_name": "GigabitEthernet4/18",
           "uid": "parapluie-38"
         }
       ],
       "rate": 1000000000,
-      "snmp_pattern": "Gi%LINECARD%/%PORT%"
+      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     }
   ],
   "metrics": [
diff --git a/input/grid5000/sites/rennes/networks/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
index 701e52b7a5aead62d6259b8aa1677bd49daf5ecc..8922dd2b9936f223bc48b09acf0c1e30c0605d79 100644
--- a/input/grid5000/sites/rennes/networks/c6509.yaml
+++ b/input/grid5000/sites/rennes/networks/c6509.yaml
@@ -39,7 +39,7 @@ c6509:
           kind: switch
     2:
       kind: node
-      snmp_pattern: Gi%LINECARD%/%PORT%
+      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
       kavlan_pattern: Gi%LINECARD%/%PORT%
       rate: 1000000000
       backplane_bps: 40000000000
@@ -55,7 +55,7 @@ c6509:
         48: paranoia-8-eth2
     3:
       kind: node
-      snmp_pattern: Gi%LINECARD%/%PORT%
+      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
       kavlan_pattern: Gi%LINECARD%/%PORT%
       rate: 1000000000
       backplane_bps: 40000000000
@@ -83,7 +83,7 @@ c6509:
         21: parapide-25
     4:
       kind: node
-      snmp_pattern: Gi%LINECARD%/%PORT%
+      snmp_pattern: GigabitEthernet%LINECARD%/%PORT%
       kavlan_pattern: Gi%LINECARD%/%PORT%
       rate: 1000000000
       backplane_bps: 40000000000