-${VNFD_PKG1} charm-packages/cmr_relation_vnf
-${VNFD_PKG2} charm-packages/cmr_no_relation_vnf
-${NSD_PKG} charm-packages/cmr_relation_ns
-${VNFD_NAME1} cross_model_relation-vnf
-${VNFD_NAME2} cross_model_no_relation-vnf
-${NSD_NAME} cross_model_relation-ns
+${vnfd_pkg_1} charm-packages/cmr_relation_vnf
+${vnfd_pkg_2} charm-packages/cmr_no_relation_vnf
+${nsd_pkg} charm-packages/cmr_relation_ns
+${vnfd_name_1} cross_model_relation-vnf
+${vnfd_name_2} cross_model_no_relation-vnf
+${nsd_name} cross_model_relation-ns