diff --git a/data/grid5000/network_equipments/renater5-bordeaux.json b/data/grid5000/network_equipments/renater-bordeaux.json
similarity index 81%
rename from data/grid5000/network_equipments/renater5-bordeaux.json
rename to data/grid5000/network_equipments/renater-bordeaux.json
index 6bb15b12980d41037940b363989d0ea5471916d8..df38c04707eabdcf6e649fd82b5f50dbe03de047 100644
--- a/data/grid5000/network_equipments/renater5-bordeaux.json
+++ b/data/grid5000/network_equipments/renater-bordeaux.json
@@ -5,7 +5,7 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-lyon"
+          "uid": "renater-lyon"
         },
         {
           "kind": "router",
@@ -16,5 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-bordeaux"
+  "uid": "renater-bordeaux"
 }
diff --git a/data/grid5000/network_equipments/renater5-grenoble.json b/data/grid5000/network_equipments/renater-grenoble.json
similarity index 81%
rename from data/grid5000/network_equipments/renater5-grenoble.json
rename to data/grid5000/network_equipments/renater-grenoble.json
index 5cd88b03fa135f3e8f9ca3207285b59f67a05927..22e359d50640a12fa054f70ac9de135979fe9c29 100644
--- a/data/grid5000/network_equipments/renater5-grenoble.json
+++ b/data/grid5000/network_equipments/renater-grenoble.json
@@ -5,7 +5,7 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-lyon"
+          "uid": "renater-lyon"
         },
         {
           "kind": "router",
@@ -16,5 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-grenoble"
+  "uid": "renater-grenoble"
 }
diff --git a/data/grid5000/network_equipments/renater5-lille.json b/data/grid5000/network_equipments/renater-lille.json
similarity index 77%
rename from data/grid5000/network_equipments/renater5-lille.json
rename to data/grid5000/network_equipments/renater-lille.json
index 93cc9339d1ae4b3137dc72058c986a8b683b9e88..7413470ca91053576911116e7dfdd1b784885cd9 100644
--- a/data/grid5000/network_equipments/renater5-lille.json
+++ b/data/grid5000/network_equipments/renater-lille.json
@@ -5,11 +5,11 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-paris"
+          "uid": "renater-paris"
         },
         {
           "rate": 10000000,
-          "uid": "renater5-reims"
+          "uid": "renater-reims"
         },
         {
           "kind": "router",
@@ -20,5 +20,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-lille"
+  "uid": "renater-lille"
 }
diff --git a/data/grid5000/network_equipments/renater5-luxembourg.json b/data/grid5000/network_equipments/renater-luxembourg.json
similarity index 81%
rename from data/grid5000/network_equipments/renater5-luxembourg.json
rename to data/grid5000/network_equipments/renater-luxembourg.json
index cdcf145f830f0326e3b4e4814a837151ece58624..b35504fc06dd2fb7bd9a2fe74103ecb23b970ad1 100644
--- a/data/grid5000/network_equipments/renater5-luxembourg.json
+++ b/data/grid5000/network_equipments/renater-luxembourg.json
@@ -5,7 +5,7 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-nancy"
+          "uid": "renater-nancy"
         },
         {
           "kind": "router",
@@ -16,5 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-luxembourg"
+  "uid": "renater-luxembourg"
 }
diff --git a/data/grid5000/network_equipments/renater5-lyon.json b/data/grid5000/network_equipments/renater-lyon.json
similarity index 71%
rename from data/grid5000/network_equipments/renater5-lyon.json
rename to data/grid5000/network_equipments/renater-lyon.json
index 5d1af318a6504e2931247d27bd698e25dab3f388..c45e9aa465ebc5b04713272fc1042370a1d84bb0 100644
--- a/data/grid5000/network_equipments/renater5-lyon.json
+++ b/data/grid5000/network_equipments/renater-lyon.json
@@ -5,19 +5,19 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-paris"
+          "uid": "renater-paris"
         },
         {
           "rate": 10000000000,
-          "uid": "renater5-marseille"
+          "uid": "renater-marseille"
         },
         {
           "rate": 10000000000,
-          "uid": "renater5-bordeaux"
+          "uid": "renater-bordeaux"
         },
         {
           "rate": 10000000000,
-          "uid": "renater5-grenoble"
+          "uid": "renater-grenoble"
         },
         {
           "kind": "router",
@@ -28,5 +28,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-lyon"
+  "uid": "renater-lyon"
 }
diff --git a/data/grid5000/network_equipments/renater5-marseille.json b/data/grid5000/network_equipments/renater-marseille.json
similarity index 66%
rename from data/grid5000/network_equipments/renater5-marseille.json
rename to data/grid5000/network_equipments/renater-marseille.json
index c1180e3808c5a65d09ff09ec748b223e8fce049e..6da8bd6dd027039e19e42852b7b0da7c7f419ce8 100644
--- a/data/grid5000/network_equipments/renater5-marseille.json
+++ b/data/grid5000/network_equipments/renater-marseille.json
@@ -5,19 +5,19 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-lyon"
+          "uid": "renater-lyon"
         },
         {
           "rate": 10000000000,
-          "uid": "renater5-toulouse"
+          "uid": "renater-toulouse"
         },
         {
           "rate": 10000000000,
-          "uid": "renater5-sophia"
+          "uid": "renater-sophia"
         }
       ]
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-marseille"
+  "uid": "renater-marseille"
 }
