diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index 7c61fd660619a3cd271f4b856f37dc53ddea2d8c..9eb10eefcd250268d419e1f700ee8b8beb39eea6 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -5,7 +5,7 @@
   ],
   "backplane_bps": 800000000000,
   "channels": {
-    "ACI-G5K-INT": {
+    "X670V-48x Port 43": {
       "kind": "switch",
       "port": "TN-G5K-INT",
       "rate": 30000000000,
@@ -275,17 +275,17 @@
         {
           "kind": "channel",
           "snmp_name": "X670V-48x Port 43",
-          "uid": "ACI-G5K-INT"
+          "uid": "X670V-48x Port 43"
         },
         {
           "kind": "channel",
           "snmp_name": "X670V-48x Port 44",
-          "uid": "ACI-G5K-INT"
+          "uid": "X670V-48x Port 43"
         },
         {
           "kind": "channel",
           "snmp_name": "X670V-48x Port 45",
-          "uid": "ACI-G5K-INT"
+          "uid": "X670V-48x Port 43"
         },
         {
           "kind": "server",
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
index e8d9a340f76f21bafa8fdce68bbd629fa8976b07..3c978b2b516a573b85c70dc83deab6ea6d9e2211 100644
--- a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
@@ -2,7 +2,7 @@
   "channels": {
     "TN-G5K-INT": {
       "kind": "switch",
-      "port": "ACI-G5K-INT",
+      "port": "X670V-48x Port 43",
       "rate": 30000000000,
       "uid": "gw"
     }
diff --git a/input/grid5000/sites/grenoble/networks/gw.yaml b/input/grid5000/sites/grenoble/networks/gw.yaml
index bfdae1b4988addcbfdb393b568d2432f40df001a..044f2d5580a64662975b08f9fa56f8a6b03a0e2c 100644
--- a/input/grid5000/sites/grenoble/networks/gw.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw.yaml
@@ -130,13 +130,13 @@ gw:
           uid: dighyp2
           kind: server
         43:
-          uid: ACI-G5K-INT
+          uid: X670V-48x Port 43
           kind: channel
         44:
-          uid: ACI-G5K-INT
+          uid: X670V-48x Port 43
           kind: channel
         45:
-          uid: ACI-G5K-INT
+          uid: X670V-48x Port 43
           kind: channel
         46:
           uid: digwatt
@@ -148,7 +148,7 @@ gw:
           uid: renater5
           kind: backbone
   channels:
-    ACI-G5K-INT:
+    X670V-48x Port 43:
       uid: sw-aci-333
       port: TN-G5K-INT
       kind: switch
diff --git a/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
index e6eb0fea6abd098436b1f37054e99db900de77b0..ac04dc078857909ecff4d1eee82eca16e78e04df 100644
--- a/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
+++ b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
@@ -27,6 +27,6 @@ sw-aci-333:
   channels:
     TN-G5K-INT:
       uid: gw
-      port: ACI-G5K-INT
+      port: X670V-48x Port 43
       kind: switch
       rate: 30000000000