diff --git a/hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml b/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml
similarity index 69%
rename from hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml
rename to hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml
index 428d5eed9198493d50aa2b33691ee9c52d195df0..ae146bdf9c1a9cbfe9e579f531c84521bf1a23dd 100644
--- a/hackfest_simple_k8s_nsd/hackfest_simple_k8s_nsd.yaml
+++ b/hackfest_simple_k8s_ns/hackfest_simple_k8s_nsd.yaml
@@ -1,13 +1,13 @@
 nsd:nsd-catalog:
     nsd:
-    -   id: hackfest-simple-k8s-nsd
-        name: hackfest-simple-k8s-nsd
-        short-name: hackfest-simple-k8s-nsd
+    -   id: hackfest-simple-k8s-ns
+        name: hackfest-simple-k8s-ns
+        short-name: hackfest-simple-k8s-ns
         description: NS with 1 KDU connected to the mgmtnet VL
         version: '1.0'
         logo: osm.png
         constituent-vnfd:
-        -   vnfd-id-ref: hackfest-simple-k8s-vnfd
+        -   vnfd-id-ref: hackfest-simple-k8s-vnf
             member-vnf-index: '1'
         vld:
         -   id: mgmtnet
@@ -17,6 +17,6 @@ nsd:nsd-catalog:
             mgmt-network: 'true'
             vim-network-name: mgmt
             vnfd-connection-point-ref:
-            -   vnfd-id-ref: hackfest-simple-k8s-vnfd
+            -   vnfd-id-ref: hackfest-simple-k8s-vnf
                 member-vnf-index-ref: '1'
                 vnfd-connection-point-ref: mgmtnet
diff --git a/hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml b/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml
similarity index 81%
rename from hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml
rename to hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml
index a802bf7ce4093e96fc38178209436d5f36979f75..40a719c287a27bd0501fd7d569991aee0ed47918 100644
--- a/hackfest_simple_k8s_vnfd/hackfest_simple_k8s_vnfd.yaml
+++ b/hackfest_simple_k8s_vnf/hackfest_simple_k8s_vnfd.yaml
@@ -1,7 +1,7 @@
 vnfd-catalog:
     vnfd:
-    -   id: hackfest-simple-k8s-vnfd
-        name: hackfest-simple-k8s-vnfd
+    -   id: hackfest-simple-k8s-vnf
+        name: hackfest-simple-k8s-vnf
         connection-point:
         -   name: mgmtnet
         mgmt-interface: