diff --git a/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml b/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
index f090875..ed9433f 100644
--- a/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
+++ b/src/nsd/cirros_2vnf_ns/cirros_2vnf_nsd.yaml
@@ -1,8 +1,8 @@
 nsd:nsd-catalog:
     nsd:
     -   id: cirros_2vnf_nsd
-        name: cirros_2vnf_nsd
-        short-name: cirros_2vnf_nsd
+        name: cirros_2vnf_ns
+        short-name: cirros_2vnf_ns
         description: Generated by OSM pacakage generator
         vendor: OSM
         version: '1.0'
diff --git a/src/nsd/cirros_ns/cirros_nsd.yaml b/src/nsd/cirros_ns/cirros_nsd.yaml
index 364d368..96d0f60 100644
--- a/src/nsd/cirros_ns/cirros_nsd.yaml
+++ b/src/nsd/cirros_ns/cirros_nsd.yaml
@@ -1,8 +1,8 @@
 nsd:nsd-catalog:
     nsd:
     -   id: cirros_nsd
-        name: cirros_nsd
-        short-name: cirros_nsd
+        name: cirros_ns
+        short-name: cirros_ns
         description: Generated by OSM pacakage generator
         vendor: OSM
         version: '1.0'
diff --git a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
index daf84bd..7f91d43 100644
--- a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
+++ b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
@@ -1,8 +1,8 @@
 nsd:nsd-catalog:
     nsd:
     -   id: ubuntu_xenial_nsd
-        name: ubuntu_xenial_nsd
-        short-name: ubuntu_xenial_nsd
+        name: ubuntu_xenial_ns
+        short-name: ubuntu_xenial_ns
         description: Generated by OSM pacakage generator
         vendor: OSM
         version: '1.0'
diff --git a/src/vnfd/cirros_vnf/cirros_vnfd.yaml b/src/vnfd/cirros_vnf/cirros_vnfd.yaml
index b4b98e2..e9209e7 100644
--- a/src/vnfd/cirros_vnf/cirros_vnfd.yaml
+++ b/src/vnfd/cirros_vnf/cirros_vnfd.yaml
@@ -1,8 +1,8 @@
 vnfd:vnfd-catalog:
     vnfd:
     -   id: cirros_vnfd
-        name: cirros_vnfd
-        short-name: cirros_vnfd
+        name: cirros_vnf
+        short-name: cirros_vnf
         description: Simple VNF example with a cirros 
         vendor: OSM
         version: '1.0'
diff --git a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
index 8fd61d9..ee6a3ac 100644
--- a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
+++ b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
@@ -1,8 +1,8 @@
 vnfd:vnfd-catalog:
     vnfd:
     -   id: ubuntu_xenial_vnfd
-        name: ubuntu_xenial_vnfd
-        short-name: ubuntu_xenial_vnfd
+        name: ubuntu_xenial_vnf
+        short-name: ubuntu_xenial_vnf
         description: Generated by OSM pacakage generator
         vendor: OSM
         version: '1.0'