diff --git a/SOL002/VNFLifecycleManagement-API/environment/variables.txt b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
index fb0bb290722ede39733e0da3a013e812295237d1..4c3960dbd7e0669a4ec685636e4715aaa0454f34 100644
--- a/SOL002/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL002/VNFLifecycleManagement-API/environment/variables.txt
@@ -101,14 +101,14 @@ ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
  
-@{VDU_IDs}
-@{VNF_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
-@{externalCP_IDs}
-@{InstantiationLevel_IDs}
+${VDU_IDs}
+${VNF_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${Storage_IDs}
+${internalCP_IDs}
+${externalCP_IDs}
+${InstantiationLevel_IDs}
 
 ${Descriptor_ID}
 ${Provider}
diff --git a/SOL003/VNFLifecycleManagement-API/environment/variables.txt b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
index 53851db2a32f681983d834419babf6ced35e6393..bb8e1657f2f2fb0fee4260c9386568825fe67278 100644
--- a/SOL003/VNFLifecycleManagement-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleManagement-API/environment/variables.txt
@@ -146,14 +146,14 @@ ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
  
-@{VDU_IDs}
-@{VNF_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
-@{externalCP_IDs}
-@{InstantiationLevel_IDs}
+${VDU_IDs}
+${VNF_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${Storage_IDs}
+${internalCP_IDs}
+${externalCP_IDs}
+${InstantiationLevel_IDs}
 
 ${Descriptor_ID}
 ${Provider}
diff --git a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
index dbbedb4bf30bfb0e61f3b57331fd1a55d76f4771..61ccb5695f76b0c010bc3386f41b1fe0080216db 100644
--- a/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
+++ b/SOL003/VNFLifecycleOperationGranting-API/environment/variables.txt
@@ -51,11 +51,11 @@ ${tosca_type_VDU_compute}    tosca.nodes.nfv.Vdu.Compute
 ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
  
-@{VDU_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{externalCP_IDs}
-@{Compute_IDs}
+${VDU_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${externalCP_IDs}
+${Compute_IDs}
 
 ${Descriptor_ID}
 ${Provider}
diff --git a/SOL005/NSLifecycleManagement-API/environment/variables.txt b/SOL005/NSLifecycleManagement-API/environment/variables.txt
index 5576d1622b79260f490c07bdfd1c21eff3b46efb..ca2f36fe8c6410cbce1dd804c7e137bdcf89143f 100644
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
@@ -111,18 +111,18 @@ ${tosca_type_NS}    tosca.nodes.nfv.NS
 ${tosca_type_NsVirtualLink}    tosca.nodes.nfv.NsVirtualLink
 ${tosca_type_NsCP}    tosca.nodes.nfv.Cp
   
-@{VDU_IDs}
-@{VNF_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
-@{externalCP_IDs}
-@{InstantiationLevel_IDs}
-
-@{NS_VirtualLink_IDs}
-@{NsCP_IDs}
-@{SAP_IDs}
+${VDU_IDs}
+${VNF_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${Storage_IDs}
+${internalCP_IDs}
+${externalCP_IDs}
+${InstantiationLevel_IDs}
+
+${NS_VirtualLink_IDs}
+${NsCP_IDs}
+${SAP_IDs}
 
 ${NS_DescriptorID}
 ${Designer}
diff --git a/SOL005/VNFPackageManagement-API/environment/variables.txt b/SOL005/VNFPackageManagement-API/environment/variables.txt
index 8846ff677a503681e3f8717c184849b8551a53cf..af33fce8cf6f1502003cbef52c63417c01a2fd9e 100644
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
@@ -99,14 +99,14 @@ ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
   
-@{VDU_IDs}
-@{VNF_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
-@{externalCP_IDs}
-@{InstantiationLevel_IDs}
+${VDU_IDs}
+${VNF_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${Storage_IDs}
+${internalCP_IDs}
+${externalCP_IDs}
+${InstantiationLevel_IDs}
 
 ${Descriptor_ID}
 ${Provider}
diff --git a/internal_variables.txt b/internal_variables.txt
index 51cafb784cd5e125b2ff19e77f6547bcea0800c5..89817045f5bd24118a50350ce243d7d5586fdc79 100644
--- a/internal_variables.txt
+++ b/internal_variables.txt
@@ -66,14 +66,14 @@ ${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 ${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 ${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
  
-@{VDU_IDs}
-@{VNF_IDs}
-@{virtualLink_IDs}
-@{CP_IDs}
-@{Storage_IDs}
-@{internalCP_IDs}
-@{externalCP_IDs}
-@{InstantiationLevel_IDs}
+${VDU_IDs}
+${VNF_IDs}
+${virtualLink_IDs}
+${CP_IDs}
+${Storage_IDs}
+${internalCP_IDs}
+${externalCP_IDs}
+${InstantiationLevel_IDs}
 
 ${Descriptor_ID}
 ${Provider}
@@ -187,10 +187,10 @@ ${scaleOutResponse}
 #${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 #${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
  
-#@{VDU_IDs}
-#@{virtualLink_IDs}
-#@{CP_IDs}
-#@{externalCP_IDs}
+#${VDU_IDs}
+#${virtualLink_IDs}
+#${CP_IDs}
+#${externalCP_IDs}
 
 #${Descriptor_ID}
 #${Provider}
@@ -215,10 +215,10 @@ ${scaleOutResponse}
 #${tosca_type_virtual_link}    tosca.nodes.nfv.VnfVirtualLink
 #${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
  
-#@{VDU_IDs}
-#@{virtualLink_IDs}
-#@{CP_IDs}
-#@{externalCP_IDs}
+#${VDU_IDs}
+#${virtualLink_IDs}
+#${CP_IDs}
+#${externalCP_IDs}
 
 #${Descriptor_ID}
 #${Provider}
@@ -358,14 +358,14 @@ ${CONTENT_TYPE_ZIP}    application/zip
 #${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 #${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
 
-#@{VDU_IDs}
-#@{VNF_IDs}
-#@{virtualLink_IDs}
-#@{CP_IDs}
-#@{Storage_IDs}
-#@{internalCP_IDs}
-#@{externalCP_IDs}
-#@{InstantiationLevel_IDs}
+#${VDU_IDs}
+#${VNF_IDs}
+#${virtualLink_IDs}
+#${CP_IDs}
+#${Storage_IDs}
+#${internalCP_IDs}
+#${externalCP_IDs}
+#${InstantiationLevel_IDs}
 
 #${Descriptor_ID}
 #${Provider}
@@ -408,14 +408,14 @@ ${CONTENT_TYPE_ZIP}    application/zip
 #${tosca_type_VDU_cp}    tosca.nodes.nfv.VduCp
 #${tosca_type_storage}    tosca.nodes.nfv.Vdu.VirtualBlockStorage
   
-#@{VDU_IDs}
-#@{VNF_IDs}
-#@{virtualLink_IDs}
-#@{CP_IDs}
-#@{Storage_IDs}
-#@{internalCP_IDs}
-#@{externalCP_IDs}
-#@{InstantiationLevel_IDs}
+#${VDU_IDs}
+#${VNF_IDs}
+#${virtualLink_IDs}
+#${CP_IDs}
+#${Storage_IDs}
+#${internalCP_IDs}
+#${externalCP_IDs}
+#${InstantiationLevel_IDs}
 
 #${Descriptor_ID}
 #${Provider}