-${VNFD_VOLUMES_PKG} several_volumes_vnf
-${VNFD_VOLUMES_NAME} several_volumes-vnf
-${VDU_VOLUMES_NAME} several_volumes-VM
-${VNF_SEVERAL_INDEX} several_volumes_vnf
-${VNFD_CHARM_PKG} charm-packages/native_manual_scale_charm_vnf
-${VNFD_CHARM_NAME} native_manual_scale_charm-vnf
-${VDU_CHARM_NAME} mgmtVM
-${VNF_CHARM_INDEX} charm_vnf
-${VNF_CHARM_SCALING_GROUP} manual-scaling_mgmtVM
-${VNF_CHARM_CLOUDINIT_FILE} /root/helloworld.txt
-${VNF_CHARM_DAY1_FILE} /home/ubuntu/first-touch
-${NSD_PKG} volumes_nativecharm_ns
-${NSD_NAME} volumes_nativecharm-ns
+${vnfd_volumes_pkg} several_volumes_vnf
+${vnfd_volumes_name} several_volumes-vnf
+${vdu_volumes_name} several_volumes-VM
+${vnf_several_index} several_volumes_vnf
+${vnfd_charm_pkg} charm-packages/native_manual_scale_charm_vnf
+${vnfd_charm_name} native_manual_scale_charm-vnf
+${vdu_charm_name} mgmtVM
+${vnf_charm_index} charm_vnf
+${vnf_charm_scaling_group} manual-scaling_mgmtVM
+${vnf_charm_cloudinit_file} /root/helloworld.txt
+${vnf_charm_day1_file} /home/ubuntu/first-touch
+${nsd_pkg} volumes_nativecharm_ns
+${nsd_name} volumes_nativecharm-ns