-${ns_id} ${EMPTY}
-${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${publickey} ${EMPTY}
-${vnf_member_index} native_k8s_charm-vnf
-${action_name} changecontent
-${kdu_name} native-kdu
-${application_name} nginx
-${customtitle} Day 2 Action
+# NS and VNF descriptor package folder and ids
+${VNFD_PKG} charm-packages/native_k8s_charm_vnf
+${VNFD_NAME} native_k8s_charm-vnf
+${NSD_PKG} charm-packages/native_k8s_charm_ns
+${NSD_NAME} native_k8s_charm-ns
+
+# NS instance name and configuration
+${NS_NAME} native-k8s
+${NS_CONFIG} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
+${NS_ID} ${EMPTY}
+${PUBLICKEY} ${EMPTY}
+${VNF_MEMBER_INDEX} native_k8s_charm-vnf
+${ACTION_NAME} changecontent
+${KDU_NAME} native-kdu
+${APPLICATION_NAME} nginx
+${CUSTOMTITLE} Day 2 Action
+