-${username} ubuntu
-${password} ${EMPTY}
-${ns_config} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${action_name} touch
-${vnf_member_index_1} 1
-${vnf_member_index_2} 2
-${day_1_file_name} /home/ubuntu/first-touch
-${day_2_file_name_1} /home/ubuntu/mytouch1
-${day_2_file_name_2} /home/ubuntu/mytouch2
-${ns_timeout} 15min
+# NS and VNF descriptor package folder and ids
+${VNFD_PKG} charm-packages/ha_proxy_charm_vnf
+${VNFD_NAME} ha_proxy_charm-vnf
+${NSD_PKG} charm-packages/ha_proxy_charm_ns
+${NSD_NAME} ha_proxy_charm-ns
+
+# NS instance name and configuration
+${NS_NAME} basic_06_charm_test
+${NS_CONFIG} {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+
+# SSH keys and username to be used
+${PUBLICKEY} %{HOME}/.ssh/id_rsa.pub
+${PRIVATEKEY} %{HOME}/.ssh/id_rsa
+${USERNAME} ubuntu
+${PASSWORD} ${EMPTY}
+
+${ACTION_NAME} touch
+${VNF_MEMBER_INDEX_1} vnf1
+${VNF_MEMBER_INDEX_2} vnf2
+${DAY_1_FILE_NAME} /home/ubuntu/first-touch
+${DAY_2_FILE_NAME_1} /home/ubuntu/mytouch1
+${DAY_2_FILE_NAME_2} /home/ubuntu/mytouch2
+${NS_TIMEOUT} 15min
+
+# VNF profile id, execution environment name to check VNF level charm naming
+${VNF_PROFILE_ID} vnf1
+${EE_NAME} simple-ee