diff --git a/extras/hs-test/topo-network/2peerVeth.yaml b/extras/hs-test/topo-network/2peerVeth.yaml
index 9a966dc..f991d8b 100644
--- a/extras/hs-test/topo-network/2peerVeth.yaml
+++ b/extras/hs-test/topo-network/2peerVeth.yaml
@@ -3,23 +3,23 @@
   - name: "hsns"
     type: "netns"
 
-  - name: "vppsrv"
+  - name: "srv"
     type: "veth"
     preset-hw-address: "00:00:5e:00:53:01"
     peer:
-      name: "vppsrv_veth"
+      name: "srv_veth"
       netns: "hsns"
 
-  - name: "vppcln"
+  - name: "cln"
     type: "veth"
     peer:
-      name: "vppcln_veth"
+      name: "cln_veth"
       netns: "hsns"
 
   - name: "br"
     type: "bridge"
     netns: "hsns"
     interfaces:
-      - vppsrv_veth
-      - vppcln_veth
+      - srv_veth
+      - cln_veth
 
diff --git a/extras/hs-test/topo-network/2taps.yaml b/extras/hs-test/topo-network/2taps.yaml
index 38f6fca..f5dd8e2 100644
--- a/extras/hs-test/topo-network/2taps.yaml
+++ b/extras/hs-test/topo-network/2taps.yaml
@@ -1,6 +1,6 @@
 ---
 devices:
-  - name: "hst_client"
+  - name: "hstcln"
     type: "tap"
     ip4:
       network: 1
@@ -8,7 +8,7 @@
       name: ""
       ip4:
         network: 1
-  - name: "hst_server"
+  - name: "hstsrv"
     type: "tap"
     ip4:
       network: 2
diff --git a/extras/hs-test/topo-network/ns.yaml b/extras/hs-test/topo-network/ns.yaml
index cf77f7e..018c329 100644
--- a/extras/hs-test/topo-network/ns.yaml
+++ b/extras/hs-test/topo-network/ns.yaml
@@ -1,23 +1,23 @@
 ---
 devices:
-  - name: "client"
+  - name: "cln"
     type: "netns"
 
-  - name: "server"
+  - name: "srv"
     type: "netns"
 
-  - name: "hst_client_vpp"
+  - name: "hclnvpp"
     type: "veth"
     peer:
-      name: "client"
-      netns: "client"
+      name: "cln"
+      netns: "cln"
       ip4:
         network: 1
 
-  - name: "hst_server_vpp"
+  - name: "hsrvvpp"
     type: "veth"
     peer:
-      name: "server"
-      netns: "server"
+      name: "srv"
+      netns: "srv"
       ip4:
         network: 2
diff --git a/extras/hs-test/topo-network/tap.yaml b/extras/hs-test/topo-network/tap.yaml
index 26481de..acf1495 100644
--- a/extras/hs-test/topo-network/tap.yaml
+++ b/extras/hs-test/topo-network/tap.yaml
@@ -1,6 +1,6 @@
 ---
 devices:
-  - name: "hst_tap_host"
+  - name: "htaphost"
     type: "tap"
     ip4:
       network: 1