-${vnfd_pkg} sol004_hackfest_basic_vnf
-${vnfd_name} sol004_hackfest_basic-vnf
-${nsd_pkg} sol007_hackfest_basic_ns
-${nsd_name} sol007_hackfest_basic-ns
+${VNFD_PKG} sol004_hackfest_basic_vnf
+${VNFD_NAME} sol004_hackfest_basic-vnf
+${NSD_PKG} sol007_hackfest_basic_ns
+${NSD_NAME} sol007_hackfest_basic-ns