diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 39fff66bc94529cfce8a2cfd1c8c38160ee9c931..fe2c97163c5b0fb1a8b7cfcdbdddd339477062b1 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -56,8 +56,8 @@
       "rate": 1000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet21",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
index 19ce0811c3bf4d35567ec0f02616fe520b36d6ee..2adf8ce2c04c5b4fa45cfbecc3e068294d3576aa 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -136,9 +136,9 @@
         },
         {
           "kind": "node",
-          "port": "core mgmt",
+          "port": "eth0",
           "snmp_name": "Ethernet21",
-          "uid": "sw"
+          "uid": "engelbourg-1"
         },
         {
           "kind": "node",
@@ -229,10 +229,9 @@
         {
         },
         {
-          "kind": "node",
-          "port": "core",
+          "kind": "switch",
           "snmp_name": "Ethernet48",
-          "uid": "sw"
+          "uid": "sw-core"
         }
       ],
       "rate": 1000000000,
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
index fb2ad00fc3e84fba74e72b4c0a185e56bc124dae..f7e9479217caea3a7c6f92a4a3ec775fe938bda9 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -1,4 +1,7 @@
 {
+  "alias": [
+    "engelbourg-1"
+  ],
   "channels": {
     "port-channel1": {
       "kind": "server",
@@ -229,10 +232,9 @@
           "uid": "fleckenstein-10"
         },
         {
-          "kind": "node",
-          "port": "admin",
+          "kind": "switch",
           "snmp_name": "Ethernet36",
-          "uid": "sw"
+          "uid": "sw-admin"
         },
         {
         },
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
index 3225ef553a4d6cd1fdc3b98cbb07759f1ddd3188..82e22b7af235948cf565e90930ce44babad72268 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -7,6 +7,8 @@ sw-core:
   kind: switch
   managed_by_us: true
   snmp_community: Unknown
+  alias:
+    - engelbourg-1
   site: strasbourg
   linecards: 
     1:
@@ -84,7 +86,7 @@ sw-core:
         84: 
         88:
         92: 
-        uid: engelbourg-6-eth0
+          uid: engelbourg-6-eth0
           rate: 1000000000
         96: 
         100: