diff --git a/src/nsd/ping_pong_ns/ping_pong_nsd.yaml b/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
index 321c6c3..775528e 100644
--- a/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
+++ b/src/nsd/ping_pong_ns/ping_pong_nsd.yaml
@@ -20,6 +20,9 @@
      -  nsd:id: rift_ping_pong_ns
         nsd:logo: rift_logo.png
         nsd:name: ping_pong_ns
+        nsd:short-name: ping_pong_ns
+        nsd:vendor: RIFT.io
+        nsd:version: '1.0'
         nsd:description: RIFT.io sample ping pong network service
         nsd:config-parameter-map:
         -   nsd:config-parameter-request:
@@ -77,9 +80,6 @@
             nsd:name: Quaoar
             nsd:requirement: Place this VM on the Kuiper belt object Quaoar
             nsd:strategy: COLOCATION
-        nsd:short-name: ping_pong_nsd
-        nsd:vendor: RIFT.io
-        nsd:version: '1.0'
         nsd:vld:
         -   nsd:id: mgmt_vl
             nsd:vim-network-name: mgmt
diff --git a/src/vnfd/ping_vnf/ping_vnfd.yaml b/src/vnfd/ping_vnf/ping_vnfd.yaml
index 8888f50..1b1e4dd 100644
--- a/src/vnfd/ping_vnf/ping_vnfd.yaml
+++ b/src/vnfd/ping_vnf/ping_vnfd.yaml
@@ -75,7 +75,7 @@
                 vnfd:path: api/v1/ping/stats
                 vnfd:port: '18888'
             vnfd:port: '18888'
-            vnfd:ssh-key: 'true'
+            rw-vnfd:ssh-key: 'true'
             vnfd:vdu-id: iovdu_0
         vnfd:monitoring-param:
         -   vnfd:description: no of ping requests
diff --git a/src/vnfd/pong_vnf/pong_vnfd.yaml b/src/vnfd/pong_vnf/pong_vnfd.yaml
index 63dbfdd..d2ca878 100644
--- a/src/vnfd/pong_vnf/pong_vnfd.yaml
+++ b/src/vnfd/pong_vnf/pong_vnfd.yaml
@@ -70,7 +70,7 @@
                 vnfd:path: api/v1/pong/stats
                 vnfd:port: '18889'
             vnfd:port: '18889'
-            vnfd:ssh-key: 'true'
+            rw-vnfd:ssh-key: 'true'
             vnfd:vdu-id: iovdu_0
         vnfd:monitoring-param:
         -   vnfd:description: no of ping requests