diff --git a/ttcn/AtsMec/AtsMec_FixedAccessInfoAPI_TestCases.ttcn b/ttcn/AtsMec/AtsMec_FixedAccessInfoAPI_TestCases.ttcn
index 375d8c129ff8963684eb75a0817ee10a67a69273..6f60959f6db31b5536a50137a980b8d7c75405aa 100644
--- a/ttcn/AtsMec/AtsMec_FixedAccessInfoAPI_TestCases.ttcn
+++ b/ttcn/AtsMec/AtsMec_FixedAccessInfoAPI_TestCases.ttcn
@@ -46,7 +46,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_001_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -103,7 +103,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_001_BR() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -157,7 +157,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_001_NF() runs on HttpComponent system HttpTestAdapter {
       // Local variables
-      var HeaderLines v_headers;
+      var Headers v_headers;
         
       // Test control
         if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) {
@@ -210,7 +210,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_002_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -267,7 +267,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_002_BR() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -322,7 +322,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_002_NF() runs on HttpComponent system HttpTestAdapter {
       // Local variables
-      var HeaderLines v_headers;
+      var Headers v_headers;
         
       // Test control
         if (not(PICS_MEC_PLAT) or not(PICS_SERVICES) or not(PICS_FAI_API_SUPPORTED)) {
@@ -375,7 +375,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_003_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -433,7 +433,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_003_BR() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -488,7 +488,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_003_NF() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -542,7 +542,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_004_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -601,7 +601,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_004_BR() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -656,7 +656,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_004_NF() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -710,7 +710,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_005_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -769,7 +769,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_005_BR() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -824,7 +824,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_005_NF() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -879,7 +879,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_006_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -959,7 +959,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_006_BR() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1022,7 +1022,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_007_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1083,7 +1083,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_007_NF() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1138,7 +1138,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_008_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1206,7 +1206,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_008_BR() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1271,7 +1271,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_008_NF() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1339,7 +1339,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_008_PF() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1407,7 +1407,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_009_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1462,7 +1462,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_009_NF() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1517,7 +1517,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_010_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control
@@ -1601,7 +1601,7 @@ module AtsMec_FixedAccessInformationAPI_TestCases {
      */
     testcase TP_MEC_SRV_FAIS_011_OK() runs on HttpComponent system HttpTestAdapter {
         // Local variables
-        var HeaderLines v_headers;
+        var Headers v_headers;
         var HttpMessage v_response;
         
         // Test control