diff --git a/data/grid5000/network_equipments/renater5-nancy.json b/data/grid5000/network_equipments/renater-nancy.json
similarity index 76%
rename from data/grid5000/network_equipments/renater5-nancy.json
rename to data/grid5000/network_equipments/renater-nancy.json
index 04022f6eec3cef74f50fac3be88cd488080760e9..f6806566f568cae5cfb872ba8b1bedef0c8e20a8 100644
--- a/data/grid5000/network_equipments/renater5-nancy.json
+++ b/data/grid5000/network_equipments/renater-nancy.json
@@ -5,11 +5,11 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-paris"
+          "uid": "renater-paris"
         },
         {
           "rate": 10000000000,
-          "uid": "renater5-luxembourg"
+          "uid": "renater-luxembourg"
         },
         {
           "kind": "router",
@@ -20,5 +20,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-nancy"
+  "uid": "renater-nancy"
 }
diff --git a/data/grid5000/network_equipments/renater5-paris.json b/data/grid5000/network_equipments/renater-paris.json
similarity index 66%
rename from data/grid5000/network_equipments/renater5-paris.json
rename to data/grid5000/network_equipments/renater-paris.json
index 3de4f5a08f5e9e52a336456c4d0c7d21704d6c62..91aa8b8da36651989f3bc72688795d054a759595 100644
--- a/data/grid5000/network_equipments/renater5-paris.json
+++ b/data/grid5000/network_equipments/renater-paris.json
@@ -5,23 +5,23 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-lille"
+          "uid": "renater-lille"
         },
         {
           "rate": 10000000000,
-          "uid": "renater5-lyon"
+          "uid": "renater-lyon"
         },
         {
           "rate": 10000000000,
-          "uid": "renater5-nancy"
+          "uid": "renater-nancy"
         },
         {
           "rate": 10000000000,
-          "uid": "renater5-rennes"
+          "uid": "renater-rennes"
         }
       ]
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-paris"
+  "uid": "renater-paris"
 }
diff --git a/data/grid5000/network_equipments/renater5-reims.json b/data/grid5000/network_equipments/renater-reims.json
similarity index 81%
rename from data/grid5000/network_equipments/renater5-reims.json
rename to data/grid5000/network_equipments/renater-reims.json
index 9049bc72e07260fa132cc9e2182a171a8dab7e31..98dc9d37bcb14d8ab811a657e8d151a909e3bb5f 100644
--- a/data/grid5000/network_equipments/renater5-reims.json
+++ b/data/grid5000/network_equipments/renater-reims.json
@@ -5,7 +5,7 @@
       "ports": [
         {
           "rate": 10000000,
-          "uid": "renater5-lille"
+          "uid": "renater-lille"
         },
         {
           "kind": "router",
@@ -16,5 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-reims"
+  "uid": "renater-reims"
 }
diff --git a/data/grid5000/network_equipments/renater5-rennes.json b/data/grid5000/network_equipments/renater-rennes.json
similarity index 81%
rename from data/grid5000/network_equipments/renater5-rennes.json
rename to data/grid5000/network_equipments/renater-rennes.json
index 67ea0a5f9c474bc5984d217ad13530231249132a..5ca69dac970d3e55ac2534952ea6fb1147c84eff 100644
--- a/data/grid5000/network_equipments/renater5-rennes.json
+++ b/data/grid5000/network_equipments/renater-rennes.json
@@ -5,7 +5,7 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-paris"
+          "uid": "renater-paris"
         },
         {
           "kind": "router",
@@ -16,5 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-rennes"
+  "uid": "renater-rennes"
 }
diff --git a/data/grid5000/network_equipments/renater5-sophia.json b/data/grid5000/network_equipments/renater-sophia.json
similarity index 80%
rename from data/grid5000/network_equipments/renater5-sophia.json
rename to data/grid5000/network_equipments/renater-sophia.json
index d7eccf9ca065782fa3d4b2f7e136a6a7fdc08ceb..e3652087b9ab8f876044c1a3e4528874d0f6ddf1 100644
--- a/data/grid5000/network_equipments/renater5-sophia.json
+++ b/data/grid5000/network_equipments/renater-sophia.json
@@ -5,7 +5,7 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-marseille"
+          "uid": "renater-marseille"
         },
         {
           "kind": "router",
@@ -16,5 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-sophia"
+  "uid": "renater-sophia"
 }
diff --git a/data/grid5000/network_equipments/renater5-toulouse.json b/data/grid5000/network_equipments/renater-toulouse.json
similarity index 80%
rename from data/grid5000/network_equipments/renater5-toulouse.json
rename to data/grid5000/network_equipments/renater-toulouse.json
index cf729810f5bd9ffed2c7275e9c28692c9b7199dc..f231beba0aea6e1168975742f50610703f838d9d 100644
--- a/data/grid5000/network_equipments/renater5-toulouse.json
+++ b/data/grid5000/network_equipments/renater-toulouse.json
@@ -5,7 +5,7 @@
       "ports": [
         {
           "rate": 10000000000,
-          "uid": "renater5-marseille"
+          "uid": "renater-marseille"
         },
         {
           "kind": "router",
@@ -16,5 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater5-toulouse"
+  "uid": "renater-toulouse"
 }