-${VNFD_PKG1} charm-packages/ns_relations_provides_vnf
-${VNFD_PKG2} charm-packages/ns_relations_requires_vnf
-${VNFD_NAME1} ns_relations_provides-vnf
-${VNFD_NAME2} ns_relations_requires-vnf
-${NSD_PKG} charm-packages/ns_relations_ns
-${NSD_NAME} ns_relations-ns
+${vnfd_pkg1} charm-packages/ns_relations_provides_vnf
+${vnfd_pkg2} charm-packages/ns_relations_requires_vnf
+${vnfd_name1} ns_relations_provides-vnf
+${vnfd_name2} ns_relations_requires-vnf
+${nsd_pkg} charm-packages/ns_relations_ns
+${nsd_name} ns_relations-ns