-${VNFD_PKG} hackfest_basic_vnf
-${VNFD_NAME} hackfest_basic-vnf
-${NSD_PKG} hackfest_basic_ns
-${NSD_NAME} hackfest_basic-ns
+${vnfd_pkg} hackfest_basic_vnf
+${vnfd_name} hackfest_basic-vnf
+${nsd_pkg} hackfest_basic_ns
+${nsd_name} hackfest_basic-ns