Bug 91 : VNF names and NS names in the descriptor packages use a confusing suffix vnfd and nsd

Signed-off-by: Anurag Dwivedi <anurag.dwivedi@riftio.com>
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'