diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
index bae2eae4fd294453861893e7268e96183fca6666..32a709d24326e0be9448377684ec2c470ed363e4 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-1.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/1"
+      "switch_port": "GigabitEthernet0/1"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
index 2f1c945de5eb0fb5c11f82d7b9e1510feec29a5f..935bfcd3678528852bf0fc167a2f6296f8f33b05 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-10.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/10"
+      "switch_port": "GigabitEthernet0/10"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
index 8e0b70769c864377653d430149428573c7d40ec3..4459fe582fa960ea13fd6dcd4f42b47f65361558 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-11.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/11"
+      "switch_port": "GigabitEthernet0/11"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
index 6e07b91e508aa63c8b66411d54cac7d989ee840c..1e043d09852f7715027a56ee784bbff5ba21aee3 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-12.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/12"
+      "switch_port": "GigabitEthernet0/12"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
index 114182a507dde64bf296c075e964a2c0b6c8d901..7121d736bc5cbfc37d83648e6c7e295ea8eefb87 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-13.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/13"
+      "switch_port": "GigabitEthernet0/13"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
index 303da24ecd57dcdd1caf83c04254dc2c10486b62..47ad3a09cb0a39a6497e0473cf930ebd630c33db 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-14.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/14"
+      "switch_port": "GigabitEthernet0/14"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
index 60c1492d51f374854cbb4b2186e7b91517210478..38138ccec54f4e78841f0792574ff714d74e4d7a 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-15.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/15"
+      "switch_port": "GigabitEthernet0/15"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
index 915f8cb655d89d3eb51fb6c9c20a1dca136d8de1..cb11d1a705a0da99853028085c51428b6d85c2ec 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-16.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/16"
+      "switch_port": "GigabitEthernet0/16"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
index 538bc1c514b500a579b0409e85620dd5558c62be..cce80846105c0a4ff902978c21143b80b662a7fc 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-17.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/17"
+      "switch_port": "GigabitEthernet0/17"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
index 36d34179cc6b0074a381e80277a8437d04007e19..be5fa0f7e9e629ec9d1d15127b3107b8c551e56d 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-18.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/18"
+      "switch_port": "GigabitEthernet0/18"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
index 195e30c6adb08127ed5d1594dc7ac1e9ed50bc03..dabcf57e110d7ece2d616c8c375550f1c4c7b097 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-19.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/19"
+      "switch_port": "GigabitEthernet0/19"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
index 8c1fae3d54f43749ce0c67a5ed3cb9bee604c3db..283b08de33b113d9b7800488b5fc4f3f2e011fa6 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-2.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/2"
+      "switch_port": "GigabitEthernet0/2"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
index 909a0470398235484747d045937f754297e8ec9e..6d4f18a8f21cabac54cbfc8733d12727da12ba9d 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-20.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/20"
+      "switch_port": "GigabitEthernet0/20"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
index 57db9283b949eeff91b2db6fd77b76728458b476..37455733edfc8e0fc4fe230af209c69246c82f05 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-21.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/21"
+      "switch_port": "GigabitEthernet0/21"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
index c842788e7c23b3cd63538c96ec539fa166c3a982..8e2df120ef82d3d62d820cabbab7d2b94e94b10d 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-22.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/22"
+      "switch_port": "GigabitEthernet0/22"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
index 810d1bc999a7b5e4d02407c4c3e62482e447b80d..bf70b7416c7e2de8da528f0118f4b45962a8ff84 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-23.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/23"
+      "switch_port": "GigabitEthernet0/23"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
index 9fb41b749c2ebd4c5d653f8b8e56acfe81ab4488..45c1b585b0ee1c755d0ed607c56e173e844a53c0 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-24.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/24"
+      "switch_port": "GigabitEthernet0/24"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
index 1e9c129904d89016d51ed7a6e267dd8be106f670..14fdb894df6aeeb77eac39a25dba2f79da97bf93 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-25.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/25"
+      "switch_port": "GigabitEthernet0/25"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
index 7bec773336fb77ca69817349a7db0eaff1e44b3a..2625e927db0271c236e5684d8ad97a9af8efcbc3 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-26.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/26"
+      "switch_port": "GigabitEthernet0/26"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
index 84b5f8799ae015a30926bf0492d9fbdaa430c67a..817636ca4c0fe19722b40f5d3121c0befb1078cb 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-27.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/27"
+      "switch_port": "GigabitEthernet0/27"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
index cba3166d575f2519420a2f4a745e805427d858de..448805eb7314b10bf40c157540603f8e2babd0af 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-28.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/28"
+      "switch_port": "GigabitEthernet0/28"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
index 6e4ea5718b16a20d5d16b15b683e9a735f1483aa..6f54defaa4ff458a2cd01847346be0ebfff41ab4 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-29.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/29"
+      "switch_port": "GigabitEthernet0/29"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
index 9d0a6229bdee7ac9813914af7bce1f45a3fedbf4..8f574219b79a5d42de4965f9cf2426d5c72d16c9 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-3.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/3"
+      "switch_port": "GigabitEthernet0/3"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
index e59ee7f640ca3aa75eca16148ce8525dbb9d88f4..61c2c73f6550d8ff03aaf0a846f49efab1460171 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-30.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/30"
+      "switch_port": "GigabitEthernet0/30"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
index 6ac769c95c4d78172fbc88a2c712ddc7eae7cdcb..aff341ab38f80c1408ffbbf0a8ed317763d2e5bc 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-31.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/31"
+      "switch_port": "GigabitEthernet0/31"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
index 27733b921235e57324d2913fc2c161cb33aefed6..a1dcbd4c2abd6aa50b817c0edb3f8f8361e8af0d 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-32.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/32"
+      "switch_port": "GigabitEthernet0/32"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
index 0f5dfd79903272708d8206a5a9ca82dfdd98bf2d..ebe4644b153e0d42d517286e13ec5efd1aed8cdc 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-33.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/34"
+      "switch_port": "GigabitEthernet0/34"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
index b3efd9a51257fad4f5aa3caaeba738b9f5eca9e8..7754dbe27691acf00970ae54e8946bf0d0ad2860 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-34.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/33"
+      "switch_port": "GigabitEthernet0/33"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
index 6c8ec48156885c015c04b52cd387774c67191d05..35745af3351e1a132d8fd7e3fb2565d27b674ca6 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-35.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/35"
+      "switch_port": "GigabitEthernet0/35"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
index b07e2a9a67eb960f0cbe237f29af83d7da216895..72f6166d214179ed3b4a416c2a0886c530628ed8 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-36.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/36"
+      "switch_port": "GigabitEthernet0/36"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
index 3a96c9813c0d55abe9b385da555d3c0b9665564e..f89262b33b69cc292f9865ca01b0c49082c67fc3 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-37.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/37"
+      "switch_port": "GigabitEthernet0/37"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
index ab5af4a57382532a60133f8d35e903148c60563e..c3e52c4e57af51bb23ae1daf8c9b8811bd890fab 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-38.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/38"
+      "switch_port": "GigabitEthernet0/38"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
index e3debb4ddb5515d4e02ba836d36871952980ed29..eae2ec3a4206617468281f153e14753e7f4852df 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-39.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/39"
+      "switch_port": "GigabitEthernet0/39"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
index 359bbfcc1a751cf06099ad2c0a6f784f2f517043..bc03eafb71c8fae3e3b33f33ffc3c070243c8bd2 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-4.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/4"
+      "switch_port": "GigabitEthernet0/4"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
index e61c4b5548f2e0da7221a7b730f1b05f4a25b486..6257f55ed3c291bd1e5142b447504edbf2f0e4a7 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-40.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/40"
+      "switch_port": "GigabitEthernet0/40"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
index a4acf435e92952b7c71b8e7d00859524bb87d40e..a289287b9903c196b7c6ce1180ca646af1a437ca 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-41.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/41"
+      "switch_port": "GigabitEthernet0/41"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
index 895325f144a745c039f1326be690bedcec8c708f..878f7c57e61fe2262494dffcc6a4510bc4c288f3 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-42.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/42"
+      "switch_port": "GigabitEthernet0/42"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
index bc1d2197254484ab98334a6f93e1a39a654a8ebc..8039e2bc6092903f1faacba7ec446a1c8361bc1b 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-43.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/43"
+      "switch_port": "GigabitEthernet0/43"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
index f03b5a981c343c8ae2c5e82318d887894d8d3089..7a7c39301b8eb1ae177a257a4bb639958b322bbb 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-44.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/44"
+      "switch_port": "GigabitEthernet0/44"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
index 80900bd5ac7d6e62e19d2617baf436d29d6bf1cf..96b036d38d07624341666987e2fb947db939179f 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-5.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/5"
+      "switch_port": "GigabitEthernet0/5"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
index 69a8058aa454d5923e9365206e32fbcb9e2a44be..2bcec800381f45eaa48e7436b394ef98af022465 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-6.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/6"
+      "switch_port": "GigabitEthernet0/6"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
index ad3bf17681394130c34c9e53efa687b5ba6e7e1f..28c2aae4fa517dd44713ad001b74d2088f25e56d 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-7.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/7"
+      "switch_port": "GigabitEthernet0/7"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
index 08a18993e9fc48e84d1a5ade772e148095ae89ed..f571f412ce42ef7e04d6eafa1a00358b2c523041 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-8.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/8"
+      "switch_port": "GigabitEthernet0/8"
     },
     {
       "bridged": false,
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
index 4c8fdcc68d06413a71cc832d7b5449f4d16ab915..00f3b7a58c90014572f92c20c270189a851f6ac0 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
@@ -40,7 +40,7 @@
       "network_address": "stremi-9.reims.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw-reims",
-      "switch_port": "Gi0/9"
+      "switch_port": "GigabitEthernet0/9"
     },
     {
       "bridged": false,
diff --git a/generators/input/sites/reims/clusters/stremi.rb b/generators/input/sites/reims/clusters/stremi.rb
index d8928a00c464fcfe2f1244fd09190f7ee7f872d1..1ef9f9329be8727946dcad0749ffa42b24e94851 100644
--- a/generators/input/sites/reims/clusters/stremi.rb
+++ b/generators/input/sites/reims/clusters/stremi.rb
@@ -75,8 +75,8 @@ site :reims do |site_uid|
           :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
           :ip               => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'ip'),
           :ip6              => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'ip6'),
-          :switch           => lookup('stremi_manual', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
-          :switch_port      => lookup('stremi_manual', node_uid, 'network_interfaces', 'eth0', 'switch_port'),
+          :switch           => net_switch_lookup('reims', 'stremi', node_uid),
+          :switch_port      => net_port_lookup('reims', 'stremi', node_uid),
           :mac              => lookup('stremi_generated', node_uid, 'network_interfaces', 'eth0', 'mac')
         },
         {