ASLTS: replace TS with __METHOD__ to improve style

This removes most of the TS objects which is used to store method names.

Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>

125 files changed, 5285 insertions, 5645 deletions

diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/RUN.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/RUN.asl
index f22a26f51..37529d589 100644
--- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/RUN.asl
+++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/RUN.asl
@@ -36,7 +36,6 @@
         /* Run-method */
         Method (DYN0, 0, Serialized)
         {
-            Name (TS, "DYN0")
             Name (PP00, Package (0x01){})
             Name (PP0A, Package (0x01){})
             /* Create and initialize the Memory Consumption Statistics Packages */
diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl
index 207f2e4b4..74ca8352c 100644
--- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl
+++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl
@@ -33,7 +33,6 @@
 
     Method (M374, 0, Serialized)
     {
-        Name (TS, "m374")
         /* Package for _TCI-begin statistics */
         /* (use NamedX, dont use ArgX/LocalX). */
         Name (PP0A, Package (0x01){})
@@ -47,14 +46,14 @@
         Local1 = M3A0 (C200)   /* _TCI-end statistics */
         PP0A = M3A0 (C201)     /* _TCI-begin statistics */
         Local3 = M3A0 (0x00)      /* difference */
-        SET0 (Z132, TS, 0x00)
+        SET0 (Z132, __METHOD__, 0x00)
         If (RN00)
         {
-            CH03 (TS, Z132, 0x00, 0x3B, 0x00)
+            CH03 (__METHOD__, Z132, 0x00, 0x3B, 0x00)
             _TCI (C200, Local1)
             M000 (0x00)
             _TCI (C201, PP0A)
-            CH04 (TS, 0x00, 0xFF, Z132, 0x41, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z132, 0x41, 0x00, 0x00)
             M3A3 (Local1, PP0A, Local3)
             M3A4 (Local1, PP0A, Local3, 0x00, 0x00, 0x00, 0x00)
         }
diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl
index 8da05eb50..b0a1d62d7 100644
--- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl
+++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0063/Misc.asl
@@ -82,7 +82,6 @@
      */
     Method (MD74, 0, Serialized)
     {
-        Name (TS, "md74")
         /* 8 decimal */
 
         Local0 = ("12345678" + 0x11111111)
@@ -187,7 +186,7 @@
             ERR ("", ZFFF, 0xA9, 0x00, 0x00, Local0, 0x00013456)
         }
 
-        CH03 (TS, ZFFF, 0x0100, 0xAC, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0100, 0xAC, 0x00)
         /* Too large, all hex, should be trancated */
 
         Local0 = ("abcdef0123456789112233445566778890" + 0x00)
@@ -203,7 +202,7 @@
             ERR ("", ZFFF, 0xB6, 0x00, 0x00, Local0, 0xABCDEF01)
         }
 
-        CH03 (TS, ZFFF, 0x0101, 0xBA, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0101, 0xBA, 0x00)
         /* Large, all hex, looks like octal, should be trancated */
 
         Local0 = ("0abcdef0123456789112233445566778890" + 0x1234)
@@ -219,7 +218,7 @@
             ERR ("", ZFFF, 0xC4, 0x00, 0x00, Local0, 0xABCDEF01)
         }
 
-        CH03 (TS, ZFFF, 0x0102, 0xC8, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0102, 0xC8, 0x00)
         /* Looks like usual hex, but 'x' terminates conversion */
 
         Local0 = ("0x1111" + 0x2222)
@@ -228,7 +227,7 @@
             ERR ("", ZFFF, 0xCD, 0x00, 0x00, Local0, 0x2222)
         }
 
-        CH03 (TS, ZFFF, 0x0103, 0xD0, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0103, 0xD0, 0x00)
         /* Empty string, no action - the relevant parameter of Add remains zero */
 
         Local0 = ("" + 0xDE)
@@ -237,7 +236,7 @@
             ERR ("", ZFFF, 0xD5, 0x00, 0x00, Local0, 0xDE)
         }
 
-        CH03 (TS, ZFFF, 0x0104, 0xD8, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0104, 0xD8, 0x00)
         /* Blank string, no action - the relevant parameter of Add remains zero */
 
         Local0 = (" " + 0x0333)
@@ -246,7 +245,7 @@
             ERR ("", ZFFF, 0xDD, 0x00, 0x00, Local0, 0x0333)
         }
 
-        CH03 (TS, ZFFF, 0x0105, 0xE0, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0105, 0xE0, 0x00)
         /* Blank string, no action - the relevant parameter of Add remains zero */
 
         Local0 = ("                                " + 0x92)
@@ -255,7 +254,7 @@
             ERR ("", ZFFF, 0xE5, 0x00, 0x00, Local0, 0x92)
         }
 
-        CH03 (TS, ZFFF, 0x0106, 0xE8, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0106, 0xE8, 0x00)
         /* Conversion is terminated just by the first symbol (non-hex) though followed by hex-es, remains zero */
 
         Local0 = ("k1234567" + 0x01E9)
@@ -272,7 +271,7 @@
             ERR ("", ZFFF, 0xF3, 0x00, 0x00, Local0, 0x000000ABCDEF0000)
         }
 
-        CH03 (TS, ZFFF, 0x0107, 0xF6, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0107, 0xF6, 0x00)
         /* Looks like designation of hex (terminated by x) */
 
         Local0 = ("0x" + 0x12345678)
@@ -281,7 +280,7 @@
             ERR ("", ZFFF, 0xFB, 0x00, 0x00, Local0, 0x12345678)
         }
 
-        CH03 (TS, ZFFF, 0x0108, 0xFE, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0108, 0xFE, 0x00)
         /* Special symbol in the hex designation (terminated by x) */
 
         Local0 = ("x" + 0x00BC614E)
@@ -378,7 +377,7 @@
             ERR ("", ZFFF, 0x0145, 0x00, 0x00, Local0, 0x3021)
         }
 
-        CH03 (TS, ZFFF, 0x0109, 0x0148, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0109, 0x0148, 0x00)
         /* Only decimal, much more than 16 */
 
         Store (("123456789012345601112223334446667788990087654" + 0x00), Local1)
@@ -394,7 +393,7 @@
             ERR ("", ZFFF, 0x0152, 0x00, 0x00, Local0, 0x12345678)
         }
 
-        CH03 (TS, ZFFF, 0x010A, 0x0156, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x010A, 0x0156, 0x00)
         /* Only hex, much more than 16 */
 
         Store (("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabc" + 0x00), Local1)
@@ -410,7 +409,7 @@
             ERR ("", ZFFF, 0x0160, 0x00, 0x00, Local0, 0xABCDEFAB)
         }
 
-        CH03 (TS, ZFFF, 0x010B, 0x0164, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x010B, 0x0164, 0x00)
         /* Only decimal, much more than 16, non-hex at the end */
 
         Store (("123456789012345601112223334446667788990087654ZZZZ" + 0x00), Local1)
@@ -426,7 +425,7 @@
             ERR ("", ZFFF, 0x016E, 0x00, 0x00, Local0, 0x12345678)
         }
 
-        CH03 (TS, ZFFF, 0x010C, 0x0172, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x010C, 0x0172, 0x00)
         /* Only hex, much more than 16, non-hex at the end */
 
         Store (("abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcZZZZ" + 0x00), Local1)
@@ -442,7 +441,7 @@
             ERR ("", ZFFF, 0x017C, 0x00, 0x00, Local0, 0xABCDEFAB)
         }
 
-        CH03 (TS, ZFFF, 0x010D, 0x0180, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x010D, 0x0180, 0x00)
     }
 
     Method (MD75, 0, NotSerialized)
@@ -452,10 +451,9 @@
 
     Method (MD76, 0, Serialized)
     {
-        Name (TS, "md76")
-        CH03 (TS, ZFFF, 0x010E, 0x018B, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x010E, 0x018B, 0x00)
         MD74 ()
-        CH03 (TS, ZFFF, 0x010F, 0x018D, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x010F, 0x018D, 0x00)
         MD75 ()
-        CH03 (TS, ZFFF, 0x0110, 0x018F, 0x00)
+        CH03 (__METHOD__, ZFFF, 0x0110, 0x018F, 0x00)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/misc/misc.asl b/tests/aslts/src/runtime/collections/complex/misc/misc.asl
index e236d8561..bd3e9a904 100644
--- a/tests/aslts/src/runtime/collections/complex/misc/misc.asl
+++ b/tests/aslts/src/runtime/collections/complex/misc/misc.asl
@@ -203,20 +203,19 @@
 
     Method (M117, 2, Serialized)
     {
-        Name (TS, "m117")
         If (Arg1)
         {
             Local0 = 0x00
         }
 
-        CH03 (TS, Z054, 0x0100, 0xC4, 0x00)
+        CH03 (__METHOD__, Z054, 0x0100, 0xC4, 0x00)
         Local1 = ObjectType (Local0)
         If ((Local1 != 0x00))
         {
             ERR (Arg0, Z054, 0xC9, 0x00, 0x00, Local1, 0x00)
         }
 
-        CH03 (TS, Z054, 0x0101, 0xCC, 0x00)
+        CH03 (__METHOD__, Z054, 0x0101, 0xCC, 0x00)
     }
 
     Method (M118, 1, NotSerialized)
@@ -322,8 +321,7 @@
     /* are passed immediately */
     Method (M11C, 1, Serialized)
     {
-        Name (TS, "m11c")
-        CH03 (TS, Z054, 0x0103, 0x0154, 0x00)
+        CH03 (__METHOD__, Z054, 0x0103, 0x0154, 0x00)
         Store ((Buffer (0x01)
                 {
                      0x79                                             // y
@@ -331,7 +329,7 @@
                 {
                      0x79                                             // y
                 }), Local5)
-        CH03 (TS, Z054, 0x0104, 0x0158, 0x00)
+        CH03 (__METHOD__, Z054, 0x0104, 0x0158, 0x00)
     }
 
     /* Bug 57: The empty Return operator (without specifying the returning value) */
@@ -1201,7 +1199,6 @@ Zero)
 
     Method (M15B, 0, Serialized)
     {
-        Name (TS, "m15b")
         /* **************** Definitions **************** */
 
         Method (MM00, 0, NotSerialized)
@@ -1222,45 +1219,45 @@ Zero)
             Local0 = MM00 ()
             If ((Local0 != 0xABCD0000))
             {
-                ERR (TS, Z054, 0x043A, 0x00, 0x00, Local0, 0xABCD0000)
+                ERR (__METHOD__, Z054, 0x043A, 0x00, 0x00, Local0, 0xABCD0000)
             }
         }
 
         Method (M001, 0, NotSerialized)
         {
-            CH03 (TS, Z054, 0x01, 0x0440, 0x00)
+            CH03 (__METHOD__, Z054, 0x01, 0x0440, 0x00)
             Local0 = DerefOf (RefOf (MM00))
             If (SLCK)
             {
-                CH03 (TS, Z054, 0x02, 0x0443, 0x00)
+                CH03 (__METHOD__, Z054, 0x02, 0x0443, 0x00)
                 Local1 = ObjectType (Local0)
                 If ((Local1 != C010))
                 {
-                    ERR (TS, Z054, 0x0446, 0x00, 0x00, Local1, C010)
+                    ERR (__METHOD__, Z054, 0x0446, 0x00, 0x00, Local1, C010)
                 }
             }
             Else
             {
-                CH04 (TS, 0x00, 0x2F, Z054, 0x0449, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */
+                CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x0449, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */
             }
         }
 
         Method (M002, 0, NotSerialized)
         {
-            CH03 (TS, Z054, 0x05, 0x044F, 0x00)
+            CH03 (__METHOD__, Z054, 0x05, 0x044F, 0x00)
             Local0 = DerefOf (P000 [0x01])
             If (SLCK)
             {
-                CH03 (TS, Z054, 0x06, 0x0452, 0x00)
+                CH03 (__METHOD__, Z054, 0x06, 0x0452, 0x00)
                 Local1 = ObjectType (Local0)
                 If ((Local1 != C010))
                 {
-                    ERR (TS, Z054, 0x0455, 0x00, 0x00, Local1, C010)
+                    ERR (__METHOD__, Z054, 0x0455, 0x00, 0x00, Local1, C010)
                 }
             }
             Else
             {
-                CH04 (TS, 0x00, 0x2F, Z054, 0x0458, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */
+                CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x0458, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */
             }
         }
 
@@ -1287,31 +1284,31 @@ Zero)
             CopyObject (MM00 (), Local0)
             If ((Local0 != 0xABCD0000))
             {
-                ERR (TS, Z054, 0x0472, 0x00, 0x00, Local0, 0xABCD0000)
+                ERR (__METHOD__, Z054, 0x0472, 0x00, 0x00, Local0, 0xABCD0000)
             }
         }
 
         Method (M005, 0, NotSerialized)
         {
-            CH03 (TS, Z054, 0x0E, 0x0478, 0x00)
+            CH03 (__METHOD__, Z054, 0x0E, 0x0478, 0x00)
             CopyObject (DerefOf (RefOf (MM00)), Local0)
-            CH03 (TS, Z054, 0x0F, 0x047A, 0x00)
+            CH03 (__METHOD__, Z054, 0x0F, 0x047A, 0x00)
             Local1 = ObjectType (Local0)
             If ((Local1 != C010))
             {
-                ERR (TS, Z054, 0x047E, 0x00, 0x00, Local1, C010)
+                ERR (__METHOD__, Z054, 0x047E, 0x00, 0x00, Local1, C010)
             }
         }
 
         Method (M006, 0, NotSerialized)
         {
-            CH03 (TS, Z054, 0x11, 0x0484, 0x00)
+            CH03 (__METHOD__, Z054, 0x11, 0x0484, 0x00)
             CopyObject (DerefOf (P000 [0x01]), Local0)
-            CH03 (TS, Z054, 0x12, 0x0486, 0x00)
+            CH03 (__METHOD__, Z054, 0x12, 0x0486, 0x00)
             Local1 = ObjectType (Local0)
             If ((Local1 != C010))
             {
-                ERR (TS, Z054, 0x048A, 0x00, 0x00, Local1, C010)
+                ERR (__METHOD__, Z054, 0x048A, 0x00, 0x00, Local1, C010)
             }
         }
 
@@ -1335,22 +1332,22 @@ Zero)
             Local0 = (MM00 () + 0x01)
             If ((Local0 != 0xABCD0001))
             {
-                ERR (TS, Z054, 0x04A2, 0x00, 0x00, Local0, 0xABCD0001)
+                ERR (__METHOD__, Z054, 0x04A2, 0x00, 0x00, Local0, 0xABCD0001)
             }
         }
 
         Method (M009, 0, NotSerialized)
         {
-            CH03 (TS, Z054, 0x18, 0x04A8, 0x00)
+            CH03 (__METHOD__, Z054, 0x18, 0x04A8, 0x00)
             Local0 = (DerefOf (RefOf (MM00)) + 0x02)
-            CH04 (TS, 0x00, 0x2F, Z054, 0x04AA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */
+            CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x04AA, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */
         }
 
         Method (M00A, 0, NotSerialized)
         {
-            CH03 (TS, Z054, 0x1A, 0x04AF, 0x00)
+            CH03 (__METHOD__, Z054, 0x1A, 0x04AF, 0x00)
             Local0 = (DerefOf (P000 [0x01]) + 0x03)
-            CH04 (TS, 0x00, 0x2F, Z054, 0x04B1, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */
+            CH04 (__METHOD__, 0x00, 0x2F, Z054, 0x04B1, 0x00, 0x00) /* AE_AML_OPERAND_TYPE */
         }
 
         Method (M00B, 0, NotSerialized)
@@ -1368,7 +1365,7 @@ Zero)
             Local0 = ObjectType (MM00)
             If ((Local0 != C010))
             {
-                ERR (TS, Z054, 0x04C3, 0x00, 0x00, Local0, C010)
+                ERR (__METHOD__, Z054, 0x04C3, 0x00, 0x00, Local0, C010)
             }
         }
 
@@ -1377,7 +1374,7 @@ Zero)
             Local0 = ObjectType (DerefOf (RefOf (MM00)))
             If ((Local0 != C010))
             {
-                ERR (TS, Z054, 0x04CB, 0x00, 0x00, Local0, C010)
+                ERR (__METHOD__, Z054, 0x04CB, 0x00, 0x00, Local0, C010)
             }
         }
 
@@ -1386,7 +1383,7 @@ Zero)
             Local0 = ObjectType (DerefOf (P000 [0x01]))
             If ((Local0 != C010))
             {
-                ERR (TS, Z054, 0x04D3, 0x00, 0x00, Local0, C010)
+                ERR (__METHOD__, Z054, 0x04D3, 0x00, 0x00, Local0, C010)
             }
         }
 
@@ -1442,50 +1439,49 @@ Zero)
 
     Method (MSC0, 0, Serialized)
     {
-        Name (TS, "MSC0")
         SRMT ("m110")
-        M110 (TS)
+        M110 (__METHOD__)
         SRMT ("m112")
-        M112 (TS)
+        M112 (__METHOD__)
         SRMT ("m113")
-        M113 (TS)
+        M113 (__METHOD__)
         SRMT ("m114")
-        M114 (TS)
+        M114 (__METHOD__)
         SRMT ("m115")
-        M115 (TS)
+        M115 (__METHOD__)
         SRMT ("m116")
-        M116 (TS)
+        M116 (__METHOD__)
         SRMT ("m118")
-        M118 (TS)
+        M118 (__METHOD__)
         SRMT ("m119")
-        M119 (TS)
+        M119 (__METHOD__)
         SRMT ("m11c")
-        M11C (TS)
+        M11C (__METHOD__)
         SRMT ("m11d")
-        M11D (TS)
+        M11D (__METHOD__)
         SRMT ("m11e")
-        M11E (TS)
+        M11E (__METHOD__)
         SRMT ("m11f")
-        M11F (TS)
+        M11F (__METHOD__)
         SRMT ("m120")
-        M120 (TS)
+        M120 (__METHOD__)
         SRMT ("m121")
-        M121 (TS)
+        M121 (__METHOD__)
         SRMT ("m122")
-        M122 (TS)
+        M122 (__METHOD__)
         SRMT ("m123")
-        M123 (TS)
+        M123 (__METHOD__)
         SRMT ("m124")
-        M124 (TS)
+        M124 (__METHOD__)
         SRMT ("m125")
-        M125 (TS)
+        M125 (__METHOD__)
         SRMT ("mf75")
-        MF75 (TS)
+        MF75 (__METHOD__)
         /*SRMT("mf77") */
         /*mf77(ts) */
         SRMT ("mf86")
-        MF86 (TS)
+        MF86 (__METHOD__)
         SRMT ("mf87")
-        MF87 (TS)
+        MF87 (__METHOD__)
         M15B ()
     }
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl
index 2509cbdde..a00eaea08 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/fullpath.asl
@@ -34,18 +34,17 @@
      */
     Method (FP00, 0, Serialized)
     {
-        Name (TS, "fp00")
         Method (M000, 0, Serialized)
         {
             Name (\I4Z0, 0xABCD0000)
             If ((I4Z0 != 0xABCD0000))
             {
-                ERR (TS, Z179, 0x30, 0x00, 0x00, I4Z0, 0xABCD0000)
+                ERR (__METHOD__, Z179, 0x30, 0x00, 0x00, I4Z0, 0xABCD0000)
             }
 
             If ((\I4Z0 != 0xABCD0000))
             {
-                ERR (TS, Z179, 0x33, 0x00, 0x00, \I4Z0, 0xABCD0000)
+                ERR (__METHOD__, Z179, 0x33, 0x00, 0x00, \I4Z0, 0xABCD0000)
             }
 
             M001 ()
@@ -55,23 +54,22 @@
         {
             If ((I4Z0 != 0xABCD0000))
             {
-                ERR (TS, Z179, 0x3B, 0x00, 0x00, I4Z0, 0xABCD0000)
+                ERR (__METHOD__, Z179, 0x3B, 0x00, 0x00, I4Z0, 0xABCD0000)
             }
 
             If ((\I4Z0 != 0xABCD0000))
             {
-                ERR (TS, Z179, 0x3E, 0x00, 0x00, \I4Z0, 0xABCD0000)
+                ERR (__METHOD__, Z179, 0x3E, 0x00, 0x00, \I4Z0, 0xABCD0000)
             }
         }
 
-        CH03 (TS, Z179, 0x44, 0x42, 0x00)
+        CH03 (__METHOD__, Z179, 0x44, 0x42, 0x00)
         M000 ()
-        CH03 (TS, Z179, 0x45, 0x44, 0x00)
+        CH03 (__METHOD__, Z179, 0x45, 0x44, 0x00)
     }
 
     Method (FP01, 0, Serialized)
     {
-        Name (TS, "fp01")
         Method (M000, 1, Serialized)
         {
             If (!Arg0)
@@ -81,12 +79,12 @@
 
             If ((I4Z1 != 0xABCD0000))
             {
-                ERR (TS, Z179, 0x52, 0x00, 0x00, I4Z1, 0xABCD0000)
+                ERR (__METHOD__, Z179, 0x52, 0x00, 0x00, I4Z1, 0xABCD0000)
             }
 
             If ((\I4Z1 != 0xABCD0000))
             {
-                ERR (TS, Z179, 0x55, 0x00, 0x00, \I4Z1, 0xABCD0000)
+                ERR (__METHOD__, Z179, 0x55, 0x00, 0x00, \I4Z1, 0xABCD0000)
             }
 
             M001 ()
@@ -96,18 +94,18 @@
         {
             If ((I4Z1 != 0xABCD0000))
             {
-                ERR (TS, Z179, 0x5D, 0x00, 0x00, I4Z1, 0xABCD0000)
+                ERR (__METHOD__, Z179, 0x5D, 0x00, 0x00, I4Z1, 0xABCD0000)
             }
 
             If ((\I4Z1 != 0xABCD0000))
             {
-                ERR (TS, Z179, 0x60, 0x00, 0x00, \I4Z1, 0xABCD0000)
+                ERR (__METHOD__, Z179, 0x60, 0x00, 0x00, \I4Z1, 0xABCD0000)
             }
         }
 
-        CH03 (TS, Z179, 0x44, 0x64, 0x00)
+        CH03 (__METHOD__, Z179, 0x44, 0x64, 0x00)
         M000 (0x00)
-        CH03 (TS, Z179, 0x45, 0x66, 0x00)
+        CH03 (__METHOD__, Z179, 0x45, 0x66, 0x00)
     }
 
     Method (FPD0, 0, NotSerialized)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl
index f98d5418a..27ff81664 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0.asl
@@ -44,7 +44,6 @@
      */
     Method (M000, 1, Serialized)
     {
-        Name (TS, "m000")
         Name (I000, 0x01)
         Name (P000, Package (0x04)
         {
@@ -54,7 +53,7 @@
             0x04
         })
         Name (I001, 0x00)
-        CH03 (TS, Z154, 0x00, 0x38, 0x00)
+        CH03 (__METHOD__, Z154, 0x00, 0x38, 0x00)
         I001 = Arg0
         Method (M001, 0, NotSerialized)
         {
@@ -79,16 +78,15 @@
         Store ((I000 + M001 ()), Local0)
         If ((Local0 != 0xABCD0003))
         {
-            ERR (TS, Z154, 0x4D, 0x00, 0x00, Local0, 0xABCD0003)
+            ERR (__METHOD__, Z154, 0x4D, 0x00, 0x00, Local0, 0xABCD0003)
         }
 
         Debug = Local0
-        CH03 (TS, Z154, 0x02, 0x51, 0x00)
+        CH03 (__METHOD__, Z154, 0x02, 0x51, 0x00)
     }
 
     Method (M001, 1, Serialized)
     {
-        Name (TS, "m001")
         Name (I000, 0x01)
         Name (I001, 0x00)
         Name (P000, Package (0x04)
@@ -154,20 +152,19 @@
         Store ((I000 + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z154, 0x8B, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z154, 0x8B, 0x00, 0x00, Local0, 0x87654321)
         }
 
         If ((I000 != 0x80000000))
         {
-            ERR (TS, Z154, 0x8F, 0x00, 0x00, I000, 0x80000000)
+            ERR (__METHOD__, Z154, 0x8F, 0x00, 0x00, I000, 0x80000000)
         }
 
-        CH03 (TS, Z154, 0x05, 0x92, 0x00)
+        CH03 (__METHOD__, Z154, 0x05, 0x92, 0x00)
     }
 
     Method (M002, 0, Serialized)
     {
-        Name (TS, "m002")
         Name (I000, 0x00100000)
         Name (I001, 0x00)
         Method (M001, 0, NotSerialized)
@@ -186,20 +183,19 @@
         Store ((I000 + M001 ()), Local0)
         If ((Local0 != 0x065013BA))
         {
-            ERR (TS, Z154, 0xA8, 0x00, 0x00, Local0, 0x065013BA)
+            ERR (__METHOD__, Z154, 0xA8, 0x00, 0x00, Local0, 0x065013BA)
         }
 
         If ((I000 != 0x00100064))
         {
-            ERR (TS, Z154, 0xAC, 0x00, 0x00, I000, 0x00100064)
+            ERR (__METHOD__, Z154, 0xAC, 0x00, 0x00, I000, 0x00100064)
         }
 
-        CH03 (TS, Z154, 0x08, 0xAF, 0x00)
+        CH03 (__METHOD__, Z154, 0x08, 0xAF, 0x00)
     }
 
     Method (M003, 0, Serialized)
     {
-        Name (TS, "m003")
         Name (I000, 0x00100000)
         Name (I001, 0x00)
         Method (M001, 0, NotSerialized)
@@ -217,15 +213,15 @@
         Store ((I000 + M001 ()), Local0)
         If ((Local0 != 0x065013BA))
         {
-            ERR (TS, Z154, 0xC4, 0x00, 0x00, Local0, 0x065013BA)
+            ERR (__METHOD__, Z154, 0xC4, 0x00, 0x00, Local0, 0x065013BA)
         }
 
         If ((I000 != 0x00100064))
         {
-            ERR (TS, Z154, 0xC8, 0x00, 0x00, I000, 0x00100064)
+            ERR (__METHOD__, Z154, 0xC8, 0x00, 0x00, I000, 0x00100064)
         }
 
-        CH03 (TS, Z154, 0x0B, 0xCB, 0x00)
+        CH03 (__METHOD__, Z154, 0x0B, 0xCB, 0x00)
     }
 
     /*
@@ -233,7 +229,6 @@
      */
     Method (M004, 1, Serialized)
     {
-        Name (TS, "m004")
         Name (I001, 0x00)
         Name (P000, Package (0x04)
         {
@@ -299,15 +294,15 @@
         Store ((Local7 + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z154, 0x0109, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z154, 0x0109, 0x00, 0x00, Local0, 0x87654321)
         }
 
         If ((Local7 != 0x01))
         {
-            ERR (TS, Z154, 0x010D, 0x00, 0x00, Local7, 0x01)
+            ERR (__METHOD__, Z154, 0x010D, 0x00, 0x00, Local7, 0x01)
         }
 
-        CH03 (TS, Z154, 0x0E, 0x0110, 0x00)
+        CH03 (__METHOD__, Z154, 0x0E, 0x0110, 0x00)
     }
 
     /*
@@ -315,7 +310,6 @@
      */
     Method (M005, 2, Serialized)
     {
-        Name (TS, "m005")
         Name (I001, 0x00)
         Name (P000, Package (0x04)
         {
@@ -381,15 +375,15 @@
         Store ((Arg1 + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z154, 0x014E, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z154, 0x014E, 0x00, 0x00, Local0, 0x87654321)
         }
 
         If ((Arg1 != 0x01))
         {
-            ERR (TS, Z154, 0x0152, 0x00, 0x00, Arg1, 0x01)
+            ERR (__METHOD__, Z154, 0x0152, 0x00, 0x00, Arg1, 0x01)
         }
 
-        CH03 (TS, Z154, 0x11, 0x0155, 0x00)
+        CH03 (__METHOD__, Z154, 0x11, 0x0155, 0x00)
     }
 
     Method (N000, 0, NotSerialized)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl
index 26aab51c5..e33041cfb 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns0_root.asl
@@ -33,7 +33,6 @@
      */
     Method (M006, 1, Serialized)
     {
-        Name (TS, "m006")
         Device (D000)
         {
             Name (I000, 0x01)
@@ -48,7 +47,7 @@
             0x04
         })
         I001 = Arg0
-        CH03 (TS, Z154, 0x14, 0x30, 0x00)
+        CH03 (__METHOD__, Z154, 0x14, 0x30, 0x00)
         Method (M001, 0, NotSerialized)
         {
             Method (M002, 0, NotSerialized)
@@ -104,20 +103,20 @@
         Store ((D000.I000 + M001 ()), Local0)
         If (FLG9)
         {
-            CH03 (TS, Z154, 0x14, 0x61, 0x00)
+            CH03 (__METHOD__, Z154, 0x14, 0x61, 0x00)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z154, 0x63, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z154, 0x63, 0x00, 0x00, Local0, 0x87654321)
             }
 
             If ((D000.I000 != 0x80000000))
             {
-                ERR (TS, Z154, 0x66, 0x00, 0x00, D000.I000, 0x80000000)
+                ERR (__METHOD__, Z154, 0x66, 0x00, 0x00, D000.I000, 0x80000000)
             }
         }
         Else
         {
-            CH04 (TS, 0x01, 0x05, Z154, 0x69, 0x00, 0x00)    /* AE_NOT_FOUND */
+            CH04 (__METHOD__, 0x01, 0x05, Z154, 0x69, 0x00, 0x00)    /* AE_NOT_FOUND */
         }
     }
 
@@ -126,7 +125,6 @@
      */
     Method (M007, 1, Serialized)
     {
-        Name (TS, "m007")
         ThermalZone (TZ00)
         {
             Name (I000, 0x01)
@@ -141,7 +139,7 @@
             0x04
         })
         I001 = Arg0
-        CH03 (TS, Z154, 0x14, 0x7C, 0x00)
+        CH03 (__METHOD__, Z154, 0x14, 0x7C, 0x00)
         Method (M001, 0, NotSerialized)
         {
             Method (M002, 0, NotSerialized)
@@ -197,20 +195,20 @@
         Store ((TZ00.I000 + M001 ()), Local0)
         If (FLG9)
         {
-            CH03 (TS, Z154, 0x14, 0xAC, 0x00)
+            CH03 (__METHOD__, Z154, 0x14, 0xAC, 0x00)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z154, 0xAE, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z154, 0xAE, 0x00, 0x00, Local0, 0x87654321)
             }
 
             If ((TZ00.I000 != 0x80000000))
             {
-                ERR (TS, Z154, 0xB1, 0x00, 0x00, TZ00.I000, 0x80000000)
+                ERR (__METHOD__, Z154, 0xB1, 0x00, 0x00, TZ00.I000, 0x80000000)
             }
         }
         Else
         {
-            CH04 (TS, 0x01, 0x05, Z154, 0xB4, 0x00, 0x00)    /* AE_NOT_FOUND */
+            CH04 (__METHOD__, 0x01, 0x05, Z154, 0xB4, 0x00, 0x00)    /* AE_NOT_FOUND */
         }
     }
 
@@ -219,7 +217,6 @@
      */
     Method (M008, 1, Serialized)
     {
-        Name (TS, "m008")
         Processor (PR00, 0x00, 0xFFFFFFFF, 0x00)
         {
             Name (I000, 0x01)
@@ -234,7 +231,7 @@
             0x04
         })
         I001 = Arg0
-        CH03 (TS, Z154, 0x14, 0xC7, 0x00)
+        CH03 (__METHOD__, Z154, 0x14, 0xC7, 0x00)
         Method (M001, 0, NotSerialized)
         {
             Method (M002, 0, NotSerialized)
@@ -290,20 +287,20 @@
         Store ((PR00.I000 + M001 ()), Local0)
         If (FLG9)
         {
-            CH03 (TS, Z154, 0x14, 0xF8, 0x00)
+            CH03 (__METHOD__, Z154, 0x14, 0xF8, 0x00)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z154, 0xFA, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z154, 0xFA, 0x00, 0x00, Local0, 0x87654321)
             }
 
             If ((PR00.I000 != 0x80000000))
             {
-                ERR (TS, Z154, 0xFD, 0x00, 0x00, PR00.I000, 0x80000000)
+                ERR (__METHOD__, Z154, 0xFD, 0x00, 0x00, PR00.I000, 0x80000000)
             }
         }
         Else
         {
-            CH04 (TS, 0x01, 0x05, Z154, 0x0100, 0x00, 0x00)    /* AE_NOT_FOUND */
+            CH04 (__METHOD__, 0x01, 0x05, Z154, 0x0100, 0x00, 0x00)    /* AE_NOT_FOUND */
         }
     }
 
@@ -312,7 +309,6 @@
      */
     Method (M009, 1, Serialized)
     {
-        Name (TS, "m009")
         PowerResource (PW00, 0x01, 0x0000)
         {
             Name (I000, 0x01)
@@ -327,7 +323,7 @@
             0x04
         })
         I001 = Arg0
-        CH03 (TS, Z154, 0x1D, 0x0113, 0x00)
+        CH03 (__METHOD__, Z154, 0x1D, 0x0113, 0x00)
         Method (M001, 0, NotSerialized)
         {
             Method (M002, 0, NotSerialized)
@@ -383,20 +379,20 @@
         Store ((PW00.I000 + M001 ()), Local0)
         If (FLG9)
         {
-            CH03 (TS, Z154, 0x14, 0x0144, 0x00)
+            CH03 (__METHOD__, Z154, 0x14, 0x0144, 0x00)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z154, 0x0146, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z154, 0x0146, 0x00, 0x00, Local0, 0x87654321)
             }
 
             If ((PW00.I000 != 0x80000000))
             {
-                ERR (TS, Z154, 0x0149, 0x00, 0x00, PW00.I000, 0x80000000)
+                ERR (__METHOD__, Z154, 0x0149, 0x00, 0x00, PW00.I000, 0x80000000)
             }
         }
         Else
         {
-            CH04 (TS, 0x01, 0x05, Z154, 0x014C, 0x00, 0x00)    /* AE_NOT_FOUND */
+            CH04 (__METHOD__, 0x01, 0x05, Z154, 0x014C, 0x00, 0x00)    /* AE_NOT_FOUND */
         }
     }
 
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl
index 7ab6cde5e..260401fc1 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns1.asl
@@ -34,7 +34,6 @@
      */
     Method (M100, 0, Serialized)
     {
-        Name (TS, "m100")
         Name (P000, Package (0x03)
         {
             0xABCD0000,
@@ -50,15 +49,14 @@
         Local0 = DerefOf (P000 [0x00])
         If ((Local0 != 0x11112222))
         {
-            ERR (TS, Z155, 0x34, 0x00, 0x00, Local0, 0x11112222)
+            ERR (__METHOD__, Z155, 0x34, 0x00, 0x00, Local0, 0x11112222)
         }
 
-        CH03 (TS, Z155, 0x01, 0x37, 0x00)
+        CH03 (__METHOD__, Z155, 0x01, 0x37, 0x00)
     }
 
     Method (M101, 0, Serialized)
     {
-        Name (TS, "m101")
         Name (B000, Buffer (0x03)
         {
              0x10, 0x11, 0x12                                 // ...
@@ -72,15 +70,14 @@
         Local0 = DerefOf (B000 [0x00])
         If ((Local0 != 0x67))
         {
-            ERR (TS, Z155, 0x48, 0x00, 0x00, Local0, 0x67)
+            ERR (__METHOD__, Z155, 0x48, 0x00, 0x00, Local0, 0x67)
         }
 
-        CH03 (TS, Z155, 0x03, 0x4B, 0x00)
+        CH03 (__METHOD__, Z155, 0x03, 0x4B, 0x00)
     }
 
     Method (M102, 0, Serialized)
     {
-        Name (TS, "m102")
         Name (S000, "qqqqqqqqqqqqqq")
         Method (M001, 2, NotSerialized)
         {
@@ -91,10 +88,10 @@
         Local0 = DerefOf (S000 [0x00])
         If ((Local0 != 0x38))
         {
-            ERR (TS, Z155, 0x5C, 0x00, 0x00, Local0, 0x38)
+            ERR (__METHOD__, Z155, 0x5C, 0x00, 0x00, Local0, 0x38)
         }
 
-        CH03 (TS, Z155, 0x05, 0x5F, 0x00)
+        CH03 (__METHOD__, Z155, 0x05, 0x5F, 0x00)
     }
 
     /*
@@ -102,7 +99,6 @@
      */
     Method (M103, 1, Serialized)
     {
-        Name (TS, "m103")
         Name (I001, 0x00)
         Name (P000, Package (0x04)
         {
@@ -117,7 +113,7 @@
             0x01,
             0x22223333
         })
-        CH03 (TS, Z155, 0x06, 0x6C, 0x00)
+        CH03 (__METHOD__, Z155, 0x06, 0x6C, 0x00)
         I001 = Arg0
         Method (M001, 0, NotSerialized)
         {
@@ -174,16 +170,16 @@
         Store ((DerefOf (PP00 [0x01]) + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z155, 0x9E, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z155, 0x9E, 0x00, 0x00, Local0, 0x87654321)
         }
 
         Local0 = DerefOf (PP00 [0x01])
         If ((Local0 != 0x80000000))
         {
-            ERR (TS, Z155, 0xA4, 0x00, 0x00, Local0, 0x80000000)
+            ERR (__METHOD__, Z155, 0xA4, 0x00, 0x00, Local0, 0x80000000)
         }
 
-        CH03 (TS, Z155, 0x09, 0xA7, 0x00)
+        CH03 (__METHOD__, Z155, 0x09, 0xA7, 0x00)
     }
 
     /*
@@ -191,7 +187,6 @@
      */
     Method (M104, 0, Serialized)
     {
-        Name (TS, "m104")
         Name (I001, 0x00)
         Name (PP00, Package (0x03)
         {
@@ -217,16 +212,16 @@
         Store ((DerefOf (PP00 [0x01]) + M001 ()), Local0)
         If ((Local0 != 0x065013BA))
         {
-            ERR (TS, Z155, 0xC3, 0x00, 0x00, Local0, 0x065013BA)
+            ERR (__METHOD__, Z155, 0xC3, 0x00, 0x00, Local0, 0x065013BA)
         }
 
         Local0 = DerefOf (PP00 [0x01])
         If ((Local0 != 0x00100064))
         {
-            ERR (TS, Z155, 0xC9, 0x00, 0x00, Local0, 0x00100064)
+            ERR (__METHOD__, Z155, 0xC9, 0x00, 0x00, Local0, 0x00100064)
         }
 
-        CH03 (TS, Z155, 0x0C, 0xCC, 0x00)
+        CH03 (__METHOD__, Z155, 0x0C, 0xCC, 0x00)
     }
 
     /*
@@ -234,11 +229,10 @@
      */
     Method (M105, 1, Serialized)
     {
-        Name (TS, "m105")
         Name (I001, 0x00)
         Name (B000, Buffer (0x10){})
         CreateField (B000, 0x05, 0x20, BF00)
-        CH03 (TS, Z155, 0x0D, 0xD9, 0x00)
+        CH03 (__METHOD__, Z155, 0x0D, 0xD9, 0x00)
         I001 = Arg0
         Method (M001, 0, NotSerialized)
         {
@@ -296,7 +290,7 @@
         Store ((BF00 + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z155, 0x010E, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z155, 0x010E, 0x00, 0x00, Local0, 0x87654321)
         }
 
         If (Arg0)
@@ -310,10 +304,10 @@
 
         If ((BF00 != Local1))
         {
-            ERR (TS, Z155, 0x0118, 0x00, 0x00, BF00, Local1)
+            ERR (__METHOD__, Z155, 0x0118, 0x00, 0x00, BF00, Local1)
         }
 
-        CH03 (TS, Z155, 0x10, 0x011B, 0x00)
+        CH03 (__METHOD__, Z155, 0x10, 0x011B, 0x00)
     }
 
     /*
@@ -321,7 +315,6 @@
      */
     Method (M106, 1, Serialized)
     {
-        Name (TS, "m106")
         Name (I001, 0x00)
         OperationRegion (R000, SystemMemory, 0x0100, 0x0100)
         Field (R000, ByteAcc, NoLock, Preserve)
@@ -330,7 +323,7 @@
             F001,   32
         }
 
-        CH03 (TS, Z155, 0x11, 0x0128, 0x00)
+        CH03 (__METHOD__, Z155, 0x11, 0x0128, 0x00)
         I001 = Arg0
         Method (M001, 0, NotSerialized)
         {
@@ -388,7 +381,7 @@
         Store ((F001 + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z155, 0x015D, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z155, 0x015D, 0x00, 0x00, Local0, 0x87654321)
         }
 
         If (Arg0)
@@ -402,10 +395,10 @@
 
         If ((F001 != Local1))
         {
-            ERR (TS, Z155, 0x0167, 0x00, 0x00, F001, Local1)
+            ERR (__METHOD__, Z155, 0x0167, 0x00, 0x00, F001, Local1)
         }
 
-        CH03 (TS, Z155, 0x14, 0x016A, 0x00)
+        CH03 (__METHOD__, Z155, 0x14, 0x016A, 0x00)
     }
 
     /*
@@ -415,7 +408,6 @@
      */
     Method (M107, 1, Serialized)
     {
-        Name (TS, "m107")
         Name (I001, 0x00)
         OperationRegion (R000, SystemMemory, 0x0100, 0x0100)
         Field (R000, ByteAcc, NoLock, Preserve)
@@ -429,7 +421,7 @@
             BNK0,   32
         }
 
-        CH03 (TS, Z155, 0x15, 0x017A, 0x00)
+        CH03 (__METHOD__, Z155, 0x15, 0x017A, 0x00)
         I001 = Arg0
         Method (M001, 0, NotSerialized)
         {
@@ -487,7 +479,7 @@
         Store ((BNK0 + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z155, 0x01AF, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z155, 0x01AF, 0x00, 0x00, Local0, 0x87654321)
         }
 
         If (Arg0)
@@ -501,10 +493,10 @@
 
         If ((BNK0 != Local1))
         {
-            ERR (TS, Z155, 0x01B9, 0x00, 0x00, BNK0, Local1)
+            ERR (__METHOD__, Z155, 0x01B9, 0x00, 0x00, BNK0, Local1)
         }
 
-        CH03 (TS, Z155, 0x18, 0x01BC, 0x00)
+        CH03 (__METHOD__, Z155, 0x18, 0x01BC, 0x00)
     }
 
     /*
@@ -514,7 +506,6 @@
      */
     Method (M108, 1, Serialized)
     {
-        Name (TS, "m108")
         Name (I001, 0x00)
         OperationRegion (R000, SystemMemory, 0x0100, 0x0100)
         Field (R000, ByteAcc, NoLock, Preserve)
@@ -528,7 +519,7 @@
             IF00,   32
         }
 
-        CH03 (TS, Z155, 0x19, 0x01CC, 0x00)
+        CH03 (__METHOD__, Z155, 0x19, 0x01CC, 0x00)
         I001 = Arg0
         Method (M001, 0, NotSerialized)
         {
@@ -586,7 +577,7 @@
         Store ((IF00 + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z155, 0x0201, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z155, 0x0201, 0x00, 0x00, Local0, 0x87654321)
         }
 
         If (Arg0)
@@ -600,10 +591,10 @@
 
         If ((IF00 != Local1))
         {
-            ERR (TS, Z155, 0x020B, 0x00, 0x00, IF00, Local1)
+            ERR (__METHOD__, Z155, 0x020B, 0x00, 0x00, IF00, Local1)
         }
 
-        CH03 (TS, Z155, 0x1C, 0x020E, 0x00)
+        CH03 (__METHOD__, Z155, 0x1C, 0x020E, 0x00)
     }
 
     /*
@@ -611,13 +602,12 @@
      */
     Method (M109, 1, Serialized)
     {
-        Name (TS, "m109")
         Name (I001, 0x00)
         Name (B000, Buffer (0x03)
         {
              0x11, 0x01, 0x22                                 // .."
         })
-        CH03 (TS, Z155, 0x1D, 0x021A, 0x00)
+        CH03 (__METHOD__, Z155, 0x1D, 0x021A, 0x00)
         I001 = Arg0
         Method (M001, 0, NotSerialized)
         {
@@ -674,7 +664,7 @@
         Store ((DerefOf (B000 [0x01]) + M001 ()), Local0)
         If ((Local0 != 0x24))
         {
-            ERR (TS, Z155, 0x024C, 0x00, 0x00, Local0, 0x24)
+            ERR (__METHOD__, Z155, 0x024C, 0x00, 0x00, Local0, 0x24)
         }
 
         Local0 = DerefOf (B000 [0x01])
@@ -689,10 +679,10 @@
 
         If ((Local0 != Local1))
         {
-            ERR (TS, Z155, 0x0258, 0x00, 0x00, Local0, Local1)
+            ERR (__METHOD__, Z155, 0x0258, 0x00, 0x00, Local0, Local1)
         }
 
-        CH03 (TS, Z155, 0x20, 0x025B, 0x00)
+        CH03 (__METHOD__, Z155, 0x20, 0x025B, 0x00)
     }
 
     /*
@@ -700,10 +690,9 @@
      */
     Method (M10A, 1, Serialized)
     {
-        Name (TS, "m10a")
         Name (I001, 0x00)
         Name (S000, "q\x01ertyuiop")
-        CH03 (TS, Z155, 0x21, 0x0267, 0x00)
+        CH03 (__METHOD__, Z155, 0x21, 0x0267, 0x00)
         I001 = Arg0
         Method (M001, 0, NotSerialized)
         {
@@ -760,7 +749,7 @@
         Store ((DerefOf (S000 [0x01]) + M001 ()), Local0)
         If ((Local0 != 0x24))
         {
-            ERR (TS, Z155, 0x0299, 0x00, 0x00, Local0, 0x24)
+            ERR (__METHOD__, Z155, 0x0299, 0x00, 0x00, Local0, 0x24)
         }
 
         Local0 = DerefOf (S000 [0x01])
@@ -775,10 +764,10 @@
 
         If ((Local0 != Local1))
         {
-            ERR (TS, Z155, 0x02A5, 0x00, 0x00, Local0, Local1)
+            ERR (__METHOD__, Z155, 0x02A5, 0x00, 0x00, Local0, Local1)
         }
 
-        CH03 (TS, Z155, 0x24, 0x02A8, 0x00)
+        CH03 (__METHOD__, Z155, 0x24, 0x02A8, 0x00)
     }
 
     Method (N001, 0, NotSerialized)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl
index d81f20a28..75a6f07aa 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2.asl
@@ -32,7 +32,6 @@
      */
     Method (M200, 0, Serialized)
     {
-        Name (TS, "m200")
         Device (D000)
         {
             Name (P000, Package (0x03)
@@ -52,15 +51,14 @@
         Local0 = DerefOf (D000.P000 [0x00])
         If ((Local0 != 0x11112222))
         {
-            ERR (TS, Z156, 0x36, 0x00, 0x00, Local0, 0x11112222)
+            ERR (__METHOD__, Z156, 0x36, 0x00, 0x00, Local0, 0x11112222)
         }
 
-        CH03 (TS, Z156, 0x01, 0x39, 0x00)
+        CH03 (__METHOD__, Z156, 0x01, 0x39, 0x00)
     }
 
     Method (M201, 0, Serialized)
     {
-        Name (TS, "m201")
         Device (D000)
         {
             Name (B000, Buffer (0x03)
@@ -78,15 +76,14 @@
         Local0 = DerefOf (D000.B000 [0x00])
         If ((Local0 != 0x67))
         {
-            ERR (TS, Z156, 0x4D, 0x00, 0x00, Local0, 0x67)
+            ERR (__METHOD__, Z156, 0x4D, 0x00, 0x00, Local0, 0x67)
         }
 
-        CH03 (TS, Z156, 0x03, 0x50, 0x00)
+        CH03 (__METHOD__, Z156, 0x03, 0x50, 0x00)
     }
 
     Method (M202, 0, Serialized)
     {
-        Name (TS, "m202")
         Device (D000)
         {
             Name (S000, "qqqqqqqqqqqqqq")
@@ -101,10 +98,10 @@
         Local0 = DerefOf (D000.S000 [0x00])
         If ((Local0 != 0x38))
         {
-            ERR (TS, Z156, 0x64, 0x00, 0x00, Local0, 0x38)
+            ERR (__METHOD__, Z156, 0x64, 0x00, 0x00, Local0, 0x38)
         }
 
-        CH03 (TS, Z156, 0x05, 0x67, 0x00)
+        CH03 (__METHOD__, Z156, 0x05, 0x67, 0x00)
     }
 
     /*
@@ -112,7 +109,6 @@
      */
     Method (M204, 0, Serialized)
     {
-        Name (TS, "m204")
         Name (I001, 0x00)
         Device (D000)
         {
@@ -142,16 +138,16 @@
         Store ((DerefOf (D000.PP00 [0x01]) + M001 ()), Local0)
         If ((Local0 != 0x065013BA))
         {
-            ERR (TS, Z156, 0x86, 0x00, 0x00, Local0, 0x065013BA)
+            ERR (__METHOD__, Z156, 0x86, 0x00, 0x00, Local0, 0x065013BA)
         }
 
         Local0 = DerefOf (D000.PP00 [0x01])
         If ((Local0 != 0x00100064))
         {
-            ERR (TS, Z156, 0x8C, 0x00, 0x00, Local0, 0x00100064)
+            ERR (__METHOD__, Z156, 0x8C, 0x00, 0x00, Local0, 0x00100064)
         }
 
-        CH03 (TS, Z156, 0x0C, 0x8F, 0x00)
+        CH03 (__METHOD__, Z156, 0x0C, 0x8F, 0x00)
     }
 
     Method (N002, 0, NotSerialized)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl
index 647c269b7..61ea925d9 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns2_root.asl
@@ -33,7 +33,6 @@
      */
     Method (M203, 1, Serialized)
     {
-        Name (TS, "m203")
         Name (I001, 0x00)
         Name (P000, Package (0x04)
         {
@@ -52,7 +51,7 @@
             })
         }
 
-        CH03 (TS, Z156, 0x06, 0x2E, 0x00)
+        CH03 (__METHOD__, Z156, 0x06, 0x2E, 0x00)
         I001 = Arg0
         Method (M001, 0, NotSerialized)
         {
@@ -109,16 +108,16 @@
         Store ((DerefOf (D000.PP00 [0x01]) + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z156, 0x60, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z156, 0x60, 0x00, 0x00, Local0, 0x87654321)
         }
 
         Local0 = DerefOf (D000.PP00 [0x01])
         If ((Local0 != 0x80000000))
         {
-            ERR (TS, Z156, 0x66, 0x00, 0x00, Local0, 0x80000000)
+            ERR (__METHOD__, Z156, 0x66, 0x00, 0x00, Local0, 0x80000000)
         }
 
-        CH03 (TS, Z156, 0x09, 0x69, 0x00)
+        CH03 (__METHOD__, Z156, 0x09, 0x69, 0x00)
     }
 
     /*
@@ -126,7 +125,6 @@
      */
     Method (M205, 1, Serialized)
     {
-        Name (TS, "m205")
         Name (I001, 0x00)
         Name (P000, Package (0x04)
         {
@@ -135,14 +133,14 @@
             0x03,
             0x04
         })
-        CH03 (TS, Z156, 0x0D, 0x75, 0x00)
+        CH03 (__METHOD__, Z156, 0x0D, 0x75, 0x00)
         Device (D000)
         {
             Name (B000, Buffer (0x10){})
             CreateField (B000, 0x05, 0x20, BF00)
         }
 
-        CH03 (TS, Z156, 0x0E, 0x7D, 0x00)
+        CH03 (__METHOD__, Z156, 0x0E, 0x7D, 0x00)
         If (0x00)
         {
             CreateField (D000.B000, 0x05, 0x20, BF00)
@@ -204,16 +202,16 @@
         Store ((DerefOf (D000.BF00 [0x01]) + M001 ()), Local0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z156, 0xB3, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z156, 0xB3, 0x00, 0x00, Local0, 0x87654321)
         }
 
         Local0 = DerefOf (D000.BF00 [0x01])
         If ((Local0 != 0x80000000))
         {
-            ERR (TS, Z156, 0xB9, 0x00, 0x00, Local0, 0x80000000)
+            ERR (__METHOD__, Z156, 0xB9, 0x00, 0x00, Local0, 0x80000000)
         }
 
-        CH03 (TS, Z156, 0x11, 0xBC, 0x00)
+        CH03 (__METHOD__, Z156, 0x11, 0xBC, 0x00)
     }
 
     Method (N102, 0, NotSerialized)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl
index 6a0e82600..8ef76b555 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns3.asl
@@ -32,7 +32,6 @@
     Name (Z157, 0x9D)
     Method (M300, 0, Serialized)
     {
-        Name (TS, "m300")
         Name (P000, Package (0x03)
         {
             0xABCD0000,
@@ -50,7 +49,7 @@
             Local0 = DerefOf (Arg0 [0x00])
             If ((Local0 != 0x11112222))
             {
-                ERR (TS, Z157, 0x33, 0x00, 0x00, Local0, 0x11112222)
+                ERR (__METHOD__, Z157, 0x33, 0x00, 0x00, Local0, 0x11112222)
             }
         }
 
@@ -58,15 +57,14 @@
         Local0 = DerefOf (P000 [0x00])
         If ((Local0 != 0x11112222))
         {
-            ERR (TS, Z157, 0x3C, 0x00, 0x00, Local0, 0x11112222)
+            ERR (__METHOD__, Z157, 0x3C, 0x00, 0x00, Local0, 0x11112222)
         }
 
-        CH03 (TS, Z157, 0x02, 0x3F, 0x00)
+        CH03 (__METHOD__, Z157, 0x02, 0x3F, 0x00)
     }
 
     Method (M301, 0, Serialized)
     {
-        Name (TS, "m301")
         Name (B000, Buffer (0x03)
         {
              0x10, 0x11, 0x12                                 // ...
@@ -82,7 +80,7 @@
             Local0 = DerefOf (Arg0 [0x00])
             If ((Local0 != 0x67))
             {
-                ERR (TS, Z157, 0x53, 0x00, 0x00, Local0, 0x67)
+                ERR (__METHOD__, Z157, 0x53, 0x00, 0x00, Local0, 0x67)
             }
         }
 
@@ -90,15 +88,14 @@
         Local0 = DerefOf (B000 [0x00])
         If ((Local0 != 0x67))
         {
-            ERR (TS, Z157, 0x5C, 0x00, 0x00, Local0, 0x67)
+            ERR (__METHOD__, Z157, 0x5C, 0x00, 0x00, Local0, 0x67)
         }
 
-        CH03 (TS, Z157, 0x05, 0x5F, 0x00)
+        CH03 (__METHOD__, Z157, 0x05, 0x5F, 0x00)
     }
 
     Method (M302, 0, Serialized)
     {
-        Name (TS, "m302")
         Name (S000, "qqqqqqqqqqqqqq")
         Method (M000, 1, NotSerialized)
         {
@@ -111,7 +108,7 @@
             Local0 = DerefOf (Arg0 [0x00])
             If ((Local0 != 0x38))
             {
-                ERR (TS, Z157, 0x72, 0x00, 0x00, Local0, 0x38)
+                ERR (__METHOD__, Z157, 0x72, 0x00, 0x00, Local0, 0x38)
             }
         }
 
@@ -119,10 +116,10 @@
         Local0 = DerefOf (S000 [0x00])
         If ((Local0 != 0x38))
         {
-            ERR (TS, Z157, 0x7B, 0x00, 0x00, Local0, 0x38)
+            ERR (__METHOD__, Z157, 0x7B, 0x00, 0x00, Local0, 0x38)
         }
 
-        CH03 (TS, Z157, 0x08, 0x7E, 0x00)
+        CH03 (__METHOD__, Z157, 0x08, 0x7E, 0x00)
     }
 
     /*
@@ -130,7 +127,6 @@
      */
     Method (M303, 1, Serialized)
     {
-        Name (TS, "m303")
         Name (PP00, Package (0x03)
         {
             0x11111111,
@@ -147,7 +143,7 @@
                 0x03,
                 0x04
             })
-            CH03 (TS, Z157, 0x09, 0x8E, 0x00)
+            CH03 (__METHOD__, Z157, 0x09, 0x8E, 0x00)
             I001 = Arg1
             Method (M001, 1, NotSerialized)
             {
@@ -204,32 +200,32 @@
             Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z157, 0xC0, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z157, 0xC0, 0x00, 0x00, Local0, 0x87654321)
             }
 
             Local1 = DerefOf (Arg0 [0x01])
             If ((Local1 != 0x80000000))
             {
-                ERR (TS, Z157, 0xC6, 0x00, 0x00, Local1, 0x80000000)
+                ERR (__METHOD__, Z157, 0xC6, 0x00, 0x00, Local1, 0x80000000)
             }
 
-            CH03 (TS, Z157, 0x0C, 0xC9, 0x00)
+            CH03 (__METHOD__, Z157, 0x0C, 0xC9, 0x00)
             Return (Local0)
         }
 
         Local0 = M000 (PP00, Arg0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z157, 0xD1, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z157, 0xD1, 0x00, 0x00, Local0, 0x87654321)
         }
 
         Local0 = DerefOf (PP00 [0x01])
         If ((Local0 != 0x80000000))
         {
-            ERR (TS, Z157, 0xD7, 0x00, 0x00, Local0, 0x80000000)
+            ERR (__METHOD__, Z157, 0xD7, 0x00, 0x00, Local0, 0x80000000)
         }
 
-        CH03 (TS, Z157, 0x0F, 0xDA, 0x00)
+        CH03 (__METHOD__, Z157, 0x0F, 0xDA, 0x00)
     }
 
     /*
@@ -237,7 +233,6 @@
      */
     Method (M304, 0, Serialized)
     {
-        Name (TS, "m304")
         Name (I001, 0x00)
         Name (PP00, Package (0x03)
         {
@@ -265,13 +260,13 @@
             Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0)
             If ((Local0 != 0x065013BA))
             {
-                ERR (TS, Z157, 0xF7, 0x00, 0x00, Local0, 0x065013BA)
+                ERR (__METHOD__, Z157, 0xF7, 0x00, 0x00, Local0, 0x065013BA)
             }
 
             Local1 = DerefOf (Arg0 [0x01])
             If ((Local1 != 0x00100064))
             {
-                ERR (TS, Z157, 0xFD, 0x00, 0x00, Local1, 0x00100064)
+                ERR (__METHOD__, Z157, 0xFD, 0x00, 0x00, Local1, 0x00100064)
             }
 
             Return (Local0)
@@ -280,16 +275,16 @@
         Local0 = M000 (PP00)
         If ((Local0 != 0x065013BA))
         {
-            ERR (TS, Z157, 0x0105, 0x00, 0x00, Local0, 0x065013BA)
+            ERR (__METHOD__, Z157, 0x0105, 0x00, 0x00, Local0, 0x065013BA)
         }
 
         Local1 = DerefOf (PP00 [0x01])
         If ((Local1 != 0x00100064))
         {
-            ERR (TS, Z157, 0x010B, 0x00, 0x00, Local1, 0x00100064)
+            ERR (__METHOD__, Z157, 0x010B, 0x00, 0x00, Local1, 0x00100064)
         }
 
-        CH03 (TS, Z157, 0x14, 0x010E, 0x00)
+        CH03 (__METHOD__, Z157, 0x14, 0x010E, 0x00)
     }
 
     /*
@@ -297,9 +292,8 @@
      */
     Method (M305, 0, Serialized)
     {
-        Name (TS, "m305")
         Name (B000, Buffer (0x10){})
-        CH03 (TS, Z157, 0x15, 0x0119, 0x00)
+        CH03 (__METHOD__, Z157, 0x15, 0x0119, 0x00)
         CreateField (B000, 0x05, 0x20, BF00)
         BF00 = 0xABCDEF70
         Method (M000, 1, NotSerialized)
@@ -355,32 +349,32 @@
             Store ((Arg0 + M001 ()), Local0)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z157, 0x014D, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z157, 0x014D, 0x00, 0x00, Local0, 0x87654321)
             }
 
             Local1 = 0x01
             If ((Arg0 != Local1))
             {
-                ERR (TS, Z157, 0x0153, 0x00, 0x00, Arg0, Local1)
+                ERR (__METHOD__, Z157, 0x0153, 0x00, 0x00, Arg0, Local1)
             }
 
-            CH03 (TS, Z157, 0x18, 0x0156, 0x00)
+            CH03 (__METHOD__, Z157, 0x18, 0x0156, 0x00)
             Return (Local0)
         }
 
         Local0 = M000 (BF00)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z157, 0x015E, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z157, 0x015E, 0x00, 0x00, Local0, 0x87654321)
         }
 
         Local1 = 0xABCDEF70
         If ((BF00 != Local1))
         {
-            ERR (TS, Z157, 0x0164, 0x00, 0x00, BF00, Local1)
+            ERR (__METHOD__, Z157, 0x0164, 0x00, 0x00, BF00, Local1)
         }
 
-        CH03 (TS, Z157, 0x1B, 0x0167, 0x00)
+        CH03 (__METHOD__, Z157, 0x1B, 0x0167, 0x00)
     }
 
     /*
@@ -388,7 +382,6 @@
      */
     Method (M306, 0, Serialized)
     {
-        Name (TS, "m306")
         Name (I001, 0x00)
         OperationRegion (R000, SystemMemory, 0x0100, 0x0100)
         Field (R000, ByteAcc, NoLock, Preserve)
@@ -397,7 +390,7 @@
             F001,   32
         }
 
-        CH03 (TS, Z157, 0x1C, 0x0174, 0x00)
+        CH03 (__METHOD__, Z157, 0x1C, 0x0174, 0x00)
         F000 = 0xABCDEF70
         Method (M000, 1, NotSerialized)
         {
@@ -452,32 +445,32 @@
             Store ((Arg0 + M001 ()), Local0)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z157, 0x01A7, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z157, 0x01A7, 0x00, 0x00, Local0, 0x87654321)
             }
 
             Local1 = 0x01
             If ((Arg0 != Local1))
             {
-                ERR (TS, Z157, 0x01AD, 0x00, 0x00, Arg0, Local1)
+                ERR (__METHOD__, Z157, 0x01AD, 0x00, 0x00, Arg0, Local1)
             }
 
-            CH03 (TS, Z157, 0x1F, 0x01B0, 0x00)
+            CH03 (__METHOD__, Z157, 0x1F, 0x01B0, 0x00)
             Return (Local0)
         }
 
         Local0 = M000 (F000)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z157, 0x01B8, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z157, 0x01B8, 0x00, 0x00, Local0, 0x87654321)
         }
 
         Local1 = 0xABCDEF70
         If ((F000 != Local1))
         {
-            ERR (TS, Z157, 0x01BE, 0x00, 0x00, F000, Local1)
+            ERR (__METHOD__, Z157, 0x01BE, 0x00, 0x00, F000, Local1)
         }
 
-        CH03 (TS, Z157, 0x22, 0x01C1, 0x00)
+        CH03 (__METHOD__, Z157, 0x22, 0x01C1, 0x00)
     }
 
     /*
@@ -485,7 +478,6 @@
      */
     Method (M307, 0, Serialized)
     {
-        Name (TS, "m307")
         Name (I001, 0x00)
         OperationRegion (R000, SystemMemory, 0x0100, 0x0100)
         Field (R000, ByteAcc, NoLock, Preserve)
@@ -499,7 +491,7 @@
             BNK0,   32
         }
 
-        CH03 (TS, Z157, 0x23, 0x01CF, 0x00)
+        CH03 (__METHOD__, Z157, 0x23, 0x01CF, 0x00)
         BNK0 = 0xABCDEF70
         Method (M000, 1, NotSerialized)
         {
@@ -554,32 +546,32 @@
             Store ((Arg0 + M001 ()), Local0)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z157, 0x0202, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z157, 0x0202, 0x00, 0x00, Local0, 0x87654321)
             }
 
             Local1 = 0x01
             If ((Arg0 != Local1))
             {
-                ERR (TS, Z157, 0x0208, 0x00, 0x00, Arg0, Local1)
+                ERR (__METHOD__, Z157, 0x0208, 0x00, 0x00, Arg0, Local1)
             }
 
-            CH03 (TS, Z157, 0x26, 0x020B, 0x00)
+            CH03 (__METHOD__, Z157, 0x26, 0x020B, 0x00)
             Return (Local0)
         }
 
         Local0 = M000 (BNK0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z157, 0x0213, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z157, 0x0213, 0x00, 0x00, Local0, 0x87654321)
         }
 
         Local1 = 0xABCDEF70
         If ((BNK0 != Local1))
         {
-            ERR (TS, Z157, 0x0219, 0x00, 0x00, BNK0, Local1)
+            ERR (__METHOD__, Z157, 0x0219, 0x00, 0x00, BNK0, Local1)
         }
 
-        CH03 (TS, Z157, 0x29, 0x021C, 0x00)
+        CH03 (__METHOD__, Z157, 0x29, 0x021C, 0x00)
     }
 
     /*
@@ -587,7 +579,6 @@
      */
     Method (M308, 0, Serialized)
     {
-        Name (TS, "m308")
         Name (I001, 0x00)
         OperationRegion (R000, SystemMemory, 0x0100, 0x0100)
         Field (R000, ByteAcc, NoLock, Preserve)
@@ -601,7 +592,7 @@
             IF00,   32
         }
 
-        CH03 (TS, Z157, 0x2A, 0x022A, 0x00)
+        CH03 (__METHOD__, Z157, 0x2A, 0x022A, 0x00)
         IF00 = 0xABCDEF70
         Method (M000, 1, NotSerialized)
         {
@@ -656,32 +647,32 @@
             Store ((Arg0 + M001 ()), Local0)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z157, 0x025D, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z157, 0x025D, 0x00, 0x00, Local0, 0x87654321)
             }
 
             Local1 = 0x01
             If ((Arg0 != Local1))
             {
-                ERR (TS, Z157, 0x0263, 0x00, 0x00, Arg0, Local1)
+                ERR (__METHOD__, Z157, 0x0263, 0x00, 0x00, Arg0, Local1)
             }
 
-            CH03 (TS, Z157, 0x2D, 0x0266, 0x00)
+            CH03 (__METHOD__, Z157, 0x2D, 0x0266, 0x00)
             Return (Local0)
         }
 
         Local0 = M000 (IF00)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z157, 0x026E, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z157, 0x026E, 0x00, 0x00, Local0, 0x87654321)
         }
 
         Local1 = 0xABCDEF70
         If ((IF00 != Local1))
         {
-            ERR (TS, Z157, 0x0274, 0x00, 0x00, IF00, Local1)
+            ERR (__METHOD__, Z157, 0x0274, 0x00, 0x00, IF00, Local1)
         }
 
-        CH03 (TS, Z157, 0x30, 0x0277, 0x00)
+        CH03 (__METHOD__, Z157, 0x30, 0x0277, 0x00)
     }
 
     /*
@@ -689,13 +680,12 @@
      */
     Method (M309, 1, Serialized)
     {
-        Name (TS, "m309")
         Name (I001, 0x00)
         Name (B000, Buffer (0x03)
         {
              0x11, 0x01, 0x22                                 // .."
         })
-        CH03 (TS, Z157, 0x31, 0x0283, 0x00)
+        CH03 (__METHOD__, Z157, 0x31, 0x0283, 0x00)
         I001 = Arg0
         Method (M000, 2, NotSerialized)
         {
@@ -754,7 +744,7 @@
             Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0)
             If ((Local0 != 0x24))
             {
-                ERR (TS, Z157, 0x02B7, 0x00, 0x00, Local0, 0x24)
+                ERR (__METHOD__, Z157, 0x02B7, 0x00, 0x00, Local0, 0x24)
             }
 
             Local1 = DerefOf (Arg0 [0x01])
@@ -769,17 +759,17 @@
 
             If ((Local1 != Local2))
             {
-                ERR (TS, Z157, 0x02C3, 0x00, 0x00, Local1, Local2)
+                ERR (__METHOD__, Z157, 0x02C3, 0x00, 0x00, Local1, Local2)
             }
 
-            CH03 (TS, Z157, 0x34, 0x02C6, 0x00)
+            CH03 (__METHOD__, Z157, 0x34, 0x02C6, 0x00)
             Return (Local0)
         }
 
         Local0 = M000 (B000, Arg0)
         If ((Local0 != 0x24))
         {
-            ERR (TS, Z157, 0x02CE, 0x00, 0x00, Local0, 0x24)
+            ERR (__METHOD__, Z157, 0x02CE, 0x00, 0x00, Local0, 0x24)
         }
 
         Local1 = DerefOf (B000 [0x01])
@@ -794,10 +784,10 @@
 
         If ((Local1 != Local2))
         {
-            ERR (TS, Z157, 0x02DA, 0x00, 0x00, Local1, Local2)
+            ERR (__METHOD__, Z157, 0x02DA, 0x00, 0x00, Local1, Local2)
         }
 
-        CH03 (TS, Z157, 0x37, 0x02DD, 0x00)
+        CH03 (__METHOD__, Z157, 0x37, 0x02DD, 0x00)
     }
 
     /*
@@ -805,10 +795,9 @@
      */
     Method (M30A, 1, Serialized)
     {
-        Name (TS, "m30a")
         Name (I001, 0x00)
         Name (S000, "q\x01ertyuiop")
-        CH03 (TS, Z157, 0x38, 0x02E9, 0x00)
+        CH03 (__METHOD__, Z157, 0x38, 0x02E9, 0x00)
         I001 = Arg0
         Method (M000, 2, NotSerialized)
         {
@@ -867,7 +856,7 @@
             Store ((DerefOf (Arg0 [0x01]) + M001 (Arg0)), Local0)
             If ((Local0 != 0x24))
             {
-                ERR (TS, Z157, 0x031D, 0x00, 0x00, Local0, 0x24)
+                ERR (__METHOD__, Z157, 0x031D, 0x00, 0x00, Local0, 0x24)
             }
 
             Local1 = DerefOf (Arg0 [0x01])
@@ -882,17 +871,17 @@
 
             If ((Local1 != Local2))
             {
-                ERR (TS, Z157, 0x0329, 0x00, 0x00, Local1, Local2)
+                ERR (__METHOD__, Z157, 0x0329, 0x00, 0x00, Local1, Local2)
             }
 
-            CH03 (TS, Z157, 0x3B, 0x032C, 0x00)
+            CH03 (__METHOD__, Z157, 0x3B, 0x032C, 0x00)
             Return (Local0)
         }
 
         Local0 = M000 (S000, Arg0)
         If ((Local0 != 0x24))
         {
-            ERR (TS, Z157, 0x0334, 0x00, 0x00, Local0, 0x24)
+            ERR (__METHOD__, Z157, 0x0334, 0x00, 0x00, Local0, 0x24)
         }
 
         Local1 = DerefOf (S000 [0x01])
@@ -907,10 +896,10 @@
 
         If ((Local1 != Local2))
         {
-            ERR (TS, Z157, 0x0340, 0x00, 0x00, Local1, Local2)
+            ERR (__METHOD__, Z157, 0x0340, 0x00, 0x00, Local1, Local2)
         }
 
-        CH03 (TS, Z157, 0x3E, 0x0343, 0x00)
+        CH03 (__METHOD__, Z157, 0x3E, 0x0343, 0x00)
     }
 
     /*
@@ -920,11 +909,10 @@
      */
     Method (M30B, 1, Serialized)
     {
-        Name (TS, "m30b")
         Name (I001, 0x00)
         Name (B000, Buffer (0x10){})
         I001 = Arg0
-        CH03 (TS, Z157, 0x3F, 0x0353, 0x00)
+        CH03 (__METHOD__, Z157, 0x3F, 0x0353, 0x00)
         Method (M000, 2, NotSerialized)
         {
             CreateField (B000, 0x05, 0x20, BF00)
@@ -984,7 +972,7 @@
             Store ((BF00 + M001 ()), Local0)
             If ((Local0 != 0x87654321))
             {
-                ERR (TS, Z157, 0x038A, 0x00, 0x00, Local0, 0x87654321)
+                ERR (__METHOD__, Z157, 0x038A, 0x00, 0x00, Local0, 0x87654321)
             }
 
             If (Arg1)
@@ -998,20 +986,20 @@
 
             If ((BF00 != Local1))
             {
-                ERR (TS, Z157, 0x0394, 0x00, 0x00, BF00, Local1)
+                ERR (__METHOD__, Z157, 0x0394, 0x00, 0x00, BF00, Local1)
             }
 
-            CH03 (TS, Z157, 0x42, 0x0397, 0x00)
+            CH03 (__METHOD__, Z157, 0x42, 0x0397, 0x00)
             Return (Local0)
         }
 
         Local0 = M000 (0x00, Arg0)
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z157, 0x039F, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z157, 0x039F, 0x00, 0x00, Local0, 0x87654321)
         }
 
-        CH03 (TS, Z157, 0x44, 0x03A2, 0x00)
+        CH03 (__METHOD__, Z157, 0x44, 0x03A2, 0x00)
     }
 
     Method (N003, 0, NotSerialized)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl
index 1c8cc64a7..c9cbbdadc 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns4.asl
@@ -35,7 +35,6 @@
     Name (Z158, 0x9E)
     Method (M401, 1, Serialized)
     {
-        Name (TS, "m401")
         Name (I000, 0x01)
         Name (I001, 0x00)
         Name (P000, Package (0x04)
@@ -45,7 +44,7 @@
             0x03,
             0x04
         })
-        CH03 (TS, Z158, 0x00, 0x2F, 0x00)
+        CH03 (__METHOD__, Z158, 0x00, 0x2F, 0x00)
         I001 = Arg0
         Method (MADD, 2, NotSerialized)
         {
@@ -108,15 +107,15 @@
         Local0 = MADD (I000, M001 ())
         If ((Local0 != 0x87654321))
         {
-            ERR (TS, Z158, 0x67, 0x00, 0x00, Local0, 0x87654321)
+            ERR (__METHOD__, Z158, 0x67, 0x00, 0x00, Local0, 0x87654321)
         }
 
         If ((I000 != 0x80000000))
         {
-            ERR (TS, Z158, 0x6B, 0x00, 0x00, I000, 0x80000000)
+            ERR (__METHOD__, Z158, 0x6B, 0x00, 0x00, I000, 0x80000000)
         }
 
-        CH03 (TS, Z158, 0x03, 0x6E, 0x00)
+        CH03 (__METHOD__, Z158, 0x03, 0x6E, 0x00)
     }
 
     Method (N004, 0, NotSerialized)
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl
index cb8ce8cd0..f66fd9ca3 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/ns6.asl
@@ -3,21 +3,20 @@
     Name (Z160, 0xA0)
     Method (M600, 0, Serialized)
     {
-        Name (TS, "m600")
         Name (I000, 0xABCD0000)
         Method (M000, 1, NotSerialized)
         {
             I000 = 0x11223344
             If ((Arg0 != 0xABCD0000))
             {
-                ERR (TS, Z160, 0x0D, 0x00, 0x00, Arg0, 0xABCD0000)
+                ERR (__METHOD__, Z160, 0x0D, 0x00, 0x00, Arg0, 0xABCD0000)
             }
         }
 
         M000 (I000)
         If ((I000 != 0x11223344))
         {
-            ERR (TS, Z160, 0x14, 0x00, 0x00, I000, 0x11223344)
+            ERR (__METHOD__, Z160, 0x14, 0x00, 0x00, I000, 0x11223344)
         }
     }
 
diff --git a/tests/aslts/src/runtime/collections/complex/namespace/scope.asl b/tests/aslts/src/runtime/collections/complex/namespace/scope.asl
index d13577b4c..333e02b80 100644
--- a/tests/aslts/src/runtime/collections/complex/namespace/scope.asl
+++ b/tests/aslts/src/runtime/collections/complex/namespace/scope.asl
@@ -31,7 +31,6 @@
      */
     Method (SC00, 0, Serialized)
     {
-        Name (TS, "sc00")
         Method (M000, 1, Serialized)
         {
             Scope (\)
@@ -40,9 +39,9 @@
             }
         }
 
-        CH03 (TS, Z178, 0x44, 0x2C, 0x00)
+        CH03 (__METHOD__, Z178, 0x44, 0x2C, 0x00)
         M000 (0x00)
-        CH03 (TS, Z178, 0x45, 0x2E, 0x00)
+        CH03 (__METHOD__, Z178, 0x45, 0x2E, 0x00)
     }
 
     Method (SCP0, 0, NotSerialized)
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl
index 10ae7ec74..a5a64e701 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/oarg.asl
@@ -31,7 +31,6 @@
     Name (Z121, 0x79)
     Method (M617, 0, Serialized)
     {
-        Name (TS, "m617")
         /* Integer to String implicit conversion Cases. */
         /* Integer to String conversion of the Integer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
@@ -21307,13 +21306,13 @@
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
         If (F64)
         {
-            Concatenate (TS, "-m640", Local0)
+            Concatenate (__METHOD__, "-m640", Local0)
             SRMT (Local0)
             M640 (Local0, 0xFE7CB391D650A284)
         }
         Else
         {
-            Concatenate (TS, "-m320", Local0)
+            Concatenate (__METHOD__, "-m320", Local0)
             SRMT (Local0)
             M320 (Local0, 0xC179B3FE)
         }
@@ -21322,13 +21321,13 @@
         /* Concatenate operator when the first operand is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m641", Local0)
+            Concatenate (__METHOD__, "-m641", Local0)
             SRMT (Local0)
             M641 (Local0, 0xFE7CB391D650A284)
         }
         Else
         {
-            Concatenate (TS, "-m321", Local0)
+            Concatenate (__METHOD__, "-m321", Local0)
             SRMT (Local0)
             M321 (Local0, 0xFE7CB391D650A284, 0xC179B3FE)
         }
@@ -21346,13 +21345,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0, 0xFE7CB391D650A284)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0, 0xC179B3FE)
         }
@@ -21361,13 +21360,13 @@
         /* Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0, 0xFE7CB391D650A284)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0, 0xC179B3FE)
         }
@@ -21376,13 +21375,13 @@
         /* Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0, 0xFE7CB391D650A284)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0, 0xFE7CB391D650A284, 0xC179B3FE)
         }
@@ -21391,13 +21390,13 @@
         /* ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0, 0x6E7C534136502214, 0x6E00534136002214)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0, 0x6179534E, 0x6E7C534136002214)
         }
@@ -21406,13 +21405,13 @@
         /* Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0, 0xFE7CB391D650A284, 0x6E7C534136002214)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0, 0xC179B3FE, 0x6E7C534136002214)
         }
@@ -21429,33 +21428,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64b", Local0)
+            Concatenate (__METHOD__, "-m64b", Local0)
             SRMT (Local0)
             M64B (Local0, "0321", "FE7CB391D650A284")
         }
         Else
         {
-            Concatenate (TS, "-m32b", Local0)
+            Concatenate (__METHOD__, "-m32b", Local0)
             SRMT (Local0)
             M32B (Local0, "0321", "C179B3FE")
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m000", Local0)
+        Concatenate (__METHOD__, "-m000", Local0)
         SRMT (Local0)
         M000 (Local0, "0321", "FE7CB391D650A284", "C179B3FE", "0")
         /* String to Integer conversion of the String sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64c", Local0)
+            Concatenate (__METHOD__, "-m64c", Local0)
             SRMT (Local0)
             M64C (Local0, "0321", "FE7CB391D650A284", "3789012345678901", "D76162EE9EC35")
         }
         Else
         {
-            Concatenate (TS, "-m32c", Local0)
+            Concatenate (__METHOD__, "-m32c", Local0)
             SRMT (Local0)
             M32C (Local0, "0321", "FE7CB391D650A284", "90123456", "55F2CC0")
         }
@@ -21466,39 +21465,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64D (Concatenate (TS, "-m64d"))
+            M64D (Concatenate (__METHOD__, "-m64d"))
         }
         Else
         {
-            M32D (Concatenate (TS, "-m32d"))
+            M32D (Concatenate (__METHOD__, "-m32d"))
         }
 
         /* String to Integer conversion of each String operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64E (Concatenate (TS, "-m64e"))
+            M64E (Concatenate (__METHOD__, "-m64e"))
         }
         Else
         {
-            M32E (Concatenate (TS, "-m32e"))
+            M32E (Concatenate (__METHOD__, "-m32e"))
         }
 
         /* String to Integer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m02b", Local0)
+        Concatenate (__METHOD__, "-m02b", Local0)
         SRMT (Local0)
         M02B (Local0, "0321")
         If (F64)
         {
-            Concatenate (TS, "-m64f", Local0)
+            Concatenate (__METHOD__, "-m64f", Local0)
             SRMT (Local0)
             M64F (Local0, "FE7CB391D650A284")
         }
         Else
         {
-            Concatenate (TS, "-m32f", Local0)
+            Concatenate (__METHOD__, "-m32f", Local0)
             SRMT (Local0)
             M32F (Local0, "C179B3FE")
         }
@@ -21507,72 +21506,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64g", Local0)
+            Concatenate (__METHOD__, "-m64g", Local0)
             SRMT (Local0)
             M64G (Local0, "0321", "FE7CB391D650A284")
         }
         Else
         {
-            Concatenate (TS, "-m32g", Local0)
+            Concatenate (__METHOD__, "-m32g", Local0)
             SRMT (Local0)
             M32G (Local0, "0321", "C179B3FE")
         }
 
         /* String to Integer conversion of the String Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m02c", Local0)
+        Concatenate (__METHOD__, "-m02c", Local0)
         SRMT (Local0)
         M02C (Local0, "0321", "B")
         If (F64)
         {
-            Concatenate (TS, "-m64h", Local0)
+            Concatenate (__METHOD__, "-m64h", Local0)
             SRMT (Local0)
             M64H (Local0, "FE7CB391D650A284")
         }
         Else
         {
-            Concatenate (TS, "-m32h", Local0)
+            Concatenate (__METHOD__, "-m32h", Local0)
             SRMT (Local0)
             M32H (Local0, "C179B3FE")
         }
 
         /* String to Integer conversion of the String Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m02d", Local0)
+        Concatenate (__METHOD__, "-m02d", Local0)
         SRMT (Local0)
         M02D (Local0, "B")
         /* String to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m02e", Local0)
+        Concatenate (__METHOD__, "-m02e", Local0)
         SRMT (Local0)
         M02E (Local0, "0321", "FE7CB391D650A284", "C179B3FE")
         /* String to Integer conversion of the String Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m02f", Local0)
+        Concatenate (__METHOD__, "-m02f", Local0)
         SRMT (Local0)
         M02F (Local0, "B")
         If (F64)
         {
-            Concatenate (TS, "-m64i", Local0)
+            Concatenate (__METHOD__, "-m64i", Local0)
             SRMT (Local0)
             M64I (Local0, "FE7CB391D650A284", "B")
         }
         Else
         {
-            Concatenate (TS, "-m32i", Local0)
+            Concatenate (__METHOD__, "-m32i", Local0)
             SRMT (Local0)
             M32I (Local0, "C179B3FE", "B")
         }
 
         /* String to Integer conversion of the String StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m030", Local0)
+        Concatenate (__METHOD__, "-m030", Local0)
         SRMT (Local0)
         M030 (Local0, "B")
         /* String to Integer conversion of the String sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m031", Local0)
+        Concatenate (__METHOD__, "-m031", Local0)
         SRMT (Local0)
         M031 (Local0, "0321", "63")
         /* String to Integer conversion of the String TimeoutValue */
@@ -21584,13 +21583,13 @@
          */
         /* String to Integer conversion of the String TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m033", Local0)
+        Concatenate (__METHOD__, "-m033", Local0)
         SRMT (Local0)
         M033 (Local0, "0321")
         /* String to Integer conversion of the String value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m034", Local0)
+        Concatenate (__METHOD__, "-m034", Local0)
         SRMT (Local0)
         M034 (Local0, "0321", "FE7CB391D650A284", "C179B3FE", "0")
         /* String to Integer conversion of the String value */
@@ -21602,18 +21601,18 @@
         /* String to Buffer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Buffer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m035", Local0)
+        Concatenate (__METHOD__, "-m035", Local0)
         SRMT (Local0)
         M035 (Local0, "0321", "", "!\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&\'()*")
         /* String to Buffer conversion of the String second operand of */
         /* Concatenate operator when the first operand is evaluated as Buffer */
-        Concatenate (TS, "-m036", Local0)
+        Concatenate (__METHOD__, "-m036", Local0)
         SRMT (Local0)
         M036 (Local0, "0321", "", "!\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&\'()*")
         /* String to Buffer conversion of the String Source operand of */
         /* ToString operator (has a visual effect in shortening of the */
         /* String taken the null character) */
-        Concatenate (TS, "-m037", Local0)
+        Concatenate (__METHOD__, "-m037", Local0)
         SRMT (Local0)
         M037 (Local0, "0321", "", "!\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ !\"#$%&\'()*")
         /* Buffer to Integer implicit conversion Cases. */
@@ -21622,7 +21621,7 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0, Buffer (0x03)
                 {
@@ -21635,7 +21634,7 @@
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0, Buffer (0x03)
                 {
@@ -21649,7 +21648,7 @@
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0, Buffer (0x03)
             {
@@ -21666,7 +21665,7 @@
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0, Buffer (0x03)
                 {
@@ -21681,7 +21680,7 @@
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0, Buffer (0x03)
                 {
@@ -21701,28 +21700,28 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer to Integer conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0, Buffer (0x03)
             {
@@ -21730,7 +21729,7 @@
             })
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0, Buffer (0x09)
                 {
@@ -21740,7 +21739,7 @@
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0, Buffer (0x09)
                 {
@@ -21753,7 +21752,7 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0, Buffer (0x03)
                 {
@@ -21766,7 +21765,7 @@
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0, Buffer (0x03)
                 {
@@ -21780,7 +21779,7 @@
 
         /* Buffer to Integer conversion of the Buffer Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0, Buffer (0x03)
             {
@@ -21791,7 +21790,7 @@
             })
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0, Buffer (0x09)
                 {
@@ -21801,7 +21800,7 @@
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0, Buffer (0x09)
                 {
@@ -21812,7 +21811,7 @@
 
         /* Buffer to Integer conversion of the Buffer Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0, Buffer (0x01)
             {
@@ -21821,7 +21820,7 @@
         /* Buffer to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0, Buffer (0x03)
             {
@@ -21833,7 +21832,7 @@
             })
         /* Buffer to Integer conversion of the Buffer Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0, Buffer (0x01)
             {
@@ -21841,7 +21840,7 @@
             })
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0, Buffer (0x09)
                 {
@@ -21854,7 +21853,7 @@
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0, Buffer (0x09)
                 {
@@ -21868,7 +21867,7 @@
 
         /* Buffer to Integer conversion of the Buffer StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0, Buffer (0x01)
             {
@@ -21876,7 +21875,7 @@
             })
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0, Buffer (0x03)
             {
@@ -21894,7 +21893,7 @@
          */
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0, Buffer (0x03)
             {
@@ -21903,7 +21902,7 @@
         /* Buffer to Integer conversion of the Buffer value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         M06E (Local0, Buffer (0x03)
             {
@@ -21925,7 +21924,7 @@
         /* Buffer to String conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
-        Concatenate (TS, "-m06f", Local0)
+        Concatenate (__METHOD__, "-m06f", Local0)
         SRMT (Local0)
         M06F (Local0, Buffer (0x03)
             {
@@ -21944,7 +21943,7 @@
             })
         /* Buffer to String conversion of the Buffer second operand of */
         /* Concatenate operator when the first operand is evaluated as String */
-        Concatenate (TS, "-m070", Local0)
+        Concatenate (__METHOD__, "-m070", Local0)
         SRMT (Local0)
         M070 (Local0, Buffer (0x03)
             {
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl
index 6178fae6a..87cd56b92 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/oconst.asl
@@ -31,7 +31,6 @@
     Name (Z085, 0x55)
     Method (M610, 0, Serialized)
     {
-        Name (TS, "m610")
         /* Integer to String implicit conversion Cases. */
         /* Integer to String conversion of the Integer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
@@ -34250,13 +34249,13 @@
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
         If (F64)
         {
-            Concatenate (TS, "-m640", Local0)
+            Concatenate (__METHOD__, "-m640", Local0)
             SRMT (Local0)
             M640 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m320", Local0)
+            Concatenate (__METHOD__, "-m320", Local0)
             SRMT (Local0)
             M320 (Local0)
         }
@@ -34265,13 +34264,13 @@
         /* Concatenate operator when the first operand is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m641", Local0)
+            Concatenate (__METHOD__, "-m641", Local0)
             SRMT (Local0)
             M641 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m321", Local0)
+            Concatenate (__METHOD__, "-m321", Local0)
             SRMT (Local0)
             M321 (Local0)
         }
@@ -34281,13 +34280,13 @@
         /* is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m642", Local0)
+            Concatenate (__METHOD__, "-m642", Local0)
             SRMT (Local0)
             M642 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m322", Local0)
+            Concatenate (__METHOD__, "-m322", Local0)
             SRMT (Local0)
             M322 (Local0)
         }
@@ -34299,13 +34298,13 @@
         /* or ToString */
         If (F64)
         {
-            Concatenate (TS, "-m643", Local0)
+            Concatenate (__METHOD__, "-m643", Local0)
             SRMT (Local0)
             M643 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m323", Local0)
+            Concatenate (__METHOD__, "-m323", Local0)
             SRMT (Local0)
             M323 (Local0)
         }
@@ -34316,13 +34315,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -34331,13 +34330,13 @@
         /* Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -34346,13 +34345,13 @@
         /* Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -34361,13 +34360,13 @@
         /* ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -34376,13 +34375,13 @@
         /* Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -34392,13 +34391,13 @@
         /* is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m649", Local0)
+            Concatenate (__METHOD__, "-m649", Local0)
             SRMT (Local0)
             M649 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m329", Local0)
+            Concatenate (__METHOD__, "-m329", Local0)
             SRMT (Local0)
             M329 (Local0)
         }
@@ -34409,13 +34408,13 @@
         /* Buffer by ToBuffer */
         If (F64)
         {
-            Concatenate (TS, "-m64a", Local0)
+            Concatenate (__METHOD__, "-m64a", Local0)
             SRMT (Local0)
             M64A (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32a", Local0)
+            Concatenate (__METHOD__, "-m32a", Local0)
             SRMT (Local0)
             M32A (Local0)
         }
@@ -34426,33 +34425,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64b", Local0)
+            Concatenate (__METHOD__, "-m64b", Local0)
             SRMT (Local0)
             M64B (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32b", Local0)
+            Concatenate (__METHOD__, "-m32b", Local0)
             SRMT (Local0)
             M32B (Local0)
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m000", Local0)
+        Concatenate (__METHOD__, "-m000", Local0)
         SRMT (Local0)
         M000 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64c", Local0)
+            Concatenate (__METHOD__, "-m64c", Local0)
             SRMT (Local0)
             M64C (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32c", Local0)
+            Concatenate (__METHOD__, "-m32c", Local0)
             SRMT (Local0)
             M32C (Local0)
         }
@@ -34463,39 +34462,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64D (Concatenate (TS, "-m64d"))
+            M64D (Concatenate (__METHOD__, "-m64d"))
         }
         Else
         {
-            M32D (Concatenate (TS, "-m32d"))
+            M32D (Concatenate (__METHOD__, "-m32d"))
         }
 
         /* String to Integer conversion of each String operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64E (Concatenate (TS, "-m64e"))
+            M64E (Concatenate (__METHOD__, "-m64e"))
         }
         Else
         {
-            M32E (Concatenate (TS, "-m32e"))
+            M32E (Concatenate (__METHOD__, "-m32e"))
         }
 
         /* String to Integer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m02b", Local0)
+        Concatenate (__METHOD__, "-m02b", Local0)
         SRMT (Local0)
         M02B (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64f", Local0)
+            Concatenate (__METHOD__, "-m64f", Local0)
             SRMT (Local0)
             M64F (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32f", Local0)
+            Concatenate (__METHOD__, "-m32f", Local0)
             SRMT (Local0)
             M32F (Local0)
         }
@@ -34504,67 +34503,67 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64g", Local0)
+            Concatenate (__METHOD__, "-m64g", Local0)
             SRMT (Local0)
             M64G (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32g", Local0)
+            Concatenate (__METHOD__, "-m32g", Local0)
             SRMT (Local0)
             M32G (Local0)
         }
 
         /* String to Integer conversion of the String Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m02c", Local0)
+        Concatenate (__METHOD__, "-m02c", Local0)
         SRMT (Local0)
         M02C (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64h", Local0)
+            Concatenate (__METHOD__, "-m64h", Local0)
             SRMT (Local0)
             M64H (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32h", Local0)
+            Concatenate (__METHOD__, "-m32h", Local0)
             SRMT (Local0)
             M32H (Local0)
         }
 
         /* String to Integer conversion of the String Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m02d", Local0)
+        Concatenate (__METHOD__, "-m02d", Local0)
         SRMT (Local0)
         M02D (Local0)
         /* String to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m02e", Local0)
+        Concatenate (__METHOD__, "-m02e", Local0)
         SRMT (Local0)
         M02E (Local0)
         /* String to Integer conversion of the String Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m02f", Local0)
+        Concatenate (__METHOD__, "-m02f", Local0)
         SRMT (Local0)
         M02F (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64i", Local0)
+            Concatenate (__METHOD__, "-m64i", Local0)
             SRMT (Local0)
             M64I (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32i", Local0)
+            Concatenate (__METHOD__, "-m32i", Local0)
             SRMT (Local0)
             M32I (Local0)
         }
 
         /* String to Integer conversion of the String StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m030", Local0)
+        Concatenate (__METHOD__, "-m030", Local0)
         SRMT (Local0)
         M030 (Local0)
         /* String to Integer conversion of the String elements */
@@ -34572,20 +34571,20 @@
         /* MatchObject is evaluated as Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64j", Local0)
+            Concatenate (__METHOD__, "-m64j", Local0)
             SRMT (Local0)
             M64J (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32j", Local0)
+            Concatenate (__METHOD__, "-m32j", Local0)
             SRMT (Local0)
             M32J (Local0)
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m031", Local0)
+        Concatenate (__METHOD__, "-m031", Local0)
         SRMT (Local0)
         M031 (Local0)
         /* String to Integer conversion of the String TimeoutValue */
@@ -34597,13 +34596,13 @@
          */
         /* String to Integer conversion of the String TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m033", Local0)
+        Concatenate (__METHOD__, "-m033", Local0)
         SRMT (Local0)
         M033 (Local0)
         /* String to Integer conversion of the String value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m034", Local0)
+        Concatenate (__METHOD__, "-m034", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -34619,13 +34618,13 @@
         /* Switch is evaluated as Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64k", Local0)
+            Concatenate (__METHOD__, "-m64k", Local0)
             SRMT (Local0)
             M64K (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32k", Local0)
+            Concatenate (__METHOD__, "-m32k", Local0)
             SRMT (Local0)
             M32K (Local0)
         }
@@ -34634,31 +34633,31 @@
         /* String to Buffer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Buffer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m035", Local0)
+        Concatenate (__METHOD__, "-m035", Local0)
         SRMT (Local0)
         M035 (Local0)
         /* String to Buffer conversion of the String second operand of */
         /* Concatenate operator when the first operand is evaluated as Buffer */
-        Concatenate (TS, "-m036", Local0)
+        Concatenate (__METHOD__, "-m036", Local0)
         SRMT (Local0)
         M036 (Local0)
         /* String to Buffer conversion of the String Source operand of */
         /* ToString operator (has a visual effect in shortening of the */
         /* String taken the null character) */
-        Concatenate (TS, "-m037", Local0)
+        Concatenate (__METHOD__, "-m037", Local0)
         SRMT (Local0)
         M037 (Local0)
         /* String to Buffer conversion of the String elements of */
         /* a search package of Match operator when some MatchObject */
         /* is evaluated as Buffer */
-        Concatenate (TS, "-m038", Local0)
+        Concatenate (__METHOD__, "-m038", Local0)
         SRMT (Local0)
         M038 (Local0)
         /* String to Buffer conversion of the String value of */
         /* Expression of Case statement when Expression in Switch */
         /* is either static Buffer data or explicitly converted to */
         /* Buffer by ToBuffer */
-        Concatenate (TS, "-m039", Local0)
+        Concatenate (__METHOD__, "-m039", Local0)
         SRMT (Local0)
         M039 (Local0)
         /* Buffer to Integer implicit conversion Cases. */
@@ -34667,33 +34666,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -34704,39 +34703,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer to Integer conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -34745,67 +34744,67 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer to Integer conversion of the Buffer Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer to Integer conversion of the Buffer elements */
@@ -34813,20 +34812,20 @@
         /* MatchObject is evaluated as Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64t", Local0)
+            Concatenate (__METHOD__, "-m64t", Local0)
             SRMT (Local0)
             M64T (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32t", Local0)
+            Concatenate (__METHOD__, "-m32t", Local0)
             SRMT (Local0)
             M32T (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
@@ -34838,13 +34837,13 @@
          */
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer to Integer conversion of the Buffer value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -34860,13 +34859,13 @@
         /* Switch is evaluated as Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64u", Local0)
+            Concatenate (__METHOD__, "-m64u", Local0)
             SRMT (Local0)
             M64U (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32u", Local0)
+            Concatenate (__METHOD__, "-m32u", Local0)
             SRMT (Local0)
             M32U (Local0)
         }
@@ -34875,18 +34874,18 @@
         /* Buffer to String conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
-        Concatenate (TS, "-m06f", Local0)
+        Concatenate (__METHOD__, "-m06f", Local0)
         SRMT (Local0)
         M06F (Local0)
         /* Buffer to String conversion of the Buffer second operand of */
         /* Concatenate operator when the first operand is evaluated as String */
-        Concatenate (TS, "-m070", Local0)
+        Concatenate (__METHOD__, "-m070", Local0)
         SRMT (Local0)
         M070 (Local0)
         /* Buffer to String conversion of the Buffer elements */
         /* of a search package of Match operator when some MatchObject */
         /* is evaluated as String */
-        Concatenate (TS, "-m071", Local0)
+        Concatenate (__METHOD__, "-m071", Local0)
         SRMT (Local0)
         M071 (Local0)
         /* Buffer to String conversion of the Buffer value */
@@ -34894,7 +34893,7 @@
         /* Switch is either static String data or explicitly */
         /* converted to String by ToDecimalString, ToHexString */
         /* or ToString */
-        Concatenate (TS, "-m072", Local0)
+        Concatenate (__METHOD__, "-m072", Local0)
         SRMT (Local0)
         M072 (Local0)
         /* There are no Buffer field and Field unit constant */
@@ -34912,7 +34911,6 @@
      */
     Method (M620, 0, Serialized)
     {
-        Name (TS, "m620")
         /* Buffer to Integer conversion if second operand is Buffer */
 
         Method (M645, 1, NotSerialized)
@@ -35112,13 +35110,13 @@
 
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl
index 180d63d81..35a29f8d8 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/olocal.asl
@@ -32,7 +32,6 @@
     Name (Z117, 0x75)
     Method (M618, 0, Serialized)
     {
-        Name (TS, "m618")
         /* Integer to String implicit conversion Cases. */
         /* Integer to String conversion of the Integer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
@@ -21723,13 +21722,13 @@
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
         If (F64)
         {
-            Concatenate (TS, "-m640", Local0)
+            Concatenate (__METHOD__, "-m640", Local0)
             SRMT (Local0)
             M640 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m320", Local0)
+            Concatenate (__METHOD__, "-m320", Local0)
             SRMT (Local0)
             M320 (Local0)
         }
@@ -21738,13 +21737,13 @@
         /* Concatenate operator when the first operand is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m641", Local0)
+            Concatenate (__METHOD__, "-m641", Local0)
             SRMT (Local0)
             M641 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m321", Local0)
+            Concatenate (__METHOD__, "-m321", Local0)
             SRMT (Local0)
             M321 (Local0)
         }
@@ -21762,13 +21761,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -21777,13 +21776,13 @@
         /* Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -21792,13 +21791,13 @@
         /* Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -21807,13 +21806,13 @@
         /* ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -21822,13 +21821,13 @@
         /* Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -21845,33 +21844,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64b", Local0)
+            Concatenate (__METHOD__, "-m64b", Local0)
             SRMT (Local0)
             M64B (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32b", Local0)
+            Concatenate (__METHOD__, "-m32b", Local0)
             SRMT (Local0)
             M32B (Local0)
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m000", Local0)
+        Concatenate (__METHOD__, "-m000", Local0)
         SRMT (Local0)
         M000 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64c", Local0)
+            Concatenate (__METHOD__, "-m64c", Local0)
             SRMT (Local0)
             M64C (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32c", Local0)
+            Concatenate (__METHOD__, "-m32c", Local0)
             SRMT (Local0)
             M32C (Local0)
         }
@@ -21882,39 +21881,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64D (Concatenate (TS, "-m64d"))
+            M64D (Concatenate (__METHOD__, "-m64d"))
         }
         Else
         {
-            M32D (Concatenate (TS, "-m32d"))
+            M32D (Concatenate (__METHOD__, "-m32d"))
         }
 
         /* String to Integer conversion of each String operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64E (Concatenate (TS, "-m64e"))
+            M64E (Concatenate (__METHOD__, "-m64e"))
         }
         Else
         {
-            M32E (Concatenate (TS, "-m32e"))
+            M32E (Concatenate (__METHOD__, "-m32e"))
         }
 
         /* String to Integer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m02b", Local0)
+        Concatenate (__METHOD__, "-m02b", Local0)
         SRMT (Local0)
         M02B (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64f", Local0)
+            Concatenate (__METHOD__, "-m64f", Local0)
             SRMT (Local0)
             M64F (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32f", Local0)
+            Concatenate (__METHOD__, "-m32f", Local0)
             SRMT (Local0)
             M32F (Local0)
         }
@@ -21923,72 +21922,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64g", Local0)
+            Concatenate (__METHOD__, "-m64g", Local0)
             SRMT (Local0)
             M64G (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32g", Local0)
+            Concatenate (__METHOD__, "-m32g", Local0)
             SRMT (Local0)
             M32G (Local0)
         }
 
         /* String to Integer conversion of the String Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m02c", Local0)
+        Concatenate (__METHOD__, "-m02c", Local0)
         SRMT (Local0)
         M02C (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64h", Local0)
+            Concatenate (__METHOD__, "-m64h", Local0)
             SRMT (Local0)
             M64H (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32h", Local0)
+            Concatenate (__METHOD__, "-m32h", Local0)
             SRMT (Local0)
             M32H (Local0)
         }
 
         /* String to Integer conversion of the String Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m02d", Local0)
+        Concatenate (__METHOD__, "-m02d", Local0)
         SRMT (Local0)
         M02D (Local0)
         /* String to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m02e", Local0)
+        Concatenate (__METHOD__, "-m02e", Local0)
         SRMT (Local0)
         M02E (Local0)
         /* String to Integer conversion of the String Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m02f", Local0)
+        Concatenate (__METHOD__, "-m02f", Local0)
         SRMT (Local0)
         M02F (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64i", Local0)
+            Concatenate (__METHOD__, "-m64i", Local0)
             SRMT (Local0)
             M64I (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32i", Local0)
+            Concatenate (__METHOD__, "-m32i", Local0)
             SRMT (Local0)
             M32I (Local0)
         }
 
         /* String to Integer conversion of the String StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m030", Local0)
+        Concatenate (__METHOD__, "-m030", Local0)
         SRMT (Local0)
         M030 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m031", Local0)
+        Concatenate (__METHOD__, "-m031", Local0)
         SRMT (Local0)
         M031 (Local0)
         /* String to Integer conversion of the String TimeoutValue */
@@ -22000,13 +21999,13 @@
          */
         /* String to Integer conversion of the String TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m033", Local0)
+        Concatenate (__METHOD__, "-m033", Local0)
         SRMT (Local0)
         M033 (Local0)
         /* String to Integer conversion of the String value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m034", Local0)
+        Concatenate (__METHOD__, "-m034", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -22026,18 +22025,18 @@
         /* String to Buffer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Buffer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m035", Local0)
+        Concatenate (__METHOD__, "-m035", Local0)
         SRMT (Local0)
         M035 (Local0)
         /* String to Buffer conversion of the String second operand of */
         /* Concatenate operator when the first operand is evaluated as Buffer */
-        Concatenate (TS, "-m036", Local0)
+        Concatenate (__METHOD__, "-m036", Local0)
         SRMT (Local0)
         M036 (Local0)
         /* String to Buffer conversion of the String Source operand of */
         /* ToString operator (has a visual effect in shortening of the */
         /* String taken the null character) */
-        Concatenate (TS, "-m037", Local0)
+        Concatenate (__METHOD__, "-m037", Local0)
         SRMT (Local0)
         M037 (Local0)
         /* Buffer to Integer implicit conversion Cases. */
@@ -22046,33 +22045,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -22083,39 +22082,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer to Integer conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -22124,72 +22123,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer to Integer conversion of the Buffer Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
@@ -22201,13 +22200,13 @@
          */
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer to Integer conversion of the Buffer value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -22227,12 +22226,12 @@
         /* Buffer to String conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
-        Concatenate (TS, "-m06f", Local0)
+        Concatenate (__METHOD__, "-m06f", Local0)
         SRMT (Local0)
         M06F (Local0)
         /* Buffer to String conversion of the Buffer second operand of */
         /* Concatenate operator when the first operand is evaluated as String */
-        Concatenate (TS, "-m070", Local0)
+        Concatenate (__METHOD__, "-m070", Local0)
         SRMT (Local0)
         M070 (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl
index 17f454195..b6b748e50 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob1.asl
@@ -32,7 +32,6 @@
     Name (Z086, 0x56)
     Method (M611, 0, Serialized)
     {
-        Name (TS, "m611")
         /* Integer to String implicit conversion Cases. */
         /* Integer to String conversion of the Integer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
@@ -21022,13 +21021,13 @@
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
         If (F64)
         {
-            Concatenate (TS, "-m640", Local0)
+            Concatenate (__METHOD__, "-m640", Local0)
             SRMT (Local0)
             M640 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m320", Local0)
+            Concatenate (__METHOD__, "-m320", Local0)
             SRMT (Local0)
             M320 (Local0)
         }
@@ -21037,13 +21036,13 @@
         /* Concatenate operator when the first operand is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m641", Local0)
+            Concatenate (__METHOD__, "-m641", Local0)
             SRMT (Local0)
             M641 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m321", Local0)
+            Concatenate (__METHOD__, "-m321", Local0)
             SRMT (Local0)
             M321 (Local0)
         }
@@ -21054,13 +21053,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -21069,13 +21068,13 @@
         /* Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -21084,13 +21083,13 @@
         /* Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -21099,13 +21098,13 @@
         /* ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -21114,13 +21113,13 @@
         /* Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -21131,33 +21130,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64b", Local0)
+            Concatenate (__METHOD__, "-m64b", Local0)
             SRMT (Local0)
             M64B (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32b", Local0)
+            Concatenate (__METHOD__, "-m32b", Local0)
             SRMT (Local0)
             M32B (Local0)
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m000", Local0)
+        Concatenate (__METHOD__, "-m000", Local0)
         SRMT (Local0)
         M000 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64c", Local0)
+            Concatenate (__METHOD__, "-m64c", Local0)
             SRMT (Local0)
             M64C (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32c", Local0)
+            Concatenate (__METHOD__, "-m32c", Local0)
             SRMT (Local0)
             M32C (Local0)
         }
@@ -21168,39 +21167,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64D (Concatenate (TS, "-m64d"))
+            M64D (Concatenate (__METHOD__, "-m64d"))
         }
         Else
         {
-            M32D (Concatenate (TS, "-m32d"))
+            M32D (Concatenate (__METHOD__, "-m32d"))
         }
 
         /* String to Integer conversion of each String operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64E (Concatenate (TS, "-m64e"))
+            M64E (Concatenate (__METHOD__, "-m64e"))
         }
         Else
         {
-            M32E (Concatenate (TS, "-m32e"))
+            M32E (Concatenate (__METHOD__, "-m32e"))
         }
 
         /* String to Integer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m02b", Local0)
+        Concatenate (__METHOD__, "-m02b", Local0)
         SRMT (Local0)
         M02B (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64f", Local0)
+            Concatenate (__METHOD__, "-m64f", Local0)
             SRMT (Local0)
             M64F (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32f", Local0)
+            Concatenate (__METHOD__, "-m32f", Local0)
             SRMT (Local0)
             M32F (Local0)
         }
@@ -21209,72 +21208,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64g", Local0)
+            Concatenate (__METHOD__, "-m64g", Local0)
             SRMT (Local0)
             M64G (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32g", Local0)
+            Concatenate (__METHOD__, "-m32g", Local0)
             SRMT (Local0)
             M32G (Local0)
         }
 
         /* String to Integer conversion of the String Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m02c", Local0)
+        Concatenate (__METHOD__, "-m02c", Local0)
         SRMT (Local0)
         M02C (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64h", Local0)
+            Concatenate (__METHOD__, "-m64h", Local0)
             SRMT (Local0)
             M64H (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32h", Local0)
+            Concatenate (__METHOD__, "-m32h", Local0)
             SRMT (Local0)
             M32H (Local0)
         }
 
         /* String to Integer conversion of the String Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m02d", Local0)
+        Concatenate (__METHOD__, "-m02d", Local0)
         SRMT (Local0)
         M02D (Local0)
         /* String to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m02e", Local0)
+        Concatenate (__METHOD__, "-m02e", Local0)
         SRMT (Local0)
         M02E (Local0)
         /* String to Integer conversion of the String Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m02f", Local0)
+        Concatenate (__METHOD__, "-m02f", Local0)
         SRMT (Local0)
         M02F (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64i", Local0)
+            Concatenate (__METHOD__, "-m64i", Local0)
             SRMT (Local0)
             M64I (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32i", Local0)
+            Concatenate (__METHOD__, "-m32i", Local0)
             SRMT (Local0)
             M32I (Local0)
         }
 
         /* String to Integer conversion of the String StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m030", Local0)
+        Concatenate (__METHOD__, "-m030", Local0)
         SRMT (Local0)
         M030 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m031", Local0)
+        Concatenate (__METHOD__, "-m031", Local0)
         SRMT (Local0)
         M031 (Local0)
         /* String to Integer conversion of the String TimeoutValue */
@@ -21286,13 +21285,13 @@
          */
         /* String to Integer conversion of the String TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m033", Local0)
+        Concatenate (__METHOD__, "-m033", Local0)
         SRMT (Local0)
         M033 (Local0)
         /* String to Integer conversion of the String value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m034", Local0)
+        Concatenate (__METHOD__, "-m034", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -21312,18 +21311,18 @@
         /* String to Buffer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Buffer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m035", Local0)
+        Concatenate (__METHOD__, "-m035", Local0)
         SRMT (Local0)
         M035 (Local0)
         /* String to Buffer conversion of the String second operand of */
         /* Concatenate operator when the first operand is evaluated as Buffer */
-        Concatenate (TS, "-m036", Local0)
+        Concatenate (__METHOD__, "-m036", Local0)
         SRMT (Local0)
         M036 (Local0)
         /* String to Buffer conversion of the String Source operand of */
         /* ToString operator (has a visual effect in shortening of the */
         /* String taken the null character) */
-        Concatenate (TS, "-m037", Local0)
+        Concatenate (__METHOD__, "-m037", Local0)
         SRMT (Local0)
         M037 (Local0)
         /* Buffer to Integer implicit conversion Cases. */
@@ -21332,33 +21331,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -21369,39 +21368,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer to Integer conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -21410,72 +21409,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer to Integer conversion of the Buffer Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
@@ -21487,13 +21486,13 @@
          */
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer to Integer conversion of the Buffer value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -21513,17 +21512,17 @@
         /* Buffer to String conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
-        Concatenate (TS, "-m06f", Local0)
+        Concatenate (__METHOD__, "-m06f", Local0)
         SRMT (Local0)
         M06F (Local0)
         /* Buffer to String conversion of the Buffer second operand of */
         /* Concatenate operator when the first operand is evaluated as String */
-        Concatenate (TS, "-m070", Local0)
+        Concatenate (__METHOD__, "-m070", Local0)
         SRMT (Local0)
         M070 (Local0)
         /* Check consistency of the test Named Objects */
         /* in the root Scope of the Global ACPI namespace */
-        Concatenate (TS, "-m606", Local0)
+        Concatenate (__METHOD__, "-m606", Local0)
         SRMT (Local0)
         M606 (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl
index b5611ca65..865dc2147 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/onamedglob2.asl
@@ -50,7 +50,6 @@
     Name (Z087, 0x57)
     Method (M612, 0, Serialized)
     {
-        Name (TS, "m612")
         /* Buffer Field to Buffer implicit conversion Cases. */
         /* Buffer Field to Buffer conversion of the Buffer Field second operand */
         /* of Logical operators when the first operand is evaluated as Buffer */
@@ -10574,13 +10573,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -10589,13 +10588,13 @@
         /* of Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -10604,13 +10603,13 @@
         /* of Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -10619,13 +10618,13 @@
         /* of ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -10634,13 +10633,13 @@
         /* of Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -10651,33 +10650,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -10688,39 +10687,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer Field to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field second operand */
         /* of Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -10729,88 +10728,88 @@
         /* second operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field Length */
         /* (second) operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field Index */
         /* (second) operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field Index */
         /* and Length operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         M06E (Local0)
         /* Check Buffer Fields consistency */
 
-        Concatenate (TS, "-m074", Local0)
+        Concatenate (__METHOD__, "-m074", Local0)
         SRMT (Local0)
         M074 (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl
index 33b2461cc..ebeba5387 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc1.asl
@@ -32,7 +32,6 @@
     Name (Z088, 0x58)
     Method (M613, 0, Serialized)
     {
-        Name (TS, "m613")
         /* Integer to String implicit conversion Cases. */
         /* Integer to String conversion of the Integer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
@@ -21711,13 +21710,13 @@
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
         If (F64)
         {
-            Concatenate (TS, "-m640", Local0)
+            Concatenate (__METHOD__, "-m640", Local0)
             SRMT (Local0)
             M640 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m320", Local0)
+            Concatenate (__METHOD__, "-m320", Local0)
             SRMT (Local0)
             M320 (Local0)
         }
@@ -21726,13 +21725,13 @@
         /* Concatenate operator when the first operand is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m641", Local0)
+            Concatenate (__METHOD__, "-m641", Local0)
             SRMT (Local0)
             M641 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m321", Local0)
+            Concatenate (__METHOD__, "-m321", Local0)
             SRMT (Local0)
             M321 (Local0)
         }
@@ -21750,13 +21749,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -21765,13 +21764,13 @@
         /* Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -21780,13 +21779,13 @@
         /* Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -21795,13 +21794,13 @@
         /* ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -21810,13 +21809,13 @@
         /* Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -21833,33 +21832,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64b", Local0)
+            Concatenate (__METHOD__, "-m64b", Local0)
             SRMT (Local0)
             M64B (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32b", Local0)
+            Concatenate (__METHOD__, "-m32b", Local0)
             SRMT (Local0)
             M32B (Local0)
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m000", Local0)
+        Concatenate (__METHOD__, "-m000", Local0)
         SRMT (Local0)
         M000 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64c", Local0)
+            Concatenate (__METHOD__, "-m64c", Local0)
             SRMT (Local0)
             M64C (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32c", Local0)
+            Concatenate (__METHOD__, "-m32c", Local0)
             SRMT (Local0)
             M32C (Local0)
         }
@@ -21870,39 +21869,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64D (Concatenate (TS, "-m64d"))
+            M64D (Concatenate (__METHOD__, "-m64d"))
         }
         Else
         {
-            M32D (Concatenate (TS, "-m32d"))
+            M32D (Concatenate (__METHOD__, "-m32d"))
         }
 
         /* String to Integer conversion of each String operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64E (Concatenate (TS, "-m64e"))
+            M64E (Concatenate (__METHOD__, "-m64e"))
         }
         Else
         {
-            M32E (Concatenate (TS, "-m32e"))
+            M32E (Concatenate (__METHOD__, "-m32e"))
         }
 
         /* String to Integer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m02b", Local0)
+        Concatenate (__METHOD__, "-m02b", Local0)
         SRMT (Local0)
         M02B (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64f", Local0)
+            Concatenate (__METHOD__, "-m64f", Local0)
             SRMT (Local0)
             M64F (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32f", Local0)
+            Concatenate (__METHOD__, "-m32f", Local0)
             SRMT (Local0)
             M32F (Local0)
         }
@@ -21911,72 +21910,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64g", Local0)
+            Concatenate (__METHOD__, "-m64g", Local0)
             SRMT (Local0)
             M64G (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32g", Local0)
+            Concatenate (__METHOD__, "-m32g", Local0)
             SRMT (Local0)
             M32G (Local0)
         }
 
         /* String to Integer conversion of the String Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m02c", Local0)
+        Concatenate (__METHOD__, "-m02c", Local0)
         SRMT (Local0)
         M02C (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64h", Local0)
+            Concatenate (__METHOD__, "-m64h", Local0)
             SRMT (Local0)
             M64H (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32h", Local0)
+            Concatenate (__METHOD__, "-m32h", Local0)
             SRMT (Local0)
             M32H (Local0)
         }
 
         /* String to Integer conversion of the String Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m02d", Local0)
+        Concatenate (__METHOD__, "-m02d", Local0)
         SRMT (Local0)
         M02D (Local0)
         /* String to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m02e", Local0)
+        Concatenate (__METHOD__, "-m02e", Local0)
         SRMT (Local0)
         M02E (Local0)
         /* String to Integer conversion of the String Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m02f", Local0)
+        Concatenate (__METHOD__, "-m02f", Local0)
         SRMT (Local0)
         M02F (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64i", Local0)
+            Concatenate (__METHOD__, "-m64i", Local0)
             SRMT (Local0)
             M64I (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32i", Local0)
+            Concatenate (__METHOD__, "-m32i", Local0)
             SRMT (Local0)
             M32I (Local0)
         }
 
         /* String to Integer conversion of the String StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m030", Local0)
+        Concatenate (__METHOD__, "-m030", Local0)
         SRMT (Local0)
         M030 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m031", Local0)
+        Concatenate (__METHOD__, "-m031", Local0)
         SRMT (Local0)
         M031 (Local0)
         /* String to Integer conversion of the String TimeoutValue */
@@ -21988,13 +21987,13 @@
          */
         /* String to Integer conversion of the String TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m033", Local0)
+        Concatenate (__METHOD__, "-m033", Local0)
         SRMT (Local0)
         M033 (Local0)
         /* String to Integer conversion of the String value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m034", Local0)
+        Concatenate (__METHOD__, "-m034", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -22014,18 +22013,18 @@
         /* String to Buffer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Buffer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m035", Local0)
+        Concatenate (__METHOD__, "-m035", Local0)
         SRMT (Local0)
         M035 (Local0)
         /* String to Buffer conversion of the String second operand of */
         /* Concatenate operator when the first operand is evaluated as Buffer */
-        Concatenate (TS, "-m036", Local0)
+        Concatenate (__METHOD__, "-m036", Local0)
         SRMT (Local0)
         M036 (Local0)
         /* String to Buffer conversion of the String Source operand of */
         /* ToString operator (has a visual effect in shortening of the */
         /* String taken the null character) */
-        Concatenate (TS, "-m037", Local0)
+        Concatenate (__METHOD__, "-m037", Local0)
         SRMT (Local0)
         M037 (Local0)
         /* Buffer to Integer implicit conversion Cases. */
@@ -22034,33 +22033,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -22071,39 +22070,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer to Integer conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -22112,72 +22111,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer to Integer conversion of the Buffer Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
@@ -22189,13 +22188,13 @@
          */
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer to Integer conversion of the Buffer value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -22215,12 +22214,12 @@
         /* Buffer to String conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
-        Concatenate (TS, "-m06f", Local0)
+        Concatenate (__METHOD__, "-m06f", Local0)
         SRMT (Local0)
         M06F (Local0)
         /* Buffer to String conversion of the Buffer second operand of */
         /* Concatenate operator when the first operand is evaluated as String */
-        Concatenate (TS, "-m070", Local0)
+        Concatenate (__METHOD__, "-m070", Local0)
         SRMT (Local0)
         M070 (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl
index c760e12b4..7db9e0a6b 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/onamedloc2.asl
@@ -32,7 +32,6 @@
     Name (Z089, 0x59)
     Method (M614, 0, Serialized)
     {
-        Name (TS, "m614")
         Name (B640, Buffer (0x01C4){})
         Name (B641, Buffer (0x45){})
         /* Buffer Field to Buffer implicit conversion Cases. */
@@ -10931,13 +10930,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -10946,13 +10945,13 @@
         /* of Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -10961,13 +10960,13 @@
         /* of Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -10976,13 +10975,13 @@
         /* of ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -10991,13 +10990,13 @@
         /* of Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -11008,33 +11007,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -11045,39 +11044,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer Field to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field second operand */
         /* of Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -11086,83 +11085,83 @@
         /* second operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field Length */
         /* (second) operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field Index */
         /* (second) operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field Index */
         /* and Length operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         M06E (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl
index 39f23f86e..2057358ea 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/opackageel.asl
@@ -32,7 +32,6 @@
     Name (Z090, 0x5A)
     Method (M615, 0, Serialized)
     {
-        Name (TS, "m615")
         /* Integer to String implicit conversion Cases. */
         /* Integer to String conversion of the Integer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
@@ -22552,13 +22551,13 @@
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
         If (F64)
         {
-            Concatenate (TS, "-m640", Local0)
+            Concatenate (__METHOD__, "-m640", Local0)
             SRMT (Local0)
             M640 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m320", Local0)
+            Concatenate (__METHOD__, "-m320", Local0)
             SRMT (Local0)
             M320 (Local0)
         }
@@ -22567,13 +22566,13 @@
         /* Concatenate operator when the first operand is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m641", Local0)
+            Concatenate (__METHOD__, "-m641", Local0)
             SRMT (Local0)
             M641 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m321", Local0)
+            Concatenate (__METHOD__, "-m321", Local0)
             SRMT (Local0)
             M321 (Local0)
         }
@@ -22584,13 +22583,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -22599,13 +22598,13 @@
         /* Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -22614,13 +22613,13 @@
         /* Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -22629,13 +22628,13 @@
         /* ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -22644,13 +22643,13 @@
         /* Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -22661,33 +22660,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64b", Local0)
+            Concatenate (__METHOD__, "-m64b", Local0)
             SRMT (Local0)
             M64B (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32b", Local0)
+            Concatenate (__METHOD__, "-m32b", Local0)
             SRMT (Local0)
             M32B (Local0)
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m000", Local0)
+        Concatenate (__METHOD__, "-m000", Local0)
         SRMT (Local0)
         M000 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64c", Local0)
+            Concatenate (__METHOD__, "-m64c", Local0)
             SRMT (Local0)
             M64C (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32c", Local0)
+            Concatenate (__METHOD__, "-m32c", Local0)
             SRMT (Local0)
             M32C (Local0)
         }
@@ -22698,39 +22697,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64D (Concatenate (TS, "-m64d"))
+            M64D (Concatenate (__METHOD__, "-m64d"))
         }
         Else
         {
-            M32D (Concatenate (TS, "-m32d"))
+            M32D (Concatenate (__METHOD__, "-m32d"))
         }
 
         /* String to Integer conversion of each String operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64E (Concatenate (TS, "-m64e"))
+            M64E (Concatenate (__METHOD__, "-m64e"))
         }
         Else
         {
-            M32E (Concatenate (TS, "-m32e"))
+            M32E (Concatenate (__METHOD__, "-m32e"))
         }
 
         /* String to Integer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m02b", Local0)
+        Concatenate (__METHOD__, "-m02b", Local0)
         SRMT (Local0)
         M02B (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64f", Local0)
+            Concatenate (__METHOD__, "-m64f", Local0)
             SRMT (Local0)
             M64F (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32f", Local0)
+            Concatenate (__METHOD__, "-m32f", Local0)
             SRMT (Local0)
             M32F (Local0)
         }
@@ -22739,72 +22738,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64g", Local0)
+            Concatenate (__METHOD__, "-m64g", Local0)
             SRMT (Local0)
             M64G (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32g", Local0)
+            Concatenate (__METHOD__, "-m32g", Local0)
             SRMT (Local0)
             M32G (Local0)
         }
 
         /* String to Integer conversion of the String Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m02c", Local0)
+        Concatenate (__METHOD__, "-m02c", Local0)
         SRMT (Local0)
         M02C (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64h", Local0)
+            Concatenate (__METHOD__, "-m64h", Local0)
             SRMT (Local0)
             M64H (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32h", Local0)
+            Concatenate (__METHOD__, "-m32h", Local0)
             SRMT (Local0)
             M32H (Local0)
         }
 
         /* String to Integer conversion of the String Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m02d", Local0)
+        Concatenate (__METHOD__, "-m02d", Local0)
         SRMT (Local0)
         M02D (Local0)
         /* String to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m02e", Local0)
+        Concatenate (__METHOD__, "-m02e", Local0)
         SRMT (Local0)
         M02E (Local0)
         /* String to Integer conversion of the String Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m02f", Local0)
+        Concatenate (__METHOD__, "-m02f", Local0)
         SRMT (Local0)
         M02F (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64i", Local0)
+            Concatenate (__METHOD__, "-m64i", Local0)
             SRMT (Local0)
             M64I (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32i", Local0)
+            Concatenate (__METHOD__, "-m32i", Local0)
             SRMT (Local0)
             M32I (Local0)
         }
 
         /* String to Integer conversion of the String StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m030", Local0)
+        Concatenate (__METHOD__, "-m030", Local0)
         SRMT (Local0)
         M030 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m031", Local0)
+        Concatenate (__METHOD__, "-m031", Local0)
         SRMT (Local0)
         M031 (Local0)
         /* String to Integer conversion of the String TimeoutValue */
@@ -22816,13 +22815,13 @@
          */
         /* String to Integer conversion of the String TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m033", Local0)
+        Concatenate (__METHOD__, "-m033", Local0)
         SRMT (Local0)
         M033 (Local0)
         /* String to Integer conversion of the String value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m034", Local0)
+        Concatenate (__METHOD__, "-m034", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -22842,18 +22841,18 @@
         /* String to Buffer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Buffer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m035", Local0)
+        Concatenate (__METHOD__, "-m035", Local0)
         SRMT (Local0)
         M035 (Local0)
         /* String to Buffer conversion of the String second operand of */
         /* Concatenate operator when the first operand is evaluated as Buffer */
-        Concatenate (TS, "-m036", Local0)
+        Concatenate (__METHOD__, "-m036", Local0)
         SRMT (Local0)
         M036 (Local0)
         /* String to Buffer conversion of the String Source operand of */
         /* ToString operator (has a visual effect in shortening of the */
         /* String taken the null character) */
-        Concatenate (TS, "-m037", Local0)
+        Concatenate (__METHOD__, "-m037", Local0)
         SRMT (Local0)
         M037 (Local0)
         /* Buffer to Integer implicit conversion Cases. */
@@ -22862,33 +22861,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -22899,39 +22898,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer to Integer conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -22940,72 +22939,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer to Integer conversion of the Buffer Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
@@ -23017,13 +23016,13 @@
          */
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer to Integer conversion of the Buffer value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -23043,17 +23042,17 @@
         /* Buffer to String conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
-        Concatenate (TS, "-m06f", Local0)
+        Concatenate (__METHOD__, "-m06f", Local0)
         SRMT (Local0)
         M06F (Local0)
         /* Buffer to String conversion of the Buffer second operand of */
         /* Concatenate operator when the first operand is evaluated as String */
-        Concatenate (TS, "-m070", Local0)
+        Concatenate (__METHOD__, "-m070", Local0)
         SRMT (Local0)
         M070 (Local0)
         /* Check consistency of the test Named Objects */
         /* in the root Scope of the Global ACPI namespace */
-        Concatenate (TS, "-m606", Local0)
+        Concatenate (__METHOD__, "-m606", Local0)
         SRMT (Local0)
         M606 (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl
index 30b39400e..1ff194add 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed1.asl
@@ -32,7 +32,6 @@
     Name (Z091, 0x5B)
     Method (M616, 0, Serialized)
     {
-        Name (TS, "m616")
         /* Integer to String implicit conversion Cases. */
         /* Integer to String conversion of the Integer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
@@ -21126,13 +21125,13 @@
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
         If (F64)
         {
-            Concatenate (TS, "-m640", Local0)
+            Concatenate (__METHOD__, "-m640", Local0)
             SRMT (Local0)
             M640 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m320", Local0)
+            Concatenate (__METHOD__, "-m320", Local0)
             SRMT (Local0)
             M320 (Local0)
         }
@@ -21141,13 +21140,13 @@
         /* Concatenate operator when the first operand is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m641", Local0)
+            Concatenate (__METHOD__, "-m641", Local0)
             SRMT (Local0)
             M641 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m321", Local0)
+            Concatenate (__METHOD__, "-m321", Local0)
             SRMT (Local0)
             M321 (Local0)
         }
@@ -21158,13 +21157,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -21173,13 +21172,13 @@
         /* Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -21188,13 +21187,13 @@
         /* Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -21203,13 +21202,13 @@
         /* ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -21218,13 +21217,13 @@
         /* Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -21235,33 +21234,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64b", Local0)
+            Concatenate (__METHOD__, "-m64b", Local0)
             SRMT (Local0)
             M64B (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32b", Local0)
+            Concatenate (__METHOD__, "-m32b", Local0)
             SRMT (Local0)
             M32B (Local0)
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m000", Local0)
+        Concatenate (__METHOD__, "-m000", Local0)
         SRMT (Local0)
         M000 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64c", Local0)
+            Concatenate (__METHOD__, "-m64c", Local0)
             SRMT (Local0)
             M64C (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32c", Local0)
+            Concatenate (__METHOD__, "-m32c", Local0)
             SRMT (Local0)
             M32C (Local0)
         }
@@ -21272,39 +21271,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64D (Concatenate (TS, "-m64d"))
+            M64D (Concatenate (__METHOD__, "-m64d"))
         }
         Else
         {
-            M32D (Concatenate (TS, "-m32d"))
+            M32D (Concatenate (__METHOD__, "-m32d"))
         }
 
         /* String to Integer conversion of each String operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64E (Concatenate (TS, "-m64e"))
+            M64E (Concatenate (__METHOD__, "-m64e"))
         }
         Else
         {
-            M32E (Concatenate (TS, "-m32e"))
+            M32E (Concatenate (__METHOD__, "-m32e"))
         }
 
         /* String to Integer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m02b", Local0)
+        Concatenate (__METHOD__, "-m02b", Local0)
         SRMT (Local0)
         M02B (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64f", Local0)
+            Concatenate (__METHOD__, "-m64f", Local0)
             SRMT (Local0)
             M64F (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32f", Local0)
+            Concatenate (__METHOD__, "-m32f", Local0)
             SRMT (Local0)
             M32F (Local0)
         }
@@ -21313,72 +21312,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64g", Local0)
+            Concatenate (__METHOD__, "-m64g", Local0)
             SRMT (Local0)
             M64G (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32g", Local0)
+            Concatenate (__METHOD__, "-m32g", Local0)
             SRMT (Local0)
             M32G (Local0)
         }
 
         /* String to Integer conversion of the String Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m02c", Local0)
+        Concatenate (__METHOD__, "-m02c", Local0)
         SRMT (Local0)
         M02C (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64h", Local0)
+            Concatenate (__METHOD__, "-m64h", Local0)
             SRMT (Local0)
             M64H (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32h", Local0)
+            Concatenate (__METHOD__, "-m32h", Local0)
             SRMT (Local0)
             M32H (Local0)
         }
 
         /* String to Integer conversion of the String Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m02d", Local0)
+        Concatenate (__METHOD__, "-m02d", Local0)
         SRMT (Local0)
         M02D (Local0)
         /* String to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m02e", Local0)
+        Concatenate (__METHOD__, "-m02e", Local0)
         SRMT (Local0)
         M02E (Local0)
         /* String to Integer conversion of the String Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m02f", Local0)
+        Concatenate (__METHOD__, "-m02f", Local0)
         SRMT (Local0)
         M02F (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64i", Local0)
+            Concatenate (__METHOD__, "-m64i", Local0)
             SRMT (Local0)
             M64I (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32i", Local0)
+            Concatenate (__METHOD__, "-m32i", Local0)
             SRMT (Local0)
             M32I (Local0)
         }
 
         /* String to Integer conversion of the String StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m030", Local0)
+        Concatenate (__METHOD__, "-m030", Local0)
         SRMT (Local0)
         M030 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m031", Local0)
+        Concatenate (__METHOD__, "-m031", Local0)
         SRMT (Local0)
         M031 (Local0)
         /* String to Integer conversion of the String TimeoutValue */
@@ -21390,13 +21389,13 @@
          */
         /* String to Integer conversion of the String TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m033", Local0)
+        Concatenate (__METHOD__, "-m033", Local0)
         SRMT (Local0)
         M033 (Local0)
         /* String to Integer conversion of the String value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m034", Local0)
+        Concatenate (__METHOD__, "-m034", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -21416,18 +21415,18 @@
         /* String to Buffer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Buffer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m035", Local0)
+        Concatenate (__METHOD__, "-m035", Local0)
         SRMT (Local0)
         M035 (Local0)
         /* String to Buffer conversion of the String second operand of */
         /* Concatenate operator when the first operand is evaluated as Buffer */
-        Concatenate (TS, "-m036", Local0)
+        Concatenate (__METHOD__, "-m036", Local0)
         SRMT (Local0)
         M036 (Local0)
         /* String to Buffer conversion of the String Source operand of */
         /* ToString operator (has a visual effect in shortening of the */
         /* String taken the null character) */
-        Concatenate (TS, "-m037", Local0)
+        Concatenate (__METHOD__, "-m037", Local0)
         SRMT (Local0)
         M037 (Local0)
         /* Buffer to Integer implicit conversion Cases. */
@@ -21436,33 +21435,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -21473,39 +21472,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer to Integer conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -21514,72 +21513,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer to Integer conversion of the Buffer Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
@@ -21591,13 +21590,13 @@
          */
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer to Integer conversion of the Buffer value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -21617,17 +21616,17 @@
         /* Buffer to String conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
-        Concatenate (TS, "-m06f", Local0)
+        Concatenate (__METHOD__, "-m06f", Local0)
         SRMT (Local0)
         M06F (Local0)
         /* Buffer to String conversion of the Buffer second operand of */
         /* Concatenate operator when the first operand is evaluated as String */
-        Concatenate (TS, "-m070", Local0)
+        Concatenate (__METHOD__, "-m070", Local0)
         SRMT (Local0)
         M070 (Local0)
         /* Check consistency of the test Named Objects */
         /* in the root Scope of the Global ACPI namespace */
-        Concatenate (TS, "-m606", Local0)
+        Concatenate (__METHOD__, "-m606", Local0)
         SRMT (Local0)
         M606 (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl
index dfd8c37a1..474663fa9 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/oreftonamed2.asl
@@ -32,7 +32,6 @@
     Name (Z120, 0x78)
     Method (M61B, 0, Serialized)
     {
-        Name (TS, "m61b")
         /* Buffer Field to Buffer implicit conversion Cases. */
         /* Buffer Field to Buffer conversion of the Buffer Field second operand */
         /* of Logical operators when the first operand is evaluated as Buffer */
@@ -10635,13 +10634,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -10650,13 +10649,13 @@
         /* of Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -10665,13 +10664,13 @@
         /* of Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -10680,13 +10679,13 @@
         /* of ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -10695,13 +10694,13 @@
         /* of Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -10712,33 +10711,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -10749,39 +10748,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer Field to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field second operand */
         /* of Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -10790,83 +10789,83 @@
         /* second operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field Length */
         /* (second) operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field Index */
         /* (second) operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field Index */
         /* and Length operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer Field to Integer conversion of the Buffer Field StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer Field to Integer conversion of the Buffer Field value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         If (Y364)
         {
@@ -10879,7 +10878,7 @@
 
         /* Check Buffer Fields consistency */
 
-        Concatenate (TS, "-m074", Local0)
+        Concatenate (__METHOD__, "-m074", Local0)
         SRMT (Local0)
         M074 (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl
index 6e43fae6f..a33ea48c4 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/oreftopackageel.asl
@@ -33,7 +33,6 @@
     Name (Z119, 0x77)
     Method (M61A, 0, Serialized)
     {
-        Name (TS, "m61a")
         /* Integer to String implicit conversion Cases. */
         /* Integer to String conversion of the Integer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
@@ -24171,13 +24170,13 @@
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
         If (F64)
         {
-            Concatenate (TS, "-m640", Local0)
+            Concatenate (__METHOD__, "-m640", Local0)
             SRMT (Local0)
             M640 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m320", Local0)
+            Concatenate (__METHOD__, "-m320", Local0)
             SRMT (Local0)
             M320 (Local0)
         }
@@ -24186,13 +24185,13 @@
         /* Concatenate operator when the first operand is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m641", Local0)
+            Concatenate (__METHOD__, "-m641", Local0)
             SRMT (Local0)
             M641 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m321", Local0)
+            Concatenate (__METHOD__, "-m321", Local0)
             SRMT (Local0)
             M321 (Local0)
         }
@@ -24203,13 +24202,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -24218,13 +24217,13 @@
         /* Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -24233,13 +24232,13 @@
         /* Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -24248,13 +24247,13 @@
         /* ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -24263,13 +24262,13 @@
         /* Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -24280,33 +24279,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64b", Local0)
+            Concatenate (__METHOD__, "-m64b", Local0)
             SRMT (Local0)
             M64B (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32b", Local0)
+            Concatenate (__METHOD__, "-m32b", Local0)
             SRMT (Local0)
             M32B (Local0)
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m000", Local0)
+        Concatenate (__METHOD__, "-m000", Local0)
         SRMT (Local0)
         M000 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64c", Local0)
+            Concatenate (__METHOD__, "-m64c", Local0)
             SRMT (Local0)
             M64C (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32c", Local0)
+            Concatenate (__METHOD__, "-m32c", Local0)
             SRMT (Local0)
             M32C (Local0)
         }
@@ -24317,39 +24316,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64D (Concatenate (TS, "-m64d"))
+            M64D (Concatenate (__METHOD__, "-m64d"))
         }
         Else
         {
-            M32D (Concatenate (TS, "-m32d"))
+            M32D (Concatenate (__METHOD__, "-m32d"))
         }
 
         /* String to Integer conversion of each String operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64E (Concatenate (TS, "-m64e"))
+            M64E (Concatenate (__METHOD__, "-m64e"))
         }
         Else
         {
-            M32E (Concatenate (TS, "-m32e"))
+            M32E (Concatenate (__METHOD__, "-m32e"))
         }
 
         /* String to Integer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m02b", Local0)
+        Concatenate (__METHOD__, "-m02b", Local0)
         SRMT (Local0)
         M02B (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64f", Local0)
+            Concatenate (__METHOD__, "-m64f", Local0)
             SRMT (Local0)
             M64F (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32f", Local0)
+            Concatenate (__METHOD__, "-m32f", Local0)
             SRMT (Local0)
             M32F (Local0)
         }
@@ -24358,72 +24357,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64g", Local0)
+            Concatenate (__METHOD__, "-m64g", Local0)
             SRMT (Local0)
             M64G (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32g", Local0)
+            Concatenate (__METHOD__, "-m32g", Local0)
             SRMT (Local0)
             M32G (Local0)
         }
 
         /* String to Integer conversion of the String Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m02c", Local0)
+        Concatenate (__METHOD__, "-m02c", Local0)
         SRMT (Local0)
         M02C (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64h", Local0)
+            Concatenate (__METHOD__, "-m64h", Local0)
             SRMT (Local0)
             M64H (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32h", Local0)
+            Concatenate (__METHOD__, "-m32h", Local0)
             SRMT (Local0)
             M32H (Local0)
         }
 
         /* String to Integer conversion of the String Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m02d", Local0)
+        Concatenate (__METHOD__, "-m02d", Local0)
         SRMT (Local0)
         M02D (Local0)
         /* String to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m02e", Local0)
+        Concatenate (__METHOD__, "-m02e", Local0)
         SRMT (Local0)
         M02E (Local0)
         /* String to Integer conversion of the String Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m02f", Local0)
+        Concatenate (__METHOD__, "-m02f", Local0)
         SRMT (Local0)
         M02F (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64i", Local0)
+            Concatenate (__METHOD__, "-m64i", Local0)
             SRMT (Local0)
             M64I (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32i", Local0)
+            Concatenate (__METHOD__, "-m32i", Local0)
             SRMT (Local0)
             M32I (Local0)
         }
 
         /* String to Integer conversion of the String StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m030", Local0)
+        Concatenate (__METHOD__, "-m030", Local0)
         SRMT (Local0)
         M030 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m031", Local0)
+        Concatenate (__METHOD__, "-m031", Local0)
         SRMT (Local0)
         M031 (Local0)
         /* String to Integer conversion of the String TimeoutValue */
@@ -24435,13 +24434,13 @@
          */
         /* String to Integer conversion of the String TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m033", Local0)
+        Concatenate (__METHOD__, "-m033", Local0)
         SRMT (Local0)
         M033 (Local0)
         /* String to Integer conversion of the String value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m034", Local0)
+        Concatenate (__METHOD__, "-m034", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -24461,18 +24460,18 @@
         /* String to Buffer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Buffer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m035", Local0)
+        Concatenate (__METHOD__, "-m035", Local0)
         SRMT (Local0)
         M035 (Local0)
         /* String to Buffer conversion of the String second operand of */
         /* Concatenate operator when the first operand is evaluated as Buffer */
-        Concatenate (TS, "-m036", Local0)
+        Concatenate (__METHOD__, "-m036", Local0)
         SRMT (Local0)
         M036 (Local0)
         /* String to Buffer conversion of the String Source operand of */
         /* ToString operator (has a visual effect in shortening of the */
         /* String taken the null character) */
-        Concatenate (TS, "-m037", Local0)
+        Concatenate (__METHOD__, "-m037", Local0)
         SRMT (Local0)
         M037 (Local0)
         /* Buffer to Integer implicit conversion Cases. */
@@ -24481,33 +24480,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -24518,39 +24517,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer to Integer conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -24559,72 +24558,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer to Integer conversion of the Buffer Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
@@ -24636,13 +24635,13 @@
          */
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer to Integer conversion of the Buffer value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -24662,17 +24661,17 @@
         /* Buffer to String conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
-        Concatenate (TS, "-m06f", Local0)
+        Concatenate (__METHOD__, "-m06f", Local0)
         SRMT (Local0)
         M06F (Local0)
         /* Buffer to String conversion of the Buffer second operand of */
         /* Concatenate operator when the first operand is evaluated as String */
-        Concatenate (TS, "-m070", Local0)
+        Concatenate (__METHOD__, "-m070", Local0)
         SRMT (Local0)
         M070 (Local0)
         /* Check consistency of the test Named Objects */
         /* in the root Scope of the Global ACPI namespace */
-        Concatenate (TS, "-m606", Local0)
+        Concatenate (__METHOD__, "-m606", Local0)
         SRMT (Local0)
         M606 (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl
index 84654d9bb..17f9012cc 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/oreturn.asl
@@ -32,7 +32,6 @@
     Name (Z118, 0x76)
     Method (M619, 0, Serialized)
     {
-        Name (TS, "m619")
         /* Integer to String implicit conversion Cases. */
         /* Integer to String conversion of the Integer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
@@ -22554,13 +22553,13 @@
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
         If (F64)
         {
-            Concatenate (TS, "-m640", Local0)
+            Concatenate (__METHOD__, "-m640", Local0)
             SRMT (Local0)
             M640 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m320", Local0)
+            Concatenate (__METHOD__, "-m320", Local0)
             SRMT (Local0)
             M320 (Local0)
         }
@@ -22569,13 +22568,13 @@
         /* Concatenate operator when the first operand is evaluated as String */
         If (F64)
         {
-            Concatenate (TS, "-m641", Local0)
+            Concatenate (__METHOD__, "-m641", Local0)
             SRMT (Local0)
             M641 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m321", Local0)
+            Concatenate (__METHOD__, "-m321", Local0)
             SRMT (Local0)
             M321 (Local0)
         }
@@ -22586,13 +22585,13 @@
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
         If (F64)
         {
-            Concatenate (TS, "-m644", Local0)
+            Concatenate (__METHOD__, "-m644", Local0)
             SRMT (Local0)
             M644 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m324", Local0)
+            Concatenate (__METHOD__, "-m324", Local0)
             SRMT (Local0)
             M324 (Local0)
         }
@@ -22601,13 +22600,13 @@
         /* Concatenate operator */
         If (F64)
         {
-            Concatenate (TS, "-m645", Local0)
+            Concatenate (__METHOD__, "-m645", Local0)
             SRMT (Local0)
             M645 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m325", Local0)
+            Concatenate (__METHOD__, "-m325", Local0)
             SRMT (Local0)
             M325 (Local0)
         }
@@ -22616,13 +22615,13 @@
         /* Concatenate operator when the first operand is evaluated as Buffer */
         If (F64)
         {
-            Concatenate (TS, "-m646", Local0)
+            Concatenate (__METHOD__, "-m646", Local0)
             SRMT (Local0)
             M646 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m326", Local0)
+            Concatenate (__METHOD__, "-m326", Local0)
             SRMT (Local0)
             M326 (Local0)
         }
@@ -22631,13 +22630,13 @@
         /* ToString operator */
         If (F64)
         {
-            Concatenate (TS, "-m647", Local0)
+            Concatenate (__METHOD__, "-m647", Local0)
             SRMT (Local0)
             M647 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m327", Local0)
+            Concatenate (__METHOD__, "-m327", Local0)
             SRMT (Local0)
             M327 (Local0)
         }
@@ -22646,13 +22645,13 @@
         /* Mid operator */
         If (F64)
         {
-            Concatenate (TS, "-m648", Local0)
+            Concatenate (__METHOD__, "-m648", Local0)
             SRMT (Local0)
             M648 (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m328", Local0)
+            Concatenate (__METHOD__, "-m328", Local0)
             SRMT (Local0)
             M328 (Local0)
         }
@@ -22663,33 +22662,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64b", Local0)
+            Concatenate (__METHOD__, "-m64b", Local0)
             SRMT (Local0)
             M64B (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32b", Local0)
+            Concatenate (__METHOD__, "-m32b", Local0)
             SRMT (Local0)
             M32B (Local0)
         }
 
         /* String to Integer conversion of the String sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m000", Local0)
+        Concatenate (__METHOD__, "-m000", Local0)
         SRMT (Local0)
         M000 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64c", Local0)
+            Concatenate (__METHOD__, "-m64c", Local0)
             SRMT (Local0)
             M64C (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32c", Local0)
+            Concatenate (__METHOD__, "-m32c", Local0)
             SRMT (Local0)
             M32C (Local0)
         }
@@ -22700,39 +22699,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64D (Concatenate (TS, "-m64d"))
+            M64D (Concatenate (__METHOD__, "-m64d"))
         }
         Else
         {
-            M32D (Concatenate (TS, "-m32d"))
+            M32D (Concatenate (__METHOD__, "-m32d"))
         }
 
         /* String to Integer conversion of each String operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64E (Concatenate (TS, "-m64e"))
+            M64E (Concatenate (__METHOD__, "-m64e"))
         }
         Else
         {
-            M32E (Concatenate (TS, "-m32e"))
+            M32E (Concatenate (__METHOD__, "-m32e"))
         }
 
         /* String to Integer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m02b", Local0)
+        Concatenate (__METHOD__, "-m02b", Local0)
         SRMT (Local0)
         M02B (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64f", Local0)
+            Concatenate (__METHOD__, "-m64f", Local0)
             SRMT (Local0)
             M64F (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32f", Local0)
+            Concatenate (__METHOD__, "-m32f", Local0)
             SRMT (Local0)
             M32F (Local0)
         }
@@ -22741,72 +22740,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64g", Local0)
+            Concatenate (__METHOD__, "-m64g", Local0)
             SRMT (Local0)
             M64G (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32g", Local0)
+            Concatenate (__METHOD__, "-m32g", Local0)
             SRMT (Local0)
             M32G (Local0)
         }
 
         /* String to Integer conversion of the String Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m02c", Local0)
+        Concatenate (__METHOD__, "-m02c", Local0)
         SRMT (Local0)
         M02C (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64h", Local0)
+            Concatenate (__METHOD__, "-m64h", Local0)
             SRMT (Local0)
             M64H (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32h", Local0)
+            Concatenate (__METHOD__, "-m32h", Local0)
             SRMT (Local0)
             M32H (Local0)
         }
 
         /* String to Integer conversion of the String Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m02d", Local0)
+        Concatenate (__METHOD__, "-m02d", Local0)
         SRMT (Local0)
         M02D (Local0)
         /* String to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m02e", Local0)
+        Concatenate (__METHOD__, "-m02e", Local0)
         SRMT (Local0)
         M02E (Local0)
         /* String to Integer conversion of the String Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m02f", Local0)
+        Concatenate (__METHOD__, "-m02f", Local0)
         SRMT (Local0)
         M02F (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64i", Local0)
+            Concatenate (__METHOD__, "-m64i", Local0)
             SRMT (Local0)
             M64I (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32i", Local0)
+            Concatenate (__METHOD__, "-m32i", Local0)
             SRMT (Local0)
             M32I (Local0)
         }
 
         /* String to Integer conversion of the String StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m030", Local0)
+        Concatenate (__METHOD__, "-m030", Local0)
         SRMT (Local0)
         M030 (Local0)
         /* String to Integer conversion of the String sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m031", Local0)
+        Concatenate (__METHOD__, "-m031", Local0)
         SRMT (Local0)
         M031 (Local0)
         /* String to Integer conversion of the String TimeoutValue */
@@ -22818,13 +22817,13 @@
          */
         /* String to Integer conversion of the String TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m033", Local0)
+        Concatenate (__METHOD__, "-m033", Local0)
         SRMT (Local0)
         M033 (Local0)
         /* String to Integer conversion of the String value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m034", Local0)
+        Concatenate (__METHOD__, "-m034", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -22844,18 +22843,18 @@
         /* String to Buffer conversion of the String second operand of */
         /* Logical operators when the first operand is evaluated as Buffer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m035", Local0)
+        Concatenate (__METHOD__, "-m035", Local0)
         SRMT (Local0)
         M035 (Local0)
         /* String to Buffer conversion of the String second operand of */
         /* Concatenate operator when the first operand is evaluated as Buffer */
-        Concatenate (TS, "-m036", Local0)
+        Concatenate (__METHOD__, "-m036", Local0)
         SRMT (Local0)
         M036 (Local0)
         /* String to Buffer conversion of the String Source operand of */
         /* ToString operator (has a visual effect in shortening of the */
         /* String taken the null character) */
-        Concatenate (TS, "-m037", Local0)
+        Concatenate (__METHOD__, "-m037", Local0)
         SRMT (Local0)
         M037 (Local0)
         /* Buffer to Integer implicit conversion Cases. */
@@ -22864,33 +22863,33 @@
         /* (Decrement, Increment, FindSetLeftBit, FindSetRightBit, Not) */
         If (F64)
         {
-            Concatenate (TS, "-m64l", Local0)
+            Concatenate (__METHOD__, "-m64l", Local0)
             SRMT (Local0)
             M64L (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32l", Local0)
+            Concatenate (__METHOD__, "-m32l", Local0)
             SRMT (Local0)
             M32L (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the LNot Logical Integer operator */
-        Concatenate (TS, "-m03a", Local0)
+        Concatenate (__METHOD__, "-m03a", Local0)
         SRMT (Local0)
         M03A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the FromBCD and ToBCD conversion operators */
         If (F64)
         {
-            Concatenate (TS, "-m64m", Local0)
+            Concatenate (__METHOD__, "-m64m", Local0)
             SRMT (Local0)
             M64M (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32m", Local0)
+            Concatenate (__METHOD__, "-m32m", Local0)
             SRMT (Local0)
             M32M (Local0)
         }
@@ -22901,39 +22900,39 @@
         /* ShiftLeft, ShiftRight, Subtract, Xor */
         If (F64)
         {
-            M64N (Concatenate (TS, "-m64n"))
+            M64N (Concatenate (__METHOD__, "-m64n"))
         }
         Else
         {
-            M32N (Concatenate (TS, "-m32n"))
+            M32N (Concatenate (__METHOD__, "-m32n"))
         }
 
         /* Buffer to Integer conversion of each Buffer operand */
         /* of the 2-parameter Logical Integer operators LAnd and LOr */
         If (F64)
         {
-            M64O (Concatenate (TS, "-m64o"))
+            M64O (Concatenate (__METHOD__, "-m64o"))
         }
         Else
         {
-            M32O (Concatenate (TS, "-m32o"))
+            M32O (Concatenate (__METHOD__, "-m32o"))
         }
 
         /* Buffer to Integer conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as Integer */
         /* (LEqual, LGreater, LGreaterEqual, LLess, LLessEqual, LNotEqual) */
-        Concatenate (TS, "-m065", Local0)
+        Concatenate (__METHOD__, "-m065", Local0)
         SRMT (Local0)
         M065 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64p", Local0)
+            Concatenate (__METHOD__, "-m64p", Local0)
             SRMT (Local0)
             M64P (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32p", Local0)
+            Concatenate (__METHOD__, "-m32p", Local0)
             SRMT (Local0)
             M32P (Local0)
         }
@@ -22942,72 +22941,72 @@
         /* operand of Concatenate operator in case the first one is Integer */
         If (F64)
         {
-            Concatenate (TS, "-m64q", Local0)
+            Concatenate (__METHOD__, "-m64q", Local0)
             SRMT (Local0)
             M64Q (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32q", Local0)
+            Concatenate (__METHOD__, "-m32q", Local0)
             SRMT (Local0)
             M32Q (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Length (second) */
         /* operand of the ToString operator */
-        Concatenate (TS, "-m066", Local0)
+        Concatenate (__METHOD__, "-m066", Local0)
         SRMT (Local0)
         M066 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64r", Local0)
+            Concatenate (__METHOD__, "-m64r", Local0)
             SRMT (Local0)
             M64R (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32r", Local0)
+            Concatenate (__METHOD__, "-m32r", Local0)
             SRMT (Local0)
             M32R (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer Index (second) */
         /* operand of the Index operator */
-        Concatenate (TS, "-m067", Local0)
+        Concatenate (__METHOD__, "-m067", Local0)
         SRMT (Local0)
         M067 (Local0)
         /* Buffer to Integer conversion of the String Arg (third) */
         /* operand of the Fatal operator */
         /* (it can only be checked an exception does not occur) */
-        Concatenate (TS, "-m068", Local0)
+        Concatenate (__METHOD__, "-m068", Local0)
         SRMT (Local0)
         M068 (Local0)
         /* Buffer to Integer conversion of the Buffer Index and Length */
         /* operands of the Mid operator */
-        Concatenate (TS, "-m069", Local0)
+        Concatenate (__METHOD__, "-m069", Local0)
         SRMT (Local0)
         M069 (Local0)
         If (F64)
         {
-            Concatenate (TS, "-m64s", Local0)
+            Concatenate (__METHOD__, "-m64s", Local0)
             SRMT (Local0)
             M64S (Local0)
         }
         Else
         {
-            Concatenate (TS, "-m32s", Local0)
+            Concatenate (__METHOD__, "-m32s", Local0)
             SRMT (Local0)
             M32S (Local0)
         }
 
         /* Buffer to Integer conversion of the Buffer StartIndex */
         /* operand of the Match operator */
-        Concatenate (TS, "-m06a", Local0)
+        Concatenate (__METHOD__, "-m06a", Local0)
         SRMT (Local0)
         M06A (Local0)
         /* Buffer to Integer conversion of the Buffer sole operand */
         /* of the Method execution control operators (Sleep, Stall) */
-        Concatenate (TS, "-m06b", Local0)
+        Concatenate (__METHOD__, "-m06b", Local0)
         SRMT (Local0)
         M06B (Local0)
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
@@ -23019,13 +23018,13 @@
          */
         /* Buffer to Integer conversion of the Buffer TimeoutValue */
         /* (second) operand of the Wait operator */
-        Concatenate (TS, "-m06d", Local0)
+        Concatenate (__METHOD__, "-m06d", Local0)
         SRMT (Local0)
         M06D (Local0)
         /* Buffer to Integer conversion of the Buffer value */
         /* of Predicate of the Method execution control statements */
         /* (If, ElseIf, While) */
-        Concatenate (TS, "-m06e", Local0)
+        Concatenate (__METHOD__, "-m06e", Local0)
         SRMT (Local0)
         If (Y111)
         {
@@ -23045,17 +23044,17 @@
         /* Buffer to String conversion of the Buffer second operand of */
         /* Logical operators when the first operand is evaluated as String. */
         /* LEqual LGreater LGreaterEqual LLess LLessEqual LNotEqual */
-        Concatenate (TS, "-m06f", Local0)
+        Concatenate (__METHOD__, "-m06f", Local0)
         SRMT (Local0)
         M06F (Local0)
         /* Buffer to String conversion of the Buffer second operand of */
         /* Concatenate operator when the first operand is evaluated as String */
-        Concatenate (TS, "-m070", Local0)
+        Concatenate (__METHOD__, "-m070", Local0)
         SRMT (Local0)
         M070 (Local0)
         /* Check consistency of the test Named Objects */
         /* in the root Scope of the Global ACPI namespace */
-        Concatenate (TS, "-m606", Local0)
+        Concatenate (__METHOD__, "-m606", Local0)
         SRMT (Local0)
         M606 (Local0)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl
index 5ba26faa3..0c6abf446 100644
--- a/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl
+++ b/tests/aslts/src/runtime/collections/complex/provoke/provoke.asl
@@ -122,15 +122,14 @@
 
     Method (PRV0, 0, Serialized)
     {
-        Name (TS, "PRV0")
         SRMT ("m130")
-        M130 (TS)
+        M130 (__METHOD__)
         SRMT ("m132")
-        M132 (TS)
+        M132 (__METHOD__)
         SRMT ("m133")
-        M133 (TS)
+        M133 (__METHOD__)
         SRMT ("m134")
-        M134 (TS)
+        M134 (__METHOD__)
         SRMT ("m136")
-        M136 (TS)
+        M136 (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl
index 277311295..c0c84d31d 100644
--- a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl
+++ b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/rstore.asl
@@ -34,7 +34,6 @@
 
     Method (M690, 0, Serialized)
     {
-        Name (TS, "m690")
         Name (TERR, "test error")
         Name (I000, 0x00)
         /* Common testing control */
@@ -75,13 +74,13 @@
                             {
                                 /* Constant (like Store(Src0, Zero)) */
 
-                                M010 (Concatenate (TS, "-m010"), LPC0, LPC1)
+                                M010 (Concatenate (__METHOD__, "-m010"), LPC0, LPC1)
                             }
                             ElseIf ((Arg2 == 0x01))
                             {
                                 /* Named Object */
 
-                                M011 (Concatenate (TS, "-m011"), LPC0, LPC1)
+                                M011 (Concatenate (__METHOD__, "-m011"), LPC0, LPC1)
                             }
                             ElseIf ((Arg2 == 0x02))
                             {
@@ -95,7 +94,7 @@
                             {
                                 /* LocalX Object */
 
-                                M013 (Concatenate (TS, "-m013"), LPC0, LPC1)
+                                M013 (Concatenate (__METHOD__, "-m013"), LPC0, LPC1)
                             }
                             ElseIf ((Arg2 == 0x04))
                             {
@@ -136,7 +135,7 @@
                             {
                                 /* Named Object */
 
-                                M021 (Concatenate (TS, "-m021"), LPC0, LPC1)
+                                M021 (Concatenate (__METHOD__, "-m021"), LPC0, LPC1)
                             }
                             ElseIf ((Arg2 == 0x02))
                             {
@@ -150,7 +149,7 @@
                             {
                                 /* LocalX Object */
 
-                                M023 (Concatenate (TS, "-m023"), LPC0, LPC1)
+                                M023 (Concatenate (__METHOD__, "-m023"), LPC0, LPC1)
                             }
                             ElseIf ((Arg2 == 0x04))
                             {
@@ -191,7 +190,7 @@
                             {
                                 /* Named Object */
 
-                                M031 (Concatenate (TS, "-m031"), LPC0, LPC1)
+                                M031 (Concatenate (__METHOD__, "-m031"), LPC0, LPC1)
                             }
                             ElseIf ((Arg2 == 0x02))
                             {
@@ -256,9 +255,9 @@
                             {
                                 /* Named Object */
 
-                                M0E0 (Concatenate (TS, "-m0e0"), LPC0, LPC1)
-                                M0E1 (Concatenate (TS, "-m0e1"), LPC0, LPC1)
-                                M0E2 (Concatenate (TS, "-m0e2"), LPC0, LPC1)
+                                M0E0 (Concatenate (__METHOD__, "-m0e0"), LPC0, LPC1)
+                                M0E1 (Concatenate (__METHOD__, "-m0e1"), LPC0, LPC1)
+                                M0E2 (Concatenate (__METHOD__, "-m0e2"), LPC0, LPC1)
                             }
                             ElseIf ((Arg2 == 0x02))
                             {
@@ -6956,13 +6955,13 @@
             Return (0x00)
         }
 
-        M100 (Concatenate (TS, "-m100-S-IntC"), 0x01, 0x00)
-        M100 (Concatenate (TS, "-m100-S-IntN"), 0x01, 0x01)
-        M100 (Concatenate (TS, "-m100-S-IntL"), 0x01, 0x03)
-        M100 (Concatenate (TS, "-m100-S-StrN"), 0x02, 0x01)
-        M100 (Concatenate (TS, "-m100-S-StrL"), 0x02, 0x03)
-        M100 (Concatenate (TS, "-m100-S-BufN"), 0x03, 0x01)
-        M100 (Concatenate (TS, "-m100-S-BFldN"), 0x0E, 0x01)
+        M100 (Concatenate (__METHOD__, "-m100-S-IntC"), 0x01, 0x00)
+        M100 (Concatenate (__METHOD__, "-m100-S-IntN"), 0x01, 0x01)
+        M100 (Concatenate (__METHOD__, "-m100-S-IntL"), 0x01, 0x03)
+        M100 (Concatenate (__METHOD__, "-m100-S-StrN"), 0x02, 0x01)
+        M100 (Concatenate (__METHOD__, "-m100-S-StrL"), 0x02, 0x03)
+        M100 (Concatenate (__METHOD__, "-m100-S-BufN"), 0x03, 0x01)
+        M100 (Concatenate (__METHOD__, "-m100-S-BFldN"), 0x0E, 0x01)
     }
 
     /* Run-method */
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl
index a27e0df3e..98a8096a9 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl
@@ -36,54 +36,50 @@
 
     Method (M140, 0, Serialized)
     {
-        Name (TS, "m140")
-        CH03 (TS, Z058, 0x00, 0x2B, 0x00)
+        CH03 (__METHOD__, Z058, 0x00, 0x2B, 0x00)
         Local1 = 0x01
         Local0 = 0x02
         Divide (Local1, Local0, Local2)
-        CH03 (TS, Z058, 0x01, 0x31, 0x00)
+        CH03 (__METHOD__, Z058, 0x01, 0x31, 0x00)
         Local0 = 0x00
         Divide (Local1, Local0, Local2)
-        CH04 (TS, 0x00, 0x38, Z058, 0x36, 0x00, 0x00)   /* AE_AML_DIVIDE_BY_ZERO */
+        CH04 (__METHOD__, 0x00, 0x38, Z058, 0x36, 0x00, 0x00)   /* AE_AML_DIVIDE_BY_ZERO */
         Local0 = 0x02
         Divide (Local1, Local0, Local2)
-        CH03 (TS, Z058, 0x03, 0x3B, 0x00)
+        CH03 (__METHOD__, Z058, 0x03, 0x3B, 0x00)
     }
 
     /* Modulo divide by zero */
 
     Method (M141, 0, Serialized)
     {
-        Name (TS, "m141")
-        CH03 (TS, Z058, 0x04, 0x43, 0x00)
+        CH03 (__METHOD__, Z058, 0x04, 0x43, 0x00)
         Local1 = 0x01
         Local0 = 0x02
         Local2 = (Local1 % Local0)
-        CH03 (TS, Z058, 0x05, 0x49, 0x00)
+        CH03 (__METHOD__, Z058, 0x05, 0x49, 0x00)
         Local0 = 0x00
         Local2 = (Local1 % Local0)
-        CH04 (TS, 0x00, 0x38, Z058, 0x4E, 0x00, 0x00)   /* AE_AML_DIVIDE_BY_ZERO */
+        CH04 (__METHOD__, 0x00, 0x38, Z058, 0x4E, 0x00, 0x00)   /* AE_AML_DIVIDE_BY_ZERO */
         Local0 = 0x02
         Local2 = (Local1 % Local0)
-        CH03 (TS, Z058, 0x07, 0x53, 0x00)
+        CH03 (__METHOD__, Z058, 0x07, 0x53, 0x00)
     }
 
     /* Release ownership on a Mutex that is not currently owned */
 
     Method (M142, 0, Serialized)
     {
-        Name (TS, "m142")
         Mutex (MTX0, 0x00)
-        CH03 (TS, Z058, 0x08, 0x5D, 0x00)
+        CH03 (__METHOD__, Z058, 0x08, 0x5D, 0x00)
         Release (MTX0)
-        CH04 (TS, 0x00, 0x41, Z058, 0x61, 0x00, 0x00)   /* AE_AML_MUTEX_NOT_ACQUIRED */
+        CH04 (__METHOD__, 0x00, 0x41, Z058, 0x61, 0x00, 0x00)   /* AE_AML_MUTEX_NOT_ACQUIRED */
     }
 
     /* SizeOf for data types not an Integer, Buffer, String or Package object */
 
     Method (M143, 0, Serialized)
     {
-        Name (TS, "m143")
         /* Method */
         /* DDB Handle */
         /* Debug Object */
@@ -135,19 +131,19 @@
         /* Buffer Field */
 
         Local0 = BUF0 [0x00]
-        CH03 (TS, Z058, 0x0A, 0x93, 0x00)
+        CH03 (__METHOD__, Z058, 0x0A, 0x93, 0x00)
         Local5 = SizeOf (STR0)
         Local5 = SizeOf (BUF0)
         Local5 = SizeOf (PAC0)
         Local5 = SizeOf (INT0)
-        CH03 (TS, Z058, 0x0B, 0x9A, 0x00)
+        CH03 (__METHOD__, Z058, 0x0B, 0x9A, 0x00)
         If (INT0)
         {
             Local1 = 0x00
         }
 
         Local5 = SizeOf (Local1)
-        CH04 (TS, 0x01, 0x31, Z058, 0xA0, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_LOCAL */
+        CH04 (__METHOD__, 0x01, 0x31, Z058, 0xA0, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_LOCAL */
         /* These are now caught by the compiler - Aug 2015 */
     /*	Store(SizeOf(DEV0), Local5) */
     /*	CH04(ts, 1, 47, z058, __LINE__, 0, 0)	// AE_AML_OPERAND_TYPE */
@@ -175,7 +171,6 @@
 
     Method (M144, 0, Serialized)
     {
-        Name (TS, "m144")
         Name (B000, Buffer (0xC8){})
         Local0 = 0x00
         While ((Local0 < 0xC8))
@@ -184,9 +179,9 @@
             Local0++
         }
 
-        CH03 (TS, Z058, 0x14, 0xC6, 0x00)
+        CH03 (__METHOD__, Z058, 0x14, 0xC6, 0x00)
         ToString (B000, Ones, Local5)
-        CH03 (TS, Z058, 0x15, 0xCA, 0x00)
+        CH03 (__METHOD__, Z058, 0x15, 0xCA, 0x00)
         Name (B001, Buffer (0xC9){})
         Local0 = 0x00
         While ((Local0 < 0xC9))
@@ -202,14 +197,13 @@
          * 20.12.2005.
          * No more limit of string size.
          */
-        CH03 (TS, Z058, 0x16, 0xDC, 0x00)
+        CH03 (__METHOD__, Z058, 0x16, 0xDC, 0x00)
     }
 
     /* Access out of Package */
 
     Method (M145, 0, Serialized)
     {
-        Name (TS, "m145")
         Name (P000, Package (0x03)
         {
             0x00,
@@ -222,53 +216,51 @@
             0x01,
             0x02
         })
-        CH03 (TS, Z058, 0x17, 0xE7, 0x00)
+        CH03 (__METHOD__, Z058, 0x17, 0xE7, 0x00)
         /* Package() */
 
         Store (P000 [0x02], Local5)
-        CH03 (TS, Z058, 0x18, 0xED, 0x00)
+        CH03 (__METHOD__, Z058, 0x18, 0xED, 0x00)
         Store (P000 [0x03], Local5)
-        CH04 (TS, 0x01, 0x37, Z058, 0xF1, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
+        CH04 (__METHOD__, 0x01, 0x37, Z058, 0xF1, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
         Local0 = P000 [0x02]
-        CH03 (TS, Z058, 0x1A, 0xF5, 0x00)
+        CH03 (__METHOD__, Z058, 0x1A, 0xF5, 0x00)
         Local0 = P000 [0x03]
-        CH04 (TS, 0x00, 0x37, Z058, 0xF9, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x37, Z058, 0xF9, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
         /* Package(3) */
 
         Store (P001 [0x02], Local5)
-        CH03 (TS, Z058, 0x1C, 0xFF, 0x00)
+        CH03 (__METHOD__, Z058, 0x1C, 0xFF, 0x00)
         Local5 = P001 [0x03]
-        CH04 (TS, 0x00, 0x37, Z058, 0x0103, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x37, Z058, 0x0103, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
         Local0 = P001 [0x02]
-        CH03 (TS, Z058, 0x1E, 0x0107, 0x00)
+        CH03 (__METHOD__, Z058, 0x1E, 0x0107, 0x00)
         Local0 = P001 [0x03]
-        CH04 (TS, 0x00, 0x37, Z058, 0x010B, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x37, Z058, 0x010B, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
     }
 
     /* Access out of String */
 
     Method (M085, 0, Serialized)
     {
-        Name (TS, "m085")
         Name (S000, "123")
-        CH03 (TS, Z058, 0x20, 0x0115, 0x00)
+        CH03 (__METHOD__, Z058, 0x20, 0x0115, 0x00)
         Local5 = S000 [0x02]
-        CH03 (TS, Z058, 0x21, 0x0119, 0x00)
+        CH03 (__METHOD__, Z058, 0x21, 0x0119, 0x00)
         Local5 = S000 [0x03]
         /* Bug 177, Bugzilla 5480. */
 
-        CH04 (TS, 0x00, 0x3D, Z058, 0x011E, 0x00, 0x00)   /* AE_AML_STRING_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x3D, Z058, 0x011E, 0x00, 0x00)   /* AE_AML_STRING_LIMIT */
         Local0 = S000 [0x02]
-        CH03 (TS, Z058, 0x23, 0x0122, 0x00)
+        CH03 (__METHOD__, Z058, 0x23, 0x0122, 0x00)
         Local0 = S000 [0x03]
-        CH04 (TS, 0x00, 0x3D, Z058, 0x0126, 0x00, 0x00)   /* AE_AML_STRING_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x3D, Z058, 0x0126, 0x00, 0x00)   /* AE_AML_STRING_LIMIT */
     }
 
     /* Access out of Buffer */
 
     Method (M086, 0, Serialized)
     {
-        Name (TS, "m086")
         Name (B000, Buffer (0x03)
         {
              0x00, 0x01, 0x02                                 // ...
@@ -277,35 +269,34 @@
         {
              0x00, 0x01, 0x02                                 // ...
         })
-        CH03 (TS, Z058, 0x25, 0x0131, 0x00)
+        CH03 (__METHOD__, Z058, 0x25, 0x0131, 0x00)
         /* Buffer() */
 
         Local5 = B000 [0x02]
-        CH03 (TS, Z058, 0x26, 0x0137, 0x00)
+        CH03 (__METHOD__, Z058, 0x26, 0x0137, 0x00)
         Local5 = B000 [0x03]
-        CH04 (TS, 0x00, 0x36, Z058, 0x013B, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x013B, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
         Local0 = B000 [0x02]
-        CH03 (TS, Z058, 0x28, 0x013F, 0x00)
+        CH03 (__METHOD__, Z058, 0x28, 0x013F, 0x00)
         Local0 = B000 [0x03]
-        CH04 (TS, 0x00, 0x36, Z058, 0x0143, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0143, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
         /* Buffer(3) */
 
         Local5 = B001 [0x02]
-        CH03 (TS, Z058, 0x2A, 0x0149, 0x00)
+        CH03 (__METHOD__, Z058, 0x2A, 0x0149, 0x00)
         Local5 = B001 [0x03]
-        CH04 (TS, 0x00, 0x36, Z058, 0x014D, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x014D, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
         Local0 = B001 [0x02]
-        CH03 (TS, Z058, 0x2C, 0x0151, 0x00)
+        CH03 (__METHOD__, Z058, 0x2C, 0x0151, 0x00)
         Local0 = B001 [0x03]
-        CH04 (TS, 0x00, 0x36, Z058, 0x0155, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0155, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
     }
 
     /* ToInteger() passed with an image of a number which value */
     /* exceeds the maximum of an integer for the current mode. */
     Method (M146, 0, Serialized)
     {
-        Name (TS, "m146")
-        CH03 (TS, Z058, 0x2E, 0x015E, 0x00)
+        CH03 (__METHOD__, Z058, 0x2E, 0x015E, 0x00)
         If ((F64 == 0x01))
         {
             Local0 = "0xffffffffffffffff"
@@ -316,7 +307,7 @@
         }
 
         ToInteger (Local0, Local5)
-        CH03 (TS, Z058, 0x2F, 0x0167, 0x00)
+        CH03 (__METHOD__, Z058, 0x2F, 0x0167, 0x00)
         If ((F64 == 0x01))
         {
             Local0 = "0x11111111111111111"
@@ -327,7 +318,7 @@
         }
 
         ToInteger (Local0, Local5)
-        CH04 (TS, 0x00, 0x2E, Z058, 0x0170, 0x00, 0x00)   /* AE_AML_NO_OPERAND */
+        CH04 (__METHOD__, 0x00, 0x2E, Z058, 0x0170, 0x00, 0x00)   /* AE_AML_NO_OPERAND */
     }
 
     /* [Uninitialized] None. */
@@ -335,15 +326,14 @@
     /* operand in any ASL statement. */
     Method (M147, 1, Serialized)
     {
-        Name (TS, "m147")
         If (Arg0)
         {
             Local0 = 0x00
         }
 
-        CH03 (TS, Z058, 0x31, 0x017E, 0x00)
+        CH03 (__METHOD__, Z058, 0x31, 0x017E, 0x00)
         Local0++
-        CH04 (TS, 0x00, 0x31, Z058, 0x0182, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_LOCAL */
+        CH04 (__METHOD__, 0x00, 0x31, Z058, 0x0182, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_LOCAL */
     }
 
     Method (M148, 0, NotSerialized)
@@ -355,20 +345,18 @@
 
     Method (M149, 1, Serialized)
     {
-        Name (TS, "m149")
-        CH03 (TS, Z058, 0x33, 0x0190, 0x00)
+        CH03 (__METHOD__, Z058, 0x33, 0x0190, 0x00)
         Stall (Arg0)
-        CH03 (TS, Z058, 0x34, 0x0194, 0x00)
+        CH03 (__METHOD__, Z058, 0x34, 0x0194, 0x00)
     }
 
     Method (M14A, 1, Serialized)
     {
-        Name (TS, "m14a")
-        CH03 (TS, Z058, 0x35, 0x019B, 0x00)
+        CH03 (__METHOD__, Z058, 0x35, 0x019B, 0x00)
         Stall (Arg0)
         /* It is now bug 14. */
 
-        CH04 (TS, 0x00, 0x30, Z058, 0x01A0, 0x00, 0x00)   /* AE_AML_OPERAND_VALUE */
+        CH04 (__METHOD__, 0x00, 0x30, Z058, 0x01A0, 0x00, 0x00)   /* AE_AML_OPERAND_VALUE */
     }
 
     /* Bug 14. */
@@ -394,16 +382,15 @@
 
     Method (M14C, 0, Serialized)
     {
-        Name (TS, "m14c")
         /* 100 characters */
 
         Local0 = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
         /* 101 characters */
 
         Local1 = "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
-        CH03 (TS, Z058, 0x37, 0x01C0, 0x00)
+        CH03 (__METHOD__, Z058, 0x37, 0x01C0, 0x00)
         Concatenate (Local0, Local0, Local5)
-        CH03 (TS, Z058, 0x38, 0x01C4, 0x00)
+        CH03 (__METHOD__, Z058, 0x38, 0x01C4, 0x00)
         Concatenate (Local0, Local1, Local5)
         /*
          * CH04(ts, 0, 61, z058, __LINE__, 0, 0)	// AE_AML_STRING_LIMIT
@@ -411,14 +398,13 @@
          * 20.12.2005.
          * No more limit of string size.
          */
-        CH03 (TS, Z058, 0x39, 0x01CF, 0x00)
+        CH03 (__METHOD__, Z058, 0x39, 0x01CF, 0x00)
     }
 
     /* ToDecimalString() when the number of result characters in string exceeds 200 */
 
     Method (M14D, 0, Serialized)
     {
-        Name (TS, "m14d")
         /* Results into 200 (99 * 2 + 2) characters */
 
         Name (B000, Buffer (0x64)
@@ -455,9 +441,9 @@
             /* 0058 */  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,  // ........
             /* 0060 */  0x01, 0x01, 0x01, 0x01, 0x01                     // .....
         })
-        CH03 (TS, Z058, 0x3A, 0x01EB, 0x00)
+        CH03 (__METHOD__, Z058, 0x3A, 0x01EB, 0x00)
         ToDecimalString (B000, Local5)
-        CH03 (TS, Z058, 0x3B, 0x01EF, 0x00)
+        CH03 (__METHOD__, Z058, 0x3B, 0x01EF, 0x00)
         ToDecimalString (B001, Local5)
         /*
          * CH04(ts, 0, 61, z058, __LINE__, 0, 0)	// AE_AML_STRING_LIMIT
@@ -465,15 +451,14 @@
          * 20.12.2005.
          * No more limit of string size.
          */
-        CH03 (TS, Z058, 0x3C, 0x01FA, 0x00)
+        CH03 (__METHOD__, Z058, 0x3C, 0x01FA, 0x00)
     }
 
     /* ToBCD() when a specified integer overflows a number of the BCD format */
 
     Method (M14E, 0, Serialized)
     {
-        Name (TS, "m14e")
-        CH03 (TS, Z058, 0x3D, 0x0202, 0x00)
+        CH03 (__METHOD__, Z058, 0x3D, 0x0202, 0x00)
         If ((F64 == 0x01))
         {
             Local4 = 0x002386F26FC0FFFF
@@ -484,7 +469,7 @@
             ToBCD (0x05F5E0FF, Local5)
         }
 
-        CH03 (TS, Z058, 0x3E, 0x020B, 0x00)
+        CH03 (__METHOD__, Z058, 0x3E, 0x020B, 0x00)
         If ((F64 == 0x01))
         {
             Local4 = 0x002386F26FC10000
@@ -496,81 +481,78 @@
             ToBCD (Local4, Local5)
         }
 
-        CH04 (TS, 0x00, 0x34, Z058, 0x0215, 0x00, 0x00)   /* AE_AML_NUMERIC_OVERFLOW */
+        CH04 (__METHOD__, 0x00, 0x34, Z058, 0x0215, 0x00, 0x00)   /* AE_AML_NUMERIC_OVERFLOW */
     }
 
     /* Create field out of buffer */
 
     Method (M14F, 0, Serialized)
     {
-        Name (TS, "m14f")
         Name (B001, Buffer (0x10){})
-        CH03 (TS, Z058, 0x40, 0x021F, 0x00)
+        CH03 (__METHOD__, Z058, 0x40, 0x021F, 0x00)
         CreateBitField (B001, 0x7F, F000)
-        CH03 (TS, Z058, 0x41, 0x0221, 0x00)
+        CH03 (__METHOD__, Z058, 0x41, 0x0221, 0x00)
         CreateBitField (B001, 0x80, F001)
-        CH04 (TS, 0x00, 0x36, Z058, 0x0223, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
-        CH03 (TS, Z058, 0x43, 0x0225, 0x00)
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0223, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH03 (__METHOD__, Z058, 0x43, 0x0225, 0x00)
         CreateByteField (B001, 0x0F, F002)
-        CH03 (TS, Z058, 0x44, 0x0227, 0x00)
+        CH03 (__METHOD__, Z058, 0x44, 0x0227, 0x00)
         CreateByteField (B001, 0x10, F003)
-        CH04 (TS, 0x00, 0x36, Z058, 0x0229, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
-        CH03 (TS, Z058, 0x46, 0x022B, 0x00)
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0229, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH03 (__METHOD__, Z058, 0x46, 0x022B, 0x00)
         CreateWordField (B001, 0x0E, F004)
-        CH03 (TS, Z058, 0x47, 0x022D, 0x00)
+        CH03 (__METHOD__, Z058, 0x47, 0x022D, 0x00)
         CreateWordField (B001, 0x0F, F005)
-        CH04 (TS, 0x00, 0x36, Z058, 0x022F, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
-        CH03 (TS, Z058, 0x49, 0x0231, 0x00)
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x022F, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH03 (__METHOD__, Z058, 0x49, 0x0231, 0x00)
         CreateDWordField (B001, 0x0C, F006)
-        CH03 (TS, Z058, 0x4A, 0x0233, 0x00)
+        CH03 (__METHOD__, Z058, 0x4A, 0x0233, 0x00)
         CreateDWordField (B001, 0x0D, F007)
-        CH04 (TS, 0x00, 0x36, Z058, 0x0235, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
-        CH03 (TS, Z058, 0x4C, 0x0237, 0x00)
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0235, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH03 (__METHOD__, Z058, 0x4C, 0x0237, 0x00)
         CreateQWordField (B001, 0x08, F008)
-        CH03 (TS, Z058, 0x4D, 0x0239, 0x00)
+        CH03 (__METHOD__, Z058, 0x4D, 0x0239, 0x00)
         CreateQWordField (B001, 0x09, F009)
-        CH04 (TS, 0x00, 0x36, Z058, 0x023B, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
-        CH03 (TS, Z058, 0x4F, 0x023D, 0x00)
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x023B, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH03 (__METHOD__, Z058, 0x4F, 0x023D, 0x00)
         CreateField (B001, 0x7F, 0x01, F00A)
-        CH03 (TS, Z058, 0x50, 0x023F, 0x00)
+        CH03 (__METHOD__, Z058, 0x50, 0x023F, 0x00)
         CreateField (B001, 0x80, 0x01, F00B)
-        CH04 (TS, 0x00, 0x36, Z058, 0x0241, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
-        CH03 (TS, Z058, 0x52, 0x0243, 0x00)
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0241, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH03 (__METHOD__, Z058, 0x52, 0x0243, 0x00)
         CreateField (B001, 0x78, 0x08, F00C)
-        CH03 (TS, Z058, 0x53, 0x0245, 0x00)
+        CH03 (__METHOD__, Z058, 0x53, 0x0245, 0x00)
         CreateField (B001, 0x78, 0x09, F00D)
-        CH04 (TS, 0x00, 0x36, Z058, 0x0247, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0247, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
     }
 
     /* Access to uninitialized local */
 
     Method (M150, 1, Serialized)
     {
-        Name (TS, "m150")
         If (Arg0)
         {
             Local0 = 0x00
         }
 
-        CH03 (TS, Z058, 0x55, 0x0253, 0x00)
+        CH03 (__METHOD__, Z058, 0x55, 0x0253, 0x00)
         Local5 = Local0 [0x00]
-        CH04 (TS, 0x00, 0x31, Z058, 0x0257, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_LOCAL */
+        CH04 (__METHOD__, 0x00, 0x31, Z058, 0x0257, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_LOCAL */
     }
 
     /* Access to an uninitialized element of package */
 
     Method (M151, 0, Serialized)
     {
-        Name (TS, "m151")
         Name (P000, Package (0x04)
         {
             0x00,
             0x01,
             0x02
         })
-        CH03 (TS, Z058, 0x57, 0x0261, 0x00)
+        CH03 (__METHOD__, Z058, 0x57, 0x0261, 0x00)
         Local5 = DerefOf (P000 [0x02])
-        CH03 (TS, Z058, 0x58, 0x0265, 0x00)
+        CH03 (__METHOD__, Z058, 0x58, 0x0265, 0x00)
         Local5 = DerefOf (P000 [0x03])
         /*
          * Obsolete:
@@ -583,15 +565,15 @@
          * OBSOLETE July 2013. DerefOf on an empty package element now causes error
          * CH04(ts, 0, 62, z058, __LINE__, 0, 0)
          */
-        CH04 (TS, 0x01, 0x33, Z058, 0x0274, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_ELEMENT */
+        CH04 (__METHOD__, 0x01, 0x33, Z058, 0x0274, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_ELEMENT */
         Local5 = (DerefOf (P000 [0x03]) + 0x01)
         If (EXCV)
         {
-            CH04 (TS, 0x00, 0x33, Z058, 0x0279, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_ELEMENT */
+            CH04 (__METHOD__, 0x00, 0x33, Z058, 0x0279, 0x00, 0x00)   /* AE_AML_UNINITIALIZED_ELEMENT */
         }
         Else
         {
-            CH04 (TS, 0x00, 0xFF, Z058, 0x027B, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x027B, 0x00, 0x00)
         }
 
         Return (0x00)
@@ -601,7 +583,6 @@
 
     Method (M152, 0, Serialized)
     {
-        Name (TS, "m152")
         /* Results into 200 (67 * 3 - 1) characters */
 
         Name (B000, Buffer (0x43)
@@ -630,9 +611,9 @@
             /* 0038 */  0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,  // ........
             /* 0040 */  0x01, 0x01, 0x01, 0x01                           // ....
         })
-        CH03 (TS, Z058, 0x5A, 0x0296, 0x00)
+        CH03 (__METHOD__, Z058, 0x5A, 0x0296, 0x00)
         ToHexString (B000, Local5)
-        CH03 (TS, Z058, 0x5B, 0x029A, 0x00)
+        CH03 (__METHOD__, Z058, 0x5B, 0x029A, 0x00)
         ToHexString (B001, Local5)
         /*
          * CH04(ts, 0, 61, z058, __LINE__, 0, 0)	// AE_AML_STRING_LIMIT
@@ -640,30 +621,28 @@
          * 20.12.2005.
          * No more limit of string size.
          */
-        CH03 (TS, Z058, 0x5C, 0x02A5, 0x00)
+        CH03 (__METHOD__, Z058, 0x5C, 0x02A5, 0x00)
     }
 
     /* StartIndex in Match greater than the package size */
 
     Method (M153, 0, Serialized)
     {
-        Name (TS, "m153")
         Name (PAC0, Package (0x01)
         {
             0x00
         })
-        CH03 (TS, Z058, 0x5D, 0x02AF, 0x00)
+        CH03 (__METHOD__, Z058, 0x5D, 0x02AF, 0x00)
         Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x00)
-        CH03 (TS, Z058, 0x5E, 0x02B3, 0x00)
+        CH03 (__METHOD__, Z058, 0x5E, 0x02B3, 0x00)
         Local5 = Match (PAC0, MTR, 0x00, MTR, 0x00, 0x01)
-        CH04 (TS, 0x01, 0x37, Z058, 0x02B7, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
+        CH04 (__METHOD__, 0x01, 0x37, Z058, 0x02B7, 0x00, 0x00)   /* AE_AML_PACKAGE_LIMIT */
     }
 
     /* Exeptional conditions of ConcatenateResTemplate */
 
     Method (M154, 0, Serialized)
     {
-        Name (TS, "m154")
         Name (RT00, ResourceTemplate ()
         {
             IRQNoFlags ()
@@ -673,13 +652,13 @@
 
         Local0 = 0x00
         Local2 = Buffer (Local0){}
-        CH03 (TS, Z058, 0x60, 0x02C7, 0x00)
+        CH03 (__METHOD__, Z058, 0x60, 0x02C7, 0x00)
         ConcatenateResTemplate (RT00, RT00, Local5)
-        CH03 (TS, Z058, 0x61, 0x02CB, 0x00)
+        CH03 (__METHOD__, Z058, 0x61, 0x02CB, 0x00)
         ConcatenateResTemplate (RT00, Local2, Local5)
         /* Bug 188. */
 
-        CH03 (TS, Z058, 0x62, 0x02D0, 0x00)
+        CH03 (__METHOD__, Z058, 0x62, 0x02D0, 0x00)
         /* CH04(ts, 0, 71, z058, __LINE__, 0, 0)	// AE_AML_NO_RESOURCE_END_TAG */
         /* One-element buffer */
         Local2 = Buffer (0x01)
@@ -695,11 +674,11 @@
          */
         If (EXCV)
         {
-            CH04 (TS, 0x00, 0x47, Z058, 0x02E0, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */
+            CH04 (__METHOD__, 0x00, 0x47, Z058, 0x02E0, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */
         }
         Else
         {
-            CH04 (TS, 0x00, 0xFF, Z058, 0x02E2, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x02E2, 0x00, 0x00)
         }
 
         /* One-element 0x79 buffer */
@@ -711,7 +690,7 @@
         ConcatenateResTemplate (RT00, Local2, Local5)
         /* Bug 189. */
 
-        CH04 (TS, 0x00, 0x47, Z058, 0x02EC, 0x00, 0x00)   /* AE_AML_NO_RESOURCE_END_TAG */
+        CH04 (__METHOD__, 0x00, 0x47, Z058, 0x02EC, 0x00, 0x00)   /* AE_AML_NO_RESOURCE_END_TAG */
         /* Not resource template buffer */
 
         Local2 = Buffer (0x03)
@@ -721,11 +700,11 @@
         ConcatenateResTemplate (RT00, Local2, Local5)
         If (EXCV)
         {
-            CH04 (TS, 0x00, 0x47, Z058, 0x02F5, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */
+            CH04 (__METHOD__, 0x00, 0x47, Z058, 0x02F5, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */
         }
         Else
         {
-            CH04 (TS, 0x00, 0xFF, Z058, 0x02F7, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x02F7, 0x00, 0x00)
         }
 
         /* Nearly resource template buffer */
@@ -737,7 +716,7 @@
         ConcatenateResTemplate (RT00, Local2, Local5)
         /* Bug 190. */
 
-        CH04 (TS, 0x00, 0x47, Z058, 0x0301, 0x00, 0x00)   /* AE_AML_NO_RESOURCE_END_TAG */
+        CH04 (__METHOD__, 0x00, 0x47, Z058, 0x0301, 0x00, 0x00)   /* AE_AML_NO_RESOURCE_END_TAG */
         /* Like resource template buffer */
 
         Local2 = Buffer (0x05)
@@ -747,14 +726,14 @@
         ConcatenateResTemplate (RT00, Local2, Local5)
         If (EXCV)
         {
-            CH04 (TS, 0x00, 0x47, Z058, 0x030A, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */
+            CH04 (__METHOD__, 0x00, 0x47, Z058, 0x030A, 0x00, 0x00) /* AE_AML_NO_RESOURCE_END_TAG */
         }
         Else
         {
-            CH04 (TS, 0x00, 0xFF, Z058, 0x030C, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x030C, 0x00, 0x00)
         }
 
-        CH03 (TS, Z058, 0xAB, 0x030F, 0x00)
+        CH03 (__METHOD__, Z058, 0xAB, 0x030F, 0x00)
     }
 
     /*
@@ -774,8 +753,7 @@
      */
     Method (M155, 0, Serialized)
     {
-        Name (TS, "m155")
-        CH03 (TS, Z058, 0x69, 0x0325, 0x00)
+        CH03 (__METHOD__, Z058, 0x69, 0x0325, 0x00)
         Local0 = ("0x1111" + 0x00)
         /*
          * Obsolete:
@@ -783,12 +761,12 @@
          *
          * New:
          */
-        CH03 (TS, Z058, 0x6A, 0x032F, 0x00)
+        CH03 (__METHOD__, Z058, 0x6A, 0x032F, 0x00)
         If ((Local0 != 0x1111))
         {
             /* Bug 63, Bugzilla 5329. */
 
-            ERR (TS, Z058, 0x0332, 0x00, 0x00, Local0, 0x00)
+            ERR (__METHOD__, Z058, 0x0332, 0x00, 0x00, Local0, 0x00)
         }
     }
 
@@ -801,46 +779,45 @@
      */
     Method (M156, 0, Serialized)
     {
-        Name (TS, "m156")
         Local0 = 0x00
         Name (B000, Buffer (Local0){})
-        CH03 (TS, Z058, 0x6B, 0x0344, 0x00)
+        CH03 (__METHOD__, Z058, 0x6B, 0x0344, 0x00)
         /* Add, empty String */
 
         Local5 = ("" + 0x00)
         /*	CH04(ts, 0, 34, z058, __LINE__, 0, 0)	// AE_BAD_HEX_CONSTANT */
 
-        CH03 (TS, Z058, 0x6C, 0x034A, 0x00)
+        CH03 (__METHOD__, Z058, 0x6C, 0x034A, 0x00)
         /* Add, String filled with blanks */
 
         Local5 = ("                 " + 0x00)
         /*	CH04(ts, 0, 34, z058, __LINE__, 0, 0)	// AE_BAD_HEX_CONSTANT */
 
-        CH03 (TS, Z058, 0x6D, 0x0350, 0x00)
+        CH03 (__METHOD__, Z058, 0x6D, 0x0350, 0x00)
         /* ToInteger, empty String */
 
         Local4 = ""
         ToInteger (Local4, Local5)
-        CH04 (TS, 0x00, 0x24, Z058, 0x0356, 0x00, 0x00)   /* AE_BAD_DECIMAL_CONSTANT */
+        CH04 (__METHOD__, 0x00, 0x24, Z058, 0x0356, 0x00, 0x00)   /* AE_BAD_DECIMAL_CONSTANT */
         /* ToInteger, String filled with blanks */
 
         Local4 = "                 "
         ToInteger (Local4, Local5)
         /*	CH04(ts, 0, 34, z058, __LINE__, 0, 0)	// AE_BAD_HEX_CONSTANT */
 
-        CH04 (TS, 0x00, 0x24, Z058, 0x035D, 0x00, 0x00)   /* AE_BAD_DECIMAL_CONSTANT */
+        CH04 (__METHOD__, 0x00, 0x24, Z058, 0x035D, 0x00, 0x00)   /* AE_BAD_DECIMAL_CONSTANT */
         /* Add, zero-length Buffer */
 
         Local5 = (B000 + 0x00)
         /*	CH04(ts, 0, 34, z058, __LINE__, 0, 0)	// AE_BAD_HEX_CONSTANT */
 
-        CH04 (TS, 0x00, 0x36, Z058, 0x0363, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0363, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
         /* ToInteger, zero-length Buffer */
 
         ToInteger (B000, Local5)
         /*	CH04(ts, 0, 34, z058, __LINE__, 0, 0)	// AE_BAD_HEX_CONSTANT */
 
-        CH04 (TS, 0x00, 0x36, Z058, 0x0369, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x0369, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
     }
 
     /* ////////////////////////////////////////////////////////// */
@@ -851,113 +828,107 @@
     /* Index(Integer) */
     Method (M157, 0, Serialized)
     {
-        Name (TS, "m157")
         Name (I000, 0xAAAAAAAA)
-        CH03 (TS, Z058, 0x72, 0x0379, 0x00)
+        CH03 (__METHOD__, Z058, 0x72, 0x0379, 0x00)
         Store (I000 [0x00], Local5)
-        CH04 (TS, 0x01, 0x2F, Z058, 0x037D, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x037D, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Local0 = I000 [0x00]
-        CH04 (TS, 0x00, 0x2F, Z058, 0x0381, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x0381, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Store (I000 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0385, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0385, 0x00, 0x00)
         Local1 = Local0 = I000 [0x00]
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0389, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0389, 0x00, 0x00)
     }
 
     /* Bug 83 */
     /* DerefOf(Integer) */
     Method (M158, 0, Serialized)
     {
-        Name (TS, "m158")
         Name (I000, 0xAAAAAAAA)
-        CH03 (TS, Z058, 0x77, 0x0394, 0x00)
+        CH03 (__METHOD__, Z058, 0x77, 0x0394, 0x00)
         /* Bug 83, Bugzilla 5387. */
 
         Local5 = DerefOf (I000)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0399, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0399, 0x00, 0x00)
         Local0 = DerefOf (I000)
         /* Bug 83, Bugzilla 5387. */
 
-        CH04 (TS, 0x00, 0xFF, Z058, 0x039E, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x039E, 0x00, 0x00)
     }
 
     /* Index(Local7-Integer) */
     /* DerefOf(Integer) */
     Method (M087, 0, Serialized)
     {
-        Name (TS, "m087")
         Name (I000, 0xAAAAAAAA)
         Local7 = I000 /* \M087.I000 */
-        CH03 (TS, Z058, 0x7A, 0x03AB, 0x00)
+        CH03 (__METHOD__, Z058, 0x7A, 0x03AB, 0x00)
         /* Index(Integer) */
 
         Store (Local7 [0x00], Local5)
-        CH04 (TS, 0x01, 0x2F, Z058, 0x03B1, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x03B1, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Local0 = Local7 [0x00]
-        CH04 (TS, 0x00, 0x2F, Z058, 0x03B5, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x03B5, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Store (Local7 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x03B9, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03B9, 0x00, 0x00)
         Local1 = Local0 = Local7 [0x00]
-        CH04 (TS, 0x00, 0xFF, Z058, 0x03BD, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03BD, 0x00, 0x00)
         /* DerefOf(Integer) */
 
         Local5 = DerefOf (Local7)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x03C3, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03C3, 0x00, 0x00)
         Local0 = DerefOf (Local7)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x03C7, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03C7, 0x00, 0x00)
     }
 
     /* Index(Buffer Field) */
 
     Method (M159, 0, Serialized)
     {
-        Name (TS, "m159")
         Name (B000, Buffer (0x09)
         {
             /* 0000 */  0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,  // ........
             /* 0008 */  0x09                                             // .
         })
         CreateField (B000, 0x00, 0x08, BF00)
-        CH03 (TS, Z058, 0x81, 0x03D2, 0x00)
+        CH03 (__METHOD__, Z058, 0x81, 0x03D2, 0x00)
         Store (BF00 [0x00], Local5)
-        CH04 (TS, 0x01, 0x2F, Z058, 0x03D6, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x03D6, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Local0 = BF00 [0x00]
-        CH04 (TS, 0x00, 0x2F, Z058, 0x03DA, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x03DA, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Store (BF00 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x03DE, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03DE, 0x00, 0x00)
         Store (BF00 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x03E2, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03E2, 0x00, 0x00)
         Local1 = Local0 = BF00 [0x00]
-        CH04 (TS, 0x00, 0xFF, Z058, 0x03E6, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03E6, 0x00, 0x00)
     }
 
     /* Bug 83 */
     /* DerefOf(Buffer Field) */
     Method (M15A, 0, Serialized)
     {
-        Name (TS, "m15a")
         Name (B000, Buffer (0x09)
         {
             /* 0000 */  0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,  // ........
             /* 0008 */  0x09                                             // .
         })
         CreateField (B000, 0x00, 0x08, BF00)
-        CH03 (TS, Z058, 0x87, 0x03F2, 0x00)
+        CH03 (__METHOD__, Z058, 0x87, 0x03F2, 0x00)
         Local5 = DerefOf (BF00)
         /* Bug 83, Bugzilla 5387. */
 
-        CH04 (TS, 0x00, 0xFF, Z058, 0x03F7, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03F7, 0x00, 0x00)
         Local0 = DerefOf (BF00)
         /* Bug 83, Bugzilla 5387. */
 
-        CH04 (TS, 0x00, 0xFF, Z058, 0x03FC, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x03FC, 0x00, 0x00)
     }
 
     /* Index(Field Unit) */
 
     Method (M15D, 0, Serialized)
     {
-        Name (TS, "m15d")
         OperationRegion (R000, SystemMemory, 0x0100, 0x0100)
         Field (R000, ByteAcc, NoLock, Preserve)
         {
@@ -982,50 +953,49 @@
             IF01,   1
         }
 
-        CH03 (TS, Z058, 0x8A, 0x040A, 0x00)
+        CH03 (__METHOD__, Z058, 0x8A, 0x040A, 0x00)
         /* Field */
 
         Store (F000 [0x00], Local5)
-        CH04 (TS, 0x01, 0x2F, Z058, 0x0410, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x0410, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Local0 = F000 [0x00]
-        CH04 (TS, 0x00, 0x2F, Z058, 0x0414, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x0414, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Store (F000 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0418, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0418, 0x00, 0x00)
         Store (F000 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x041C, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x041C, 0x00, 0x00)
         Local1 = Local0 = F000 [0x00]
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0420, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0420, 0x00, 0x00)
         /* BankField */
 
         Store (BKF0 [0x00], Local5)
-        CH04 (TS, 0x01, 0x2F, Z058, 0x0426, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x0426, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Local0 = BKF0 [0x00]
-        CH04 (TS, 0x00, 0x2F, Z058, 0x042A, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x042A, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Store (BKF0 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x042E, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x042E, 0x00, 0x00)
         Store (BKF0 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0432, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0432, 0x00, 0x00)
         Local1 = Local0 = BKF0 [0x00]
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0436, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0436, 0x00, 0x00)
         /* IndexField */
 
         Store (IF00 [0x00], Local5)
-        CH04 (TS, 0x01, 0x2F, Z058, 0x043C, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x01, 0x2F, Z058, 0x043C, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Local0 = IF00 [0x00]
-        CH04 (TS, 0x00, 0x2F, Z058, 0x0440, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
+        CH04 (__METHOD__, 0x00, 0x2F, Z058, 0x0440, 0x00, 0x00)   /* AE_AML_OPERAND_TYPE */
         Store (IF00 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0444, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0444, 0x00, 0x00)
         Store (IF00 [0x00], Local0)
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0448, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0448, 0x00, 0x00)
         Local1 = Local0 = IF00 [0x00]
-        CH04 (TS, 0x00, 0xFF, Z058, 0x044C, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x044C, 0x00, 0x00)
     }
 
     /* Bug 83 */
     /* DerefOf(Field Unit) */
     Method (M15E, 0, Serialized)
     {
-        Name (TS, "m15e")
         OperationRegion (R000, SystemMemory, 0x0100, 0x0100)
         Field (R000, ByteAcc, NoLock, Preserve)
         {
@@ -1050,37 +1020,37 @@
             IF01,   1
         }
 
-        CH03 (TS, Z058, 0x9A, 0x045B, 0x00)
+        CH03 (__METHOD__, Z058, 0x9A, 0x045B, 0x00)
         /* Field */
 
         Local5 = DerefOf (F000)
         /* Bug 83, Bugzilla 5387. */
 
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0462, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0462, 0x00, 0x00)
         Local0 = DerefOf (F000)
         /* Bug 83, Bugzilla 5387. */
 
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0467, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0467, 0x00, 0x00)
         /* BankField */
 
         Local5 = DerefOf (BKF0)
         /* Bug 83, Bugzilla 5387. */
 
-        CH04 (TS, 0x00, 0xFF, Z058, 0x046E, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x046E, 0x00, 0x00)
         Local0 = DerefOf (BKF0)
         /* Bug 83, Bugzilla 5387. */
 
-        CH04 (TS, 0x00, 0xFF, Z058, 0x0473, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x0473, 0x00, 0x00)
         /* IndexField */
 
         Local5 = DerefOf (IF00)
         /* Bug 83, Bugzilla 5387. */
 
-        CH04 (TS, 0x00, 0xFF, Z058, 0x047A, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x047A, 0x00, 0x00)
         Local0 = DerefOf (IF00)
         /* Bug 83, Bugzilla 5387. */
 
-        CH04 (TS, 0x00, 0xFF, Z058, 0x047F, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x047F, 0x00, 0x00)
     }
 
     /* UPDATE exc.m084: Implement this test for all the types of objects */
@@ -1088,7 +1058,6 @@
     /*                  all the types of operators. */
     Method (M084, 1, Serialized)
     {
-        Name (TS, "m084")
         If (Arg0)
         {
             Name (I000, 0x12345678)
@@ -1103,7 +1072,7 @@
             })
         }
 
-        CH03 (TS, Z058, 0xA1, 0x0490, 0x00)
+        CH03 (__METHOD__, Z058, 0xA1, 0x0490, 0x00)
         /*
          Discuss: now the ObjectType doesnt cause exception!
          Is it correct? Understand and discuss it.
@@ -1119,14 +1088,14 @@
         Store (P000 [0x00], Local0)
         If (!Arg0)
         {
-            CH04 (TS, 0x00, 0xFF, Z058, 0x04A5, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z058, 0x04A5, 0x00, 0x00)
         }
         Else
         {
-            CH03 (TS, Z058, 0xA7, 0x04A7, 0x00)
+            CH03 (__METHOD__, Z058, 0xA7, 0x04A7, 0x00)
         }
 
-        CH03 (TS, Z058, 0xA8, 0x04AA, 0x00)
+        CH03 (__METHOD__, Z058, 0xA8, 0x04AA, 0x00)
     }
 
     Method (MF9D, 0, NotSerialized)
@@ -1166,7 +1135,6 @@
 
     Method (M708, 0, Serialized)
     {
-        Name (TS, "m708")
         Method (M000, 1, Serialized)
         {
             OperationRegion (RGN0, SystemMemory, 0x00, Arg0)
@@ -1223,13 +1191,13 @@
                 }
 
                 Local3 = RefOf (Local2)
-                CH03 (TS, Z058, 0x04F6, 0x00, 0x00)
+                CH03 (__METHOD__, Z058, 0x04F6, 0x00, 0x00)
                 /* Write: except DataTableRegion */
 
                 If ((Local1 < 0x03))
                 {
                     DerefOf (Local3) = 0x12345678
-                    CH04 (TS, 0x00, 0x35, Z058, 0x04FB, 0x00, 0x00)/* AE_AML_REGION_LIMIT */
+                    CH04 (__METHOD__, 0x00, 0x35, Z058, 0x04FB, 0x00, 0x00)/* AE_AML_REGION_LIMIT */
                 }
 
                 /* Read */
@@ -1244,7 +1212,7 @@
                  * Indicate we only care about the first by placing a 1
                  * in the second argument
                  */
-                CH04 (TS, 0x01, 0x35, Z058, 0x050A, 0x00, 0x00)   /* AE_AML_REGION_LIMIT */
+                CH04 (__METHOD__, 0x01, 0x35, Z058, 0x050A, 0x00, 0x00)   /* AE_AML_REGION_LIMIT */
                 Local0--
                 Local1++
             }
@@ -1257,7 +1225,6 @@
 
     Method (M709, 0, Serialized)
     {
-        Name (TS, "m709")
         Name (OFFP, Package (0x01)
         {
             0xFEDCBA987654321F
@@ -1288,7 +1255,6 @@
 
     Method (M70A, 0, Serialized)
     {
-        Name (TS, "m70a")
         Name (OFF0, 0xFFFFFFFFFFFFFFF0)
         Name (LEN0, 0x11)
         OperationRegion (OPR0, SystemMemory, OFF0, LEN0)
@@ -1308,18 +1274,17 @@
             FU01,   8
         }
 
-        CH03 (TS, Z058, 0xBF, 0x053F, 0x00)
+        CH03 (__METHOD__, Z058, 0xBF, 0x053F, 0x00)
         FU00 = 0x12
-        CH04 (TS, 0x00, 0x35, Z058, 0x0543, 0x00, 0x00)   /* AE_AML_REGION_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x35, Z058, 0x0543, 0x00, 0x00)   /* AE_AML_REGION_LIMIT */
         FU01 = 0x12
-        CH04 (TS, 0x00, 0x35, Z058, 0x0547, 0x00, 0x00)   /* AE_AML_REGION_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x35, Z058, 0x0547, 0x00, 0x00)   /* AE_AML_REGION_LIMIT */
     }
 
     /* Attempt to write into DataTableRegion */
 
     Method (M70B, 0, Serialized)
     {
-        Name (TS, "m70b")
         DataTableRegion (DR00, "SSDT", "", "")
         Field (DR00, AnyAcc, NoLock, Preserve)
         {
@@ -1327,16 +1292,15 @@
         }
 
         Local0 = FU00 /* \M70B.FU00 */
-        CH03 (TS, Z058, 0xC2, 0x0556, 0x00)
+        CH03 (__METHOD__, Z058, 0xC2, 0x0556, 0x00)
         FU00 = 0x00
-        CH04 (TS, 0x00, 0x10, Z058, 0x055A, 0x00, 0x00)   /* AE_SUPPORT */
+        CH04 (__METHOD__, 0x00, 0x10, Z058, 0x055A, 0x00, 0x00)   /* AE_SUPPORT */
     }
 
     /* Check non-String DataTableRegion *String arguments */
 
     Method (M7F5, 0, Serialized)
     {
-        Name (TS, "m7f5")
         Name (B000, Buffer (0x01)
         {
              0x12                                             // .
@@ -1346,19 +1310,19 @@
         {
             0x12
         })
-        CH03 (TS, Z058, 0xC1, 0x0566, 0x00)
+        CH03 (__METHOD__, Z058, 0xC1, 0x0566, 0x00)
         DataTableRegion (DR00, B000, "", "")
-        CH04 (TS, 0x00, 0x05, Z058, 0x0569, 0x00, 0x00)    /* AE_NOT_FOUND */
+        CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0569, 0x00, 0x00)    /* AE_NOT_FOUND */
         DataTableRegion (DR01, "SSDT", B000, "")
-        CH04 (TS, 0x00, 0x05, Z058, 0x056C, 0x00, 0x00)    /* AE_NOT_FOUND */
+        CH04 (__METHOD__, 0x00, 0x05, Z058, 0x056C, 0x00, 0x00)    /* AE_NOT_FOUND */
         DataTableRegion (DR02, "SSDT", "", B000)
-        CH04 (TS, 0x00, 0x05, Z058, 0x056F, 0x00, 0x00)    /* AE_NOT_FOUND */
+        CH04 (__METHOD__, 0x00, 0x05, Z058, 0x056F, 0x00, 0x00)    /* AE_NOT_FOUND */
         DataTableRegion (DR03, I000, "", "")
-        CH04 (TS, 0x00, 0x05, Z058, 0x0572, 0x00, 0x00)    /* AE_NOT_FOUND */
+        CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0572, 0x00, 0x00)    /* AE_NOT_FOUND */
         DataTableRegion (DR04, "SSDT", I000, "")
-        CH04 (TS, 0x00, 0x05, Z058, 0x0575, 0x00, 0x00)    /* AE_NOT_FOUND */
+        CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0575, 0x00, 0x00)    /* AE_NOT_FOUND */
         DataTableRegion (DR05, "SSDT", "", I000)
-        CH04 (TS, 0x00, 0x05, Z058, 0x0578, 0x00, 0x00)    /* AE_NOT_FOUND */
+        CH04 (__METHOD__, 0x00, 0x05, Z058, 0x0578, 0x00, 0x00)    /* AE_NOT_FOUND */
         /* These are now caught by the compiler - Aug 2015 */
     /* */
     /*	DataTableRegion (DR06, p000, "", i000) */
@@ -1375,7 +1339,6 @@
 
     Method (M7F6, 0, Serialized)
     {
-        Name (TS, "m7f6")
         OperationRegion (SMBD, SMBus, 0x4200, 0x0100)
         Field (SMBD, BufferAcc, NoLock, Preserve)
         {
@@ -1386,18 +1349,17 @@
         /* Create improper SMBus data buffer */
 
         Name (BUFF, Buffer (0x21){})
-        CH03 (TS, Z058, 0xCD, 0x0595, 0x00)
+        CH03 (__METHOD__, Z058, 0xCD, 0x0595, 0x00)
         /* Invoke Write Quick transaction */
 
         FLD0 = BUFF /* \M7F6.BUFF */
-        CH04 (TS, 0x00, 0x36, Z058, 0x059A, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
+        CH04 (__METHOD__, 0x00, 0x36, Z058, 0x059A, 0x00, 0x00)   /* AE_AML_BUFFER_LIMIT */
     }
 
     /* Name space issues */
 
     Method (M0BC, 0, Serialized)
     {
-        Name (TS, "m0bc")
         Method (M000, 0, NotSerialized)
         {
             Return (0xABCD0000)
@@ -1414,12 +1376,12 @@
             Local1 = M000 ()
             If ((Local0 != 0xABCD0000))
             {
-                ERR (TS, Z058, 0x05B3, 0x00, 0x00, Local0, 0xABCD0000)
+                ERR (__METHOD__, Z058, 0x05B3, 0x00, 0x00, Local0, 0xABCD0000)
             }
 
             If ((Local1 != 0xABCD0001))
             {
-                ERR (TS, Z058, 0x05B7, 0x00, 0x00, Local1, 0xABCD0001)
+                ERR (__METHOD__, Z058, 0x05B7, 0x00, 0x00, Local1, 0xABCD0001)
             }
         }
 
@@ -1430,18 +1392,18 @@
                 Return (0xABCD0002)
             }
 
-            CH03 (TS, Z058, 0xD0, 0x05C2, 0x00)
+            CH03 (__METHOD__, Z058, 0xD0, 0x05C2, 0x00)
             M004 ()
-            CH04 (TS, 0x00, 0x05, Z058, 0x05C4, 0x00, 0x00) /* AE_NOT_FOUND */
+            CH04 (__METHOD__, 0x00, 0x05, Z058, 0x05C4, 0x00, 0x00) /* AE_NOT_FOUND */
         }
 
         Method (M003, 0, NotSerialized)
         {
             /* Recursion */
 
-            CH03 (TS, Z058, 0xD0, 0x05CA, 0x00)
+            CH03 (__METHOD__, Z058, 0xD0, 0x05CA, 0x00)
             M003 ()
-            CH04 (TS, 0x00, 0x54, Z058, 0x05CC, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */
+            CH04 (__METHOD__, 0x00, 0x54, Z058, 0x05CC, 0x00, 0x00) /* AE_AML_METHOD_LIMIT */
             Method (M003, 0, NotSerialized)
             {
                 Return (0xABCD0002)
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl
index 9d1ae4442..676c95b60 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_00_undef.asl
@@ -38,7 +38,6 @@
     /* 51 - AE_AML_UNINITIALIZED_ELEMENT */
     Method (M4B0, 1, Serialized)
     {
-        Name (TS, "m4b0")
         Name (I000, 0x00)
         Event (E000)
         /* Uninitialized Local */
@@ -53,7 +52,7 @@
             /* CondRefOf */
 
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z092, 0x01, 0x3B, 0x00)
+            CH03 (__METHOD__, Z092, 0x01, 0x3B, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
@@ -93,11 +92,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z092, 0x02, 0x6D, 0x00)
+            CH03 (__METHOD__, Z092, 0x02, 0x6D, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z092, 0x03, 0x72, 0x00)
+            CH03 (__METHOD__, Z092, 0x03, 0x72, 0x00)
             /* Release */
 
             Release (Local0)
@@ -345,7 +344,7 @@
             /* DeRefOf(Index(Package, Ind)) */
 
             Local1 = DerefOf (P000 [0x00])
-            CH04 (TS, 0x01, 0x33, Z092, 0x01A2, 0x00, 0x00)
+            CH04 (__METHOD__, 0x01, 0x33, Z092, 0x01A2, 0x00, 0x00)
             /* CondRefOf */
 
             CondRefOf (DerefOf (P000 [0x00]), Local1)
@@ -391,7 +390,7 @@
             If (X104)
             {
                 Local1 = ObjectType (DerefOf (P000 [0x00]))
-                CH03 (TS, Z092, 0x05, 0x01DA, 0x00)
+                CH03 (__METHOD__, Z092, 0x05, 0x01DA, 0x00)
             }
 
             /* RefOf */
@@ -953,7 +952,7 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH04 (TS, 0x00, 0x3E, Z092, 0x04F9, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0x3E, Z092, 0x04F9, 0x00, 0x00)
             /* CondRefOf */
 
             CondRefOf (DerefOf (Arg1), Local1)
@@ -999,7 +998,7 @@
             If (X104)
             {
                 Local1 = ObjectType (DerefOf (Arg1))
-                CH03 (TS, Z092, 0x0B, 0x0531, 0x00)
+                CH03 (__METHOD__, Z092, 0x0B, 0x0531, 0x00)
             }
 
             /* RefOf */
@@ -1418,13 +1417,13 @@
             }
         }
 
-        CH03 (TS, Z092, 0x0C, 0x0716, 0x00)
+        CH03 (__METHOD__, Z092, 0x0C, 0x0716, 0x00)
         /* Uninitialized Local */
 
-        M000 (Concatenate (TS, "-m000"), 0x00)
+        M000 (Concatenate (__METHOD__, "-m000"), 0x00)
         /* Uninitialized element of Package */
 
-        M001 (Concatenate (TS, "-m001"))
+        M001 (Concatenate (__METHOD__, "-m001"))
         /*
          // Causes Remark on compilation
          // Uninitialized Arg
@@ -1436,7 +1435,7 @@
             Local0 = 0x00
         }
 
-        M003 (Concatenate (TS, "-m003-RefLocal"), RefOf (Local0))
+        M003 (Concatenate (__METHOD__, "-m003-RefLocal"), RefOf (Local0))
         /* Reference (Index) to Uninitialized element of Package */
 
         If (Y502)
@@ -1444,32 +1443,32 @@
             Name (P000, Package (0x01){})
             If (Y113)
             {
-                M003 (Concatenate (TS, "-m003-Index"), P000 [0x00])
+                M003 (Concatenate (__METHOD__, "-m003-Index"), P000 [0x00])
             }
 
             Store (P000 [0x00], Local1)
-            M003 (Concatenate (TS, "-m003-Index2"), Local1)
+            M003 (Concatenate (__METHOD__, "-m003-Index2"), Local1)
             If (Y113)
             {
-                M003 (Concatenate (TS, "-m003-Index3"), Local2 = P000 [0x00])
+                M003 (Concatenate (__METHOD__, "-m003-Index3"), Local2 = P000 [0x00])
             }
 
             Local3 = P000 [0x00]
-            M003 (Concatenate (TS, "-m003-Index4"), Local3)
+            M003 (Concatenate (__METHOD__, "-m003-Index4"), Local3)
             Local5 = Local4 = P000 [0x00]
-            M003 (Concatenate (TS, "-m003-Index5"), Local5)
+            M003 (Concatenate (__METHOD__, "-m003-Index5"), Local5)
         }
 
         /* Uninitialized Local in Return */
 
         M004 (0x00)
-        CH06 (TS, 0x00, 0x31)
+        CH06 (__METHOD__, 0x00, 0x31)
         /* Uninitialized element of Package in Return */
 
         If (Y502)
         {
             M005 ()
-            CH06 (TS, 0x01, 0x33)
+            CH06 (__METHOD__, 0x01, 0x33)
         }
 
         /*
@@ -1480,13 +1479,13 @@
          */
         /* Uninitialized Local in If */
         M007 (0x00)
-        CH06 (TS, 0x03, 0x31)
+        CH06 (__METHOD__, 0x03, 0x31)
         /* Uninitialized element of Package in If */
 
         If (Y502)
         {
             M008 ()
-            CH06 (TS, 0x04, 0x33)
+            CH06 (__METHOD__, 0x04, 0x33)
         }
 
         /*
@@ -1497,13 +1496,13 @@
          */
         /* Uninitialized Local in Elseif */
         M00A (0x00)
-        CH06 (TS, 0x06, 0x31)
+        CH06 (__METHOD__, 0x06, 0x31)
         /* Uninitialized element of Package in Elseif */
 
         If (Y502)
         {
             M00B (0x00)
-            CH06 (TS, 0x07, 0x33)
+            CH06 (__METHOD__, 0x07, 0x33)
         }
 
         /*
@@ -1515,17 +1514,17 @@
         /* Uninitialized Local as parameter of a method */
         I001 = 0x00
         M00D (Local0)
-        CH06 (TS, 0x09, 0x31)
+        CH06 (__METHOD__, 0x09, 0x31)
         If ((I001 != 0x00))
         {
-            ERR (TS, Z092, 0x077B, 0x00, 0x00, I001, 0x00)
+            ERR (__METHOD__, Z092, 0x077B, 0x00, 0x00, I001, 0x00)
         }
 
         /* Uninitialized element of Package as parameter of a method */
 
         If (Y502)
         {
-            M00E (Concatenate (TS, "-m00e"))
+            M00E (Concatenate (__METHOD__, "-m00e"))
         }
         /*
      // Causes Remark on compilation
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl
index 727c333eb..c81350dda 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_01_int.asl
@@ -42,7 +42,6 @@
     /* */
     Method (M4B1, 1, Serialized)
     {
-        Name (TS, "m4b1")
         Name (I000, 0x76543210)
         Event (E000)
         /* Local Named Object */
@@ -249,7 +248,7 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z093, 0x00, 0xFC, 0x00)
+            CH03 (__METHOD__, Z093, 0x00, 0xFC, 0x00)
             Local1 = DerefOf (DerefOf (Arg1))
             CH06 (Arg0, 0x2F, 0x2F)
             Store (DerefOf (Arg1) [0x00], Local1)
@@ -361,7 +360,7 @@
                 Local0 = (0x03 * LPC0) /* \M4B1.M007.LPC0 */
                 I001 = 0x00
                 Local1 = DerefOf (M000 (0x01, LPC0))
-                CH03 (TS, Z093, 0x016A, 0x00, 0x00)
+                CH03 (__METHOD__, Z093, 0x016A, 0x00, 0x00)
                 CH00 (Arg0, 0x01)
                 Local1 = DerefOf (DerefOf (M000 (0x02, LPC0)))
                 CH06 (Arg0, (0x3C + Local0), 0x2F)
@@ -377,49 +376,49 @@
             }
         }
 
-        CH03 (TS, Z093, 0x03, 0x017E, 0x00)
+        CH03 (__METHOD__, Z093, 0x03, 0x017E, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Argument */
 
-        M002 (TS, 0x76543210)
+        M002 (__METHOD__, 0x76543210)
         /* Local */
 
-        M003 (TS)
+        M003 (__METHOD__)
         /* An element of Package */
 
-        M004 (TS)
+        M004 (__METHOD__)
         /* Reference to Local Named Object */
 
-        M005 (Concatenate (TS, "-m005-RefLocName"), RefOf (I000))
+        M005 (Concatenate (__METHOD__, "-m005-RefLocName"), RefOf (I000))
         Local0 = RefOf (I000)
-        M005 (Concatenate (TS, "-m005-RefLocName2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefLocName2"), Local0)
         CondRefOf (I000, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefLocName"), Local0)
-        M005 (Concatenate (TS, "-m005-RefGlobName"), RefOf (I100))
+        M005 (Concatenate (__METHOD__, "-m005-CondRefLocName"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefGlobName"), RefOf (I100))
         Local0 = RefOf (I100)
-        M005 (Concatenate (TS, "-m005-RefGlobName2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefGlobName2"), Local0)
         CondRefOf (I100, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefGlobName"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefGlobName"), Local0)
         /* Reference to Local */
 
         Local0 = 0x89ABCDEF
-        M005 (Concatenate (TS, "-m005-RefLocal"), RefOf (Local0))
+        M005 (Concatenate (__METHOD__, "-m005-RefLocal"), RefOf (Local0))
         Local1 = RefOf (Local0)
-        M005 (Concatenate (TS, "-m005-RefLocal2"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-RefLocal2"), Local1)
         CondRefOf (Local0, Local1)
-        M005 (Concatenate (TS, "-m005-CondRefLocal"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefLocal"), Local1)
         /* Reference to Arg */
 
-        M005 (Concatenate (TS, "-m005-RefArg"), RefOf (Arg0))
+        M005 (Concatenate (__METHOD__, "-m005-RefArg"), RefOf (Arg0))
         Local0 = RefOf (Arg0)
-        M005 (Concatenate (TS, "-m005-RefArg2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefArg2"), Local0)
         CondRefOf (Arg0, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefArg"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefArg"), Local0)
         /* Index to Package */
 
         Name (P000, Package (0x01)
@@ -428,27 +427,27 @@
         })
         If (Y113)
         {
-            M005 (Concatenate (TS, "-m005-Index"), P000 [0x00])
+            M005 (Concatenate (__METHOD__, "-m005-Index"), P000 [0x00])
         }
 
         Store (P000 [0x00], Local0)
-        M005 (Concatenate (TS, "-m005-Index2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-Index2"), Local0)
         If (Y113)
         {
-            M005 (Concatenate (TS, "-m005-Index3"), Local0 = P000 [0x00])
+            M005 (Concatenate (__METHOD__, "-m005-Index3"), Local0 = P000 [0x00])
         }
 
         Local0 = P000 [0x00]
-        M005 (Concatenate (TS, "-m005-Index4"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-Index4"), Local0)
         Local1 = Local0 = P000 [0x00]
-        M005 (Concatenate (TS, "-m005-Index5"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-Index5"), Local1)
         /* Result of Method invocation */
 
-        M006 (TS)
+        M006 (__METHOD__)
         /* Reference to Object as Result of Method invocation */
 
         If (Y500)
         {
-            M007 (TS)
+            M007 (__METHOD__)
         }
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl
index e6c20d6b3..3c31be6f0 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_02_str.asl
@@ -40,7 +40,6 @@
     /* Note: String can be used with DerefOf and Index */
     Method (M4B2, 1, Serialized)
     {
-        Name (TS, "m4b2")
         Name (S000, "2")
         /* Local Named Object */
 
@@ -58,7 +57,7 @@
             /* Index */
 
             Local1 = S000 [0x00]
-            CH03 (TS, Z094, 0x01, 0x42, 0x00)
+            CH03 (__METHOD__, Z094, 0x01, 0x42, 0x00)
             /* ConcatenateResTemplate */
 
             ConcatenateResTemplate (S000, Buffer (0x02)
@@ -86,7 +85,7 @@
             /* Index */
 
             Local1 = S100 [0x00]
-            CH03 (TS, Z094, 0x03, 0x59, 0x00)
+            CH03 (__METHOD__, Z094, 0x03, 0x59, 0x00)
             /* ConcatenateResTemplate */
 
             ConcatenateResTemplate (S100, Buffer (0x02)
@@ -140,7 +139,7 @@
             /* Index */
 
             Local1 = Arg1 [0x00]
-            CH03 (TS, Z094, 0x05, 0x8C, 0x00)
+            CH03 (__METHOD__, Z094, 0x05, 0x8C, 0x00)
             /* Wait */
 
             Local1 = Wait (Arg1, 0x00)
@@ -191,7 +190,7 @@
             /* Index */
 
             Local1 = Local0 [0x00]
-            CH03 (TS, Z094, 0x07, 0xC2, 0x00)
+            CH03 (__METHOD__, Z094, 0x07, 0xC2, 0x00)
             /* Wait */
 
             Local1 = Wait (Local0, 0x00)
@@ -215,7 +214,7 @@
             Local1 = DerefOf (DerefOf (P000 [0x00]))
             CH06 (Arg0, 0x20, 0x05)
             Store (DerefOf (P000 [0x00]) [0x00], Local1)
-            CH03 (TS, Z094, 0x08, 0xDA, 0x00)
+            CH03 (__METHOD__, Z094, 0x08, 0xDA, 0x00)
             Local1 = Match (DerefOf (P000 [0x00]), MTR, 0x00, MTR, 0x00,
                 0x00)
             CH06 (Arg0, 0x21, 0x2F)
@@ -224,7 +223,7 @@
             Local1 = DerefOf (DerefOf (Local0 = P000 [0x00]))
             CH06 (Arg0, 0x22, 0x05)
             Store (DerefOf (Local0 = P000 [0x00]) [0x00], Local1)
-            CH03 (TS, Z094, 0x09, 0xE5, 0x00)
+            CH03 (__METHOD__, Z094, 0x09, 0xE5, 0x00)
             Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00,
                 0x00)
             CH06 (Arg0, 0x23, 0x2F)
@@ -244,11 +243,11 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z094, 0x0A, 0xF8, 0x00)
+            CH03 (__METHOD__, Z094, 0x0A, 0xF8, 0x00)
             Local1 = DerefOf (DerefOf (Arg1))
             CH06 (Arg0, 0x25, 0x05)
             Store (DerefOf (Arg1) [0x00], Local1)
-            CH03 (TS, Z094, 0x0B, 0xFE, 0x00)
+            CH03 (__METHOD__, Z094, 0x0B, 0xFE, 0x00)
             Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00)
             CH06 (Arg0, 0x26, 0x2F)
             Return (0x00)
@@ -305,16 +304,16 @@
                 CH00 (Arg0, 0x05)
             }
 
-            CH03 (TS, Z094, 0x0C, 0x0135, 0x00)
+            CH03 (__METHOD__, Z094, 0x0C, 0x0135, 0x00)
             Store (M000 (0x06) [0x00], Local1)
             If (Y900)
             {
-                CH03 (TS, Z094, 0x0C, 0x0138, 0x00)
+                CH03 (__METHOD__, Z094, 0x0C, 0x0138, 0x00)
                 CH00 (Arg0, 0x06)
             }
             Else
             {
-                CH04 (TS, 0x00, 0x55, Z094, 0x013B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH04 (__METHOD__, 0x00, 0x55, Z094, 0x013B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
             }
 
             Local1 = Wait (M000 (0x07), 0x00)
@@ -365,7 +364,7 @@
                 Local0 = (0x03 * LPC0) /* \M4B2.M007.LPC0 */
                 I000 = 0x00
                 Local1 = DerefOf (M000 (0x01, LPC0))
-                CH03 (TS, Z094, 0x016B, 0x00, 0x00)
+                CH03 (__METHOD__, Z094, 0x016B, 0x00, 0x00)
                 CH00 (Arg0, 0x01)
                 Local1 = DerefOf (DerefOf (M000 (0x02, LPC0)))
                 CH06 (Arg0, (0x30 + Local0), 0x2F)
@@ -381,49 +380,49 @@
             }
         }
 
-        CH03 (TS, Z094, 0x0F, 0x017F, 0x00)
+        CH03 (__METHOD__, Z094, 0x0F, 0x017F, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Argument */
 
-        M002 (TS, "2")
+        M002 (__METHOD__, "2")
         /* Local */
 
-        M003 (TS)
+        M003 (__METHOD__)
         /* An element of Package */
 
-        M004 (TS)
+        M004 (__METHOD__)
         /* Reference to Local Named Object */
 
-        M005 (Concatenate (TS, "-m005-RefLocName"), RefOf (S000))
+        M005 (Concatenate (__METHOD__, "-m005-RefLocName"), RefOf (S000))
         Local0 = RefOf (S000)
-        M005 (Concatenate (TS, "-m005-RefLocName2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefLocName2"), Local0)
         CondRefOf (S000, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefLocName"), Local0)
-        M005 (Concatenate (TS, "-m005-RefGlobName"), RefOf (S100))
+        M005 (Concatenate (__METHOD__, "-m005-CondRefLocName"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefGlobName"), RefOf (S100))
         Local0 = RefOf (S100)
-        M005 (Concatenate (TS, "-m005-RefGlobName2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefGlobName2"), Local0)
         CondRefOf (S100, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefGlobName"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefGlobName"), Local0)
         /* Reference to Local */
 
         Local0 = "2"
-        M005 (Concatenate (TS, "-m005-RefLocal"), RefOf (Local0))
+        M005 (Concatenate (__METHOD__, "-m005-RefLocal"), RefOf (Local0))
         Local1 = RefOf (Local0)
-        M005 (Concatenate (TS, "-m005-RefLocal2"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-RefLocal2"), Local1)
         CondRefOf (Local0, Local1)
-        M005 (Concatenate (TS, "-m005-CondRefLocal"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefLocal"), Local1)
         /* Reference to Arg */
 
-        M005 (Concatenate (TS, "-m005-RefArg"), RefOf (Arg0))
+        M005 (Concatenate (__METHOD__, "-m005-RefArg"), RefOf (Arg0))
         Local0 = RefOf (Arg0)
-        M005 (Concatenate (TS, "-m005-RefArg2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefArg2"), Local0)
         CondRefOf (Arg0, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefArg"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefArg"), Local0)
         /* Index to Package */
 
         Name (P000, Package (0x01)
@@ -432,27 +431,27 @@
         })
         If (Y113)
         {
-            M005 (Concatenate (TS, "-m005-Index"), P000 [0x00])
+            M005 (Concatenate (__METHOD__, "-m005-Index"), P000 [0x00])
         }
 
         Store (P000 [0x00], Local0)
-        M005 (Concatenate (TS, "-m005-Index2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-Index2"), Local0)
         If (Y113)
         {
-            M005 (Concatenate (TS, "-m005-Index3"), Local0 = P000 [0x00])
+            M005 (Concatenate (__METHOD__, "-m005-Index3"), Local0 = P000 [0x00])
         }
 
         Local0 = P000 [0x00]
-        M005 (Concatenate (TS, "-m005-Index4"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-Index4"), Local0)
         Local1 = Local0 = P000 [0x00]
-        M005 (Concatenate (TS, "-m005-Index5"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-Index5"), Local1)
         /* Result of Method invocation */
 
-        M006 (TS)
+        M006 (__METHOD__)
         /* Reference to Object as Result of Method invocation */
 
         If (Y500)
         {
-            M007 (TS)
+            M007 (__METHOD__)
         }
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl
index d31f9b56f..e82919f07 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_03_buf.asl
@@ -41,7 +41,6 @@
     /* Note: Buffer can be used with Index */
     Method (M4B3, 1, Serialized)
     {
-        Name (TS, "m4b3")
         Name (B000, Buffer (0x01)
         {
              0x62                                             // b
@@ -61,7 +60,7 @@
             }
 
             Store (B000 [0x00], Local1)
-            CH03 (TS, Z095, 0x00, 0x3C, 0x00)
+            CH03 (__METHOD__, Z095, 0x00, 0x3C, 0x00)
         }
 
         /* Global Named Object */
@@ -75,7 +74,7 @@
             }
 
             Store (B100 [0x00], Local1)
-            CH03 (TS, Z095, 0x01, 0x48, 0x00)
+            CH03 (__METHOD__, Z095, 0x01, 0x48, 0x00)
         }
 
         /* Argument */
@@ -93,7 +92,7 @@
             Local1 = Acquire (Arg1, 0x0000)
             CH06 (Arg0, 0x06, 0x2F)
             Store (Arg1 [0x00], Local1)
-            CH03 (TS, Z095, 0x02, 0x5E, 0x00)
+            CH03 (__METHOD__, Z095, 0x02, 0x5E, 0x00)
             Local1 = Wait (Arg1, 0x00)
             CH06 (Arg0, 0x07, 0x2F)
             Local1 = Match (Arg1, MTR, 0x00, MTR, 0x00, 0x00)
@@ -119,7 +118,7 @@
             Local1 = Acquire (Local0, 0x0000)
             CH06 (Arg0, 0x0D, 0x2F)
             Store (Local0 [0x00], Local1)
-            CH03 (TS, Z095, 0x03, 0x7C, 0x00)
+            CH03 (__METHOD__, Z095, 0x03, 0x7C, 0x00)
             Local1 = Wait (Local0, 0x00)
             CH06 (Arg0, 0x0E, 0x2F)
             Local1 = Match (Local0, MTR, 0x00, MTR, 0x00, 0x00)
@@ -142,7 +141,7 @@
             Local1 = DerefOf (DerefOf (Local0 = P000 [0x00]))
             CH06 (Arg0, 0x12, 0x2F)
             Store (DerefOf (Local0 = P000 [0x00]) [0x00], Local1)
-            CH03 (TS, Z095, 0x05, 0x90, 0x00)
+            CH03 (__METHOD__, Z095, 0x05, 0x90, 0x00)
             Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00,
                 0x00)
             CH06 (Arg0, 0x13, 0x2F)
@@ -162,11 +161,11 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z095, 0x06, 0xA3, 0x00)
+            CH03 (__METHOD__, Z095, 0x06, 0xA3, 0x00)
             Local1 = DerefOf (DerefOf (Arg1))
             CH06 (Arg0, 0x15, 0x2F)
             Store (DerefOf (Arg1) [0x00], Local1)
-            CH03 (TS, Z095, 0x07, 0xA9, 0x00)
+            CH03 (__METHOD__, Z095, 0x07, 0xA9, 0x00)
             Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00)
             CH06 (Arg0, 0x16, 0x2F)
             Return (0x00)
@@ -226,16 +225,16 @@
                 CH00 (Arg0, 0x05)
             }
 
-            CH03 (TS, Z095, 0x0C, 0xE0, 0x00)
+            CH03 (__METHOD__, Z095, 0x0C, 0xE0, 0x00)
             Store (M000 (0x06) [0x00], Local1)
             If (Y900)
             {
-                CH03 (TS, Z095, 0x08, 0xE3, 0x00)
+                CH03 (__METHOD__, Z095, 0x08, 0xE3, 0x00)
                 CH00 (Arg0, 0x06)
             }
             Else
             {
-                CH04 (TS, 0x00, 0x55, Z095, 0xE6, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH04 (__METHOD__, 0x00, 0x55, Z095, 0xE6, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
             }
 
             Local1 = Wait (M000 (0x07), 0x00)
@@ -289,7 +288,7 @@
                 Local0 = (0x03 * LPC0) /* \M4B3.M007.LPC0 */
                 I000 = 0x00
                 Local1 = DerefOf (M000 (0x01, LPC0))
-                CH03 (TS, Z095, 0x0116, 0x00, 0x00)
+                CH03 (__METHOD__, Z095, 0x0116, 0x00, 0x00)
                 CH00 (Arg0, 0x01)
                 Local1 = DerefOf (DerefOf (M000 (0x02, LPC0)))
                 CH06 (Arg0, (0x20 + Local0), 0x2F)
@@ -305,55 +304,55 @@
             }
         }
 
-        CH03 (TS, Z095, 0x0B, 0x012A, 0x00)
+        CH03 (__METHOD__, Z095, 0x0B, 0x012A, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Argument */
 
-        M002 (TS, Buffer (0x01)
+        M002 (__METHOD__, Buffer (0x01)
             {
                  0x62                                             // b
             })
         /* Local */
 
-        M003 (TS)
+        M003 (__METHOD__)
         /* An element of Package */
 
-        M004 (TS)
+        M004 (__METHOD__)
         /* Reference to Local Named Object */
 
-        M005 (Concatenate (TS, "-m005-RefLocName"), RefOf (B000))
+        M005 (Concatenate (__METHOD__, "-m005-RefLocName"), RefOf (B000))
         Local0 = RefOf (B000)
-        M005 (Concatenate (TS, "-m005-RefLocName2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefLocName2"), Local0)
         CondRefOf (B000, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefLocName"), Local0)
-        M005 (Concatenate (TS, "-m005-RefGlobName"), RefOf (B100))
+        M005 (Concatenate (__METHOD__, "-m005-CondRefLocName"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefGlobName"), RefOf (B100))
         Local0 = RefOf (B100)
-        M005 (Concatenate (TS, "-m005-RefGlobName2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefGlobName2"), Local0)
         CondRefOf (B100, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefGlobName"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefGlobName"), Local0)
         /* Reference to Local */
 
         Local0 = Buffer (0x01)
             {
                  0x62                                             // b
             }
-        M005 (Concatenate (TS, "-m005-RefLocal"), RefOf (Local0))
+        M005 (Concatenate (__METHOD__, "-m005-RefLocal"), RefOf (Local0))
         Local1 = RefOf (Local0)
-        M005 (Concatenate (TS, "-m005-RefLocal2"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-RefLocal2"), Local1)
         CondRefOf (Local0, Local1)
-        M005 (Concatenate (TS, "-m005-CondRefLocal"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefLocal"), Local1)
         /* Reference to Arg */
 
-        M005 (Concatenate (TS, "-m005-RefArg"), RefOf (Arg0))
+        M005 (Concatenate (__METHOD__, "-m005-RefArg"), RefOf (Arg0))
         Local0 = RefOf (Arg0)
-        M005 (Concatenate (TS, "-m005-RefArg2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefArg2"), Local0)
         CondRefOf (Arg0, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefArg"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefArg"), Local0)
         /* Index to Package */
 
         Name (P000, Package (0x01)
@@ -365,27 +364,27 @@
         })
         If (Y113)
         {
-            M005 (Concatenate (TS, "-m005-Index"), P000 [0x00])
+            M005 (Concatenate (__METHOD__, "-m005-Index"), P000 [0x00])
         }
 
         Store (P000 [0x00], Local0)
-        M005 (Concatenate (TS, "-m005-Index2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-Index2"), Local0)
         If (Y113)
         {
-            M005 (Concatenate (TS, "-m005-Index3"), Local0 = P000 [0x00])
+            M005 (Concatenate (__METHOD__, "-m005-Index3"), Local0 = P000 [0x00])
         }
 
         Local0 = P000 [0x00]
-        M005 (Concatenate (TS, "-m005-Index4"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-Index4"), Local0)
         Local1 = Local0 = P000 [0x00]
-        M005 (Concatenate (TS, "-m005-Index5"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-Index5"), Local1)
         /* Result of Method invocation */
 
-        M006 (TS)
+        M006 (__METHOD__)
         /* Reference to Object as Result of Method invocation */
 
         If (Y500)
         {
-            M007 (TS)
+            M007 (__METHOD__)
         }
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl
index c293b6375..97b5598eb 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl
@@ -41,7 +41,6 @@
     /* Note: Package can be used with Index */
     Method (M4B4, 1, Serialized)
     {
-        Name (TS, "m4b4")
         Name (P000, Package (0x01)
         {
             0x62
@@ -60,13 +59,13 @@
             /* CondRefOf */
 
             Local1 = CondRefOf (P000)
-            CH03 (TS, Z096, 0x00, 0x3F, 0x00)
+            CH03 (__METHOD__, Z096, 0x00, 0x3F, 0x00)
             CondRefOf (P000, Local1)
-            CH03 (TS, Z096, 0x01, 0x42, 0x00)
+            CH03 (__METHOD__, Z096, 0x01, 0x42, 0x00)
             /* CopyObject */
 
             CopyObject (P000, Local1)
-            CH03 (TS, Z096, 0x02, 0x47, 0x00)
+            CH03 (__METHOD__, Z096, 0x02, 0x47, 0x00)
             /* Decrement */
             /* DerefOf */
             /* These are now caught by the compiler - Aug 2015
@@ -83,22 +82,22 @@
             /* Not */
             /* ObjectType */
             Local1 = ObjectType (P000)
-            CH03 (TS, Z096, 0x03, 0x63, 0x00)
+            CH03 (__METHOD__, Z096, 0x03, 0x63, 0x00)
             /* RefOf */
 
             Local1 = RefOf (P000)
-            CH03 (TS, Z096, 0x04, 0x68, 0x00)
+            CH03 (__METHOD__, Z096, 0x04, 0x68, 0x00)
             /* Release */
             /* Reset */
             /* Signal */
             /* SizeOf */
             Local1 = SizeOf (P000)
-            CH03 (TS, Z096, 0x05, 0x73, 0x00)
+            CH03 (__METHOD__, Z096, 0x05, 0x73, 0x00)
             /* Sleep */
             /* Stall */
             /* Store */
             Local1 = P000 /* \M4B4.M000.P000 */
-            CH03 (TS, Z096, 0x06, 0x7C, 0x00)
+            CH03 (__METHOD__, Z096, 0x06, 0x7C, 0x00)
             /* ToBCD */
             /* ToBuffer */
             /* ToDecimalString */
@@ -113,9 +112,9 @@
             /* Fatal */
             /* Index */
             Local1 = P000 [0x00]
-            CH03 (TS, Z096, 0x07, 0x99, 0x00)
+            CH03 (__METHOD__, Z096, 0x07, 0x99, 0x00)
             Store (P000 [0x00], Local1)
-            CH03 (TS, Z096, 0x08, 0x9C, 0x00)
+            CH03 (__METHOD__, Z096, 0x08, 0x9C, 0x00)
             /* LEqual */
             /* LGreater */
             /* LGreaterEqual */
@@ -137,7 +136,7 @@
             /* Mid */
             /* Match */
             Local1 = Match (P000, MTR, 0x00, MTR, 0x00, 0x00)
-            CH03 (TS, Z096, 0x09, 0xC7, 0x00)
+            CH03 (__METHOD__, Z096, 0x09, 0xC7, 0x00)
         }
 
         /* Global Named Object */
@@ -147,11 +146,11 @@
             /* CondRefOf */
 
             CondRefOf (P100, Local1)
-            CH03 (TS, Z096, 0x0B, 0xD0, 0x00)
+            CH03 (__METHOD__, Z096, 0x0B, 0xD0, 0x00)
             /* CopyObject */
 
             CopyObject (P100, Local1)
-            CH03 (TS, Z096, 0x0C, 0xD5, 0x00)
+            CH03 (__METHOD__, Z096, 0x0C, 0xD5, 0x00)
             /* Decrement */
             /* DerefOf */
             /* These are now caught by the compiler - Aug 2015
@@ -168,22 +167,22 @@
             /* Not */
             /* ObjectType */
             Local1 = ObjectType (P100)
-            CH03 (TS, Z096, 0x0D, 0xF0, 0x00)
+            CH03 (__METHOD__, Z096, 0x0D, 0xF0, 0x00)
             /* RefOf */
 
             Local1 = RefOf (P100)
-            CH03 (TS, Z096, 0x0E, 0xF5, 0x00)
+            CH03 (__METHOD__, Z096, 0x0E, 0xF5, 0x00)
             /* Release */
             /* Reset */
             /* Signal */
             /* SizeOf */
             Local1 = SizeOf (P100)
-            CH03 (TS, Z096, 0x0F, 0x0100, 0x00)
+            CH03 (__METHOD__, Z096, 0x0F, 0x0100, 0x00)
             /* Sleep */
             /* Stall */
             /* Store */
             Local1 = P100 /* \P100 */
-            CH03 (TS, Z096, 0x10, 0x0109, 0x00)
+            CH03 (__METHOD__, Z096, 0x10, 0x0109, 0x00)
             /* ToBCD */
             /* ToBuffer */
             /* ToDecimalString */
@@ -198,7 +197,7 @@
             /* Fatal */
             /* Index */
             Store (P100 [0x00], Local1)
-            CH03 (TS, Z096, 0x12, 0x0126, 0x00)
+            CH03 (__METHOD__, Z096, 0x12, 0x0126, 0x00)
             /* LEqual */
             /* LGreater */
             /* LGreaterEqual */
@@ -220,7 +219,7 @@
             /* Mid */
             /* Match */
             Local1 = Match (P100, MTR, 0x00, MTR, 0x00, 0x00)
-            CH03 (TS, Z096, 0x13, 0x0151, 0x00)
+            CH03 (__METHOD__, Z096, 0x13, 0x0151, 0x00)
         }
 
         /* Argument */
@@ -231,11 +230,11 @@
             /* CondRefOf */
 
             CondRefOf (Arg1, Local1)
-            CH03 (TS, Z096, 0x15, 0x015C, 0x00)
+            CH03 (__METHOD__, Z096, 0x15, 0x015C, 0x00)
             /* CopyObject */
 
             CopyObject (Arg1, Local1)
-            CH03 (TS, Z096, 0x16, 0x0161, 0x00)
+            CH03 (__METHOD__, Z096, 0x16, 0x0161, 0x00)
             /* Decrement */
 
             Arg1--
@@ -271,11 +270,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Arg1)
-            CH03 (TS, Z096, 0x17, 0x018E, 0x00)
+            CH03 (__METHOD__, Z096, 0x17, 0x018E, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Arg1)
-            CH03 (TS, Z096, 0x18, 0x0193, 0x00)
+            CH03 (__METHOD__, Z096, 0x18, 0x0193, 0x00)
             /* Release */
 
             Release (Arg1)
@@ -291,7 +290,7 @@
             /* SizeOf */
 
             Local1 = SizeOf (Arg1)
-            CH03 (TS, Z096, 0x19, 0x01A7, 0x00)
+            CH03 (__METHOD__, Z096, 0x19, 0x01A7, 0x00)
             /* Sleep */
 
             Sleep (Arg1)
@@ -303,7 +302,7 @@
             /* Store */
 
             Local1 = Arg1
-            CH03 (TS, Z096, 0x1A, 0x01B6, 0x00)
+            CH03 (__METHOD__, Z096, 0x1A, 0x01B6, 0x00)
             /* ToBCD */
 
             ToBCD (Arg1, Local1)
@@ -375,7 +374,7 @@
             /* Index */
 
             Local1 = Arg1 [0x00]
-            CH03 (TS, Z096, 0x1C, 0x020C, 0x00)
+            CH03 (__METHOD__, Z096, 0x1C, 0x020C, 0x00)
             Index ("0", Arg1, Local1)
             CH06 (Arg0, 0x39, 0x2F)
             /* LEqual */
@@ -497,7 +496,7 @@
             /* Match */
 
             Local1 = Match (Arg1, MTR, 0x00, MTR, 0x00, 0x00)
-            CH03 (TS, Z096, 0x1D, 0x02AF, 0x00)
+            CH03 (__METHOD__, Z096, 0x1D, 0x02AF, 0x00)
             Local1 = Match (Package (0x01)
                     {
                         0x01
@@ -526,11 +525,11 @@
             /* CondRefOf */
 
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z096, 0x1F, 0x02C3, 0x00)
+            CH03 (__METHOD__, Z096, 0x1F, 0x02C3, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
-            CH03 (TS, Z096, 0x20, 0x02C8, 0x00)
+            CH03 (__METHOD__, Z096, 0x20, 0x02C8, 0x00)
             /* Decrement */
 
             Local0--
@@ -566,11 +565,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z096, 0x21, 0x02F5, 0x00)
+            CH03 (__METHOD__, Z096, 0x21, 0x02F5, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z096, 0x22, 0x02FA, 0x00)
+            CH03 (__METHOD__, Z096, 0x22, 0x02FA, 0x00)
             /* Release */
 
             Release (Local0)
@@ -586,7 +585,7 @@
             /* SizeOf */
 
             Local1 = SizeOf (Local0)
-            CH03 (TS, Z096, 0x23, 0x030E, 0x00)
+            CH03 (__METHOD__, Z096, 0x23, 0x030E, 0x00)
             /* Sleep */
 
             Sleep (Local0)
@@ -598,7 +597,7 @@
             /* Store */
 
             Local1 = Local0
-            CH03 (TS, Z096, 0x24, 0x031D, 0x00)
+            CH03 (__METHOD__, Z096, 0x24, 0x031D, 0x00)
             /* ToBCD */
 
             ToBCD (Local0, Local1)
@@ -668,7 +667,7 @@
             /* Index */
 
             Local1 = Local0 [0x00]
-            CH03 (TS, Z096, 0x26, 0x0370, 0x00)
+            CH03 (__METHOD__, Z096, 0x26, 0x0370, 0x00)
             Index ("0", Local0, Local1)
             CH06 (Arg0, 0x39, 0x2F)
             /* LEqual */
@@ -790,7 +789,7 @@
             /* Match */
 
             Local1 = Match (Local0, MTR, 0x00, MTR, 0x00, 0x00)
-            CH03 (TS, Z096, 0x27, 0x0413, 0x00)
+            CH03 (__METHOD__, Z096, 0x27, 0x0413, 0x00)
             Local1 = Match (Package (0x01)
                     {
                         0x01
@@ -826,7 +825,7 @@
             /* CopyObject */
 
             CopyObject (DerefOf (P000 [0x00]), Local1)
-            CH03 (TS, Z096, 0x28, 0x042E, 0x00)
+            CH03 (__METHOD__, Z096, 0x28, 0x042E, 0x00)
             /* Decrement */
 
             DerefOf (P000 [0x00])--
@@ -862,7 +861,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (P000 [0x00]))
-            CH03 (TS, Z096, 0x29, 0x045B, 0x00)
+            CH03 (__METHOD__, Z096, 0x29, 0x045B, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (P000 [0x00]))
@@ -872,7 +871,7 @@
             /* Signal */
             /* SizeOf */
             Local1 = SizeOf (DerefOf (P000 [0x00]))
-            CH03 (TS, Z096, 0x2A, 0x046B, 0x00)
+            CH03 (__METHOD__, Z096, 0x2A, 0x046B, 0x00)
             /* Sleep */
 
             Sleep (DerefOf (P000 [0x00]))
@@ -884,7 +883,7 @@
             /* Store */
 
             Local1 = DerefOf (P000 [0x00])
-            CH03 (TS, Z096, 0x2B, 0x047A, 0x00)
+            CH03 (__METHOD__, Z096, 0x2B, 0x047A, 0x00)
             /* ToBCD */
 
             ToBCD (DerefOf (P000 [0x00]), Local1)
@@ -952,7 +951,7 @@
             /* Index */
 
             Local1 = DerefOf (P000 [0x00]) [0x00]
-            CH03 (TS, Z096, 0x2D, 0x04CD, 0x00)
+            CH03 (__METHOD__, Z096, 0x2D, 0x04CD, 0x00)
             Index ("0", DerefOf (P000 [0x00]), Local1)
             CH06 (Arg0, 0x39, 0x2F)
             /* LEqual */
@@ -1073,7 +1072,7 @@
 
             Local1 = Match (DerefOf (P000 [0x00]), MTR, 0x00, MTR, 0x00,
                 0x00)
-            CH03 (TS, Z096, 0x2E, 0x056D, 0x00)
+            CH03 (__METHOD__, Z096, 0x2E, 0x056D, 0x00)
             Local1 = Match (Package (0x01)
                     {
                         0x01
@@ -1096,7 +1095,7 @@
             /* CopyObject */
 
             CopyObject (DerefOf (Local0 = P000 [0x00]), Local1)
-            CH03 (TS, Z096, 0x2F, 0x0583, 0x00)
+            CH03 (__METHOD__, Z096, 0x2F, 0x0583, 0x00)
             /* Decrement */
 
             DerefOf (Local0 = P000 [0x00])--
@@ -1132,7 +1131,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Local0 = P000 [0x00]))
-            CH03 (TS, Z096, 0x30, 0x05B0, 0x00)
+            CH03 (__METHOD__, Z096, 0x30, 0x05B0, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Local0 = P000 [0x00]))
@@ -1142,7 +1141,7 @@
             /* Signal */
             /* SizeOf */
             Local1 = SizeOf (DerefOf (Local0 = P000 [0x00]))
-            CH03 (TS, Z096, 0x31, 0x05C0, 0x00)
+            CH03 (__METHOD__, Z096, 0x31, 0x05C0, 0x00)
             /* Sleep */
 
             Sleep (DerefOf (Local0 = P000 [0x00]))
@@ -1154,7 +1153,7 @@
             /* Store */
 
             Local1 = DerefOf (Local0 = P000 [0x00])
-            CH03 (TS, Z096, 0x32, 0x05CF, 0x00)
+            CH03 (__METHOD__, Z096, 0x32, 0x05CF, 0x00)
             /* ToBCD */
 
             ToBCD (DerefOf (Local0 = P000 [0x00]), Local1)
@@ -1222,7 +1221,7 @@
             /* Index */
 
             Local1 = DerefOf (Local0 = P000 [0x00]) [0x00]
-            CH03 (TS, Z096, 0x34, 0x0622, 0x00)
+            CH03 (__METHOD__, Z096, 0x34, 0x0622, 0x00)
             Index ("0", DerefOf (Local0 = P000 [0x00]), Local1)
             CH06 (Arg0, 0x39, 0x2F)
             /* LEqual */
@@ -1343,7 +1342,7 @@
 
             Local1 = Match (DerefOf (Local0 = P000 [0x00]), MTR, 0x00, MTR, 0x00,
                 0x00)
-            CH03 (TS, Z096, 0x35, 0x06C2, 0x00)
+            CH03 (__METHOD__, Z096, 0x35, 0x06C2, 0x00)
             Local1 = Match (Package (0x01)
                     {
                         0x01
@@ -1375,7 +1374,7 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z096, 0x36, 0x06DB, 0x00)
+            CH03 (__METHOD__, Z096, 0x36, 0x06DB, 0x00)
             /* CondRefOf */
 
             Local1 = CondRefOf (DerefOf (Arg1))
@@ -1385,7 +1384,7 @@
             /* CopyObject */
 
             CopyObject (DerefOf (Arg1), Local1)
-            CH03 (TS, Z096, 0x37, 0x06E8, 0x00)
+            CH03 (__METHOD__, Z096, 0x37, 0x06E8, 0x00)
             /* Decrement */
 
             DerefOf (Arg1)--
@@ -1421,7 +1420,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Arg1))
-            CH03 (TS, Z096, 0x38, 0x0715, 0x00)
+            CH03 (__METHOD__, Z096, 0x38, 0x0715, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Arg1))
@@ -1431,7 +1430,7 @@
             /* Signal */
             /* SizeOf */
             Local1 = SizeOf (DerefOf (Arg1))
-            CH03 (TS, Z096, 0x39, 0x0725, 0x00)
+            CH03 (__METHOD__, Z096, 0x39, 0x0725, 0x00)
             /* Sleep */
 
             Sleep (DerefOf (Arg1))
@@ -1443,7 +1442,7 @@
             /* Store */
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z096, 0x3A, 0x0734, 0x00)
+            CH03 (__METHOD__, Z096, 0x3A, 0x0734, 0x00)
             /* ToBCD */
 
             ToBCD (DerefOf (Arg1), Local1)
@@ -1511,7 +1510,7 @@
             /* Index */
 
             Local1 = DerefOf (Arg1) [0x00]
-            CH03 (TS, Z096, 0x3C, 0x0787, 0x00)
+            CH03 (__METHOD__, Z096, 0x3C, 0x0787, 0x00)
             Index ("0", DerefOf (Arg1), Local1)
             CH06 (Arg0, 0x39, 0x2F)
             /* LEqual */
@@ -1631,7 +1630,7 @@
             /* Match */
 
             Local1 = Match (DerefOf (Arg1), MTR, 0x00, MTR, 0x00, 0x00)
-            CH03 (TS, Z096, 0x3D, 0x0827, 0x00)
+            CH03 (__METHOD__, Z096, 0x3D, 0x0827, 0x00)
             Local1 = Match (Package (0x01)
                     {
                         0x01
@@ -1680,7 +1679,7 @@
             /* CopyObject */
 
             CopyObject (M000 (), Local1)
-            CH03 (TS, Z096, 0x3E, 0x0852, 0x00)
+            CH03 (__METHOD__, Z096, 0x3E, 0x0852, 0x00)
             /* Decrement */
 
             M000 ()--
@@ -1716,7 +1715,7 @@
             /* **** ObjectType */
             /* Nov. 2012: Method invocation as arg to ObjectType is now illegal */
             Local0 = ObjectType (M000)
-            CH03 (TS, Z096, 0x3F, 0x0880, 0x00)
+            CH03 (__METHOD__, Z096, 0x3F, 0x0880, 0x00)
             /* RefOf */
             /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */
             /*		if (y601) { */
@@ -1819,22 +1818,22 @@
             If (Y900)
             {
                 Local1 = M000 () [0x00]
-                CH03 (TS, Z096, 0x41, 0x08FF, 0x00)
+                CH03 (__METHOD__, Z096, 0x41, 0x08FF, 0x00)
                 Index ("0", M000 (), Local1)
                 CH06 (Arg0, 0x39, 0x2F)
             }
             Else
             {
-                CH03 (TS, Z096, 0x0123, 0x0904, 0x00)
-                CH03 (TS, Z096, 0x0127, 0x0905, 0x00)
+                CH03 (__METHOD__, Z096, 0x0123, 0x0904, 0x00)
+                CH03 (__METHOD__, Z096, 0x0127, 0x0905, 0x00)
                 Local1 = M000 () [0x00]
-                CH04 (TS, 0x00, 0x55, Z094, 0x0907, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
-                CH03 (TS, Z096, 0x0129, 0x0909, 0x00)
+                CH04 (__METHOD__, 0x00, 0x55, Z094, 0x0907, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH03 (__METHOD__, Z096, 0x0129, 0x0909, 0x00)
                 Index ("0", M000 (), Local1)
-                CH04 (TS, 0x00, 0xFF, Z094, 0x090B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
-                CH03 (TS, Z096, 0x0129, 0x090D, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z094, 0x090B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH03 (__METHOD__, Z096, 0x0129, 0x090D, 0x00)
                 Local1 = SS00 [M000 ()]
-                CH04 (TS, 0x00, 0x2F, Z094, 0x090F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH04 (__METHOD__, 0x00, 0x2F, Z094, 0x090F, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
             }
 
             /* LEqual */
@@ -1956,7 +1955,7 @@
             /* Match */
 
             Local1 = Match (M000 (), MTR, 0x00, MTR, 0x00, 0x00)
-            CH03 (TS, Z096, 0x42, 0x09B0, 0x00)
+            CH03 (__METHOD__, Z096, 0x42, 0x09B0, 0x00)
             Local1 = Match (Package (0x01)
                     {
                         0x01
@@ -2013,7 +2012,7 @@
                 Local0 = (0x03 * LPC0) /* \M4B4.M007.LPC0 */
                 I000 = 0x00
                 Local1 = DerefOf (M000 (0x01, LPC0))
-                CH03 (TS, Z096, 0x09DE, 0x00, 0x00)
+                CH03 (__METHOD__, Z096, 0x09DE, 0x00, 0x00)
                 CH00 (Arg0, 0x01)
                 Local1 = DerefOf (DerefOf (M000 (0x02, LPC0)))
                 CH06 (Arg0, (0x01 + Local0), 0x2F)
@@ -2118,16 +2117,16 @@
 
             /* Index */
 
-            CH03 (TS, Z094, 0x0123, 0x0A48, 0x00)
+            CH03 (__METHOD__, Z094, 0x0123, 0x0A48, 0x00)
             Store (M000 (0x09) [0x00], Local1)
             If (Y900)
             {
-                CH03 (TS, Z096, 0x45, 0x0A4B, 0x00)
+                CH03 (__METHOD__, Z096, 0x45, 0x0A4B, 0x00)
                 CH00 (Arg0, 0x09)
             }
             Else
             {
-                CH04 (TS, 0x00, 0x55, Z094, 0x0A4E, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH04 (__METHOD__, 0x00, 0x55, Z094, 0x0A4E, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
             }
 
             /* Wait */
@@ -2142,60 +2141,60 @@
             /* Match */
 
             Local1 = Match (M000 (0x0B), MTR, 0x00, MTR, 0x00, 0x00)
-            CH03 (TS, Z096, 0x46, 0x0A5C, 0x00)
+            CH03 (__METHOD__, Z096, 0x46, 0x0A5C, 0x00)
             CH00 (Arg0, 0x0B)
         }
 
-        SET0 (Z096, TS, 0x00)
-        CH03 (TS, Z096, 0x46, 0x0A62, 0x00)
+        SET0 (Z096, __METHOD__, 0x00)
+        CH03 (__METHOD__, Z096, 0x46, 0x0A62, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Argument */
 
-        M002 (TS, Package (0x01)
+        M002 (__METHOD__, Package (0x01)
             {
                 0x62
             })
         /* Local */
 
-        M003 (Concatenate (TS, "-m003"))
+        M003 (Concatenate (__METHOD__, "-m003"))
         /* An element of Package */
 
-        M004 (Concatenate (TS, "-m004"))
+        M004 (Concatenate (__METHOD__, "-m004"))
         /* Reference to Local Named Object */
 
-        M005 (Concatenate (TS, "-m005-RefLocName"), RefOf (P000))
+        M005 (Concatenate (__METHOD__, "-m005-RefLocName"), RefOf (P000))
         Local0 = RefOf (P000)
-        M005 (Concatenate (TS, "-m005-RefLocName2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefLocName2"), Local0)
         CondRefOf (P000, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefLocName"), Local0)
-        M005 (Concatenate (TS, "-m005-RefGlobName"), RefOf (P100))
+        M005 (Concatenate (__METHOD__, "-m005-CondRefLocName"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefGlobName"), RefOf (P100))
         Local0 = RefOf (P100)
-        M005 (Concatenate (TS, "-m005-RefGlobName2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefGlobName2"), Local0)
         CondRefOf (P100, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefGlobName"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefGlobName"), Local0)
         /* Reference to Local */
 
         Local0 = Package (0x01)
             {
                 0x62
             }
-        M005 (Concatenate (TS, "-m005-RefLocal"), RefOf (Local0))
+        M005 (Concatenate (__METHOD__, "-m005-RefLocal"), RefOf (Local0))
         Local1 = RefOf (Local0)
-        M005 (Concatenate (TS, "-m005-RefLocal2"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-RefLocal2"), Local1)
         CondRefOf (Local0, Local1)
-        M005 (Concatenate (TS, "-m005-CondRefLocal"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefLocal"), Local1)
         /* Reference to Arg */
 
-        M005 (Concatenate (TS, "-m005-RefArg"), RefOf (Arg0))
+        M005 (Concatenate (__METHOD__, "-m005-RefArg"), RefOf (Arg0))
         Local0 = RefOf (Arg0)
-        M005 (Concatenate (TS, "-m005-RefArg2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-RefArg2"), Local0)
         CondRefOf (Arg0, Local0)
-        M005 (Concatenate (TS, "-m005-CondRefArg"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-CondRefArg"), Local0)
         /* Index to Package */
 
         Name (PP00, Package (0x01)
@@ -2207,32 +2206,32 @@
         })
         If (Y113)
         {
-            M005 (Concatenate (TS, "-m005-Index"), PP00 [0x00])
+            M005 (Concatenate (__METHOD__, "-m005-Index"), PP00 [0x00])
         }
 
         Store (PP00 [0x00], Local0)
-        M005 (Concatenate (TS, "-m005-Index2"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-Index2"), Local0)
         If (Y113)
         {
-            M005 (Concatenate (TS, "-m005-Index3"), Local0 = PP00 [0x00])
+            M005 (Concatenate (__METHOD__, "-m005-Index3"), Local0 = PP00 [0x00])
         }
 
         Local0 = PP00 [0x00]
-        M005 (Concatenate (TS, "-m005-Index4"), Local0)
+        M005 (Concatenate (__METHOD__, "-m005-Index4"), Local0)
         Local1 = Local0 = PP00 [0x00]
-        M005 (Concatenate (TS, "-m005-Index5"), Local1)
+        M005 (Concatenate (__METHOD__, "-m005-Index5"), Local1)
         /* Result of Method invocation */
 
-        M006 (Concatenate (TS, "-m006"))
+        M006 (Concatenate (__METHOD__, "-m006"))
         /* Reference to Object as Result of Method invocation */
 
         If (Y500)
         {
-            M007 (Concatenate (TS, "-m007"))
+            M007 (Concatenate (__METHOD__, "-m007"))
         }
 
         /* Result of Method with checking of invocation */
 
-        M008 (Concatenate (TS, "-m008"))
+        M008 (Concatenate (__METHOD__, "-m008"))
         RST0 ()
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl
index 6fddc36f0..af6699f32 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_05_funit.asl
@@ -51,7 +51,6 @@
     /* */
     Method (M4B5, 0, Serialized)
     {
-        Name (TS, "m4b5")
         Field (RG01, ByteAcc, NoLock, Preserve)
         {
             Offset (0x0C),
@@ -93,11 +92,11 @@
             Store (FU03 [0x00], Local1)
             If (Y900)
             {
-                CH03 (TS, Z097, 0x00, 0x5A, 0x00)
+                CH03 (__METHOD__, Z097, 0x00, 0x5A, 0x00)
             }
             Else
             {
-                CH04 (TS, 0x00, 0x55, Z094, 0x5C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH04 (__METHOD__, 0x00, 0x55, Z094, 0x5C, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
             }
         }
 
@@ -128,11 +127,11 @@
             Store (FU01 [0x00], Local1)
             If (Y900)
             {
-                CH03 (TS, Z097, 0x01, 0x79, 0x00)
+                CH03 (__METHOD__, Z097, 0x01, 0x79, 0x00)
             }
             Else
             {
-                CH04 (TS, 0x00, 0x55, Z094, 0x7B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH04 (__METHOD__, 0x00, 0x55, Z094, 0x7B, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
             }
         }
 
@@ -150,7 +149,7 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z097, 0x02, 0x8C, 0x00)
+            CH03 (__METHOD__, Z097, 0x02, 0x8C, 0x00)
             Local1 = DerefOf (DerefOf (Arg1))
             CH06 (Arg0, 0x07, 0x2F)
             Store (DerefOf (Arg1) [0x00], Local1)
@@ -160,11 +159,11 @@
 
                 If (Y900)
                 {
-                    CH03 (TS, Z097, 0x03, 0x96, 0x00)
+                    CH03 (__METHOD__, Z097, 0x03, 0x96, 0x00)
                 }
                 Else
                 {
-                    CH04 (TS, 0x00, 0x55, Z097, 0x98, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                    CH04 (__METHOD__, 0x00, 0x55, Z097, 0x98, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
                 }
             }
             Else
@@ -233,7 +232,7 @@
                 Local0 = (0x03 * LPC0) /* \M4B5.M003.LPC0 */
                 I000 = 0x00
                 Local1 = DerefOf (M000 (0x01, LPC0))
-                CH03 (TS, Z097, 0xD3, 0x00, 0x00)
+                CH03 (__METHOD__, Z097, 0xD3, 0x00, 0x00)
                 CH00 (Arg0, 0x01)
                 Local1 = DerefOf (DerefOf (M000 (0x02, LPC0)))
                 CH06 (Arg0, (0x0B + Local0), 0x2F)
@@ -245,11 +244,11 @@
 
                     If (Y900)
                     {
-                        CH03 (TS, Z097, 0xDF, 0x00, 0x00)
+                        CH03 (__METHOD__, Z097, 0xDF, 0x00, 0x00)
                     }
                     Else
                     {
-                        CH04 (TS, 0x00, 0x55, Z097, 0xE1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                        CH04 (__METHOD__, 0x00, 0x55, Z097, 0xE1, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
                     }
                 }
                 Else
@@ -268,40 +267,40 @@
             }
         }
 
-        CH03 (TS, Z097, 0x0C, 0xF2, 0x00)
+        CH03 (__METHOD__, Z097, 0x0C, 0xF2, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Reference to Local Named Object */
 
         FU02 = II70 /* \II70 */
         FU03 = BI00 /* \BI00 */
-        M002 (Concatenate (TS, "-m002-RefLocNameI"), RefOf (FU02), 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefLocNameI"), RefOf (FU02), 0x00)
         Local0 = RefOf (FU02)
-        M002 (Concatenate (TS, "-m002-RefLocName2I"), Local0, 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefLocName2I"), Local0, 0x00)
         CondRefOf (FU02, Local0)
-        M002 (Concatenate (TS, "-m002-CondRefLocNameI"), Local0, 0x00)
-        M002 (Concatenate (TS, "-m002-RefLocNameB"), RefOf (FU03), 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-CondRefLocNameI"), Local0, 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefLocNameB"), RefOf (FU03), 0x01)
         Local0 = RefOf (FU03)
-        M002 (Concatenate (TS, "-m002-RefLocName2B"), Local0, 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-RefLocName2B"), Local0, 0x01)
         CondRefOf (FU03, Local0)
-        M002 (Concatenate (TS, "-m002-CondRefLocNameB"), Local0, 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-CondRefLocNameB"), Local0, 0x01)
         FU00 = II70 /* \II70 */
         FU01 = BI00 /* \BI00 */
-        M002 (Concatenate (TS, "-m002-RefGlobNameI"), RefOf (FU00), 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefGlobNameI"), RefOf (FU00), 0x00)
         Local0 = RefOf (FU00)
-        M002 (Concatenate (TS, "-m002-RefGlobName2I"), Local0, 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefGlobName2I"), Local0, 0x00)
         CondRefOf (FU00, Local0)
-        M002 (Concatenate (TS, "-m002-CondRefGlobNameI"), Local0, 0x00)
-        M002 (Concatenate (TS, "-m002-RefGlobNameB"), RefOf (FU01), 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-CondRefGlobNameI"), Local0, 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefGlobNameB"), RefOf (FU01), 0x01)
         Local0 = RefOf (FU01)
-        M002 (Concatenate (TS, "-m002-RefGlobName2B"), Local0, 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-RefGlobName2B"), Local0, 0x01)
         CondRefOf (FU01, Local0)
-        M002 (Concatenate (TS, "-m002-CondRefGlobNameB"), Local0, 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-CondRefGlobNameB"), Local0, 0x01)
         /* Reference to Object as Result of Method invocation */
 
-        M003 (TS)
+        M003 (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl
index c9c366561..80a8884fe 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_06_dev.asl
@@ -41,7 +41,6 @@
     /* */
     Method (M4B6, 0, Serialized)
     {
-        Name (TS, "m4b6")
         Device (DEV1)
         {
         }
@@ -79,11 +78,11 @@
             /* CondRefOf */
 
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z098, 0x01, 0x56, 0x00)
+            CH03 (__METHOD__, Z098, 0x01, 0x56, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
-            CH03 (TS, Z098, 0x02, 0x5B, 0x00)
+            CH03 (__METHOD__, Z098, 0x02, 0x5B, 0x00)
             /* Decrement */
 
             Local0--
@@ -119,11 +118,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z098, 0x03, 0x88, 0x00)
+            CH03 (__METHOD__, Z098, 0x03, 0x88, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z098, 0x04, 0x8D, 0x00)
+            CH03 (__METHOD__, Z098, 0x04, 0x8D, 0x00)
             /* Release */
 
             Release (Local0)
@@ -384,7 +383,7 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z098, 0x05, 0x01C7, 0x00)
+            CH03 (__METHOD__, Z098, 0x05, 0x01C7, 0x00)
             /* CondRefOf */
 
             CondRefOf (DerefOf (Arg1), Local1)
@@ -428,7 +427,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Arg1))
-            CH03 (TS, Z098, 0x06, 0x01FE, 0x00)
+            CH03 (__METHOD__, Z098, 0x06, 0x01FE, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Arg1))
@@ -676,7 +675,7 @@
             /* CopyObject */
 
             CopyObject (M000 (), Local1)
-            CH03 (TS, Z098, 0x07, 0x0334, 0x00)
+            CH03 (__METHOD__, Z098, 0x07, 0x0334, 0x00)
             /* Decrement */
 
             M000 ()--
@@ -712,7 +711,7 @@
             /* **** ObjectType */
             /* Nov. 2016: Method invocation as arg to ObjectType is now illegal */
             Local0 = ObjectType (M000)
-            CH03 (TS, Z098, 0x08, 0x0362, 0x00)
+            CH03 (__METHOD__, Z098, 0x08, 0x0362, 0x00)
             /* RefOf */
             /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */
             /*		Store (RefOf(m000()), Local1) */
@@ -994,7 +993,7 @@
                 Local0 = (0x03 * LPC0) /* \M4B6.M005.LPC0 */
                 I000 = 0x00
                 Local1 = DerefOf (M000 (0x01, LPC0))
-                CH03 (TS, Z098, 0x04B2, 0x00, 0x00)
+                CH03 (__METHOD__, Z098, 0x04B2, 0x00, 0x00)
                 CH00 (Arg0, 0x01)
                 Local1 = DerefOf (DerefOf (M000 (0x02, LPC0)))
                 CH06 (Arg0, (0x01 + Local0), 0x2F)
@@ -1010,25 +1009,25 @@
             }
         }
 
-        CH03 (TS, Z098, 0x0B, 0x04C6, 0x00)
+        CH03 (__METHOD__, Z098, 0x0B, 0x04C6, 0x00)
         /* Local Named Object */
         /*	m000(ts) */
         /* Global Named Object */
         /*	m001(ts) */
         /* Local */
-        M002 (Concatenate (TS, "-m002"))
+        M002 (Concatenate (__METHOD__, "-m002"))
         /* Reference to Local Named Object */
 
-        M003 (Concatenate (TS, "-m003-RefLocName"), RefOf (DEV1), 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName"), RefOf (DEV1), 0x01)
         Local0 = RefOf (DEV1)
-        M003 (Concatenate (TS, "-m003-RefLocName2"), Local0, 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName2"), Local0, 0x01)
         CondRefOf (DEV1, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefLocName"), Local0, 0x01)
-        M003 (Concatenate (TS, "-m003-RefGlobName"), RefOf (DEV0), 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefLocName"), Local0, 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName"), RefOf (DEV0), 0x01)
         Local0 = RefOf (DEV0)
-        M003 (Concatenate (TS, "-m003-RefGlobName2"), Local0, 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName2"), Local0, 0x01)
         CondRefOf (DEV0, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefGlobName"), Local0, 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefGlobName"), Local0, 0x01)
         /* Reference to Object as element of Package */
 
         Name (PP00, Package (0x01)
@@ -1037,24 +1036,24 @@
         })
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index"), PP00 [0x00], 0x00)
+            M003 (Concatenate (__METHOD__, "-m003-Index"), PP00 [0x00], 0x00)
         }
 
         Store (PP00 [0x00], Local1)
-        M003 (Concatenate (TS, "-m003-Index2"), Local1, 0x00)
+        M003 (Concatenate (__METHOD__, "-m003-Index2"), Local1, 0x00)
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index3"), Local2 = PP00 [0x00], 0x00)
+            M003 (Concatenate (__METHOD__, "-m003-Index3"), Local2 = PP00 [0x00], 0x00)
         }
 
         Local3 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index4"), Local3, 0x00)
+        M003 (Concatenate (__METHOD__, "-m003-Index4"), Local3, 0x00)
         Local5 = Local4 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index5"), Local5, 0x00)
+        M003 (Concatenate (__METHOD__, "-m003-Index5"), Local5, 0x00)
         /* Result of Method invocation */
 
-        M004 (Concatenate (TS, "-m004"))
+        M004 (Concatenate (__METHOD__, "-m004"))
         /* Reference to Object as Result of Method invocation */
 
-        M005 (Concatenate (TS, "-m005"))
+        M005 (Concatenate (__METHOD__, "-m005"))
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl
index 36647f57f..8bca4450a 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_07_event.asl
@@ -38,7 +38,6 @@
     /* */
     Method (M4B7, 0, Serialized)
     {
-        Name (TS, "m4b7")
         Event (EV01)
         Event (E000)
         Name (I000, 0x00)
@@ -70,11 +69,11 @@
             /* CondRefOf */
 
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z099, 0x01, 0x57, 0x00)
+            CH03 (__METHOD__, Z099, 0x01, 0x57, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
-            CH03 (TS, Z099, 0x02, 0x5C, 0x00)
+            CH03 (__METHOD__, Z099, 0x02, 0x5C, 0x00)
             /* Decrement */
 
             Local0--
@@ -110,11 +109,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z099, 0x03, 0x89, 0x00)
+            CH03 (__METHOD__, Z099, 0x03, 0x89, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z099, 0x04, 0x8E, 0x00)
+            CH03 (__METHOD__, Z099, 0x04, 0x8E, 0x00)
             /* Release */
 
             Release (Local0)
@@ -122,11 +121,11 @@
             /* Reset */
 
             Reset (Local0)
-            CH03 (TS, Z099, 0x0E, 0x98, 0x00)
+            CH03 (__METHOD__, Z099, 0x0E, 0x98, 0x00)
             /* Signal */
 
             Signal (Local0)
-            CH03 (TS, Z099, 0x0F, 0x9D, 0x00)
+            CH03 (__METHOD__, Z099, 0x0F, 0x9D, 0x00)
             /* SizeOf */
 
             Local1 = SizeOf (Local0)
@@ -316,7 +315,7 @@
             /* Wait */
 
             Local1 = Wait (Local0, I000)
-            CH03 (TS, Z099, 0x6C, 0x018F, 0x00)
+            CH03 (__METHOD__, Z099, 0x6C, 0x018F, 0x00)
             Local1 = Wait (E000, Local0)
             CH06 (Arg0, 0x6D, 0x2F)
             /* XOr */
@@ -368,7 +367,7 @@
             Local1 = DerefOf (Arg1)
             If (!SLCK)
             {
-                CH04 (TS, 0x00, 0x2F, Z099, 0x01C1, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0x2F, Z099, 0x01C1, 0x00, 0x00)
             }
 
             /* CondRefOf */
@@ -378,7 +377,7 @@
             /* CopyObject */
 
             CopyObject (DerefOf (Arg1), Local1)
-            CH03 (TS, Z099, 0x02, 0x01CC, 0x00)
+            CH03 (__METHOD__, Z099, 0x02, 0x01CC, 0x00)
             /* Decrement */
 
             DerefOf (Arg1)--
@@ -414,7 +413,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Arg1))
-            CH03 (TS, Z099, 0x06, 0x01F9, 0x00)
+            CH03 (__METHOD__, Z099, 0x06, 0x01F9, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Arg1))
@@ -668,7 +667,7 @@
             /* CopyObject */
 
             CopyObject (M000 (), Local1)
-            CH03 (TS, Z099, 0x07, 0x0334, 0x00)
+            CH03 (__METHOD__, Z099, 0x07, 0x0334, 0x00)
             /* Decrement */
 
             M000 ()--
@@ -704,7 +703,7 @@
             /* ObjectType */
             /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */
             Local0 = ObjectType (M000)
-            CH03 (TS, Z099, 0x08, 0x0362, 0x00)
+            CH03 (__METHOD__, Z099, 0x08, 0x0362, 0x00)
             /* RefOf */
             /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */
             /*		if (y601) { */
@@ -987,7 +986,7 @@
                 Local1 = DerefOf (M000 (0x01, LPC0))
                 If (!SLCK)
                 {
-                    CH04 (TS, 0x00, 0x2F, Z099, 0x04B5, 0x00, 0x00)
+                    CH04 (__METHOD__, 0x00, 0x2F, Z099, 0x04B5, 0x00, 0x00)
                 }
 
                 CH00 (Arg0, 0x01)
@@ -1009,26 +1008,26 @@
             }
         }
 
-        SET0 (Z099, TS, 0x00)
-        CH03 (TS, Z099, 0x0B, 0x04CE, 0x00)
+        SET0 (Z099, __METHOD__, 0x00)
+        CH03 (__METHOD__, Z099, 0x0B, 0x04CE, 0x00)
         /* Local Named Object */
         /*	m000(ts) */
         /* Global Named Object */
         /*	m001(ts) */
         /* Local */
-        M002 (Concatenate (TS, "-m002"))
+        M002 (Concatenate (__METHOD__, "-m002"))
         /* Reference to Local Named Object */
 
-        M003 (Concatenate (TS, "-m003-RefLocName"), RefOf (EV01))
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName"), RefOf (EV01))
         Local0 = RefOf (EV01)
-        M003 (Concatenate (TS, "-m003-RefLocName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName2"), Local0)
         CondRefOf (EV01, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefLocName"), Local0)
-        M003 (Concatenate (TS, "-m003-RefGlobName"), RefOf (EV00))
+        M003 (Concatenate (__METHOD__, "-m003-CondRefLocName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName"), RefOf (EV00))
         Local0 = RefOf (EV00)
-        M003 (Concatenate (TS, "-m003-RefGlobName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName2"), Local0)
         CondRefOf (EV00, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefGlobName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefGlobName"), Local0)
         /* Reference to Object as element of Package */
 
         Name (PP00, Package (0x01)
@@ -1037,25 +1036,25 @@
         })
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index"), PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index"), PP00 [0x00])
         }
 
         Store (PP00 [0x00], Local1)
-        M003 (Concatenate (TS, "-m003-Index2"), Local1)
+        M003 (Concatenate (__METHOD__, "-m003-Index2"), Local1)
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index3"), Local2 = PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index3"), Local2 = PP00 [0x00])
         }
 
         Local3 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index4"), Local3)
+        M003 (Concatenate (__METHOD__, "-m003-Index4"), Local3)
         Local5 = Local4 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index5"), Local5)
+        M003 (Concatenate (__METHOD__, "-m003-Index5"), Local5)
         /* Result of Method invocation */
 
-        M004 (Concatenate (TS, "-m004"))
+        M004 (Concatenate (__METHOD__, "-m004"))
         /* Reference to Object as Result of Method invocation */
 
-        M005 (Concatenate (TS, "-m005"))
+        M005 (Concatenate (__METHOD__, "-m005"))
         RST0 ()
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl
index 06f6a0df1..47f83cda9 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_08_method.asl
@@ -42,7 +42,6 @@
     /* */
     Method (M4B8, 0, Serialized)
     {
-        Name (TS, "m4b8")
         Method (M4F1, 0, NotSerialized)
         {
             Return ("m4f1")
@@ -91,11 +90,11 @@
             /* CondRefOf */
 
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z100, 0x01, 0x55, 0x00)
+            CH03 (__METHOD__, Z100, 0x01, 0x55, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
-            CH03 (TS, Z100, 0x02, 0x5A, 0x00)
+            CH03 (__METHOD__, Z100, 0x02, 0x5A, 0x00)
             /* Decrement */
 
             Local0--
@@ -131,11 +130,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z100, 0x03, 0x87, 0x00)
+            CH03 (__METHOD__, Z100, 0x03, 0x87, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z100, 0x04, 0x8C, 0x00)
+            CH03 (__METHOD__, Z100, 0x04, 0x8C, 0x00)
             /* Release */
 
             Release (Local0)
@@ -389,7 +388,7 @@
             Local1 = DerefOf (Arg1)
             If (!SLCK)
             {
-                CH04 (TS, 0x00, 0x2F, Z100, 0x01BF, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0x2F, Z100, 0x01BF, 0x00, 0x00)
             }
 
             /* CondRefOf */
@@ -399,7 +398,7 @@
             /* CopyObject */
 
             CopyObject (DerefOf (Arg1), Local1)
-            CH03 (TS, Z100, 0x02, 0x01CA, 0x00)
+            CH03 (__METHOD__, Z100, 0x02, 0x01CA, 0x00)
             /* Decrement */
 
             DerefOf (Arg1)--
@@ -435,7 +434,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Arg1))
-            CH03 (TS, Z100, 0x06, 0x01F7, 0x00)
+            CH03 (__METHOD__, Z100, 0x06, 0x01F7, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Arg1))
@@ -689,7 +688,7 @@
             /* CopyObject */
 
             CopyObject (M000 (), Local1)
-            CH03 (TS, Z100, 0x07, 0x0331, 0x00)
+            CH03 (__METHOD__, Z100, 0x07, 0x0331, 0x00)
             /* Decrement */
 
             M000 ()--
@@ -725,7 +724,7 @@
             /* ObjectType */
             /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */
             Local0 = ObjectType (M000)
-            CH03 (TS, Z100, 0x08, 0x035F, 0x00)
+            CH03 (__METHOD__, Z100, 0x08, 0x035F, 0x00)
             /* RefOf */
             /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */
             /*		if (y601) { */
@@ -1012,7 +1011,7 @@
                 Local1 = DerefOf (M000 (0x01, LPC0))
                 If (!SLCK)
                 {
-                    CH04 (TS, 0x00, 0x2F, Z100, 0x04B2, 0x00, 0x00)
+                    CH04 (__METHOD__, 0x00, 0x2F, Z100, 0x04B2, 0x00, 0x00)
                 }
 
                 CH00 (Arg0, 0x01)
@@ -1034,29 +1033,29 @@
             }
         }
 
-        SET0 (Z100, TS, 0x00)
-        CH03 (TS, Z100, 0x0B, 0x04CB, 0x00)
+        SET0 (Z100, __METHOD__, 0x00)
+        CH03 (__METHOD__, Z100, 0x0B, 0x04CB, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Local */
 
-        M002 (Concatenate (TS, "-m002"))
+        M002 (Concatenate (__METHOD__, "-m002"))
         /* Reference to Local Named Object */
 
-        M003 (Concatenate (TS, "-m003-RefLocName"), RefOf (M4F1))
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName"), RefOf (M4F1))
         Local0 = RefOf (M4F1)
-        M003 (Concatenate (TS, "-m003-RefLocName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName2"), Local0)
         CondRefOf (M4F1, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefLocName"), Local0)
-        M003 (Concatenate (TS, "-m003-RefGlobName"), RefOf (M4F0))
+        M003 (Concatenate (__METHOD__, "-m003-CondRefLocName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName"), RefOf (M4F0))
         Local0 = RefOf (M4F0)
-        M003 (Concatenate (TS, "-m003-RefGlobName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName2"), Local0)
         CondRefOf (M4F0, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefGlobName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefGlobName"), Local0)
         /* Reference to Object as element of Package */
 
         Name (PP00, Package (0x01)
@@ -1065,25 +1064,25 @@
         })
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index"), PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index"), PP00 [0x00])
         }
 
         Store (PP00 [0x00], Local1)
-        M003 (Concatenate (TS, "-m003-Index2"), Local1)
+        M003 (Concatenate (__METHOD__, "-m003-Index2"), Local1)
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index3"), Local2 = PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index3"), Local2 = PP00 [0x00])
         }
 
         Local3 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index4"), Local3)
+        M003 (Concatenate (__METHOD__, "-m003-Index4"), Local3)
         Local5 = Local4 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index5"), Local5)
+        M003 (Concatenate (__METHOD__, "-m003-Index5"), Local5)
         /* Result of Method invocation */
 
-        M004 (Concatenate (TS, "-m004"))
+        M004 (Concatenate (__METHOD__, "-m004"))
         /* Reference to Object as Result of Method invocation */
 
-        M005 (Concatenate (TS, "-m005"))
+        M005 (Concatenate (__METHOD__, "-m005"))
         RST0 ()
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl
index 2e97ed85c..52500f95c 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_09_mux.asl
@@ -38,7 +38,6 @@
     /* */
     Method (M4B9, 0, Serialized)
     {
-        Name (TS, "m4b9")
         Mutex (MX01, 0x00)
         Event (E000)
         Name (I000, 0x00)
@@ -77,11 +76,11 @@
             /* CondRefOf */
 
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z101, 0x01, 0x5A, 0x00)
+            CH03 (__METHOD__, Z101, 0x01, 0x5A, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
-            CH03 (TS, Z101, 0x02, 0x5F, 0x00)
+            CH03 (__METHOD__, Z101, 0x02, 0x5F, 0x00)
             /* Decrement */
 
             Local0--
@@ -117,11 +116,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z101, 0x03, 0x8C, 0x00)
+            CH03 (__METHOD__, Z101, 0x03, 0x8C, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z101, 0x04, 0x91, 0x00)
+            CH03 (__METHOD__, Z101, 0x04, 0x91, 0x00)
             /* Release */
 
             Release (Local0)
@@ -173,7 +172,7 @@
             /* Acquire */
 
             Local1 = Acquire (Local0, 0x0064)
-            CH03 (TS, Z101, 0x1E, 0xD2, 0x00)
+            CH03 (__METHOD__, Z101, 0x1E, 0xD2, 0x00)
             /* Add */
 
             Local1 = (Local0 + I000) /* \M4B9.I000 */
@@ -375,7 +374,7 @@
             Local1 = DerefOf (Arg1)
             If (!SLCK)
             {
-                CH04 (TS, 0x00, 0x2F, Z101, 0x01C4, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0x2F, Z101, 0x01C4, 0x00, 0x00)
             }
 
             /* CondRefOf */
@@ -385,7 +384,7 @@
             /* CopyObject */
 
             CopyObject (DerefOf (Arg1), Local1)
-            CH03 (TS, Z101, 0x02, 0x01CE, 0x00)
+            CH03 (__METHOD__, Z101, 0x02, 0x01CE, 0x00)
             /* Decrement */
 
             DerefOf (Arg1)--
@@ -421,7 +420,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Arg1))
-            CH03 (TS, Z101, 0x06, 0x01FB, 0x00)
+            CH03 (__METHOD__, Z101, 0x06, 0x01FB, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Arg1))
@@ -675,7 +674,7 @@
             /* CopyObject */
 
             CopyObject (M000 (), Local1)
-            CH03 (TS, Z101, 0x07, 0x0335, 0x00)
+            CH03 (__METHOD__, Z101, 0x07, 0x0335, 0x00)
             /* Decrement */
 
             M000 ()--
@@ -711,7 +710,7 @@
             /* ObjectType */
             /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */
             Local0 = ObjectType (M000)
-            CH03 (TS, Z101, 0x08, 0x0363, 0x00)
+            CH03 (__METHOD__, Z101, 0x08, 0x0363, 0x00)
             /* RefOf */
             /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */
             /*		if (y601) { */
@@ -994,7 +993,7 @@
                 Local1 = DerefOf (M000 (0x01, LPC0))
                 If (!SLCK)
                 {
-                    CH04 (TS, 0x00, 0x2F, Z101, 0x04B6, 0x00, 0x00)
+                    CH04 (__METHOD__, 0x00, 0x2F, Z101, 0x04B6, 0x00, 0x00)
                 }
 
                 CH00 (Arg0, 0x01)
@@ -1016,29 +1015,29 @@
             }
         }
 
-        SET0 (Z101, TS, 0x00)
-        CH03 (TS, Z101, 0x0B, 0x04CF, 0x00)
+        SET0 (Z101, __METHOD__, 0x00)
+        CH03 (__METHOD__, Z101, 0x0B, 0x04CF, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Local */
 
-        M002 (Concatenate (TS, "-m002"))
+        M002 (Concatenate (__METHOD__, "-m002"))
         /* Reference to Local Named Object */
 
-        M003 (Concatenate (TS, "-m003-RefLocName"), RefOf (MX01))
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName"), RefOf (MX01))
         Local0 = RefOf (MX01)
-        M003 (Concatenate (TS, "-m003-RefLocName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName2"), Local0)
         CondRefOf (MX01, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefLocName"), Local0)
-        M003 (Concatenate (TS, "-m003-RefGlobName"), RefOf (MX10))
+        M003 (Concatenate (__METHOD__, "-m003-CondRefLocName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName"), RefOf (MX10))
         Local0 = RefOf (MX10)
-        M003 (Concatenate (TS, "-m003-RefGlobName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName2"), Local0)
         CondRefOf (MX10, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefGlobName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefGlobName"), Local0)
         /* Reference to Object as element of Package */
 
         Name (PP00, Package (0x01)
@@ -1047,25 +1046,25 @@
         })
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index"), PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index"), PP00 [0x00])
         }
 
         Store (PP00 [0x00], Local1)
-        M003 (Concatenate (TS, "-m003-Index2"), Local1)
+        M003 (Concatenate (__METHOD__, "-m003-Index2"), Local1)
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index3"), Local2 = PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index3"), Local2 = PP00 [0x00])
         }
 
         Local3 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index4"), Local3)
+        M003 (Concatenate (__METHOD__, "-m003-Index4"), Local3)
         Local5 = Local4 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index5"), Local5)
+        M003 (Concatenate (__METHOD__, "-m003-Index5"), Local5)
         /* Result of Method invocation */
 
-        M004 (Concatenate (TS, "-m004"))
+        M004 (Concatenate (__METHOD__, "-m004"))
         /* Reference to Object as Result of Method invocation */
 
-        M005 (Concatenate (TS, "-m005"))
+        M005 (Concatenate (__METHOD__, "-m005"))
         RST0 ()
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl
index 5f23f960e..4f2273ec8 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_10_oreg.asl
@@ -38,7 +38,6 @@
     /* */
     Method (M4BA, 0, Serialized)
     {
-        Name (TS, "m4ba")
         OperationRegion (OPR1, SystemMemory, 0x0100, 0x0100)
         Event (E000)
         Name (I000, 0x00)
@@ -75,13 +74,13 @@
             /* CondRefOf */
 
             Local1 = CondRefOf (Local0)
-            CH03 (TS, Z102, 0x00, 0x58, 0x00)
+            CH03 (__METHOD__, Z102, 0x00, 0x58, 0x00)
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z102, 0x01, 0x5B, 0x00)
+            CH03 (__METHOD__, Z102, 0x01, 0x5B, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
-            CH03 (TS, Z102, 0x02, 0x60, 0x00)
+            CH03 (__METHOD__, Z102, 0x02, 0x60, 0x00)
             /* Decrement */
 
             Local0--
@@ -117,11 +116,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z102, 0x03, 0x8D, 0x00)
+            CH03 (__METHOD__, Z102, 0x03, 0x8D, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z102, 0x04, 0x92, 0x00)
+            CH03 (__METHOD__, Z102, 0x04, 0x92, 0x00)
             /* Release */
 
             Release (Local0)
@@ -373,7 +372,7 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z102, 0x05, 0x01C4, 0x00)
+            CH03 (__METHOD__, Z102, 0x05, 0x01C4, 0x00)
             /* CondRefOf */
 
             CondRefOf (DerefOf (Arg1), Local1)
@@ -417,7 +416,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Arg1))
-            CH03 (TS, Z102, 0x06, 0x01FB, 0x00)
+            CH03 (__METHOD__, Z102, 0x06, 0x01FB, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Arg1))
@@ -665,7 +664,7 @@
             /* CopyObject */
 
             CopyObject (M000 (), Local1)
-            CH03 (TS, Z102, 0x07, 0x0330, 0x00)
+            CH03 (__METHOD__, Z102, 0x07, 0x0330, 0x00)
             /* Decrement */
 
             M000 ()--
@@ -701,7 +700,7 @@
             /* ObjectType */
             /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */
             Local0 = ObjectType (M000)
-            CH03 (TS, Z102, 0x08, 0x035E, 0x00)
+            CH03 (__METHOD__, Z102, 0x08, 0x035E, 0x00)
             /* RefOf */
             /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */
             /*		Store (RefOf(m000()), Local1) */
@@ -980,7 +979,7 @@
                 Local0 = (0x03 * LPC0) /* \M4BA.M005.LPC0 */
                 I000 = 0x00
                 Local1 = DerefOf (M000 (0x01, LPC0))
-                CH03 (TS, Z102, (0x09 + LPC0), 0x00, 0x00)
+                CH03 (__METHOD__, Z102, (0x09 + LPC0), 0x00, 0x00)
                 CH00 (Arg0, 0x01)
                 Local1 = DerefOf (DerefOf (M000 (0x02, LPC0)))
                 CH06 (Arg0, (0x01 + Local0), 0x2F)
@@ -996,28 +995,28 @@
             }
         }
 
-        CH03 (TS, Z102, 0x0B, 0x04C2, 0x00)
+        CH03 (__METHOD__, Z102, 0x0B, 0x04C2, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Local */
 
-        M002 (Concatenate (TS, "-m002"))
+        M002 (Concatenate (__METHOD__, "-m002"))
         /* Reference to Local Named Object */
 
-        M003 (Concatenate (TS, "-m003-RefLocName"), RefOf (OPR1))
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName"), RefOf (OPR1))
         Local0 = RefOf (OPR1)
-        M003 (Concatenate (TS, "-m003-RefLocName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName2"), Local0)
         CondRefOf (OPR1, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefLocName"), Local0)
-        M003 (Concatenate (TS, "-m003-RefGlobName"), RefOf (OPR9))
+        M003 (Concatenate (__METHOD__, "-m003-CondRefLocName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName"), RefOf (OPR9))
         Local0 = RefOf (OPR9)
-        M003 (Concatenate (TS, "-m003-RefGlobName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName2"), Local0)
         CondRefOf (OPR9, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefGlobName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefGlobName"), Local0)
         /* Reference to Object as element of Package */
 
         Name (PP00, Package (0x01)
@@ -1026,24 +1025,24 @@
         })
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index"), PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index"), PP00 [0x00])
         }
 
         Store (PP00 [0x00], Local1)
-        M003 (Concatenate (TS, "-m003-Index2"), Local1)
+        M003 (Concatenate (__METHOD__, "-m003-Index2"), Local1)
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index3"), Local2 = PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index3"), Local2 = PP00 [0x00])
         }
 
         Local3 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index4"), Local3)
+        M003 (Concatenate (__METHOD__, "-m003-Index4"), Local3)
         Local5 = Local4 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index5"), Local5)
+        M003 (Concatenate (__METHOD__, "-m003-Index5"), Local5)
         /* Result of Method invocation */
 
-        M004 (Concatenate (TS, "-m004"))
+        M004 (Concatenate (__METHOD__, "-m004"))
         /* Reference to Object as Result of Method invocation */
 
-        M005 (Concatenate (TS, "-m005"))
+        M005 (Concatenate (__METHOD__, "-m005"))
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl
index d969f3f67..6cd9108b9 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_11_pwr.asl
@@ -45,7 +45,6 @@
     /* */
     Method (M4BB, 0, Serialized)
     {
-        Name (TS, "m4bb")
         PowerResource (PW01, 0x01, 0x0000)
         {
             Method (M000, 0, NotSerialized)
@@ -98,11 +97,11 @@
             /* CondRefOf */
 
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z103, 0x01, 0x59, 0x00)
+            CH03 (__METHOD__, Z103, 0x01, 0x59, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
-            CH03 (TS, Z103, 0x02, 0x5E, 0x00)
+            CH03 (__METHOD__, Z103, 0x02, 0x5E, 0x00)
             /* Decrement */
 
             Local0--
@@ -138,11 +137,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z103, 0x03, 0x8B, 0x00)
+            CH03 (__METHOD__, Z103, 0x03, 0x8B, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z103, 0x04, 0x90, 0x00)
+            CH03 (__METHOD__, Z103, 0x04, 0x90, 0x00)
             /* Release */
 
             Release (Local0)
@@ -396,7 +395,7 @@
             Local1 = DerefOf (Arg1)
             If (!SLCK)
             {
-                CH04 (TS, 0x00, 0x2F, Z103, 0x01C3, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0x2F, Z103, 0x01C3, 0x00, 0x00)
             }
 
             /* CondRefOf */
@@ -406,7 +405,7 @@
             /* CopyObject */
 
             CopyObject (DerefOf (Arg1), Local1)
-            CH03 (TS, Z103, 0x02, 0x01CE, 0x00)
+            CH03 (__METHOD__, Z103, 0x02, 0x01CE, 0x00)
             /* Decrement */
 
             DerefOf (Arg1)--
@@ -442,7 +441,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Arg1))
-            CH03 (TS, Z103, 0x06, 0x01FB, 0x00)
+            CH03 (__METHOD__, Z103, 0x06, 0x01FB, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Arg1))
@@ -696,7 +695,7 @@
             /* CopyObject */
 
             CopyObject (M000 (), Local1)
-            CH03 (TS, Z103, 0x07, 0x0335, 0x00)
+            CH03 (__METHOD__, Z103, 0x07, 0x0335, 0x00)
             /* Decrement */
 
             M000 ()--
@@ -732,7 +731,7 @@
             /* ObjectType */
             /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */
             Local0 = ObjectType (M000)
-            CH03 (TS, Z103, 0x08, 0x0363, 0x00)
+            CH03 (__METHOD__, Z103, 0x08, 0x0363, 0x00)
             /* RefOf */
             /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */
             /*		if (y601) { */
@@ -1022,7 +1021,7 @@
                 Local1 = DerefOf (M000 (0x01, LPC0))
                 If (!SLCK)
                 {
-                    CH04 (TS, 0x00, 0x2F, Z103, 0x04B6, 0x00, 0x00)
+                    CH04 (__METHOD__, 0x00, 0x2F, Z103, 0x04B6, 0x00, 0x00)
                 }
 
                 CH00 (Arg0, 0x01)
@@ -1044,29 +1043,29 @@
             }
         }
 
-        SET0 (Z103, TS, 0x00)
-        CH03 (TS, Z103, 0x0B, 0x04CF, 0x00)
+        SET0 (Z103, __METHOD__, 0x00)
+        CH03 (__METHOD__, Z103, 0x0B, 0x04CF, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Local */
 
-        M002 (Concatenate (TS, "-m002"))
+        M002 (Concatenate (__METHOD__, "-m002"))
         /* Reference to Local Named Object */
 
-        M003 (Concatenate (TS, "-m003-RefLocName"), RefOf (PW01))
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName"), RefOf (PW01))
         Local0 = RefOf (PW01)
-        M003 (Concatenate (TS, "-m003-RefLocName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName2"), Local0)
         CondRefOf (PW01, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefLocName"), Local0)
-        M003 (Concatenate (TS, "-m003-RefGlobName"), RefOf (PW00))
+        M003 (Concatenate (__METHOD__, "-m003-CondRefLocName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName"), RefOf (PW00))
         Local0 = RefOf (PW00)
-        M003 (Concatenate (TS, "-m003-RefGlobName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName2"), Local0)
         CondRefOf (PW00, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefGlobName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefGlobName"), Local0)
         /* Reference to Object as element of Package */
 
         Name (PP00, Package (0x01)
@@ -1075,25 +1074,25 @@
         })
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index"), PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index"), PP00 [0x00])
         }
 
         Store (PP00 [0x00], Local1)
-        M003 (Concatenate (TS, "-m003-Index2"), Local1)
+        M003 (Concatenate (__METHOD__, "-m003-Index2"), Local1)
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index3"), Local2 = PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index3"), Local2 = PP00 [0x00])
         }
 
         Local3 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index4"), Local3)
+        M003 (Concatenate (__METHOD__, "-m003-Index4"), Local3)
         Local5 = Local4 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index5"), Local5)
+        M003 (Concatenate (__METHOD__, "-m003-Index5"), Local5)
         /* Result of Method invocation */
 
-        M004 (Concatenate (TS, "-m004"))
+        M004 (Concatenate (__METHOD__, "-m004"))
         /* Reference to Object as Result of Method invocation */
 
-        M005 (Concatenate (TS, "-m005"))
+        M005 (Concatenate (__METHOD__, "-m005"))
         RST0 ()
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl
index aa98ba2c4..f5258ea02 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_12_proc.asl
@@ -38,7 +38,6 @@
     /* */
     Method (M4BC, 0, Serialized)
     {
-        Name (TS, "m4bc")
         Processor (PRC1, 0x00, 0xFFFFFFFF, 0x00){}
         Event (E000)
         Name (I000, 0x00)
@@ -77,11 +76,11 @@
             /* CondRefOf */
 
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z104, 0x01, 0x5B, 0x00)
+            CH03 (__METHOD__, Z104, 0x01, 0x5B, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
-            CH03 (TS, Z104, 0x02, 0x60, 0x00)
+            CH03 (__METHOD__, Z104, 0x02, 0x60, 0x00)
             /* Decrement */
 
             Local0--
@@ -117,11 +116,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z104, 0x03, 0x8D, 0x00)
+            CH03 (__METHOD__, Z104, 0x03, 0x8D, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z104, 0x04, 0x92, 0x00)
+            CH03 (__METHOD__, Z104, 0x04, 0x92, 0x00)
             /* Release */
 
             Release (Local0)
@@ -375,7 +374,7 @@
             Local1 = DerefOf (Arg1)
             If (!SLCK)
             {
-                CH04 (TS, 0x00, 0x2F, Z104, 0x01C5, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0x2F, Z104, 0x01C5, 0x00, 0x00)
             }
 
             /* CondRefOf */
@@ -385,7 +384,7 @@
             /* CopyObject */
 
             CopyObject (DerefOf (Arg1), Local1)
-            CH03 (TS, Z104, 0x02, 0x01D0, 0x00)
+            CH03 (__METHOD__, Z104, 0x02, 0x01D0, 0x00)
             /* Decrement */
 
             DerefOf (Arg1)--
@@ -421,7 +420,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Arg1))
-            CH03 (TS, Z104, 0x06, 0x01FD, 0x00)
+            CH03 (__METHOD__, Z104, 0x06, 0x01FD, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Arg1))
@@ -675,7 +674,7 @@
             /* CopyObject */
 
             CopyObject (M000 (), Local1)
-            CH03 (TS, Z104, 0x07, 0x0337, 0x00)
+            CH03 (__METHOD__, Z104, 0x07, 0x0337, 0x00)
             /* Decrement */
 
             M000 ()--
@@ -711,7 +710,7 @@
             /* ObjectType */
             /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */
             Local0 = ObjectType (M000)
-            CH03 (TS, Z104, 0x08, 0x0365, 0x00)
+            CH03 (__METHOD__, Z104, 0x08, 0x0365, 0x00)
             /* RefOf */
             /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */
             /*		if (y601) { */
@@ -994,7 +993,7 @@
                 Local1 = DerefOf (M000 (0x01, LPC0))
                 If (!SLCK)
                 {
-                    CH04 (TS, 0x00, 0x2F, Z104, 0x04B8, 0x00, 0x00)
+                    CH04 (__METHOD__, 0x00, 0x2F, Z104, 0x04B8, 0x00, 0x00)
                 }
 
                 CH00 (Arg0, 0x01)
@@ -1016,29 +1015,29 @@
             }
         }
 
-        SET0 (Z104, TS, 0x00)
-        CH03 (TS, Z104, 0x0B, 0x04D1, 0x00)
+        SET0 (Z104, __METHOD__, 0x00)
+        CH03 (__METHOD__, Z104, 0x0B, 0x04D1, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Local */
 
-        M002 (Concatenate (TS, "-m002"))
+        M002 (Concatenate (__METHOD__, "-m002"))
         /* Reference to Local Named Object */
 
-        M003 (Concatenate (TS, "-m003-RefLocName"), RefOf (PRC1))
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName"), RefOf (PRC1))
         Local0 = RefOf (PRC1)
-        M003 (Concatenate (TS, "-m003-RefLocName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName2"), Local0)
         CondRefOf (PRC1, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefLocName"), Local0)
-        M003 (Concatenate (TS, "-m003-RefGlobName"), RefOf (PR10))
+        M003 (Concatenate (__METHOD__, "-m003-CondRefLocName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName"), RefOf (PR10))
         Local0 = RefOf (PR10)
-        M003 (Concatenate (TS, "-m003-RefGlobName2"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName2"), Local0)
         CondRefOf (PR10, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefGlobName"), Local0)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefGlobName"), Local0)
         /* Reference to Object as element of Package */
 
         Name (PP00, Package (0x01)
@@ -1047,25 +1046,25 @@
         })
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index"), PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index"), PP00 [0x00])
         }
 
         Store (PP00 [0x00], Local1)
-        M003 (Concatenate (TS, "-m003-Index2"), Local1)
+        M003 (Concatenate (__METHOD__, "-m003-Index2"), Local1)
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index3"), Local2 = PP00 [0x00])
+            M003 (Concatenate (__METHOD__, "-m003-Index3"), Local2 = PP00 [0x00])
         }
 
         Local3 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index4"), Local3)
+        M003 (Concatenate (__METHOD__, "-m003-Index4"), Local3)
         Local5 = Local4 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index5"), Local5)
+        M003 (Concatenate (__METHOD__, "-m003-Index5"), Local5)
         /* Result of Method invocation */
 
-        M004 (Concatenate (TS, "-m004"))
+        M004 (Concatenate (__METHOD__, "-m004"))
         /* Reference to Object as Result of Method invocation */
 
-        M005 (Concatenate (TS, "-m005"))
+        M005 (Concatenate (__METHOD__, "-m005"))
         RST0 ()
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl
index d82ab5674..2b8f56c51 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_13_tzone.asl
@@ -42,7 +42,6 @@
     /* */
     Method (M4BD, 0, Serialized)
     {
-        Name (TS, "m4bd")
         ThermalZone (TZ01)
         {
             Name (N000, "tz01")
@@ -87,11 +86,11 @@
             /* CondRefOf */
 
             CondRefOf (Local0, Local1)
-            CH03 (TS, Z105, 0x01, 0x59, 0x00)
+            CH03 (__METHOD__, Z105, 0x01, 0x59, 0x00)
             /* CopyObject */
 
             CopyObject (Local0, Local1)
-            CH03 (TS, Z105, 0x02, 0x5E, 0x00)
+            CH03 (__METHOD__, Z105, 0x02, 0x5E, 0x00)
             /* Decrement */
 
             Local0--
@@ -127,11 +126,11 @@
             /* ObjectType */
 
             Local1 = ObjectType (Local0)
-            CH03 (TS, Z105, 0x03, 0x8B, 0x00)
+            CH03 (__METHOD__, Z105, 0x03, 0x8B, 0x00)
             /* RefOf */
 
             Local1 = RefOf (Local0)
-            CH03 (TS, Z105, 0x04, 0x90, 0x00)
+            CH03 (__METHOD__, Z105, 0x04, 0x90, 0x00)
             /* Release */
 
             Release (Local0)
@@ -392,7 +391,7 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z105, 0x05, 0x01CA, 0x00)
+            CH03 (__METHOD__, Z105, 0x05, 0x01CA, 0x00)
             /* CondRefOf */
 
             CondRefOf (DerefOf (Arg1), Local1)
@@ -436,7 +435,7 @@
             /* ObjectType */
 
             Local1 = ObjectType (DerefOf (Arg1))
-            CH03 (TS, Z105, 0x06, 0x0201, 0x00)
+            CH03 (__METHOD__, Z105, 0x06, 0x0201, 0x00)
             /* RefOf */
 
             Local1 = RefOf (DerefOf (Arg1))
@@ -684,7 +683,7 @@
             /* CopyObject */
 
             CopyObject (M000 (), Local1)
-            CH03 (TS, Z105, 0x07, 0x0336, 0x00)
+            CH03 (__METHOD__, Z105, 0x07, 0x0336, 0x00)
             /* Decrement */
 
             M000 ()--
@@ -720,7 +719,7 @@
             /* ObjectType */
             /* **** Nov. 2016: Method invocation as arg to ObjectType is now illegal */
             Local0 = ObjectType (M000)
-            CH03 (TS, Z105, 0x08, 0x0364, 0x00)
+            CH03 (__METHOD__, Z105, 0x08, 0x0364, 0x00)
             /* RefOf */
             /* **** Oct. 2016: Method invocation as arg to RefOf is now illegal */
             /*		Store (RefOf(m000()), Local1) */
@@ -1003,7 +1002,7 @@
                 Local0 = (0x03 * LPC0) /* \M4BD.M005.LPC0 */
                 I000 = 0x00
                 Local1 = DerefOf (M000 (0x01, LPC0))
-                CH03 (TS, Z105, 0x04B4, 0x00, 0x00)
+                CH03 (__METHOD__, Z105, 0x04B4, 0x00, 0x00)
                 CH00 (Arg0, 0x01)
                 Local1 = DerefOf (DerefOf (M000 (0x02, LPC0)))
                 CH06 (Arg0, (0x01 + Local0), 0x2F)
@@ -1019,32 +1018,32 @@
             }
         }
 
-        CH03 (TS, Z105, 0x0B, 0x04C8, 0x00)
+        CH03 (__METHOD__, Z105, 0x0B, 0x04C8, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Local */
 
         If (Y504)
         {
-            M002 (Concatenate (TS, "-m002"))
+            M002 (Concatenate (__METHOD__, "-m002"))
         }
 
         /* Reference to Local Named Object */
 
-        M003 (Concatenate (TS, "-m003-RefLocName"), RefOf (TZ01), 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName"), RefOf (TZ01), 0x01)
         Local0 = RefOf (TZ01)
-        M003 (Concatenate (TS, "-m003-RefLocName2"), Local0, 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-RefLocName2"), Local0, 0x01)
         CondRefOf (TZ01, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefLocName"), Local0, 0x01)
-        M003 (Concatenate (TS, "-m003-RefGlobName"), RefOf (TZ00), 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefLocName"), Local0, 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName"), RefOf (TZ00), 0x01)
         Local0 = RefOf (TZ00)
-        M003 (Concatenate (TS, "-m003-RefGlobName2"), Local0, 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-RefGlobName2"), Local0, 0x01)
         CondRefOf (TZ00, Local0)
-        M003 (Concatenate (TS, "-m003-CondRefGlobName"), Local0, 0x01)
+        M003 (Concatenate (__METHOD__, "-m003-CondRefGlobName"), Local0, 0x01)
         /* Reference to Object as element of Package */
 
         Name (PP00, Package (0x01)
@@ -1053,28 +1052,28 @@
         })
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index"), PP00 [0x00], 0x00)
+            M003 (Concatenate (__METHOD__, "-m003-Index"), PP00 [0x00], 0x00)
         }
 
         Store (PP00 [0x00], Local1)
-        M003 (Concatenate (TS, "-m003-Index2"), Local1, 0x00)
+        M003 (Concatenate (__METHOD__, "-m003-Index2"), Local1, 0x00)
         If (Y113)
         {
-            M003 (Concatenate (TS, "-m003-Index3"), Local2 = PP00 [0x00], 0x00)
+            M003 (Concatenate (__METHOD__, "-m003-Index3"), Local2 = PP00 [0x00], 0x00)
         }
 
         Local3 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index4"), Local3, 0x00)
+        M003 (Concatenate (__METHOD__, "-m003-Index4"), Local3, 0x00)
         Local5 = Local4 = PP00 [0x00]
-        M003 (Concatenate (TS, "-m003-Index5"), Local5, 0x00)
+        M003 (Concatenate (__METHOD__, "-m003-Index5"), Local5, 0x00)
         /* Result of Method invocation */
 
         If (Y504)
         {
-            M004 (Concatenate (TS, "-m004"))
+            M004 (Concatenate (__METHOD__, "-m004"))
         }
 
         /* Reference to Object as Result of Method invocation */
 
-        M005 (Concatenate (TS, "-m005"))
+        M005 (Concatenate (__METHOD__, "-m005"))
     }
diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl
index 33d668c7a..5b1d41fcf 100644
--- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl
+++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_14_bfield.asl
@@ -47,7 +47,6 @@
     /* */
     Method (M4BE, 0, Serialized)
     {
-        Name (TS, "m4be")
         Name (BBF1, Buffer (0x14){})
         CreateField (BBF1, 0x0B, 0x1F, BF02)
         CreateField (BBF1, 0x3A, 0x41, BF03)
@@ -81,11 +80,11 @@
             Store (BF03 [0x00], Local1)
             If (Y900)
             {
-                CH03 (TS, Z106, 0x00, 0x56, 0x00)
+                CH03 (__METHOD__, Z106, 0x00, 0x56, 0x00)
             }
             Else
             {
-                CH04 (TS, 0x00, 0x55, Z106, 0x58, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH04 (__METHOD__, 0x00, 0x55, Z106, 0x58, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
             }
         }
 
@@ -116,11 +115,11 @@
             Store (BF21 [0x00], Local1)
             If (Y900)
             {
-                CH03 (TS, Z106, 0x01, 0x75, 0x00)
+                CH03 (__METHOD__, Z106, 0x01, 0x75, 0x00)
             }
             Else
             {
-                CH04 (TS, 0x00, 0x55, Z106, 0x77, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                CH04 (__METHOD__, 0x00, 0x55, Z106, 0x77, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
             }
         }
 
@@ -138,7 +137,7 @@
             }
 
             Local1 = DerefOf (Arg1)
-            CH03 (TS, Z106, 0x02, 0x89, 0x00)
+            CH03 (__METHOD__, Z106, 0x02, 0x89, 0x00)
             Local1 = DerefOf (DerefOf (Arg1))
             CH06 (Arg0, 0x07, 0x2F)
             Store (DerefOf (Arg1) [0x00], Local1)
@@ -148,11 +147,11 @@
 
                 If (Y900)
                 {
-                    CH03 (TS, Z106, 0x03, 0x93, 0x00)
+                    CH03 (__METHOD__, Z106, 0x03, 0x93, 0x00)
                 }
                 Else
                 {
-                    CH04 (TS, 0x00, 0x55, Z106, 0x95, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                    CH04 (__METHOD__, 0x00, 0x55, Z106, 0x95, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
                 }
             }
             Else
@@ -217,7 +216,7 @@
                 Local0 = (0x03 * LPC0) /* \M4BE.M003.LPC0 */
                 I000 = 0x00
                 Local1 = DerefOf (M000 (0x01, LPC0))
-                CH03 (TS, Z106, (0x04 + LPC0), 0x00, 0x00)
+                CH03 (__METHOD__, Z106, (0x04 + LPC0), 0x00, 0x00)
                 CH00 (Arg0, 0x01)
                 Local1 = DerefOf (DerefOf (M000 (0x02, LPC0)))
                 CH06 (Arg0, (0x0B + Local0), 0x2F)
@@ -229,11 +228,11 @@
 
                     If (Y900)
                     {
-                        CH03 (TS, Z106, (0x08 + LPC0), 0x00, 0x00)
+                        CH03 (__METHOD__, Z106, (0x08 + LPC0), 0x00, 0x00)
                     }
                     Else
                     {
-                        CH04 (TS, 0x00, 0x55, Z106, 0xDD, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
+                        CH04 (__METHOD__, 0x00, 0x55, Z106, 0xDD, 0x00, 0x00) /* AE_INDEX_TO_NOT_ATTACHED */
                     }
                 }
                 Else
@@ -252,40 +251,40 @@
             }
         }
 
-        CH03 (TS, Z106, 0x0C, 0xEE, 0x00)
+        CH03 (__METHOD__, Z106, 0x0C, 0xEE, 0x00)
         /* Local Named Object */
 
-        M000 (TS)
+        M000 (__METHOD__)
         /* Global Named Object */
 
-        M001 (TS)
+        M001 (__METHOD__)
         /* Reference to Local Named Object */
 
         BF02 = II71 /* \II71 */
         BF03 = BI01 /* \BI01 */
-        M002 (Concatenate (TS, "-m002-RefLocNameI"), RefOf (BF02), 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefLocNameI"), RefOf (BF02), 0x00)
         Local0 = RefOf (BF02)
-        M002 (Concatenate (TS, "-m002-RefLocName2I"), Local0, 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefLocName2I"), Local0, 0x00)
         CondRefOf (BF02, Local0)
-        M002 (Concatenate (TS, "-m002-CondRefLocNameI"), Local0, 0x00)
-        M002 (Concatenate (TS, "-m002-RefLocNameB"), RefOf (BF03), 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-CondRefLocNameI"), Local0, 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefLocNameB"), RefOf (BF03), 0x01)
         Local0 = RefOf (BF03)
-        M002 (Concatenate (TS, "-m002-RefLocName2B"), Local0, 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-RefLocName2B"), Local0, 0x01)
         CondRefOf (BF03, Local0)
-        M002 (Concatenate (TS, "-m002-CondRefLocNameB"), Local0, 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-CondRefLocNameB"), Local0, 0x01)
         BF20 = II71 /* \II71 */
         BF21 = BI01 /* \BI01 */
-        M002 (Concatenate (TS, "-m002-RefGlobNameI"), RefOf (BF20), 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefGlobNameI"), RefOf (BF20), 0x00)
         Local0 = RefOf (BF20)
-        M002 (Concatenate (TS, "-m002-RefGlobName2I"), Local0, 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefGlobName2I"), Local0, 0x00)
         CondRefOf (BF20, Local0)
-        M002 (Concatenate (TS, "-m002-CondRefGlobNameI"), Local0, 0x00)
-        M002 (Concatenate (TS, "-m002-RefGlobNameB"), RefOf (BF21), 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-CondRefGlobNameI"), Local0, 0x00)
+        M002 (Concatenate (__METHOD__, "-m002-RefGlobNameB"), RefOf (BF21), 0x01)
         Local0 = RefOf (BF21)
-        M002 (Concatenate (TS, "-m002-RefGlobName2B"), Local0, 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-RefGlobName2B"), Local0, 0x01)
         CondRefOf (BF21, Local0)
-        M002 (Concatenate (TS, "-m002-CondRefGlobNameB"), Local0, 0x01)
+        M002 (Concatenate (__METHOD__, "-m002-CondRefGlobNameB"), Local0, 0x01)
         /* Reference to Object as Result of Method invocation */
 
-        M003 (TS)
+        M003 (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl
index dec239a4f..c224adbe6 100644
--- a/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl
+++ b/tests/aslts/src/runtime/collections/functional/arithmetic/arithmetic.asl
@@ -457,16 +457,15 @@
     })
     Method (ADD0, 0, Serialized)
     {
-        Name (TS, "ADD0")
         Debug = "TEST: ADD0, Integer Add"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x07, "p000", P000, P001, 0x00)
-            M000 (TS, 0x0D, "p002", P002, P003, 0x00)
+            M000 (__METHOD__, 0x07, "p000", P000, P001, 0x00)
+            M000 (__METHOD__, 0x0D, "p002", P002, P003, 0x00)
         }
         Else
         {
-            M000 (TS, 0x0A, "p000", P000, P001, 0x00)
+            M000 (__METHOD__, 0x0A, "p000", P000, P001, 0x00)
         }
     }
 
@@ -590,16 +589,15 @@
     })
     Method (SUB0, 0, Serialized)
     {
-        Name (TS, "SUB0")
         Debug = "TEST: SUB0, Integer Subtract"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x07, "p004", P004, P005, 0x01)
-            M000 (TS, 0x14, "p006", P006, P007, 0x01)
+            M000 (__METHOD__, 0x07, "p004", P004, P005, 0x01)
+            M000 (__METHOD__, 0x14, "p006", P006, P007, 0x01)
         }
         Else
         {
-            M000 (TS, 0x0C, "p004", P004, P005, 0x01)
+            M000 (__METHOD__, 0x0C, "p004", P004, P005, 0x01)
         }
     }
 
@@ -690,16 +688,15 @@
     })
     Method (MTP0, 0, Serialized)
     {
-        Name (TS, "MTP0")
         Debug = "TEST: MTP0, Integer Multiply"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x09, "p008", P008, P009, 0x02)
-            M000 (TS, 0x07, "p00a", P00A, P00B, 0x02)
+            M000 (__METHOD__, 0x09, "p008", P008, P009, 0x02)
+            M000 (__METHOD__, 0x07, "p00a", P00A, P00B, 0x02)
         }
         Else
         {
-            M000 (TS, 0x0A, "p008", P008, P009, 0x02)
+            M000 (__METHOD__, 0x0A, "p008", P008, P009, 0x02)
         }
     }
 
@@ -797,16 +794,15 @@
     })
     Method (DVD0, 0, Serialized)
     {
-        Name (TS, "DVD0")
         Debug = "TEST: DVD0, Integer Divide"
         If ((F64 == 0x01))
         {
-            M001 (TS, 0x08, "p00c", P00C, P00D, 0x00)
-            M001 (TS, 0x08, "p00e", P00E, P00F, 0x00)
+            M001 (__METHOD__, 0x08, "p00c", P00C, P00D, 0x00)
+            M001 (__METHOD__, 0x08, "p00e", P00E, P00F, 0x00)
         }
         Else
         {
-            M001 (TS, 0x08, "p00c", P00C, P00D, 0x00)
+            M001 (__METHOD__, 0x08, "p00c", P00C, P00D, 0x00)
         }
     }
 
@@ -850,16 +846,15 @@
     })
     Method (ICR0, 0, Serialized)
     {
-        Name (TS, "ICR0")
         Debug = "TEST: ICR0, Increment an Integer"
         If ((F64 == 0x01))
         {
-            M002 (TS, 0x05, "p014", P014, P015, 0x00)
-            M002 (TS, 0x06, "p016", P016, P017, 0x00)
+            M002 (__METHOD__, 0x05, "p014", P014, P015, 0x00)
+            M002 (__METHOD__, 0x06, "p016", P016, P017, 0x00)
         }
         Else
         {
-            M002 (TS, 0x06, "p014", P014, P015, 0x00)
+            M002 (__METHOD__, 0x06, "p014", P014, P015, 0x00)
         }
     }
 
@@ -903,16 +898,15 @@
     })
     Method (DCR0, 0, Serialized)
     {
-        Name (TS, "DCR0")
         Debug = "TEST: DCR0, Decrement an Integer"
         If ((F64 == 0x01))
         {
-            M002 (TS, 0x05, "p018", P018, P019, 0x01)
-            M002 (TS, 0x06, "p01a", P01A, P01B, 0x01)
+            M002 (__METHOD__, 0x05, "p018", P018, P019, 0x01)
+            M002 (__METHOD__, 0x06, "p01a", P01A, P01B, 0x01)
         }
         Else
         {
-            M002 (TS, 0x06, "p018", P018, P019, 0x01)
+            M002 (__METHOD__, 0x06, "p018", P018, P019, 0x01)
         }
     }
 
@@ -946,16 +940,15 @@
     })
     Method (AND0, 0, Serialized)
     {
-        Name (TS, "AND0")
         Debug = "TEST: AND0, Integer Bitwise And"
         If ((F64 == 0x01))
         {
-            M000 (TS, C000, "p030", P030, P01C, 0x03)
-            M000 (TS, C000, "p031", P031, P01D, 0x03)
+            M000 (__METHOD__, C000, "p030", P030, P01C, 0x03)
+            M000 (__METHOD__, C000, "p031", P031, P01D, 0x03)
         }
         Else
         {
-            M000 (TS, C000, "p030", P030, P01C, 0x03)
+            M000 (__METHOD__, C000, "p030", P030, P01C, 0x03)
         }
     }
 
@@ -1024,19 +1017,18 @@
     })
     Method (NAN0, 0, Serialized)
     {
-        Name (TS, "NAN0")
         Debug = "TEST: NAN0, Integer Bitwise Nand"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x01, "p01e", P01E, P020, 0x04)
-            M000 (TS, 0x01, "p021", P021, P022, 0x04)
-            M000 (TS, C000, "p030", P030, P024, 0x04)
-            M000 (TS, C000, "p031", P031, P025, 0x04)
+            M000 (__METHOD__, 0x01, "p01e", P01E, P020, 0x04)
+            M000 (__METHOD__, 0x01, "p021", P021, P022, 0x04)
+            M000 (__METHOD__, C000, "p030", P030, P024, 0x04)
+            M000 (__METHOD__, C000, "p031", P031, P025, 0x04)
         }
         Else
         {
-            M000 (TS, 0x01, "p01e", P01E, P01F, 0x04)
-            M000 (TS, C000, "p030", P030, P023, 0x04)
+            M000 (__METHOD__, 0x01, "p01e", P01E, P01F, 0x04)
+            M000 (__METHOD__, C000, "p030", P030, P023, 0x04)
         }
     }
 
@@ -1105,19 +1097,18 @@
     })
     Method (NOR0, 0, Serialized)
     {
-        Name (TS, "NOR0")
         Debug = "TEST: NOR0, Integer Bitwise Nor"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x01, "p026", P026, P028, 0x05)
-            M000 (TS, 0x01, "p029", P029, P02A, 0x05)
-            M000 (TS, C000, "p030", P030, P02C, 0x05)
-            M000 (TS, C000, "p031", P031, P02D, 0x05)
+            M000 (__METHOD__, 0x01, "p026", P026, P028, 0x05)
+            M000 (__METHOD__, 0x01, "p029", P029, P02A, 0x05)
+            M000 (__METHOD__, C000, "p030", P030, P02C, 0x05)
+            M000 (__METHOD__, C000, "p031", P031, P02D, 0x05)
         }
         Else
         {
-            M000 (TS, 0x01, "p026", P026, P027, 0x05)
-            M000 (TS, C000, "p030", P030, P02B, 0x05)
+            M000 (__METHOD__, 0x01, "p026", P026, P027, 0x05)
+            M000 (__METHOD__, C000, "p030", P030, P02B, 0x05)
         }
     }
 
@@ -1149,16 +1140,15 @@
     })
     Method (NOT0, 0, Serialized)
     {
-        Name (TS, "NOT0")
         Debug = "TEST: NOT0, Integer Bitwise Not"
         If ((F64 == 0x01))
         {
-            M002 (TS, C001, "p032", P032, P02F, 0x02)
-            M002 (TS, C001, "p033", P033, P040, 0x02)
+            M002 (__METHOD__, C001, "p032", P032, P02F, 0x02)
+            M002 (__METHOD__, C001, "p033", P033, P040, 0x02)
         }
         Else
         {
-            M002 (TS, C001, "p032", P032, P02E, 0x02)
+            M002 (__METHOD__, C001, "p032", P032, P02E, 0x02)
         }
     }
 
@@ -1210,19 +1200,18 @@
     })
     Method (OR00, 0, Serialized)
     {
-        Name (TS, "OR00")
         Debug = "TEST: OR00, Integer Bitwise Or"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x01, "p041", P041, P042, 0x06)
-            M000 (TS, 0x01, "p043", P043, P044, 0x06)
-            M000 (TS, C000, "p030", P030, P045, 0x06)
-            M000 (TS, C000, "p031", P031, P046, 0x06)
+            M000 (__METHOD__, 0x01, "p041", P041, P042, 0x06)
+            M000 (__METHOD__, 0x01, "p043", P043, P044, 0x06)
+            M000 (__METHOD__, C000, "p030", P030, P045, 0x06)
+            M000 (__METHOD__, C000, "p031", P031, P046, 0x06)
         }
         Else
         {
-            M000 (TS, 0x01, "p041", P041, P042, 0x06)
-            M000 (TS, C000, "p030", P030, P045, 0x06)
+            M000 (__METHOD__, 0x01, "p041", P041, P042, 0x06)
+            M000 (__METHOD__, C000, "p030", P030, P045, 0x06)
         }
     }
 
@@ -1287,20 +1276,19 @@
     })
     Method (XOR0, 0, Serialized)
     {
-        Name (TS, "XOR0")
         Debug = "TEST: XOR0, Integer Bitwise Xor"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x01, "p047", P047, P048, 0x07)
-            M000 (TS, 0x01, "p049", P049, P04A, 0x07)
-            M000 (TS, C000, "p030", P030, P04B, 0x07)
-            M000 (TS, 0x01, "p031", P031, P04C, 0x07)
-            M000 (TS, C000, "p031", P031, P04C, 0x07)
+            M000 (__METHOD__, 0x01, "p047", P047, P048, 0x07)
+            M000 (__METHOD__, 0x01, "p049", P049, P04A, 0x07)
+            M000 (__METHOD__, C000, "p030", P030, P04B, 0x07)
+            M000 (__METHOD__, 0x01, "p031", P031, P04C, 0x07)
+            M000 (__METHOD__, C000, "p031", P031, P04C, 0x07)
         }
         Else
         {
-            M000 (TS, 0x01, "p047", P047, P048, 0x07)
-            M000 (TS, C000, "p030", P030, P04D, 0x07)
+            M000 (__METHOD__, 0x01, "p047", P047, P048, 0x07)
+            M000 (__METHOD__, C000, "p030", P030, P04D, 0x07)
         }
     }
 
@@ -1334,16 +1322,15 @@
     })
     Method (MOD0, 0, Serialized)
     {
-        Name (TS, "MOD0")
         Debug = "TEST: MOD0, Integer Modulo"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x08, "p00c", P00C, P04E, 0x08)
-            M000 (TS, 0x08, "p00e", P00E, P04F, 0x08)
+            M000 (__METHOD__, 0x08, "p00c", P00C, P04E, 0x08)
+            M000 (__METHOD__, 0x08, "p00e", P00E, P04F, 0x08)
         }
         Else
         {
-            M000 (TS, 0x08, "p00c", P00C, P04E, 0x08)
+            M000 (__METHOD__, 0x08, "p00c", P00C, P04E, 0x08)
         }
     }
 
@@ -1500,16 +1487,15 @@
     })
     Method (SHL0, 0, Serialized)
     {
-        Name (TS, "SHL0")
         Debug = "TEST: SHL0, Integer shift value left"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x1A, "p050", P050, P052, 0x09)
-            M000 (TS, 0x0A, "p053", P053, P054, 0x09)
+            M000 (__METHOD__, 0x1A, "p050", P050, P052, 0x09)
+            M000 (__METHOD__, 0x0A, "p053", P053, P054, 0x09)
         }
         Else
         {
-            M000 (TS, 0x1A, "p050", P050, P051, 0x09)
+            M000 (__METHOD__, 0x1A, "p050", P050, P051, 0x09)
         }
     }
 
@@ -1559,16 +1545,15 @@
     })
     Method (SHR0, 0, Serialized)
     {
-        Name (TS, "SHR0")
         Debug = "TEST: SHR0, Integer shift value right"
         If ((F64 == 0x01))
         {
-            M000 (TS, 0x1A, "p050", P050, P055, 0x0A)
-            M000 (TS, 0x0A, "p053", P053, P056, 0x0A)
+            M000 (__METHOD__, 0x1A, "p050", P050, P055, 0x0A)
+            M000 (__METHOD__, 0x0A, "p053", P053, P056, 0x0A)
         }
         Else
         {
-            M000 (TS, 0x1A, "p050", P050, P055, 0x0A)
+            M000 (__METHOD__, 0x1A, "p050", P050, P055, 0x0A)
         }
     }
 
@@ -1612,16 +1597,15 @@
     })
     Method (FSL0, 0, Serialized)
     {
-        Name (TS, "FSL0")
         Debug = "TEST: FSL0, Index of first least significant bit set"
         If ((F64 == 0x01))
         {
-            M002 (TS, 0x06, "p057", P057, P058, 0x03)
-            M002 (TS, 0x06, "p059", P059, P05A, 0x03)
+            M002 (__METHOD__, 0x06, "p057", P057, P058, 0x03)
+            M002 (__METHOD__, 0x06, "p059", P059, P05A, 0x03)
         }
         Else
         {
-            M002 (TS, 0x06, "p057", P057, P058, 0x03)
+            M002 (__METHOD__, 0x06, "p057", P057, P058, 0x03)
         }
 
         If ((F64 == 0x01))
@@ -1651,7 +1635,7 @@
             Local4 = (Local1 + 0x01)
             If ((Local3 != Local4))
             {
-                ERR (TS, Z083, 0x05A4, 0x00, 0x00, Local0, 0x00)
+                ERR (__METHOD__, Z083, 0x05A4, 0x00, 0x00, Local0, 0x00)
             }
 
             Local1++
@@ -1681,16 +1665,15 @@
     })
     Method (FSR0, 0, Serialized)
     {
-        Name (TS, "FSR0")
         Debug = "TEST: FSR0, Index of first most significant bit set"
         If ((F64 == 0x01))
         {
-            M002 (TS, 0x06, "p057", P057, P05B, 0x04)
-            M002 (TS, 0x06, "p059", P059, P05C, 0x04)
+            M002 (__METHOD__, 0x06, "p057", P057, P05B, 0x04)
+            M002 (__METHOD__, 0x06, "p059", P059, P05C, 0x04)
         }
         Else
         {
-            M002 (TS, 0x06, "p057", P057, P05B, 0x04)
+            M002 (__METHOD__, 0x06, "p057", P057, P05B, 0x04)
         }
 
         If ((F64 == 0x01))
@@ -1721,7 +1704,7 @@
             FindSetRightBit (Local2, Local3)
             If ((Local3 != Local4))
             {
-                ERR (TS, Z083, 0x05E1, 0x00, 0x00, Local0, 0x00)
+                ERR (__METHOD__, Z083, 0x05E1, 0x00, 0x00, Local0, 0x00)
             }
 
             Local1++
diff --git a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl
index c5381a836..d74342be2 100644
--- a/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl
+++ b/tests/aslts/src/runtime/collections/functional/bfield/crbuffield.asl
@@ -275,7 +275,6 @@
 
     Method (M211, 0, Serialized)
     {
-        Name (TS, "m211")
         Debug = "TEST: m211, Create 1-Bit Buffer Field:"
         /* Size of buffer (in bytes) */
 
@@ -294,7 +293,7 @@
         {
             If ((NCUR >= BSZ1))
             {
-                ERR (TS, Z001, 0x0136, 0x00, 0x00, NCUR, BSZ1)
+                ERR (__METHOD__, Z001, 0x0136, 0x00, 0x00, NCUR, BSZ1)
                 Break
             }
 
@@ -305,7 +304,7 @@
             B010 [Local0] = Local2
             Local3 = ~Local2
             B101 [Local0] = Local3
-            M210 (TS, NCUR, B000, B0FF, B010, B101, BSZ0)
+            M210 (__METHOD__, NCUR, B000, B0FF, B010, B101, BSZ0)
             N000--
             NCUR++
         }
@@ -485,7 +484,6 @@
 
     Method (M213, 0, Serialized)
     {
-        Name (TS, "m213")
         Debug = "TEST: m213, Create 8-Bit Buffer Field:"
         /* Size of buffer (in bytes) */
 
@@ -504,7 +502,7 @@
         {
             If ((NCUR >= BSZ1))
             {
-                ERR (TS, Z001, 0x020A, 0x00, 0x00, NCUR, BSZ1)
+                ERR (__METHOD__, Z001, 0x020A, 0x00, 0x00, NCUR, BSZ1)
                 Break
             }
 
@@ -514,7 +512,7 @@
             B010 [NCUR] = 0xFF
             B0B0 [NCUR] = 0x96
             B101 [NCUR] = 0x00
-            M212 (TS, NCUR, BSZ0)
+            M212 (__METHOD__, NCUR, BSZ0)
             N000--
             NCUR++
         }
@@ -708,7 +706,6 @@
 
     Method (M215, 0, Serialized)
     {
-        Name (TS, "m215")
         Debug = "TEST: m215, Create 16-Bit Buffer Field:"
         /* Size of buffer (in bytes) */
 
@@ -727,7 +724,7 @@
         {
             If ((NCUR >= BSZ1))
             {
-                ERR (TS, Z001, 0x02E8, 0x00, 0x00, NCUR, BSZ1)
+                ERR (__METHOD__, Z001, 0x02E8, 0x00, 0x00, NCUR, BSZ1)
                 Break
             }
 
@@ -742,7 +739,7 @@
             B010 [Local0] = 0xFF
             B0B0 [Local0] = 0x76
             B101 [Local0] = 0x00
-            M214 (TS, NCUR, BSZ0)
+            M214 (__METHOD__, NCUR, BSZ0)
             N000--
             NCUR++
         }
@@ -936,7 +933,6 @@
 
     Method (M217, 0, Serialized)
     {
-        Name (TS, "m217")
         Debug = "TEST: m217, Create 32-Bit Buffer Field:"
         /* Size of buffer (in bytes) */
 
@@ -955,7 +951,7 @@
         {
             If ((NCUR >= BSZ1))
             {
-                ERR (TS, Z001, 0x03CE, 0x00, 0x00, NCUR, BSZ1)
+                ERR (__METHOD__, Z001, 0x03CE, 0x00, 0x00, NCUR, BSZ1)
                 Break
             }
 
@@ -978,7 +974,7 @@
             B010 [Local0] = 0xFF
             B0B0 [Local0] = 0x32
             B101 [Local0] = 0x00
-            M216 (TS, NCUR, BSZ0)
+            M216 (__METHOD__, NCUR, BSZ0)
             N000--
             NCUR++
         }
@@ -1336,7 +1332,6 @@
 
     Method (M219, 0, Serialized)
     {
-        Name (TS, "m219")
         Debug = "TEST: m219, Create 64-Bit Buffer Field:"
         /* Size of buffer (in bytes) */
 
@@ -1355,7 +1350,7 @@
         {
             If ((NCUR >= BSZ1))
             {
-                ERR (TS, Z001, 0x054F, 0x00, 0x00, NCUR, BSZ1)
+                ERR (__METHOD__, Z001, 0x054F, 0x00, 0x00, NCUR, BSZ1)
                 Break
             }
 
@@ -1394,7 +1389,7 @@
             B010 [Local0] = 0xFF
             B0B0 [Local0] = 0xEF
             B101 [Local0] = 0x00
-            If (M218 (TS, NCUR, BSZ0))
+            If (M218 (__METHOD__, NCUR, BSZ0))
             {
                 Return (0x01)
             }
@@ -1720,7 +1715,6 @@
 
     Method (M21D, 0, Serialized)
     {
-        Name (TS, "m21d")
         Debug = "TEST: m21d, Create Arbitrary Length Buffer Field:"
         /* Layout of Package: */
         /* - <first index of bit>, */
@@ -1759,7 +1753,7 @@
         /*		1, 1, 40, 1, 0, 2, */
         /*		0, 1, 1, 65, 0, 1, */
         })
-        M21C (TS, 0x01, "p000", P000)
+        M21C (__METHOD__, 0x01, "p000", P000)
     }
 
     /* Run-method */
diff --git a/tests/aslts/src/runtime/collections/functional/constant/constants.asl b/tests/aslts/src/runtime/collections/functional/constant/constants.asl
index 9d810e27c..b889a6a3c 100644
--- a/tests/aslts/src/runtime/collections/functional/constant/constants.asl
+++ b/tests/aslts/src/runtime/collections/functional/constant/constants.asl
@@ -33,37 +33,36 @@
 
     Method (CST1, 0, Serialized)
     {
-        Name (TS, "CST1")
         If ((Zero != 0x00))
         {
-            ERR (TS, Z002, 0x29, 0x00, 0x00, Zero, 0x00)
+            ERR (__METHOD__, Z002, 0x29, 0x00, 0x00, Zero, 0x00)
         }
 
         If ((One != 0x01))
         {
-            ERR (TS, Z002, 0x2D, 0x00, 0x00, One, 0x01)
+            ERR (__METHOD__, Z002, 0x2D, 0x00, 0x00, One, 0x01)
         }
 
         If ((F64 == 0x01))
         {
             If ((Ones != 0xFFFFFFFFFFFFFFFF))
             {
-                ERR (TS, Z002, 0x32, 0x00, 0x00, Ones, 0xFFFFFFFFFFFFFFFF)
+                ERR (__METHOD__, Z002, 0x32, 0x00, 0x00, Ones, 0xFFFFFFFFFFFFFFFF)
             }
         }
         ElseIf ((Ones != 0xFFFFFFFF))
         {
-            ERR (TS, Z002, 0x36, 0x00, 0x00, Ones, 0xFFFFFFFF)
+            ERR (__METHOD__, Z002, 0x36, 0x00, 0x00, Ones, 0xFFFFFFFF)
         }
 
         If ((Revision < 0x20140114))
         {
-            ERR (TS, Z002, 0x3B, 0x00, 0x00, Revision, 0x20050114)
+            ERR (__METHOD__, Z002, 0x3B, 0x00, 0x00, Revision, 0x20050114)
         }
 
         If ((Revision > 0x20500000))
         {
-            ERR (TS, Z002, 0x3F, 0x00, 0x00, Revision, 0x20500000)
+            ERR (__METHOD__, Z002, 0x3F, 0x00, 0x00, Revision, 0x20500000)
         }
 
         /*
@@ -75,6 +74,6 @@
          */
         If ((\_REV != 0x02))
         {
-            ERR (TS, Z002, 0x4A, 0x00, 0x00, \_REV, 0x02)
+            ERR (__METHOD__, Z002, 0x4A, 0x00, 0x00, \_REV, 0x02)
         }
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl
index 4a3ca50e5..e750d2097 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/concatenaterestemplate.asl
@@ -2150,10 +2150,9 @@
     })
     Method (RT1B, 0, Serialized)
     {
-        Name (TS, "RT1b")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Concatenate two resource templates", "concatenaterestemplate.asl")
+        THDR (__METHOD__, "Concatenate two resource templates", "concatenaterestemplate.asl")
         /* Calculate the checksum for the target first */
         /*	m334(p440, 3) */
         /*	m332(ts, 3, "p440", p438, p438, p440) */
@@ -2161,7 +2160,7 @@
         /*	Store(0, Local0) */
         /*	Store(Buffer(Local0){}, Local1) */
         /*	Store(Local1, Index(p441, 1)) */
-        M332 (TS, 0x01, "p443", P441, P442, P443)
-        M332 (TS, 0x01, "p444", P442, P441, P444)
-        CH03 (TS, Z007, 0x0123, 0x03EC, 0x00)
+        M332 (__METHOD__, 0x01, "p443", P441, P442, P443)
+        M332 (__METHOD__, 0x01, "p444", P442, P441, P444)
+        CH03 (__METHOD__, Z007, 0x0123, 0x03EC, 0x00)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dependentfn.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dependentfn.asl
index db56142cf..a55f0bdf6 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dependentfn.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dependentfn.asl
@@ -412,11 +412,10 @@
     })
     Method (RT04, 0, Serialized)
     {
-        Name (TS, "RT04")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Start/End DependentFunction Resource Descriptor Macro", "dependentfn.asl")
+        THDR (__METHOD__, "Start/End DependentFunction Resource Descriptor Macro", "dependentfn.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x0E, "p406", P406, P407)
+        M330 (__METHOD__, 0x0E, "p406", P406, P407)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dma.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dma.asl
index 5529a1024..1230a58b5 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dma.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dma.asl
@@ -381,13 +381,12 @@
     })
     Method (RT03, 0, Serialized)
     {
-        Name (TS, "RT03")
         /* Emit test header, set the filename */
 
-        THDR (TS, "DMA Resource Descriptor Macro", "dma.asl")
+        THDR (__METHOD__, "DMA Resource Descriptor Macro", "dma.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x1B, "p404", P404, P405)
+        M330 (__METHOD__, 0x1B, "p404", P404, P405)
         Local0 = ResourceTemplate ()
             {
                 DMA (Compatibility, NotBusMaster, Transfer8, )
@@ -395,7 +394,7 @@
                 DMA (Compatibility, NotBusMaster, Transfer8, )
                     {}
             }
-        M331 (TS, 0x01, 0x15, 0x15, 0x2D, 0x2D, "_TYP")
-        M331 (TS, 0x02, 0x12, 0x12, 0x2A, 0x2A, "_BM")
-        M331 (TS, 0x03, 0x10, 0x10, 0x28, 0x28, "_SIZ")
+        M331 (__METHOD__, 0x01, 0x15, 0x15, 0x2D, 0x2D, "_TYP")
+        M331 (__METHOD__, 0x02, 0x12, 0x12, 0x2A, 0x2A, "_BM")
+        M331 (__METHOD__, 0x03, 0x10, 0x10, 0x28, 0x28, "_SIZ")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dwordio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dwordio.asl
index d661645c2..d81a0378d 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dwordio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dwordio.asl
@@ -963,13 +963,12 @@
     })
     Method (RT0D, 0, Serialized)
     {
-        Name (TS, "RT0d")
         /* Emit test header, set the filename */
 
-        THDR (TS, "DWordIo Resource Descriptor Macro", "dwordio.asl")
+        THDR (__METHOD__, "DWordIo Resource Descriptor Macro", "dwordio.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x25, "p418", P418, P419)
+        M330 (__METHOD__, 0x25, "p418", P418, P419)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -989,15 +988,15 @@
                     0xFCFDFEFF,         // Length
                     ,, , TypeStatic, DenseTranslation)
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0xF1, 0xF1, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0xF2, 0xF2, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0xF3, 0xF3, "_MAF")
-        M331 (TS, 0x04, 0x28, 0x28, 0xF8, 0xF8, "_RNG")
-        M331 (TS, 0x05, 0x2C, 0x2C, 0xFC, 0xFC, "_TTP")
-        M331 (TS, 0x06, 0x2D, 0x2D, 0xFD, 0xFD, "_TRS")
-        M331 (TS, 0x07, 0x30, 0x30, 0x0100, 0x0100, "_GRA")
-        M331 (TS, 0x08, 0x50, 0x50, 0x0120, 0x0120, "_MIN")
-        M331 (TS, 0x09, 0x70, 0x70, 0x0140, 0x0140, "_MAX")
-        M331 (TS, 0x0A, 0x90, 0x90, 0x0160, 0x0160, "_TRA")
-        M331 (TS, 0x0B, 0xB0, 0xB0, 0x0180, 0x0180, "_LEN")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0xF1, 0xF1, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0xF2, 0xF2, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0xF3, 0xF3, "_MAF")
+        M331 (__METHOD__, 0x04, 0x28, 0x28, 0xF8, 0xF8, "_RNG")
+        M331 (__METHOD__, 0x05, 0x2C, 0x2C, 0xFC, 0xFC, "_TTP")
+        M331 (__METHOD__, 0x06, 0x2D, 0x2D, 0xFD, 0xFD, "_TRS")
+        M331 (__METHOD__, 0x07, 0x30, 0x30, 0x0100, 0x0100, "_GRA")
+        M331 (__METHOD__, 0x08, 0x50, 0x50, 0x0120, 0x0120, "_MIN")
+        M331 (__METHOD__, 0x09, 0x70, 0x70, 0x0140, 0x0140, "_MAX")
+        M331 (__METHOD__, 0x0A, 0x90, 0x90, 0x0160, 0x0160, "_TRA")
+        M331 (__METHOD__, 0x0B, 0xB0, 0xB0, 0x0180, 0x0180, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dwordmemory.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dwordmemory.asl
index 03bc173c5..9eaf30213 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dwordmemory.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dwordmemory.asl
@@ -2106,13 +2106,12 @@
     })
     Method (RT11, 0, Serialized)
     {
-        Name (TS, "RT11")
         /* Emit test header, set the filename */
 
-        THDR (TS, "DWordMemory Resource Descriptor Macro", "dwordmemory.asl")
+        THDR (__METHOD__, "DWordMemory Resource Descriptor Macro", "dwordmemory.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x59, "p426", P426, P427)
+        M330 (__METHOD__, 0x59, "p426", P426, P427)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -2132,16 +2131,16 @@
                     0xFCFDFEFF,         // Length
                     ,, , AddressRangeMemory, TypeStatic)
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0xF1, 0xF1, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0xF2, 0xF2, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0xF3, 0xF3, "_MAF")
-        M331 (TS, 0x04, 0x28, 0x28, 0xF8, 0xF8, "_RW")
-        M331 (TS, 0x05, 0x29, 0x29, 0xF9, 0xF9, "_MEM")
-        M331 (TS, 0x06, 0x2B, 0x2B, 0xFB, 0xFB, "_MTP")
-        M331 (TS, 0x06, 0x2D, 0x2D, 0xFD, 0xFD, "_TTP")
-        M331 (TS, 0x07, 0x30, 0x30, 0x0100, 0x0100, "_GRA")
-        M331 (TS, 0x08, 0x50, 0x50, 0x0120, 0x0120, "_MIN")
-        M331 (TS, 0x09, 0x70, 0x70, 0x0140, 0x0140, "_MAX")
-        M331 (TS, 0x0A, 0x90, 0x90, 0x0160, 0x0160, "_TRA")
-        M331 (TS, 0x0B, 0xB0, 0xB0, 0x0180, 0x0180, "_LEN")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0xF1, 0xF1, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0xF2, 0xF2, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0xF3, 0xF3, "_MAF")
+        M331 (__METHOD__, 0x04, 0x28, 0x28, 0xF8, 0xF8, "_RW")
+        M331 (__METHOD__, 0x05, 0x29, 0x29, 0xF9, 0xF9, "_MEM")
+        M331 (__METHOD__, 0x06, 0x2B, 0x2B, 0xFB, 0xFB, "_MTP")
+        M331 (__METHOD__, 0x06, 0x2D, 0x2D, 0xFD, 0xFD, "_TTP")
+        M331 (__METHOD__, 0x07, 0x30, 0x30, 0x0100, 0x0100, "_GRA")
+        M331 (__METHOD__, 0x08, 0x50, 0x50, 0x0120, 0x0120, "_MIN")
+        M331 (__METHOD__, 0x09, 0x70, 0x70, 0x0140, 0x0140, "_MAX")
+        M331 (__METHOD__, 0x0A, 0x90, 0x90, 0x0160, 0x0160, "_TRA")
+        M331 (__METHOD__, 0x0B, 0xB0, 0xB0, 0x0180, 0x0180, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/dwordspace.asl b/tests/aslts/src/runtime/collections/functional/descriptor/dwordspace.asl
index 7a2af6ad9..6eb074b1f 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/dwordspace.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/dwordspace.asl
@@ -713,13 +713,12 @@
     })
     Method (RT15, 0, Serialized)
     {
-        Name (TS, "RT15")
         /* Emit test header, set the filename */
 
-        THDR (TS, "DWordSpace Resource Descriptor Macro", "dwordspace.asl")
+        THDR (__METHOD__, "DWordSpace Resource Descriptor Macro", "dwordspace.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x1B, "p42e", P42E, P42F)
+        M330 (__METHOD__, 0x1B, "p42e", P42E, P42F)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -739,12 +738,12 @@
                     0xFCFDFEFF,         // Length
                     ,, )
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0xF1, 0xF1, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0xF2, 0xF2, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0xF3, 0xF3, "_MAF")
-        M331 (TS, 0x07, 0x30, 0x30, 0x0100, 0x0100, "_GRA")
-        M331 (TS, 0x08, 0x50, 0x50, 0x0120, 0x0120, "_MIN")
-        M331 (TS, 0x09, 0x70, 0x70, 0x0140, 0x0140, "_MAX")
-        M331 (TS, 0x0A, 0x90, 0x90, 0x0160, 0x0160, "_TRA")
-        M331 (TS, 0x0B, 0xB0, 0xB0, 0x0180, 0x0180, "_LEN")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0xF1, 0xF1, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0xF2, 0xF2, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0xF3, 0xF3, "_MAF")
+        M331 (__METHOD__, 0x07, 0x30, 0x30, 0x0100, 0x0100, "_GRA")
+        M331 (__METHOD__, 0x08, 0x50, 0x50, 0x0120, 0x0120, "_MIN")
+        M331 (__METHOD__, 0x09, 0x70, 0x70, 0x0140, 0x0140, "_MAX")
+        M331 (__METHOD__, 0x0A, 0x90, 0x90, 0x0160, 0x0160, "_TRA")
+        M331 (__METHOD__, 0x0B, 0xB0, 0xB0, 0x0180, 0x0180, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/extendedio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/extendedio.asl
index ecd82f94a..b6205d148 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/extendedio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/extendedio.asl
@@ -985,13 +985,12 @@
     })
     Method (RT0F, 0, Serialized)
     {
-        Name (TS, "RT0f")
         /* Emit test header, set the filename */
 
-        THDR (TS, "ExtendedIo Resource Descriptor Macro", "extendedio.asl")
+        THDR (__METHOD__, "ExtendedIo Resource Descriptor Macro", "extendedio.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x22, "p422", P422, P423)
+        M330 (__METHOD__, 0x22, "p422", P422, P423)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -1013,16 +1012,16 @@
                     0xF8F9FAFBFCFDFEFF, // Type-Specific Attributes
                     , TypeStatic, DenseTranslation)
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0x01E1, 0x01E1, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0x01E2, 0x01E2, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0x01E3, 0x01E3, "_MAF")
-        M331 (TS, 0x04, 0x28, 0x28, 0x01E8, 0x01E8, "_RNG")
-        M331 (TS, 0x05, 0x2C, 0x2C, 0x01EC, 0x01EC, "_TTP")
-        M331 (TS, 0x06, 0x2D, 0x2D, 0x01ED, 0x01ED, "_TRS")
-        M331 (TS, 0x07, 0x40, 0x40, 0x0200, 0x0200, "_GRA")
-        M331 (TS, 0x08, 0x80, 0x80, 0x0240, 0x0240, "_MIN")
-        M331 (TS, 0x09, 0xC0, 0xC0, 0x0280, 0x0280, "_MAX")
-        M331 (TS, 0x0A, 0x0100, 0x0100, 0x02C0, 0x02C0, "_TRA")
-        M331 (TS, 0x0B, 0x0140, 0x0140, 0x0300, 0x0300, "_LEN")
-        M331 (TS, 0x0C, 0x0180, 0x0180, 0x0340, 0x0340, "_ATT")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0x01E1, 0x01E1, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0x01E2, 0x01E2, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0x01E3, 0x01E3, "_MAF")
+        M331 (__METHOD__, 0x04, 0x28, 0x28, 0x01E8, 0x01E8, "_RNG")
+        M331 (__METHOD__, 0x05, 0x2C, 0x2C, 0x01EC, 0x01EC, "_TTP")
+        M331 (__METHOD__, 0x06, 0x2D, 0x2D, 0x01ED, 0x01ED, "_TRS")
+        M331 (__METHOD__, 0x07, 0x40, 0x40, 0x0200, 0x0200, "_GRA")
+        M331 (__METHOD__, 0x08, 0x80, 0x80, 0x0240, 0x0240, "_MIN")
+        M331 (__METHOD__, 0x09, 0xC0, 0xC0, 0x0280, 0x0280, "_MAX")
+        M331 (__METHOD__, 0x0A, 0x0100, 0x0100, 0x02C0, 0x02C0, "_TRA")
+        M331 (__METHOD__, 0x0B, 0x0140, 0x0140, 0x0300, 0x0300, "_LEN")
+        M331 (__METHOD__, 0x0C, 0x0180, 0x0180, 0x0340, 0x0340, "_ATT")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/extendedmemory.asl b/tests/aslts/src/runtime/collections/functional/descriptor/extendedmemory.asl
index 84332dd64..2f906c2a1 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/extendedmemory.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/extendedmemory.asl
@@ -2232,13 +2232,12 @@
     })
     Method (RT13, 0, Serialized)
     {
-        Name (TS, "RT13")
         /* Emit test header, set the filename */
 
-        THDR (TS, "ExtendedMemory Resource Descriptor Macro", "extendedmemory.asl")
+        THDR (__METHOD__, "ExtendedMemory Resource Descriptor Macro", "extendedmemory.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x56, "p42a", P42A, P42B)
+        M330 (__METHOD__, 0x56, "p42a", P42A, P42B)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -2260,17 +2259,17 @@
                     0xF8F9FAFBFCFDFEFF, // Type-Specific Attributes
                     , AddressRangeMemory, TypeStatic)
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0x01E1, 0x01E1, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0x01E2, 0x01E2, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0x01E3, 0x01E3, "_MAF")
-        M331 (TS, 0x04, 0x28, 0x28, 0x01E8, 0x01E8, "_RW")
-        M331 (TS, 0x05, 0x29, 0x29, 0x01E9, 0x01E9, "_MEM")
-        M331 (TS, 0x06, 0x2B, 0x2B, 0x01EB, 0x01EB, "_MTP")
-        M331 (TS, 0x06, 0x2D, 0x2D, 0x01ED, 0x01ED, "_TTP")
-        M331 (TS, 0x07, 0x40, 0x40, 0x0200, 0x0200, "_GRA")
-        M331 (TS, 0x08, 0x80, 0x80, 0x0240, 0x0240, "_MIN")
-        M331 (TS, 0x09, 0xC0, 0xC0, 0x0280, 0x0280, "_MAX")
-        M331 (TS, 0x0A, 0x0100, 0x0100, 0x02C0, 0x02C0, "_TRA")
-        M331 (TS, 0x0B, 0x0140, 0x0140, 0x0300, 0x0300, "_LEN")
-        M331 (TS, 0x0C, 0x0180, 0x0180, 0x0340, 0x0340, "_ATT")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0x01E1, 0x01E1, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0x01E2, 0x01E2, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0x01E3, 0x01E3, "_MAF")
+        M331 (__METHOD__, 0x04, 0x28, 0x28, 0x01E8, 0x01E8, "_RW")
+        M331 (__METHOD__, 0x05, 0x29, 0x29, 0x01E9, 0x01E9, "_MEM")
+        M331 (__METHOD__, 0x06, 0x2B, 0x2B, 0x01EB, 0x01EB, "_MTP")
+        M331 (__METHOD__, 0x06, 0x2D, 0x2D, 0x01ED, 0x01ED, "_TTP")
+        M331 (__METHOD__, 0x07, 0x40, 0x40, 0x0200, 0x0200, "_GRA")
+        M331 (__METHOD__, 0x08, 0x80, 0x80, 0x0240, 0x0240, "_MIN")
+        M331 (__METHOD__, 0x09, 0xC0, 0xC0, 0x0280, 0x0280, "_MAX")
+        M331 (__METHOD__, 0x0A, 0x0100, 0x0100, 0x02C0, 0x02C0, "_TRA")
+        M331 (__METHOD__, 0x0B, 0x0140, 0x0140, 0x0300, 0x0300, "_LEN")
+        M331 (__METHOD__, 0x0C, 0x0180, 0x0180, 0x0340, 0x0340, "_ATT")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/extendedspace.asl b/tests/aslts/src/runtime/collections/functional/descriptor/extendedspace.asl
index 6c47032ed..a93b4c58c 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/extendedspace.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/extendedspace.asl
@@ -715,13 +715,12 @@
     })
     Method (RT17, 0, Serialized)
     {
-        Name (TS, "RT17")
         /* Emit test header, set the filename */
 
-        THDR (TS, "ExtendedSpace Resource Descriptor Macro", "extendedspace.asl")
+        THDR (__METHOD__, "ExtendedSpace Resource Descriptor Macro", "extendedspace.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x18, "p432", P432, P433)
+        M330 (__METHOD__, 0x18, "p432", P432, P433)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -743,13 +742,13 @@
                     0xF8F9FAFBFCFDFEFF, // Type-Specific Attributes
                     )
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0x01E1, 0x01E1, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0x01E2, 0x01E2, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0x01E3, 0x01E3, "_MAF")
-        M331 (TS, 0x04, 0x40, 0x40, 0x0200, 0x0200, "_GRA")
-        M331 (TS, 0x05, 0x80, 0x80, 0x0240, 0x0240, "_MIN")
-        M331 (TS, 0x06, 0xC0, 0xC0, 0x0280, 0x0280, "_MAX")
-        M331 (TS, 0x07, 0x0100, 0x0100, 0x02C0, 0x02C0, "_TRA")
-        M331 (TS, 0x08, 0x0140, 0x0140, 0x0300, 0x0300, "_LEN")
-        M331 (TS, 0x09, 0x0180, 0x0180, 0x0340, 0x0340, "_ATT")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0x01E1, 0x01E1, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0x01E2, 0x01E2, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0x01E3, 0x01E3, "_MAF")
+        M331 (__METHOD__, 0x04, 0x40, 0x40, 0x0200, 0x0200, "_GRA")
+        M331 (__METHOD__, 0x05, 0x80, 0x80, 0x0240, 0x0240, "_MIN")
+        M331 (__METHOD__, 0x06, 0xC0, 0xC0, 0x0280, 0x0280, "_MAX")
+        M331 (__METHOD__, 0x07, 0x0100, 0x0100, 0x02C0, 0x02C0, "_TRA")
+        M331 (__METHOD__, 0x08, 0x0140, 0x0140, 0x0300, 0x0300, "_LEN")
+        M331 (__METHOD__, 0x09, 0x0180, 0x0180, 0x0340, 0x0340, "_ATT")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl b/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl
index 81c1a1c42..2f751b107 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/fixeddma.asl
@@ -116,21 +116,20 @@
     })
     Method (RT20, 0, Serialized)
     {
-        Name (TS, "RT20")
         /* Emit test header, set the filename */
 
-        THDR (TS, "FixedDMA Resource Descriptor Macro", "fixeddma.asl")
+        THDR (__METHOD__, "FixedDMA Resource Descriptor Macro", "fixeddma.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P450) != SizeOf (P451)))
         {
-            ERR (TS, 0xB1, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB1, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P450), "p450", P450, P451)
+        M330 (__METHOD__, SizeOf (P450), "p450", P450, P451)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -138,7 +137,7 @@
                 FixedDMA (0xE1E2, 0x000F, Width16bit, )
                 FixedDMA (0xD1D2, 0x00F0, Width32bit, )
             }
-        M331 (TS, 0x01, 0x08, 0x08, 0x38, 0x38, "_DMA")
-        M331 (TS, 0x02, 0x18, 0x18, 0x48, 0x48, "_TYP")
-        M331 (TS, 0x03, 0x28, 0x28, 0x58, 0x58, "_SIZ")
+        M331 (__METHOD__, 0x01, 0x08, 0x08, 0x38, 0x38, "_DMA")
+        M331 (__METHOD__, 0x02, 0x18, 0x18, 0x48, 0x48, "_TYP")
+        M331 (__METHOD__, 0x03, 0x28, 0x28, 0x58, 0x58, "_SIZ")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/fixedio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/fixedio.asl
index 7c6645111..09b9bccfd 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/fixedio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/fixedio.asl
@@ -77,13 +77,12 @@
     })
     Method (RT06, 0, Serialized)
     {
-        Name (TS, "RT06")
         /* Emit test header, set the filename */
 
-        THDR (TS, "FixedIO Resource Descriptor Macro", "fixedio.asl")
+        THDR (__METHOD__, "FixedIO Resource Descriptor Macro", "fixedio.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x02, "p40a", P40A, P40B)
+        M330 (__METHOD__, 0x02, "p40a", P40A, P40B)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -97,6 +96,6 @@
                     0xFF,               // Length
                     )
             }
-        M331 (TS, 0x01, 0x08, 0x08, 0x28, 0x28, "_BAS")
-        M331 (TS, 0x02, 0x18, 0x18, 0x38, 0x38, "_LEN")
+        M331 (__METHOD__, 0x01, 0x08, 0x08, 0x28, 0x28, "_BAS")
+        M331 (__METHOD__, 0x02, 0x18, 0x18, 0x38, 0x38, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl b/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl
index 0fe9ab272..3b4df723f 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/gpioint.asl
@@ -7350,21 +7350,20 @@
     })
     Method (RT21, 0, Serialized)
     {
-        Name (TS, "RT21")
         /* Emit test header, set the filename */
 
-        THDR (TS, "GpioInt Resource Descriptor Macro", "gpioint.asl")
+        THDR (__METHOD__, "GpioInt Resource Descriptor Macro", "gpioint.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P452) != SizeOf (P453)))
         {
-            ERR (TS, 0xB2, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB2, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P452), "p452", P452, P453)
+        M330 (__METHOD__, SizeOf (P452), "p452", P452, P453)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -7388,11 +7387,11 @@
                         0x00A3
                     }
             }
-        M331 (TS, 0x01, 0x38, 0x38, 0x0150, 0x0150, "_MOD")
-        M331 (TS, 0x02, 0x39, 0x39, 0x0151, 0x0151, "_POL")
-        M331 (TS, 0x03, 0x3B, 0x3B, 0x0153, 0x0153, "_SHR")
-        M331 (TS, 0x04, 0x48, 0x48, 0x0160, 0x0160, "_PPI")
-        M331 (TS, 0x05, 0x60, 0x60, 0x0178, 0x0178, "_DBT")
-        M331 (TS, 0x06, 0xB8, 0xB8, 0x01D0, 0x01D0, "_PIN")
-        M331 (TS, 0x07, 0xF8, 0xF8, 0x0210, 0x0210, "_VEN")
+        M331 (__METHOD__, 0x01, 0x38, 0x38, 0x0150, 0x0150, "_MOD")
+        M331 (__METHOD__, 0x02, 0x39, 0x39, 0x0151, 0x0151, "_POL")
+        M331 (__METHOD__, 0x03, 0x3B, 0x3B, 0x0153, 0x0153, "_SHR")
+        M331 (__METHOD__, 0x04, 0x48, 0x48, 0x0160, 0x0160, "_PPI")
+        M331 (__METHOD__, 0x05, 0x60, 0x60, 0x0178, 0x0178, "_DBT")
+        M331 (__METHOD__, 0x06, 0xB8, 0xB8, 0x01D0, 0x01D0, "_PIN")
+        M331 (__METHOD__, 0x07, 0xF8, 0xF8, 0x0210, 0x0210, "_VEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl
index 075e91db0..deb36f336 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/gpioio.asl
@@ -5326,21 +5326,20 @@
     })
     Method (RT22, 0, Serialized)
     {
-        Name (TS, "RT22")
         /* Emit test header, set the filename */
 
-        THDR (TS, "GpioIO Resource Descriptor Macro", "gpioio.asl")
+        THDR (__METHOD__, "GpioIO Resource Descriptor Macro", "gpioio.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P454) != SizeOf (P455)))
         {
-            ERR (TS, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P454), "p454", P454, P455)
+        M330 (__METHOD__, SizeOf (P454), "p454", P454, P455)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -5368,11 +5367,11 @@
                         0x33E3
                     }
             }
-        M331 (TS, 0x01, 0x3B, 0x3B, 0x0173, 0x0173, "_SHR")
-        M331 (TS, 0x02, 0x48, 0x48, 0x0180, 0x0180, "_PPI")
-        M331 (TS, 0x03, 0x60, 0x60, 0x0198, 0x0198, "_DBT")
-        M331 (TS, 0x04, 0x50, 0x50, 0x0188, 0x0188, "_DRS")
-        M331 (TS, 0x05, 0x38, 0x38, 0x0170, 0x0170, "_IOR")
-        M331 (TS, 0x06, 0xB8, 0xB8, 0x01F0, 0x01F0, "_PIN")
-        M331 (TS, 0x07, 0x0118, 0x0118, 0x0250, 0x0250, "_VEN")
+        M331 (__METHOD__, 0x01, 0x3B, 0x3B, 0x0173, 0x0173, "_SHR")
+        M331 (__METHOD__, 0x02, 0x48, 0x48, 0x0180, 0x0180, "_PPI")
+        M331 (__METHOD__, 0x03, 0x60, 0x60, 0x0198, 0x0198, "_DBT")
+        M331 (__METHOD__, 0x04, 0x50, 0x50, 0x0188, 0x0188, "_DRS")
+        M331 (__METHOD__, 0x05, 0x38, 0x38, 0x0170, 0x0170, "_IOR")
+        M331 (__METHOD__, 0x06, 0xB8, 0xB8, 0x01F0, 0x01F0, "_PIN")
+        M331 (__METHOD__, 0x07, 0x0118, 0x0118, 0x0250, 0x0250, "_VEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl
index 7f92e558e..1aa88016c 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl
@@ -470,21 +470,20 @@
     })
     Method (RT23, 0, Serialized)
     {
-        Name (TS, "RT23")
         /* Emit test header, set the filename */
 
-        THDR (TS, "I2cSerialBus Resource Descriptor Macro", "i2cserialbus.asl")
+        THDR (__METHOD__, "I2cSerialBus Resource Descriptor Macro", "i2cserialbus.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P456) != SizeOf (P457)))
         {
-            ERR (TS, 0xB4, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB4, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P456), "p456", P456, P457)
+        M330 (__METHOD__, SizeOf (P456), "p456", P456, P457)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -504,9 +503,9 @@
                         0xB1, 0xB2, 0xB3, 0xB4
                     })
             }
-        M331 (TS, 0x01, 0x30, 0x30, 0x0108, 0x0108, "_SLV")
-        M331 (TS, 0x02, 0x38, 0x38, 0x0110, 0x0110, "_MOD")
-        M331 (TS, 0x03, 0x60, 0x60, 0x0138, 0x0138, "_SPE")
-        M331 (TS, 0x04, 0x80, 0x80, 0x0158, 0x0158, "_ADR")
-        M331 (TS, 0x05, 0x90, 0x90, 0x0168, 0x0168, "_VEN")
+        M331 (__METHOD__, 0x01, 0x30, 0x30, 0x0108, 0x0108, "_SLV")
+        M331 (__METHOD__, 0x02, 0x38, 0x38, 0x0110, 0x0110, "_MOD")
+        M331 (__METHOD__, 0x03, 0x60, 0x60, 0x0138, 0x0138, "_SPE")
+        M331 (__METHOD__, 0x04, 0x80, 0x80, 0x0158, 0x0158, "_ADR")
+        M331 (__METHOD__, 0x05, 0x90, 0x90, 0x0168, 0x0168, "_VEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl
index bbb8dc86a..3f9389f86 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/interrupt.asl
@@ -1713,13 +1713,12 @@
     })
     Method (RT18, 0, Serialized)
     {
-        Name (TS, "RT18")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Interrupt Resource Descriptor Macro", "interrupt.asl")
+        THDR (__METHOD__, "Interrupt Resource Descriptor Macro", "interrupt.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x17, "p434", P434, P435)
+        M330 (__METHOD__, 0x17, "p434", P434, P435)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -1733,9 +1732,9 @@
                     0xFCFDFEFF,
                 }
             }
-        M331 (TS, 0x01, 0x19, 0x19, 0x61, 0x61, "_HE")
-        M331 (TS, 0x02, 0x1A, 0x1A, 0x62, 0x62, "_LL")
-        M331 (TS, 0x03, 0x1B, 0x1B, 0x63, 0x63, "_SHR")
-        M331 (TS, 0x04, 0x28, 0x28, 0x70, 0x70, "_INT")
-        CH03 (TS, Z017, 0x0123, 0x023E, 0x00)
+        M331 (__METHOD__, 0x01, 0x19, 0x19, 0x61, 0x61, "_HE")
+        M331 (__METHOD__, 0x02, 0x1A, 0x1A, 0x62, 0x62, "_LL")
+        M331 (__METHOD__, 0x03, 0x1B, 0x1B, 0x63, 0x63, "_SHR")
+        M331 (__METHOD__, 0x04, 0x28, 0x28, 0x70, 0x70, "_INT")
+        CH03 (__METHOD__, Z017, 0x0123, 0x023E, 0x00)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/io.asl b/tests/aslts/src/runtime/collections/functional/descriptor/io.asl
index fca954eff..04ff942e0 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/io.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/io.asl
@@ -114,13 +114,12 @@
     })
     Method (RT05, 0, Serialized)
     {
-        Name (TS, "RT05")
         /* Emit test header, set the filename */
 
-        THDR (TS, "IO Resource Descriptor Macro", "io.asl")
+        THDR (__METHOD__, "IO Resource Descriptor Macro", "io.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x03, "p408", P408, P409)
+        M330 (__METHOD__, 0x03, "p408", P408, P409)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -138,9 +137,9 @@
                     0xF5,               // Length
                     )
             }
-        M331 (TS, 0x01, 0x08, 0x08, 0x48, 0x48, "_DEC")
-        M331 (TS, 0x02, 0x10, 0x10, 0x50, 0x50, "_MIN")
-        M331 (TS, 0x03, 0x20, 0x20, 0x60, 0x60, "_MAX")
-        M331 (TS, 0x04, 0x30, 0x30, 0x70, 0x70, "_ALN")
-        M331 (TS, 0x05, 0x38, 0x38, 0x78, 0x78, "_LEN")
+        M331 (__METHOD__, 0x01, 0x08, 0x08, 0x48, 0x48, "_DEC")
+        M331 (__METHOD__, 0x02, 0x10, 0x10, 0x50, 0x50, "_MIN")
+        M331 (__METHOD__, 0x03, 0x20, 0x20, 0x60, 0x60, "_MAX")
+        M331 (__METHOD__, 0x04, 0x30, 0x30, 0x70, 0x70, "_ALN")
+        M331 (__METHOD__, 0x05, 0x38, 0x38, 0x78, 0x78, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl b/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl
index e2d95d3ec..4131ae531 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl
@@ -269,13 +269,12 @@
     })
     Method (RT01, 0, Serialized)
     {
-        Name (TS, "RT01")
         /* Emit test header, set the filename */
 
-        THDR (TS, "IRQ Resource Descriptor Macro", "irq.asl")
+        THDR (__METHOD__, "IRQ Resource Descriptor Macro", "irq.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x12, "p400", P400, P401)
+        M330 (__METHOD__, 0x12, "p400", P400, P401)
         Local0 = ResourceTemplate ()
             {
                 IRQ (Edge, ActiveLow, Shared, )
@@ -283,7 +282,7 @@
                 IRQ (Edge, ActiveLow, Shared, )
                     {}
             }
-        M331 (TS, 0x01, 0x18, 0x18, 0x38, 0x38, "_HE")
-        M331 (TS, 0x02, 0x1B, 0x1B, 0x3B, 0x3B, "_LL")
-        M331 (TS, 0x03, 0x1C, 0x1C, 0x3C, 0x3C, "_SHR")
+        M331 (__METHOD__, 0x01, 0x18, 0x18, 0x38, 0x38, "_HE")
+        M331 (__METHOD__, 0x02, 0x1B, 0x1B, 0x3B, 0x3B, "_LL")
+        M331 (__METHOD__, 0x03, 0x1C, 0x1C, 0x3C, 0x3C, "_SHR")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/irqnoflags.asl b/tests/aslts/src/runtime/collections/functional/descriptor/irqnoflags.asl
index 20b632317..945697e12 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/irqnoflags.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/irqnoflags.asl
@@ -260,11 +260,10 @@
     })
     Method (RT02, 0, Serialized)
     {
-        Name (TS, "RT02")
         /* Emit test header, set the filename */
 
-        THDR (TS, "IRQNoFlags Resource Descriptor Macro", "irqnoflags.asl")
+        THDR (__METHOD__, "IRQNoFlags Resource Descriptor Macro", "irqnoflags.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x12, "p402", P402, P403)
+        M330 (__METHOD__, 0x12, "p402", P402, P403)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/memory24.asl b/tests/aslts/src/runtime/collections/functional/descriptor/memory24.asl
index de59169bf..ad58933fa 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/memory24.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/memory24.asl
@@ -132,13 +132,12 @@
     })
     Method (RT08, 0, Serialized)
     {
-        Name (TS, "RT08")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Memory24 Resource Descriptor Macro", "memory24.asl")
+        THDR (__METHOD__, "Memory24 Resource Descriptor Macro", "memory24.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x03, "p40e", P40E, P40F)
+        M330 (__METHOD__, 0x03, "p40e", P40E, P40F)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -156,9 +155,9 @@
                     0xF6F7,             // Length
                     )
             }
-        M331 (TS, 0x01, 0x18, 0x18, 0x78, 0x78, "_RW")
-        M331 (TS, 0x02, 0x20, 0x20, 0x80, 0x80, "_MIN")
-        M331 (TS, 0x03, 0x30, 0x30, 0x90, 0x90, "_MAX")
-        M331 (TS, 0x04, 0x40, 0x40, 0xA0, 0xA0, "_ALN")
-        M331 (TS, 0x05, 0x50, 0x50, 0xB0, 0xB0, "_LEN")
+        M331 (__METHOD__, 0x01, 0x18, 0x18, 0x78, 0x78, "_RW")
+        M331 (__METHOD__, 0x02, 0x20, 0x20, 0x80, 0x80, "_MIN")
+        M331 (__METHOD__, 0x03, 0x30, 0x30, 0x90, 0x90, "_MAX")
+        M331 (__METHOD__, 0x04, 0x40, 0x40, 0xA0, 0xA0, "_ALN")
+        M331 (__METHOD__, 0x05, 0x50, 0x50, 0xB0, 0xB0, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/memory32.asl b/tests/aslts/src/runtime/collections/functional/descriptor/memory32.asl
index 88aa24e4f..0b5b3257a 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/memory32.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/memory32.asl
@@ -125,13 +125,12 @@
     })
     Method (RT0A, 0, Serialized)
     {
-        Name (TS, "RT0a")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Memory32 Resource Descriptor Macro", "memory32.asl")
+        THDR (__METHOD__, "Memory32 Resource Descriptor Macro", "memory32.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x03, "p412", P412, P413)
+        M330 (__METHOD__, 0x03, "p412", P412, P413)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -149,9 +148,9 @@
                     0xFCFDFEFF,         // Length
                     )
             }
-        M331 (TS, 0x01, 0x18, 0x18, 0xB8, 0xB8, "_RW")
-        M331 (TS, 0x02, 0x20, 0x20, 0xC0, 0xC0, "_MIN")
-        M331 (TS, 0x03, 0x40, 0x40, 0xE0, 0xE0, "_MAX")
-        M331 (TS, 0x04, 0x60, 0x60, 0x0100, 0x0100, "_ALN")
-        M331 (TS, 0x05, 0x80, 0x80, 0x0120, 0x0120, "_LEN")
+        M331 (__METHOD__, 0x01, 0x18, 0x18, 0xB8, 0xB8, "_RW")
+        M331 (__METHOD__, 0x02, 0x20, 0x20, 0xC0, 0xC0, "_MIN")
+        M331 (__METHOD__, 0x03, 0x40, 0x40, 0xE0, 0xE0, "_MAX")
+        M331 (__METHOD__, 0x04, 0x60, 0x60, 0x0100, 0x0100, "_ALN")
+        M331 (__METHOD__, 0x05, 0x80, 0x80, 0x0120, 0x0120, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/memory32fixed.asl b/tests/aslts/src/runtime/collections/functional/descriptor/memory32fixed.asl
index b331666c7..e3f55196b 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/memory32fixed.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/memory32fixed.asl
@@ -105,13 +105,12 @@
     })
     Method (RT0B, 0, Serialized)
     {
-        Name (TS, "RT0b")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Memory32Fixed Resource Descriptor Macro", "memory32fixed.asl")
+        THDR (__METHOD__, "Memory32Fixed Resource Descriptor Macro", "memory32fixed.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x03, "p414", P414, P415)
+        M330 (__METHOD__, 0x03, "p414", P414, P415)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -125,7 +124,7 @@
                     0xF4F5F6F7,         // Address Length
                     )
             }
-        M331 (TS, 0x01, 0x18, 0x18, 0x78, 0x78, "_RW")
-        M331 (TS, 0x02, 0x20, 0x20, 0x80, 0x80, "_BAS")
-        M331 (TS, 0x03, 0x40, 0x40, 0xA0, 0xA0, "_LEN")
+        M331 (__METHOD__, 0x01, 0x18, 0x18, 0x78, 0x78, "_RW")
+        M331 (__METHOD__, 0x02, 0x20, 0x20, 0x80, 0x80, "_BAS")
+        M331 (__METHOD__, 0x03, 0x40, 0x40, 0xA0, 0xA0, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl
index 6f1dd0984..694abd574 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/pinconfig.asl
@@ -1080,21 +1080,20 @@
     })
     Method (RT27, 0, Serialized)
     {
-        Name (TS, "RT27")
         /* Emit test header, set the filename */
 
-        THDR (TS, "PinConfig Resource Descriptor Macro", "pinconfig.asl")
+        THDR (__METHOD__, "PinConfig Resource Descriptor Macro", "pinconfig.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P45E) != SizeOf (P45F)))
         {
-            ERR (TS, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P45E), "P45E", P45E, P45F)
+        M330 (__METHOD__, SizeOf (P45E), "P45E", P45E, P45F)
                     /* Check resource descriptor tag offsets */
 
 Local0 = ResourceTemplate ()
@@ -1124,9 +1123,9 @@ Local0 = ResourceTemplate ()
                         0x00DD
                     }
             }
-        M331 (TS, 0x01, 0x20, 0x20, 0x0160, 0x0160, "_SHR")
-        M331 (TS, 0x01, 0x30, 0x30, 0x0170, 0x0170, "_TYP")
-        M331 (TS, 0x01, 0x38, 0x38, 0x0178, 0x0178, "_VAL")
-        M331 (TS, 0x01, 0xA0, 0xA0, 0x01E0, 0x01E0, "_PIN")
-        M331 (TS, 0x01, 0x0128, 0x0128, 0x0268, 0x0268, "_VEN")
+        M331 (__METHOD__, 0x01, 0x20, 0x20, 0x0160, 0x0160, "_SHR")
+        M331 (__METHOD__, 0x01, 0x30, 0x30, 0x0170, 0x0170, "_TYP")
+        M331 (__METHOD__, 0x01, 0x38, 0x38, 0x0178, 0x0178, "_VAL")
+        M331 (__METHOD__, 0x01, 0xA0, 0xA0, 0x01E0, 0x01E0, "_PIN")
+        M331 (__METHOD__, 0x01, 0x0128, 0x0128, 0x0268, 0x0268, "_VEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl
index aaa64d661..1c9046588 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/pinfunction.asl
@@ -294,21 +294,20 @@
     })
     Method (RT26, 0, Serialized)
     {
-        Name (TS, "RT26")
         /* Emit test header, set the filename */
 
-        THDR (TS, "PinFunction Resource Descriptor Macro", "pinfunction.asl")
+        THDR (__METHOD__, "PinFunction Resource Descriptor Macro", "pinfunction.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P45C) != SizeOf (P45D)))
         {
-            ERR (TS, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P45C), "P45C", P45C, P45D)
+        M330 (__METHOD__, SizeOf (P45C), "P45C", P45C, P45D)
                     /* Check resource descriptor tag offsets */
 
 Local0 = ResourceTemplate ()
@@ -336,8 +335,8 @@ Local0 = ResourceTemplate ()
                         0x0003
                     }
             }
-        M331 (TS, 0x01, 0x20, 0x20, 0x0150, 0x0150, "_SHR")
-        M331 (TS, 0x02, 0x30, 0x30, 0x0160, 0x0160, "_PPI")
-        M331 (TS, 0x03, 0x38, 0x38, 0x0168, 0x0168, "_FUN")
-        M331 (TS, 0x04, 0x0110, 0x0110, 0x0240, 0x0240, "_VEN")
+        M331 (__METHOD__, 0x01, 0x20, 0x20, 0x0150, 0x0150, "_SHR")
+        M331 (__METHOD__, 0x02, 0x30, 0x30, 0x0160, 0x0160, "_PPI")
+        M331 (__METHOD__, 0x03, 0x38, 0x38, 0x0168, 0x0168, "_FUN")
+        M331 (__METHOD__, 0x04, 0x0110, 0x0110, 0x0240, 0x0240, "_VEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl
index b132ae97f..e49c248b8 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/pingroup.asl
@@ -236,21 +236,20 @@
     })
     Method (RT28, 0, Serialized)
     {
-        Name (TS, "RT28")
         /* Emit test header, set the filename */
 
-        THDR (TS, "PinGroup Resource Descriptor Macro", "pingroup.asl")
+        THDR (__METHOD__, "PinGroup Resource Descriptor Macro", "pingroup.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P460) != SizeOf (P461)))
         {
-            ERR (TS, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P460), "P460", P460, P461)
+        M330 (__METHOD__, SizeOf (P460), "P460", P460, P461)
                     /* Check resource descriptor tag offsets */
 
 Local0 = ResourceTemplate ()
@@ -278,6 +277,6 @@ Local0 = ResourceTemplate ()
                         0x0004
                     }
             }
-        M331 (TS, 0x01, 0xE8, 0xE8, 0x01E8, 0x01E8, "_VEN")
-        M331 (TS, 0x01, 0x70, 0x70, 0x0170, 0x0170, "_PIN")
+        M331 (__METHOD__, 0x01, 0xE8, 0xE8, 0x01E8, 0x01E8, "_VEN")
+        M331 (__METHOD__, 0x01, 0x70, 0x70, 0x0170, 0x0170, "_PIN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl
index 1d26eca73..bee68d713 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupconfig.asl
@@ -688,21 +688,20 @@
     })
     Method (RT30, 0, Serialized)
     {
-        Name (TS, "RT30")
         /* Emit test header, set the filename */
 
-        THDR (TS, "PinGroupConfig Resource Descriptor Macro", "pingroupconfig.asl")
+        THDR (__METHOD__, "PinGroupConfig Resource Descriptor Macro", "pingroupconfig.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P464) != SizeOf (P465)))
         {
-            ERR (TS, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P464), "P464", P464, P465)
+        M330 (__METHOD__, SizeOf (P464), "P464", P464, P465)
                     /* Check resource descriptor tag offsets */
 
 Local0 = ResourceTemplate ()
@@ -720,8 +719,8 @@ Local0 = ResourceTemplate ()
                         0x0A, 0x0B, 0x0C, 0x0D
                     })
             }
-        M331 (TS, 0x01, 0x20, 0x20, 0x0168, 0x0168, "_SHR")
-        M331 (TS, 0x01, 0x30, 0x30, 0x0178, 0x0178, "_TYP")
-        M331 (TS, 0x01, 0x38, 0x38, 0x0180, 0x0180, "_VAL")
-        M331 (TS, 0x01, 0x0128, 0x0128, 0x0270, 0x0270, "_VEN")
+        M331 (__METHOD__, 0x01, 0x20, 0x20, 0x0168, 0x0168, "_SHR")
+        M331 (__METHOD__, 0x01, 0x30, 0x30, 0x0178, 0x0178, "_TYP")
+        M331 (__METHOD__, 0x01, 0x38, 0x38, 0x0180, 0x0180, "_VAL")
+        M331 (__METHOD__, 0x01, 0x0128, 0x0128, 0x0270, 0x0270, "_VEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl
index a596431b8..efcaa3859 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/pingroupfunction.asl
@@ -152,21 +152,20 @@
     })
     Method (RT29, 0, Serialized)
     {
-        Name (TS, "RT29")
         /* Emit test header, set the filename */
 
-        THDR (TS, "PinGroupFunction Resource Descriptor Macro", "pingroupfunction.asl")
+        THDR (__METHOD__, "PinGroupFunction Resource Descriptor Macro", "pingroupfunction.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P462) != SizeOf (P463)))
         {
-            ERR (TS, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P462), "P462", P462, P463)
+        M330 (__METHOD__, SizeOf (P462), "P462", P462, P463)
                     /* Check resource descriptor tag offsets */
 
 Local0 = ResourceTemplate ()
@@ -184,7 +183,7 @@ Local0 = ResourceTemplate ()
                         0x0A, 0x0B, 0x0C, 0x0D
                     })
             }
-        M331 (TS, 0x01, 0x20, 0x20, 0x0150, 0x0150, "_SHR")
-        M331 (TS, 0x01, 0x30, 0x30, 0x0160, 0x0160, "_FUN")
-        M331 (TS, 0x01, 0x0110, 0x0110, 0x0240, 0x0240, "_VEN")
+        M331 (__METHOD__, 0x01, 0x20, 0x20, 0x0150, 0x0150, "_SHR")
+        M331 (__METHOD__, 0x01, 0x30, 0x30, 0x0160, 0x0160, "_FUN")
+        M331 (__METHOD__, 0x01, 0x0110, 0x0110, 0x0240, 0x0240, "_VEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/qwordio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/qwordio.asl
index 59eb04c2e..b58456b70 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/qwordio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/qwordio.asl
@@ -983,13 +983,12 @@
     })
     Method (RT0C, 0, Serialized)
     {
-        Name (TS, "RT0c")
         /* Emit test header, set the filename */
 
-        THDR (TS, "QWordIO Resource Descriptor Macro", "qwordio.asl")
+        THDR (__METHOD__, "QWordIO Resource Descriptor Macro", "qwordio.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x25, "p416", P416, P417)
+        M330 (__METHOD__, 0x25, "p416", P416, P417)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -1009,15 +1008,15 @@
                     0xF8F9FAFBFCFDFEFF, // Length
                     ,, , TypeStatic, DenseTranslation)
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0x0191, 0x0191, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0x0192, 0x0192, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0x0193, 0x0193, "_MAF")
-        M331 (TS, 0x04, 0x28, 0x28, 0x0198, 0x0198, "_RNG")
-        M331 (TS, 0x05, 0x2C, 0x2C, 0x019C, 0x019C, "_TTP")
-        M331 (TS, 0x06, 0x2D, 0x2D, 0x019D, 0x019D, "_TRS")
-        M331 (TS, 0x07, 0x30, 0x30, 0x01A0, 0x01A0, "_GRA")
-        M331 (TS, 0x08, 0x70, 0x70, 0x01E0, 0x01E0, "_MIN")
-        M331 (TS, 0x09, 0xB0, 0xB0, 0x0220, 0x0220, "_MAX")
-        M331 (TS, 0x0A, 0xF0, 0xF0, 0x0260, 0x0260, "_TRA")
-        M331 (TS, 0x0B, 0x0130, 0x0130, 0x02A0, 0x02A0, "_LEN")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0x0191, 0x0191, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0x0192, 0x0192, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0x0193, 0x0193, "_MAF")
+        M331 (__METHOD__, 0x04, 0x28, 0x28, 0x0198, 0x0198, "_RNG")
+        M331 (__METHOD__, 0x05, 0x2C, 0x2C, 0x019C, 0x019C, "_TTP")
+        M331 (__METHOD__, 0x06, 0x2D, 0x2D, 0x019D, 0x019D, "_TRS")
+        M331 (__METHOD__, 0x07, 0x30, 0x30, 0x01A0, 0x01A0, "_GRA")
+        M331 (__METHOD__, 0x08, 0x70, 0x70, 0x01E0, 0x01E0, "_MIN")
+        M331 (__METHOD__, 0x09, 0xB0, 0xB0, 0x0220, 0x0220, "_MAX")
+        M331 (__METHOD__, 0x0A, 0xF0, 0xF0, 0x0260, 0x0260, "_TRA")
+        M331 (__METHOD__, 0x0B, 0x0130, 0x0130, 0x02A0, 0x02A0, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/qwordmemory.asl b/tests/aslts/src/runtime/collections/functional/descriptor/qwordmemory.asl
index 0a6c795a3..314ff5527 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/qwordmemory.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/qwordmemory.asl
@@ -2126,13 +2126,12 @@
     })
     Method (RT10, 0, Serialized)
     {
-        Name (TS, "RT10")
         /* Emit test header, set the filename */
 
-        THDR (TS, "QWordMemory Resource Descriptor Macro", "qwordmemory.asl")
+        THDR (__METHOD__, "QWordMemory Resource Descriptor Macro", "qwordmemory.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x59, "p424", P424, P425)
+        M330 (__METHOD__, 0x59, "p424", P424, P425)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -2152,16 +2151,16 @@
                     0xF8F9FAFBFCFDFEFF, // Length
                     ,, , AddressRangeMemory, TypeStatic)
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0x0191, 0x0191, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0x0192, 0x0192, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0x0193, 0x0193, "_MAF")
-        M331 (TS, 0x04, 0x28, 0x28, 0x0198, 0x0198, "_RW")
-        M331 (TS, 0x05, 0x29, 0x29, 0x0199, 0x0199, "_MEM")
-        M331 (TS, 0x06, 0x2B, 0x2B, 0x019B, 0x019B, "_MTP")
-        M331 (TS, 0x06, 0x2D, 0x2D, 0x019D, 0x019D, "_TTP")
-        M331 (TS, 0x07, 0x30, 0x30, 0x01A0, 0x01A0, "_GRA")
-        M331 (TS, 0x08, 0x70, 0x70, 0x01E0, 0x01E0, "_MIN")
-        M331 (TS, 0x09, 0xB0, 0xB0, 0x0220, 0x0220, "_MAX")
-        M331 (TS, 0x0A, 0xF0, 0xF0, 0x0260, 0x0260, "_TRA")
-        M331 (TS, 0x0B, 0x0130, 0x0130, 0x02A0, 0x02A0, "_LEN")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0x0191, 0x0191, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0x0192, 0x0192, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0x0193, 0x0193, "_MAF")
+        M331 (__METHOD__, 0x04, 0x28, 0x28, 0x0198, 0x0198, "_RW")
+        M331 (__METHOD__, 0x05, 0x29, 0x29, 0x0199, 0x0199, "_MEM")
+        M331 (__METHOD__, 0x06, 0x2B, 0x2B, 0x019B, 0x019B, "_MTP")
+        M331 (__METHOD__, 0x06, 0x2D, 0x2D, 0x019D, 0x019D, "_TTP")
+        M331 (__METHOD__, 0x07, 0x30, 0x30, 0x01A0, 0x01A0, "_GRA")
+        M331 (__METHOD__, 0x08, 0x70, 0x70, 0x01E0, 0x01E0, "_MIN")
+        M331 (__METHOD__, 0x09, 0xB0, 0xB0, 0x0220, 0x0220, "_MAX")
+        M331 (__METHOD__, 0x0A, 0xF0, 0xF0, 0x0260, 0x0260, "_TRA")
+        M331 (__METHOD__, 0x0B, 0x0130, 0x0130, 0x02A0, 0x02A0, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/qwordspace.asl b/tests/aslts/src/runtime/collections/functional/descriptor/qwordspace.asl
index 905cacffc..3b7fe5816 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/qwordspace.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/qwordspace.asl
@@ -733,13 +733,12 @@
     })
     Method (RT14, 0, Serialized)
     {
-        Name (TS, "RT14")
         /* Emit test header, set the filename */
 
-        THDR (TS, "QWordSpace Resource Descriptor Macro", "qwordspace.asl")
+        THDR (__METHOD__, "QWordSpace Resource Descriptor Macro", "qwordspace.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x1B, "p42c", P42C, P42D)
+        M330 (__METHOD__, 0x1B, "p42c", P42C, P42D)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -759,12 +758,12 @@
                     0xF8F9FAFBFCFDFEFF, // Length
                     ,, )
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0x0191, 0x0191, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0x0192, 0x0192, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0x0193, 0x0193, "_MAF")
-        M331 (TS, 0x07, 0x30, 0x30, 0x01A0, 0x01A0, "_GRA")
-        M331 (TS, 0x08, 0x70, 0x70, 0x01E0, 0x01E0, "_MIN")
-        M331 (TS, 0x09, 0xB0, 0xB0, 0x0220, 0x0220, "_MAX")
-        M331 (TS, 0x0A, 0xF0, 0xF0, 0x0260, 0x0260, "_TRA")
-        M331 (TS, 0x0B, 0x0130, 0x0130, 0x02A0, 0x02A0, "_LEN")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0x0191, 0x0191, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0x0192, 0x0192, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0x0193, 0x0193, "_MAF")
+        M331 (__METHOD__, 0x07, 0x30, 0x30, 0x01A0, 0x01A0, "_GRA")
+        M331 (__METHOD__, 0x08, 0x70, 0x70, 0x01E0, 0x01E0, "_MIN")
+        M331 (__METHOD__, 0x09, 0xB0, 0xB0, 0x0220, 0x0220, "_MAX")
+        M331 (__METHOD__, 0x0A, 0xF0, 0xF0, 0x0260, 0x0260, "_TRA")
+        M331 (__METHOD__, 0x0B, 0x0130, 0x0130, 0x02A0, 0x02A0, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/register.asl b/tests/aslts/src/runtime/collections/functional/descriptor/register.asl
index c96b15719..82f5a7b77 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/register.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/register.asl
@@ -407,21 +407,20 @@
     })
     Method (RT19, 0, Serialized)
     {
-        Name (TS, "RT19")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Register Resource Descriptor Macro", "register.asl")
+        THDR (__METHOD__, "Register Resource Descriptor Macro", "register.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P436) != SizeOf (P437)))
         {
-            ERR (TS, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB3, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P436), "p436", P436, P437)
+        M330 (__METHOD__, SizeOf (P436), "p436", P436, P437)
         /* Register macro DescriptorName is recently implemented */
         /* Check resource descriptor tag offsets */
         Local0 = ResourceTemplate ()
@@ -437,9 +436,9 @@
                     0xF2F3F4F5F6F7F8F9, // Address
                     ,)
             }
-        M331 (TS, 0x01, 0x18, 0x18, 0x90, 0x90, "_ASI")
-        M331 (TS, 0x02, 0x20, 0x20, 0x98, 0x98, "_RBW")
-        M331 (TS, 0x03, 0x28, 0x28, 0xA0, 0xA0, "_RBO")
-        M331 (TS, 0x04, 0x30, 0x30, 0xA8, 0xA8, "_ASZ")
-        M331 (TS, 0x05, 0x38, 0x38, 0xB0, 0xB0, "_ADR")
+        M331 (__METHOD__, 0x01, 0x18, 0x18, 0x90, 0x90, "_ASI")
+        M331 (__METHOD__, 0x02, 0x20, 0x20, 0x98, 0x98, "_RBW")
+        M331 (__METHOD__, 0x03, 0x28, 0x28, 0xA0, 0xA0, "_RBO")
+        M331 (__METHOD__, 0x04, 0x30, 0x30, 0xA8, 0xA8, "_ASZ")
+        M331 (__METHOD__, 0x05, 0x38, 0x38, 0xB0, 0xB0, "_ADR")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/resourcetemplate.asl b/tests/aslts/src/runtime/collections/functional/descriptor/resourcetemplate.asl
index ff2b63fa3..b863b78b2 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/resourcetemplate.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/resourcetemplate.asl
@@ -6191,21 +6191,19 @@
     })
     Method (RT1A, 0, Serialized)
     {
-        Name (TS, "RT1a")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Resource To Buffer Conversion Macro", "resourcetemplate.asl")
+        THDR (__METHOD__, "Resource To Buffer Conversion Macro", "resourcetemplate.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x03, "p438", P438, P439)
+        M330 (__METHOD__, 0x03, "p438", P438, P439)
     }
 
     Method (RT1C, 0, Serialized)
     {
-        Name (TS, "RT1c")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Resource Conversion Macros complex test", "resourcetemplate.asl")
+        THDR (__METHOD__, "Resource Conversion Macros complex test", "resourcetemplate.asl")
         Name (RT00, ResourceTemplate ()
         {
             IRQ (Level, ActiveHigh, Exclusive, )
@@ -8242,260 +8240,260 @@
             }
             EndDependentFn ()
         })
-        M330 (TS, 0x02, "p445", P445, P446)
+        M330 (__METHOD__, 0x02, "p445", P445, P446)
         /* Checkings relating to RT00 */
 
-        M331 (TS, 0x01, 0x18, 0x18, 0x3B68, 0x3B68, "_HE")
-        M331 (TS, 0x02, 0x1B, 0x1B, 0x3B6B, 0x3B6B, "_LL")
-        M331 (TS, 0x03, 0x1C, 0x1C, 0x3B6C, 0x3B6C, "_SHR")
-        M331 (TS, 0x04, 0x4D, 0x4D, 0x3B9D, 0x3B9D, "_TYP")
-        M331 (TS, 0x05, 0x4A, 0x4A, 0x3B9A, 0x3B9A, "_BM")
-        M331 (TS, 0x06, 0x48, 0x48, 0x3B98, 0x3B98, "_SIZ")
-        M331 (TS, 0x07, 0x58, 0x58, 0x3BA8, 0x3BA8, "_DEC")
-        M331 (TS, 0x08, 0x60, 0x60, 0x3BB0, 0x3BB0, "_MIN")
-        M331 (TS, 0x09, 0x70, 0x70, 0x3BC0, 0x3BC0, "_MAX")
-        M331 (TS, 0x0A, 0x80, 0x80, 0x3BD0, 0x3BD0, "_ALN")
-        M331 (TS, 0x0B, 0x88, 0x88, 0x3BD8, 0x3BD8, "_LEN")
-        M331 (TS, 0x0C, 0x98, 0x98, 0x3BE8, 0x3BE8, "_BAS")
-        M331 (TS, 0x0D, 0xA8, 0xA8, 0x3BF8, 0x3BF8, "_LEN")
-        M331 (TS, 0x0E, 0x0108, 0x0108, 0x3C58, 0x3C58, "_RW")
-        M331 (TS, 0x0F, 0x0110, 0x0110, 0x3C60, 0x3C60, "_MIN")
-        M331 (TS, 0x10, 0x0120, 0x0120, 0x3C70, 0x3C70, "_MAX")
-        M331 (TS, 0x11, 0x0130, 0x0130, 0x3C80, 0x3C80, "_ALN")
-        M331 (TS, 0x12, 0x0140, 0x0140, 0x3C90, 0x3C90, "_LEN")
-        M331 (TS, 0x13, 0x0168, 0x0168, 0x3CB8, 0x3CB8, "_RW")
-        M331 (TS, 0x14, 0x0170, 0x0170, 0x3CC0, 0x3CC0, "_MIN")
-        M331 (TS, 0x15, 0x0190, 0x0190, 0x3CE0, 0x3CE0, "_MAX")
-        M331 (TS, 0x16, 0x01B0, 0x01B0, 0x3D00, 0x3D00, "_ALN")
-        M331 (TS, 0x17, 0x01D0, 0x01D0, 0x3D20, 0x3D20, "_LEN")
-        M331 (TS, 0x18, 0x0208, 0x0208, 0x3D58, 0x3D58, "_RW")
-        M331 (TS, 0x19, 0x0210, 0x0210, 0x3D60, 0x3D60, "_BAS")
-        M331 (TS, 0x1A, 0x0230, 0x0230, 0x3D80, 0x3D80, "_LEN")
-        M331 (TS, 0x1B, 0x0331, 0x0331, 0x3E81, 0x3E81, "_DEC")
-        M331 (TS, 0x1C, 0x0332, 0x0332, 0x3E82, 0x3E82, "_MIF")
-        M331 (TS, 0x1D, 0x0333, 0x0333, 0x3E83, 0x3E83, "_MAF")
-        M331 (TS, 0x1E, 0x0338, 0x0338, 0x3E88, 0x3E88, "_RNG")
-        M331 (TS, 0x1F, 0x033C, 0x033C, 0x3E8C, 0x3E8C, "_TTP")
-        M331 (TS, 0x20, 0x033D, 0x033D, 0x3E8D, 0x3E8D, "_TRS")
-        M331 (TS, 0x21, 0x0340, 0x0340, 0x3E90, 0x3E90, "_GRA")
-        M331 (TS, 0x22, 0x0380, 0x0380, 0x3ED0, 0x3ED0, "_MIN")
-        M331 (TS, 0x23, 0x03C0, 0x03C0, 0x3F10, 0x3F10, "_MAX")
-        M331 (TS, 0x24, 0x0400, 0x0400, 0x3F50, 0x3F50, "_TRA")
-        M331 (TS, 0x25, 0x0440, 0x0440, 0x3F90, 0x3F90, "_LEN")
-        M331 (TS, 0x26, 0x0511, 0x0511, 0x4061, 0x4061, "_DEC")
-        M331 (TS, 0x27, 0x0512, 0x0512, 0x4062, 0x4062, "_MIF")
-        M331 (TS, 0x28, 0x0513, 0x0513, 0x4063, 0x4063, "_MAF")
-        M331 (TS, 0x29, 0x0518, 0x0518, 0x4068, 0x4068, "_RNG")
-        M331 (TS, 0x2A, 0x051C, 0x051C, 0x406C, 0x406C, "_TTP")
-        M331 (TS, 0x2B, 0x051D, 0x051D, 0x406D, 0x406D, "_TRS")
-        M331 (TS, 0x2C, 0x0520, 0x0520, 0x4070, 0x4070, "_GRA")
-        M331 (TS, 0x2D, 0x0540, 0x0540, 0x4090, 0x4090, "_MIN")
-        M331 (TS, 0x2E, 0x0560, 0x0560, 0x40B0, 0x40B0, "_MAX")
-        M331 (TS, 0x2F, 0x0580, 0x0580, 0x40D0, 0x40D0, "_TRA")
-        M331 (TS, 0x30, 0x05A0, 0x05A0, 0x40F0, 0x40F0, "_LEN")
-        M331 (TS, 0x31, 0x0651, 0x0651, 0x41A1, 0x41A1, "_DEC")
-        M331 (TS, 0x32, 0x0652, 0x0652, 0x41A2, 0x41A2, "_MIF")
-        M331 (TS, 0x33, 0x0653, 0x0653, 0x41A3, 0x41A3, "_MAF")
-        M331 (TS, 0x34, 0x0658, 0x0658, 0x41A8, 0x41A8, "_RNG")
-        M331 (TS, 0x35, 0x065C, 0x065C, 0x41AC, 0x41AC, "_TTP")
-        M331 (TS, 0x36, 0x065D, 0x065D, 0x41AD, 0x41AD, "_TRS")
-        M331 (TS, 0x37, 0x0660, 0x0660, 0x41B0, 0x41B0, "_GRA")
-        M331 (TS, 0x38, 0x0670, 0x0670, 0x41C0, 0x41C0, "_MIN")
-        M331 (TS, 0x39, 0x0680, 0x0680, 0x41D0, 0x41D0, "_MAX")
-        M331 (TS, 0x3A, 0x0690, 0x0690, 0x41E0, 0x41E0, "_TRA")
-        M331 (TS, 0x3B, 0x06A0, 0x06A0, 0x41F0, 0x41F0, "_LEN")
-        M331 (TS, 0x3C, 0x0741, 0x0741, 0x4291, 0x4291, "_DEC")
-        M331 (TS, 0x3D, 0x0742, 0x0742, 0x4292, 0x4292, "_MIF")
-        M331 (TS, 0x3E, 0x0743, 0x0743, 0x4293, 0x4293, "_MAF")
-        M331 (TS, 0x3F, 0x0748, 0x0748, 0x4298, 0x4298, "_RW")
-        M331 (TS, 0x40, 0x0749, 0x0749, 0x4299, 0x4299, "_MEM")
-        M331 (TS, 0x41, 0x074B, 0x074B, 0x429B, 0x429B, "_MTP")
-        M331 (TS, 0x42, 0x074D, 0x074D, 0x429D, 0x429D, "_TTP")
-        M331 (TS, 0x43, 0x0750, 0x0750, 0x42A0, 0x42A0, "_GRA")
-        M331 (TS, 0x44, 0x0790, 0x0790, 0x42E0, 0x42E0, "_MIN")
-        M331 (TS, 0x45, 0x07D0, 0x07D0, 0x4320, 0x4320, "_MAX")
-        M331 (TS, 0x46, 0x0810, 0x0810, 0x4360, 0x4360, "_TRA")
-        M331 (TS, 0x47, 0x0850, 0x0850, 0x43A0, 0x43A0, "_LEN")
-        M331 (TS, 0x48, 0x0921, 0x0921, 0x4471, 0x4471, "_DEC")
-        M331 (TS, 0x49, 0x0922, 0x0922, 0x4472, 0x4472, "_MIF")
-        M331 (TS, 0x4A, 0x0923, 0x0923, 0x4473, 0x4473, "_MAF")
-        M331 (TS, 0x4B, 0x0928, 0x0928, 0x4478, 0x4478, "_RW")
-        M331 (TS, 0x4C, 0x0929, 0x0929, 0x4479, 0x4479, "_MEM")
-        M331 (TS, 0x4D, 0x092B, 0x092B, 0x447B, 0x447B, "_MTP")
-        M331 (TS, 0x4E, 0x092D, 0x092D, 0x447D, 0x447D, "_TTP")
-        M331 (TS, 0x4F, 0x0930, 0x0930, 0x4480, 0x4480, "_GRA")
-        M331 (TS, 0x50, 0x0950, 0x0950, 0x44A0, 0x44A0, "_MIN")
-        M331 (TS, 0x51, 0x0970, 0x0970, 0x44C0, 0x44C0, "_MAX")
-        M331 (TS, 0x52, 0x0990, 0x0990, 0x44E0, 0x44E0, "_TRA")
-        M331 (TS, 0x53, 0x09B0, 0x09B0, 0x4500, 0x4500, "_LEN")
-        M331 (TS, 0x54, 0x0A61, 0x0A61, 0x45B1, 0x45B1, "_DEC")
-        M331 (TS, 0x55, 0x0A62, 0x0A62, 0x45B2, 0x45B2, "_MIF")
-        M331 (TS, 0x56, 0x0A63, 0x0A63, 0x45B3, 0x45B3, "_MAF")
-        M331 (TS, 0x57, 0x0A70, 0x0A70, 0x45C0, 0x45C0, "_GRA")
-        M331 (TS, 0x58, 0x0A80, 0x0A80, 0x45D0, 0x45D0, "_MIN")
-        M331 (TS, 0x59, 0x0A90, 0x0A90, 0x45E0, 0x45E0, "_MAX")
-        M331 (TS, 0x5A, 0x0AA0, 0x0AA0, 0x45F0, 0x45F0, "_TRA")
-        M331 (TS, 0x5B, 0x0AB0, 0x0AB0, 0x4600, 0x4600, "_LEN")
-        M331 (TS, 0x5C, 0x0B49, 0x0B49, 0x4699, 0x4699, "_HE")
-        M331 (TS, 0x5D, 0x0B4A, 0x0B4A, 0x469A, 0x469A, "_LL")
-        M331 (TS, 0x5E, 0x0B4B, 0x0B4B, 0x469B, 0x469B, "_SHR")
-        M331 (TS, 0x5F, 0x0B58, 0x0B58, 0x46A8, 0x46A8, "_INT")
-        M331 (TS, 0x60, 0x3221, 0x3221, 0x6D71, 0x6D71, "_DEC")
-        M331 (TS, 0x61, 0x3222, 0x3222, 0x6D72, 0x6D72, "_MIF")
-        M331 (TS, 0x62, 0x3223, 0x3223, 0x6D73, 0x6D73, "_MAF")
-        M331 (TS, 0x63, 0x3228, 0x3228, 0x6D78, 0x6D78, "_RNG")
-        M331 (TS, 0x64, 0x322C, 0x322C, 0x6D7C, 0x6D7C, "_TTP")
-        M331 (TS, 0x65, 0x322D, 0x322D, 0x6D7D, 0x6D7D, "_TRS")
-        M331 (TS, 0x66, 0x3240, 0x3240, 0x6D90, 0x6D90, "_GRA")
-        M331 (TS, 0x67, 0x3280, 0x3280, 0x6DD0, 0x6DD0, "_MIN")
-        M331 (TS, 0x68, 0x32C0, 0x32C0, 0x6E10, 0x6E10, "_MAX")
-        M331 (TS, 0x69, 0x3300, 0x3300, 0x6E50, 0x6E50, "_TRA")
-        M331 (TS, 0x6A, 0x3340, 0x3340, 0x6E90, 0x6E90, "_LEN")
-        M331 (TS, 0x6B, 0x3380, 0x3380, 0x6ED0, 0x6ED0, "_ATT")
-        M331 (TS, 0x6C, 0x33E1, 0x33E1, 0x6F31, 0x6F31, "_DEC")
-        M331 (TS, 0x6D, 0x33E2, 0x33E2, 0x6F32, 0x6F32, "_MIF")
-        M331 (TS, 0x6E, 0x33E3, 0x33E3, 0x6F33, 0x6F33, "_MAF")
-        M331 (TS, 0x6F, 0x33E8, 0x33E8, 0x6F38, 0x6F38, "_RW")
-        M331 (TS, 0x70, 0x33E9, 0x33E9, 0x6F39, 0x6F39, "_MEM")
-        M331 (TS, 0x71, 0x33EB, 0x33EB, 0x6F3B, 0x6F3B, "_MTP")
-        M331 (TS, 0x72, 0x33ED, 0x33ED, 0x6F3D, 0x6F3D, "_TTP")
-        M331 (TS, 0x73, 0x3400, 0x3400, 0x6F50, 0x6F50, "_GRA")
-        M331 (TS, 0x74, 0x3440, 0x3440, 0x6F90, 0x6F90, "_MIN")
-        M331 (TS, 0x75, 0x3480, 0x3480, 0x6FD0, 0x6FD0, "_MAX")
-        M331 (TS, 0x76, 0x34C0, 0x34C0, 0x7010, 0x7010, "_TRA")
-        M331 (TS, 0x77, 0x3500, 0x3500, 0x7050, 0x7050, "_LEN")
-        M331 (TS, 0x78, 0x3540, 0x3540, 0x7090, 0x7090, "_ATT")
-        M331 (TS, 0x79, 0x35A1, 0x35A1, 0x70F1, 0x70F1, "_DEC")
-        M331 (TS, 0x7A, 0x35A2, 0x35A2, 0x70F2, 0x70F2, "_MIF")
-        M331 (TS, 0x7B, 0x35A3, 0x35A3, 0x70F3, 0x70F3, "_MAF")
-        M331 (TS, 0x7C, 0x35C0, 0x35C0, 0x7110, 0x7110, "_GRA")
-        M331 (TS, 0x7D, 0x3600, 0x3600, 0x7150, 0x7150, "_MIN")
-        M331 (TS, 0x7E, 0x3640, 0x3640, 0x7190, 0x7190, "_MAX")
-        M331 (TS, 0x7F, 0x3680, 0x3680, 0x71D0, 0x71D0, "_TRA")
-        M331 (TS, 0x80, 0x36C0, 0x36C0, 0x7210, 0x7210, "_LEN")
-        M331 (TS, 0x81, 0x3700, 0x3700, 0x7250, 0x7250, "_ATT")
-        M331 (TS, 0x82, 0x3761, 0x3761, 0x72B1, 0x72B1, "_DEC")
-        M331 (TS, 0x83, 0x3762, 0x3762, 0x72B2, 0x72B2, "_MIF")
-        M331 (TS, 0x84, 0x3763, 0x3763, 0x72B3, 0x72B3, "_MAF")
-        M331 (TS, 0x85, 0x3770, 0x3770, 0x72C0, 0x72C0, "_GRA")
-        M331 (TS, 0x86, 0x3790, 0x3790, 0x72E0, 0x72E0, "_MIN")
-        M331 (TS, 0x87, 0x37B0, 0x37B0, 0x7300, 0x7300, "_MAX")
-        M331 (TS, 0x88, 0x37D0, 0x37D0, 0x7320, 0x7320, "_TRA")
-        M331 (TS, 0x89, 0x37F0, 0x37F0, 0x7340, 0x7340, "_LEN")
-        M331 (TS, 0x8A, 0x38A1, 0x38A1, 0x73F1, 0x73F1, "_DEC")
-        M331 (TS, 0x8B, 0x38A2, 0x38A2, 0x73F2, 0x73F2, "_MIF")
-        M331 (TS, 0x8C, 0x38A3, 0x38A3, 0x73F3, 0x73F3, "_MAF")
-        M331 (TS, 0x8D, 0x38B0, 0x38B0, 0x7400, 0x7400, "_GRA")
-        M331 (TS, 0x8E, 0x38F0, 0x38F0, 0x7440, 0x7440, "_MIN")
-        M331 (TS, 0x8F, 0x3930, 0x3930, 0x7480, 0x7480, "_MAX")
-        M331 (TS, 0x90, 0x3970, 0x3970, 0x74C0, 0x74C0, "_TRA")
-        M331 (TS, 0x91, 0x39B0, 0x39B0, 0x7500, 0x7500, "_LEN")
-        M331 (TS, 0x92, 0x3A81, 0x3A81, 0x75D1, 0x75D1, "_DEC")
-        M331 (TS, 0x93, 0x3A82, 0x3A82, 0x75D2, 0x75D2, "_MIF")
-        M331 (TS, 0x94, 0x3A83, 0x3A83, 0x75D3, 0x75D3, "_MAF")
-        M331 (TS, 0x95, 0x3A90, 0x3A90, 0x75E0, 0x75E0, "_GRA")
-        M331 (TS, 0x96, 0x3AA0, 0x3AA0, 0x75F0, 0x75F0, "_MIN")
-        M331 (TS, 0x97, 0x3AB0, 0x3AB0, 0x7600, 0x7600, "_MAX")
-        M331 (TS, 0x98, 0x3AC0, 0x3AC0, 0x7610, 0x7610, "_TRA")
-        M331 (TS, 0x99, 0x3AD0, 0x3AD0, 0x7620, 0x7620, "_LEN")
+        M331 (__METHOD__, 0x01, 0x18, 0x18, 0x3B68, 0x3B68, "_HE")
+        M331 (__METHOD__, 0x02, 0x1B, 0x1B, 0x3B6B, 0x3B6B, "_LL")
+        M331 (__METHOD__, 0x03, 0x1C, 0x1C, 0x3B6C, 0x3B6C, "_SHR")
+        M331 (__METHOD__, 0x04, 0x4D, 0x4D, 0x3B9D, 0x3B9D, "_TYP")
+        M331 (__METHOD__, 0x05, 0x4A, 0x4A, 0x3B9A, 0x3B9A, "_BM")
+        M331 (__METHOD__, 0x06, 0x48, 0x48, 0x3B98, 0x3B98, "_SIZ")
+        M331 (__METHOD__, 0x07, 0x58, 0x58, 0x3BA8, 0x3BA8, "_DEC")
+        M331 (__METHOD__, 0x08, 0x60, 0x60, 0x3BB0, 0x3BB0, "_MIN")
+        M331 (__METHOD__, 0x09, 0x70, 0x70, 0x3BC0, 0x3BC0, "_MAX")
+        M331 (__METHOD__, 0x0A, 0x80, 0x80, 0x3BD0, 0x3BD0, "_ALN")
+        M331 (__METHOD__, 0x0B, 0x88, 0x88, 0x3BD8, 0x3BD8, "_LEN")
+        M331 (__METHOD__, 0x0C, 0x98, 0x98, 0x3BE8, 0x3BE8, "_BAS")
+        M331 (__METHOD__, 0x0D, 0xA8, 0xA8, 0x3BF8, 0x3BF8, "_LEN")
+        M331 (__METHOD__, 0x0E, 0x0108, 0x0108, 0x3C58, 0x3C58, "_RW")
+        M331 (__METHOD__, 0x0F, 0x0110, 0x0110, 0x3C60, 0x3C60, "_MIN")
+        M331 (__METHOD__, 0x10, 0x0120, 0x0120, 0x3C70, 0x3C70, "_MAX")
+        M331 (__METHOD__, 0x11, 0x0130, 0x0130, 0x3C80, 0x3C80, "_ALN")
+        M331 (__METHOD__, 0x12, 0x0140, 0x0140, 0x3C90, 0x3C90, "_LEN")
+        M331 (__METHOD__, 0x13, 0x0168, 0x0168, 0x3CB8, 0x3CB8, "_RW")
+        M331 (__METHOD__, 0x14, 0x0170, 0x0170, 0x3CC0, 0x3CC0, "_MIN")
+        M331 (__METHOD__, 0x15, 0x0190, 0x0190, 0x3CE0, 0x3CE0, "_MAX")
+        M331 (__METHOD__, 0x16, 0x01B0, 0x01B0, 0x3D00, 0x3D00, "_ALN")
+        M331 (__METHOD__, 0x17, 0x01D0, 0x01D0, 0x3D20, 0x3D20, "_LEN")
+        M331 (__METHOD__, 0x18, 0x0208, 0x0208, 0x3D58, 0x3D58, "_RW")
+        M331 (__METHOD__, 0x19, 0x0210, 0x0210, 0x3D60, 0x3D60, "_BAS")
+        M331 (__METHOD__, 0x1A, 0x0230, 0x0230, 0x3D80, 0x3D80, "_LEN")
+        M331 (__METHOD__, 0x1B, 0x0331, 0x0331, 0x3E81, 0x3E81, "_DEC")
+        M331 (__METHOD__, 0x1C, 0x0332, 0x0332, 0x3E82, 0x3E82, "_MIF")
+        M331 (__METHOD__, 0x1D, 0x0333, 0x0333, 0x3E83, 0x3E83, "_MAF")
+        M331 (__METHOD__, 0x1E, 0x0338, 0x0338, 0x3E88, 0x3E88, "_RNG")
+        M331 (__METHOD__, 0x1F, 0x033C, 0x033C, 0x3E8C, 0x3E8C, "_TTP")
+        M331 (__METHOD__, 0x20, 0x033D, 0x033D, 0x3E8D, 0x3E8D, "_TRS")
+        M331 (__METHOD__, 0x21, 0x0340, 0x0340, 0x3E90, 0x3E90, "_GRA")
+        M331 (__METHOD__, 0x22, 0x0380, 0x0380, 0x3ED0, 0x3ED0, "_MIN")
+        M331 (__METHOD__, 0x23, 0x03C0, 0x03C0, 0x3F10, 0x3F10, "_MAX")
+        M331 (__METHOD__, 0x24, 0x0400, 0x0400, 0x3F50, 0x3F50, "_TRA")
+        M331 (__METHOD__, 0x25, 0x0440, 0x0440, 0x3F90, 0x3F90, "_LEN")
+        M331 (__METHOD__, 0x26, 0x0511, 0x0511, 0x4061, 0x4061, "_DEC")
+        M331 (__METHOD__, 0x27, 0x0512, 0x0512, 0x4062, 0x4062, "_MIF")
+        M331 (__METHOD__, 0x28, 0x0513, 0x0513, 0x4063, 0x4063, "_MAF")
+        M331 (__METHOD__, 0x29, 0x0518, 0x0518, 0x4068, 0x4068, "_RNG")
+        M331 (__METHOD__, 0x2A, 0x051C, 0x051C, 0x406C, 0x406C, "_TTP")
+        M331 (__METHOD__, 0x2B, 0x051D, 0x051D, 0x406D, 0x406D, "_TRS")
+        M331 (__METHOD__, 0x2C, 0x0520, 0x0520, 0x4070, 0x4070, "_GRA")
+        M331 (__METHOD__, 0x2D, 0x0540, 0x0540, 0x4090, 0x4090, "_MIN")
+        M331 (__METHOD__, 0x2E, 0x0560, 0x0560, 0x40B0, 0x40B0, "_MAX")
+        M331 (__METHOD__, 0x2F, 0x0580, 0x0580, 0x40D0, 0x40D0, "_TRA")
+        M331 (__METHOD__, 0x30, 0x05A0, 0x05A0, 0x40F0, 0x40F0, "_LEN")
+        M331 (__METHOD__, 0x31, 0x0651, 0x0651, 0x41A1, 0x41A1, "_DEC")
+        M331 (__METHOD__, 0x32, 0x0652, 0x0652, 0x41A2, 0x41A2, "_MIF")
+        M331 (__METHOD__, 0x33, 0x0653, 0x0653, 0x41A3, 0x41A3, "_MAF")
+        M331 (__METHOD__, 0x34, 0x0658, 0x0658, 0x41A8, 0x41A8, "_RNG")
+        M331 (__METHOD__, 0x35, 0x065C, 0x065C, 0x41AC, 0x41AC, "_TTP")
+        M331 (__METHOD__, 0x36, 0x065D, 0x065D, 0x41AD, 0x41AD, "_TRS")
+        M331 (__METHOD__, 0x37, 0x0660, 0x0660, 0x41B0, 0x41B0, "_GRA")
+        M331 (__METHOD__, 0x38, 0x0670, 0x0670, 0x41C0, 0x41C0, "_MIN")
+        M331 (__METHOD__, 0x39, 0x0680, 0x0680, 0x41D0, 0x41D0, "_MAX")
+        M331 (__METHOD__, 0x3A, 0x0690, 0x0690, 0x41E0, 0x41E0, "_TRA")
+        M331 (__METHOD__, 0x3B, 0x06A0, 0x06A0, 0x41F0, 0x41F0, "_LEN")
+        M331 (__METHOD__, 0x3C, 0x0741, 0x0741, 0x4291, 0x4291, "_DEC")
+        M331 (__METHOD__, 0x3D, 0x0742, 0x0742, 0x4292, 0x4292, "_MIF")
+        M331 (__METHOD__, 0x3E, 0x0743, 0x0743, 0x4293, 0x4293, "_MAF")
+        M331 (__METHOD__, 0x3F, 0x0748, 0x0748, 0x4298, 0x4298, "_RW")
+        M331 (__METHOD__, 0x40, 0x0749, 0x0749, 0x4299, 0x4299, "_MEM")
+        M331 (__METHOD__, 0x41, 0x074B, 0x074B, 0x429B, 0x429B, "_MTP")
+        M331 (__METHOD__, 0x42, 0x074D, 0x074D, 0x429D, 0x429D, "_TTP")
+        M331 (__METHOD__, 0x43, 0x0750, 0x0750, 0x42A0, 0x42A0, "_GRA")
+        M331 (__METHOD__, 0x44, 0x0790, 0x0790, 0x42E0, 0x42E0, "_MIN")
+        M331 (__METHOD__, 0x45, 0x07D0, 0x07D0, 0x4320, 0x4320, "_MAX")
+        M331 (__METHOD__, 0x46, 0x0810, 0x0810, 0x4360, 0x4360, "_TRA")
+        M331 (__METHOD__, 0x47, 0x0850, 0x0850, 0x43A0, 0x43A0, "_LEN")
+        M331 (__METHOD__, 0x48, 0x0921, 0x0921, 0x4471, 0x4471, "_DEC")
+        M331 (__METHOD__, 0x49, 0x0922, 0x0922, 0x4472, 0x4472, "_MIF")
+        M331 (__METHOD__, 0x4A, 0x0923, 0x0923, 0x4473, 0x4473, "_MAF")
+        M331 (__METHOD__, 0x4B, 0x0928, 0x0928, 0x4478, 0x4478, "_RW")
+        M331 (__METHOD__, 0x4C, 0x0929, 0x0929, 0x4479, 0x4479, "_MEM")
+        M331 (__METHOD__, 0x4D, 0x092B, 0x092B, 0x447B, 0x447B, "_MTP")
+        M331 (__METHOD__, 0x4E, 0x092D, 0x092D, 0x447D, 0x447D, "_TTP")
+        M331 (__METHOD__, 0x4F, 0x0930, 0x0930, 0x4480, 0x4480, "_GRA")
+        M331 (__METHOD__, 0x50, 0x0950, 0x0950, 0x44A0, 0x44A0, "_MIN")
+        M331 (__METHOD__, 0x51, 0x0970, 0x0970, 0x44C0, 0x44C0, "_MAX")
+        M331 (__METHOD__, 0x52, 0x0990, 0x0990, 0x44E0, 0x44E0, "_TRA")
+        M331 (__METHOD__, 0x53, 0x09B0, 0x09B0, 0x4500, 0x4500, "_LEN")
+        M331 (__METHOD__, 0x54, 0x0A61, 0x0A61, 0x45B1, 0x45B1, "_DEC")
+        M331 (__METHOD__, 0x55, 0x0A62, 0x0A62, 0x45B2, 0x45B2, "_MIF")
+        M331 (__METHOD__, 0x56, 0x0A63, 0x0A63, 0x45B3, 0x45B3, "_MAF")
+        M331 (__METHOD__, 0x57, 0x0A70, 0x0A70, 0x45C0, 0x45C0, "_GRA")
+        M331 (__METHOD__, 0x58, 0x0A80, 0x0A80, 0x45D0, 0x45D0, "_MIN")
+        M331 (__METHOD__, 0x59, 0x0A90, 0x0A90, 0x45E0, 0x45E0, "_MAX")
+        M331 (__METHOD__, 0x5A, 0x0AA0, 0x0AA0, 0x45F0, 0x45F0, "_TRA")
+        M331 (__METHOD__, 0x5B, 0x0AB0, 0x0AB0, 0x4600, 0x4600, "_LEN")
+        M331 (__METHOD__, 0x5C, 0x0B49, 0x0B49, 0x4699, 0x4699, "_HE")
+        M331 (__METHOD__, 0x5D, 0x0B4A, 0x0B4A, 0x469A, 0x469A, "_LL")
+        M331 (__METHOD__, 0x5E, 0x0B4B, 0x0B4B, 0x469B, 0x469B, "_SHR")
+        M331 (__METHOD__, 0x5F, 0x0B58, 0x0B58, 0x46A8, 0x46A8, "_INT")
+        M331 (__METHOD__, 0x60, 0x3221, 0x3221, 0x6D71, 0x6D71, "_DEC")
+        M331 (__METHOD__, 0x61, 0x3222, 0x3222, 0x6D72, 0x6D72, "_MIF")
+        M331 (__METHOD__, 0x62, 0x3223, 0x3223, 0x6D73, 0x6D73, "_MAF")
+        M331 (__METHOD__, 0x63, 0x3228, 0x3228, 0x6D78, 0x6D78, "_RNG")
+        M331 (__METHOD__, 0x64, 0x322C, 0x322C, 0x6D7C, 0x6D7C, "_TTP")
+        M331 (__METHOD__, 0x65, 0x322D, 0x322D, 0x6D7D, 0x6D7D, "_TRS")
+        M331 (__METHOD__, 0x66, 0x3240, 0x3240, 0x6D90, 0x6D90, "_GRA")
+        M331 (__METHOD__, 0x67, 0x3280, 0x3280, 0x6DD0, 0x6DD0, "_MIN")
+        M331 (__METHOD__, 0x68, 0x32C0, 0x32C0, 0x6E10, 0x6E10, "_MAX")
+        M331 (__METHOD__, 0x69, 0x3300, 0x3300, 0x6E50, 0x6E50, "_TRA")
+        M331 (__METHOD__, 0x6A, 0x3340, 0x3340, 0x6E90, 0x6E90, "_LEN")
+        M331 (__METHOD__, 0x6B, 0x3380, 0x3380, 0x6ED0, 0x6ED0, "_ATT")
+        M331 (__METHOD__, 0x6C, 0x33E1, 0x33E1, 0x6F31, 0x6F31, "_DEC")
+        M331 (__METHOD__, 0x6D, 0x33E2, 0x33E2, 0x6F32, 0x6F32, "_MIF")
+        M331 (__METHOD__, 0x6E, 0x33E3, 0x33E3, 0x6F33, 0x6F33, "_MAF")
+        M331 (__METHOD__, 0x6F, 0x33E8, 0x33E8, 0x6F38, 0x6F38, "_RW")
+        M331 (__METHOD__, 0x70, 0x33E9, 0x33E9, 0x6F39, 0x6F39, "_MEM")
+        M331 (__METHOD__, 0x71, 0x33EB, 0x33EB, 0x6F3B, 0x6F3B, "_MTP")
+        M331 (__METHOD__, 0x72, 0x33ED, 0x33ED, 0x6F3D, 0x6F3D, "_TTP")
+        M331 (__METHOD__, 0x73, 0x3400, 0x3400, 0x6F50, 0x6F50, "_GRA")
+        M331 (__METHOD__, 0x74, 0x3440, 0x3440, 0x6F90, 0x6F90, "_MIN")
+        M331 (__METHOD__, 0x75, 0x3480, 0x3480, 0x6FD0, 0x6FD0, "_MAX")
+        M331 (__METHOD__, 0x76, 0x34C0, 0x34C0, 0x7010, 0x7010, "_TRA")
+        M331 (__METHOD__, 0x77, 0x3500, 0x3500, 0x7050, 0x7050, "_LEN")
+        M331 (__METHOD__, 0x78, 0x3540, 0x3540, 0x7090, 0x7090, "_ATT")
+        M331 (__METHOD__, 0x79, 0x35A1, 0x35A1, 0x70F1, 0x70F1, "_DEC")
+        M331 (__METHOD__, 0x7A, 0x35A2, 0x35A2, 0x70F2, 0x70F2, "_MIF")
+        M331 (__METHOD__, 0x7B, 0x35A3, 0x35A3, 0x70F3, 0x70F3, "_MAF")
+        M331 (__METHOD__, 0x7C, 0x35C0, 0x35C0, 0x7110, 0x7110, "_GRA")
+        M331 (__METHOD__, 0x7D, 0x3600, 0x3600, 0x7150, 0x7150, "_MIN")
+        M331 (__METHOD__, 0x7E, 0x3640, 0x3640, 0x7190, 0x7190, "_MAX")
+        M331 (__METHOD__, 0x7F, 0x3680, 0x3680, 0x71D0, 0x71D0, "_TRA")
+        M331 (__METHOD__, 0x80, 0x36C0, 0x36C0, 0x7210, 0x7210, "_LEN")
+        M331 (__METHOD__, 0x81, 0x3700, 0x3700, 0x7250, 0x7250, "_ATT")
+        M331 (__METHOD__, 0x82, 0x3761, 0x3761, 0x72B1, 0x72B1, "_DEC")
+        M331 (__METHOD__, 0x83, 0x3762, 0x3762, 0x72B2, 0x72B2, "_MIF")
+        M331 (__METHOD__, 0x84, 0x3763, 0x3763, 0x72B3, 0x72B3, "_MAF")
+        M331 (__METHOD__, 0x85, 0x3770, 0x3770, 0x72C0, 0x72C0, "_GRA")
+        M331 (__METHOD__, 0x86, 0x3790, 0x3790, 0x72E0, 0x72E0, "_MIN")
+        M331 (__METHOD__, 0x87, 0x37B0, 0x37B0, 0x7300, 0x7300, "_MAX")
+        M331 (__METHOD__, 0x88, 0x37D0, 0x37D0, 0x7320, 0x7320, "_TRA")
+        M331 (__METHOD__, 0x89, 0x37F0, 0x37F0, 0x7340, 0x7340, "_LEN")
+        M331 (__METHOD__, 0x8A, 0x38A1, 0x38A1, 0x73F1, 0x73F1, "_DEC")
+        M331 (__METHOD__, 0x8B, 0x38A2, 0x38A2, 0x73F2, 0x73F2, "_MIF")
+        M331 (__METHOD__, 0x8C, 0x38A3, 0x38A3, 0x73F3, 0x73F3, "_MAF")
+        M331 (__METHOD__, 0x8D, 0x38B0, 0x38B0, 0x7400, 0x7400, "_GRA")
+        M331 (__METHOD__, 0x8E, 0x38F0, 0x38F0, 0x7440, 0x7440, "_MIN")
+        M331 (__METHOD__, 0x8F, 0x3930, 0x3930, 0x7480, 0x7480, "_MAX")
+        M331 (__METHOD__, 0x90, 0x3970, 0x3970, 0x74C0, 0x74C0, "_TRA")
+        M331 (__METHOD__, 0x91, 0x39B0, 0x39B0, 0x7500, 0x7500, "_LEN")
+        M331 (__METHOD__, 0x92, 0x3A81, 0x3A81, 0x75D1, 0x75D1, "_DEC")
+        M331 (__METHOD__, 0x93, 0x3A82, 0x3A82, 0x75D2, 0x75D2, "_MIF")
+        M331 (__METHOD__, 0x94, 0x3A83, 0x3A83, 0x75D3, 0x75D3, "_MAF")
+        M331 (__METHOD__, 0x95, 0x3A90, 0x3A90, 0x75E0, 0x75E0, "_GRA")
+        M331 (__METHOD__, 0x96, 0x3AA0, 0x3AA0, 0x75F0, 0x75F0, "_MIN")
+        M331 (__METHOD__, 0x97, 0x3AB0, 0x3AB0, 0x7600, 0x7600, "_MAX")
+        M331 (__METHOD__, 0x98, 0x3AC0, 0x3AC0, 0x7610, 0x7610, "_TRA")
+        M331 (__METHOD__, 0x99, 0x3AD0, 0x3AD0, 0x7620, 0x7620, "_LEN")
         /* Checkings relating to RT01 */
 
-        M331 (TS, 0x9A, 0x20, 0x20, 0x4780, 0x4780, "_HE")
-        M331 (TS, 0x9B, 0x23, 0x23, 0x4783, 0x4783, "_LL")
-        M331 (TS, 0x9C, 0x24, 0x24, 0x4784, 0x4784, "_SHR")
-        M331 (TS, 0x9D, 0x60, 0x60, 0x47C0, 0x47C0, "_HE")
-        M331 (TS, 0x9E, 0x63, 0x63, 0x47C3, 0x47C3, "_LL")
-        M331 (TS, 0x9F, 0x64, 0x64, 0x47C4, 0x47C4, "_SHR")
-        M331 (TS, 0xA0, 0x95, 0x95, 0x47F5, 0x47F5, "_TYP")
-        M331 (TS, 0xA1, 0x92, 0x92, 0x47F2, 0x47F2, "_BM")
-        M331 (TS, 0xA2, 0x90, 0x90, 0x47F0, 0x47F0, "_SIZ")
-        M331 (TS, 0xA3, 0xC0, 0xC0, 0x4820, 0x4820, "_HE")
-        M331 (TS, 0xA4, 0xC3, 0xC3, 0x4823, 0x4823, "_LL")
-        M331 (TS, 0xA5, 0xC4, 0xC4, 0x4824, 0x4824, "_SHR")
-        M331 (TS, 0xA6, 0xF5, 0xF5, 0x4855, 0x4855, "_TYP")
-        M331 (TS, 0xA7, 0xF2, 0xF2, 0x4852, 0x4852, "_BM")
-        M331 (TS, 0xA8, 0xF0, 0xF0, 0x4850, 0x4850, "_SIZ")
-        M331 (TS, 0xA9, 0x0100, 0x0100, 0x4860, 0x4860, "_DEC")
-        M331 (TS, 0xAA, 0x0108, 0x0108, 0x4868, 0x4868, "_MIN")
-        M331 (TS, 0xAB, 0x0118, 0x0118, 0x4878, 0x4878, "_MAX")
-        M331 (TS, 0xAC, 0x0128, 0x0128, 0x4888, 0x4888, "_ALN")
-        M331 (TS, 0xAD, 0x0130, 0x0130, 0x4890, 0x4890, "_LEN")
-        M331 (TS, 0xAE, 0x0160, 0x0160, 0x48C0, 0x48C0, "_HE")
-        M331 (TS, 0xAF, 0x0163, 0x0163, 0x48C3, 0x48C3, "_LL")
-        M331 (TS, 0xB0, 0x0164, 0x0164, 0x48C4, 0x48C4, "_SHR")
-        M331 (TS, 0xB1, 0x0195, 0x0195, 0x48F5, 0x48F5, "_TYP")
-        M331 (TS, 0xB2, 0x0192, 0x0192, 0x48F2, 0x48F2, "_BM")
-        M331 (TS, 0xB3, 0x0190, 0x0190, 0x48F0, 0x48F0, "_SIZ")
-        M331 (TS, 0xB4, 0x01A0, 0x01A0, 0x4900, 0x4900, "_DEC")
-        M331 (TS, 0xB5, 0x01A8, 0x01A8, 0x4908, 0x4908, "_MIN")
-        M331 (TS, 0xB6, 0x01B8, 0x01B8, 0x4918, 0x4918, "_MAX")
-        M331 (TS, 0xB7, 0x01C8, 0x01C8, 0x4928, 0x4928, "_ALN")
-        M331 (TS, 0xB8, 0x01D0, 0x01D0, 0x4930, 0x4930, "_LEN")
-        M331 (TS, 0xB9, 0x01E0, 0x01E0, 0x4940, 0x4940, "_BAS")
-        M331 (TS, 0xBA, 0x01F0, 0x01F0, 0x4950, 0x4950, "_LEN")
-        M331 (TS, 0xBB, 0x0220, 0x0220, 0x4980, 0x4980, "_HE")
-        M331 (TS, 0xBC, 0x0223, 0x0223, 0x4983, 0x4983, "_LL")
-        M331 (TS, 0xBD, 0x0224, 0x0224, 0x4984, 0x4984, "_SHR")
-        M331 (TS, 0xBE, 0x0255, 0x0255, 0x49B5, 0x49B5, "_TYP")
-        M331 (TS, 0xBF, 0x0252, 0x0252, 0x49B2, 0x49B2, "_BM")
-        M331 (TS, 0xC0, 0x0250, 0x0250, 0x49B0, 0x49B0, "_SIZ")
-        M331 (TS, 0xC1, 0x0260, 0x0260, 0x49C0, 0x49C0, "_DEC")
-        M331 (TS, 0xC2, 0x0268, 0x0268, 0x49C8, 0x49C8, "_MIN")
-        M331 (TS, 0xC3, 0x0278, 0x0278, 0x49D8, 0x49D8, "_MAX")
-        M331 (TS, 0xC4, 0x0288, 0x0288, 0x49E8, 0x49E8, "_ALN")
-        M331 (TS, 0xC5, 0x0290, 0x0290, 0x49F0, 0x49F0, "_LEN")
-        M331 (TS, 0xC6, 0x02A0, 0x02A0, 0x4A00, 0x4A00, "_BAS")
-        M331 (TS, 0xC7, 0x02B0, 0x02B0, 0x4A10, 0x4A10, "_LEN")
-        M331 (TS, 0xC8, 0x0320, 0x0320, 0x4A80, 0x4A80, "_HE")
-        M331 (TS, 0xC9, 0x0323, 0x0323, 0x4A83, 0x4A83, "_LL")
-        M331 (TS, 0xCA, 0x0324, 0x0324, 0x4A84, 0x4A84, "_SHR")
-        M331 (TS, 0xCB, 0x0355, 0x0355, 0x4AB5, 0x4AB5, "_TYP")
-        M331 (TS, 0xCC, 0x0352, 0x0352, 0x4AB2, 0x4AB2, "_BM")
-        M331 (TS, 0xCD, 0x0350, 0x0350, 0x4AB0, 0x4AB0, "_SIZ")
-        M331 (TS, 0xCE, 0x0360, 0x0360, 0x4AC0, 0x4AC0, "_DEC")
-        M331 (TS, 0xCF, 0x0368, 0x0368, 0x4AC8, 0x4AC8, "_MIN")
-        M331 (TS, 0xD0, 0x0378, 0x0378, 0x4AD8, 0x4AD8, "_MAX")
-        M331 (TS, 0xD1, 0x0388, 0x0388, 0x4AE8, 0x4AE8, "_ALN")
-        M331 (TS, 0xD2, 0x0390, 0x0390, 0x4AF0, 0x4AF0, "_LEN")
-        M331 (TS, 0xD3, 0x03A0, 0x03A0, 0x4B00, 0x4B00, "_BAS")
-        M331 (TS, 0xD4, 0x03B0, 0x03B0, 0x4B10, 0x4B10, "_LEN")
-        M331 (TS, 0xD5, 0x0410, 0x0410, 0x4B70, 0x4B70, "_RW")
-        M331 (TS, 0xD6, 0x0418, 0x0418, 0x4B78, 0x4B78, "_MIN")
-        M331 (TS, 0xD7, 0x0428, 0x0428, 0x4B88, 0x4B88, "_MAX")
-        M331 (TS, 0xD8, 0x0438, 0x0438, 0x4B98, 0x4B98, "_ALN")
-        M331 (TS, 0xD9, 0x0448, 0x0448, 0x4BA8, 0x4BA8, "_LEN")
-        M331 (TS, 0xDA, 0x0480, 0x0480, 0x4BE0, 0x4BE0, "_HE")
-        M331 (TS, 0xDB, 0x0483, 0x0483, 0x4BE3, 0x4BE3, "_LL")
-        M331 (TS, 0xDC, 0x0484, 0x0484, 0x4BE4, 0x4BE4, "_SHR")
-        M331 (TS, 0xDD, 0x04B5, 0x04B5, 0x4C15, 0x4C15, "_TYP")
-        M331 (TS, 0xDE, 0x04B2, 0x04B2, 0x4C12, 0x4C12, "_BM")
-        M331 (TS, 0xDF, 0x04B0, 0x04B0, 0x4C10, 0x4C10, "_SIZ")
-        M331 (TS, 0xE0, 0x04C0, 0x04C0, 0x4C20, 0x4C20, "_DEC")
-        M331 (TS, 0xE1, 0x04C8, 0x04C8, 0x4C28, 0x4C28, "_MIN")
-        M331 (TS, 0xE2, 0x04D8, 0x04D8, 0x4C38, 0x4C38, "_MAX")
-        M331 (TS, 0xE3, 0x04E8, 0x04E8, 0x4C48, 0x4C48, "_ALN")
-        M331 (TS, 0xE4, 0x04F0, 0x04F0, 0x4C50, 0x4C50, "_LEN")
-        M331 (TS, 0xE5, 0x0500, 0x0500, 0x4C60, 0x4C60, "_BAS")
-        M331 (TS, 0xE6, 0x0510, 0x0510, 0x4C70, 0x4C70, "_LEN")
-        M331 (TS, 0xE7, 0x0570, 0x0570, 0x4CD0, 0x4CD0, "_RW")
-        M331 (TS, 0xE8, 0x0578, 0x0578, 0x4CD8, 0x4CD8, "_MIN")
-        M331 (TS, 0xE9, 0x0588, 0x0588, 0x4CE8, 0x4CE8, "_MAX")
-        M331 (TS, 0xEA, 0x0598, 0x0598, 0x4CF8, 0x4CF8, "_ALN")
-        M331 (TS, 0xEB, 0x05A8, 0x05A8, 0x4D08, 0x4D08, "_LEN")
-        M331 (TS, 0xEC, 0x05D0, 0x05D0, 0x4D30, 0x4D30, "_RW")
-        M331 (TS, 0xED, 0x05D8, 0x05D8, 0x4D38, 0x4D38, "_MIN")
-        M331 (TS, 0xEE, 0x05F8, 0x05F8, 0x4D58, 0x4D58, "_MAX")
-        M331 (TS, 0xEF, 0x0618, 0x0618, 0x4D78, 0x4D78, "_ALN")
-        M331 (TS, 0xF0, 0x0638, 0x0638, 0x4D98, 0x4D98, "_LEN")
+        M331 (__METHOD__, 0x9A, 0x20, 0x20, 0x4780, 0x4780, "_HE")
+        M331 (__METHOD__, 0x9B, 0x23, 0x23, 0x4783, 0x4783, "_LL")
+        M331 (__METHOD__, 0x9C, 0x24, 0x24, 0x4784, 0x4784, "_SHR")
+        M331 (__METHOD__, 0x9D, 0x60, 0x60, 0x47C0, 0x47C0, "_HE")
+        M331 (__METHOD__, 0x9E, 0x63, 0x63, 0x47C3, 0x47C3, "_LL")
+        M331 (__METHOD__, 0x9F, 0x64, 0x64, 0x47C4, 0x47C4, "_SHR")
+        M331 (__METHOD__, 0xA0, 0x95, 0x95, 0x47F5, 0x47F5, "_TYP")
+        M331 (__METHOD__, 0xA1, 0x92, 0x92, 0x47F2, 0x47F2, "_BM")
+        M331 (__METHOD__, 0xA2, 0x90, 0x90, 0x47F0, 0x47F0, "_SIZ")
+        M331 (__METHOD__, 0xA3, 0xC0, 0xC0, 0x4820, 0x4820, "_HE")
+        M331 (__METHOD__, 0xA4, 0xC3, 0xC3, 0x4823, 0x4823, "_LL")
+        M331 (__METHOD__, 0xA5, 0xC4, 0xC4, 0x4824, 0x4824, "_SHR")
+        M331 (__METHOD__, 0xA6, 0xF5, 0xF5, 0x4855, 0x4855, "_TYP")
+        M331 (__METHOD__, 0xA7, 0xF2, 0xF2, 0x4852, 0x4852, "_BM")
+        M331 (__METHOD__, 0xA8, 0xF0, 0xF0, 0x4850, 0x4850, "_SIZ")
+        M331 (__METHOD__, 0xA9, 0x0100, 0x0100, 0x4860, 0x4860, "_DEC")
+        M331 (__METHOD__, 0xAA, 0x0108, 0x0108, 0x4868, 0x4868, "_MIN")
+        M331 (__METHOD__, 0xAB, 0x0118, 0x0118, 0x4878, 0x4878, "_MAX")
+        M331 (__METHOD__, 0xAC, 0x0128, 0x0128, 0x4888, 0x4888, "_ALN")
+        M331 (__METHOD__, 0xAD, 0x0130, 0x0130, 0x4890, 0x4890, "_LEN")
+        M331 (__METHOD__, 0xAE, 0x0160, 0x0160, 0x48C0, 0x48C0, "_HE")
+        M331 (__METHOD__, 0xAF, 0x0163, 0x0163, 0x48C3, 0x48C3, "_LL")
+        M331 (__METHOD__, 0xB0, 0x0164, 0x0164, 0x48C4, 0x48C4, "_SHR")
+        M331 (__METHOD__, 0xB1, 0x0195, 0x0195, 0x48F5, 0x48F5, "_TYP")
+        M331 (__METHOD__, 0xB2, 0x0192, 0x0192, 0x48F2, 0x48F2, "_BM")
+        M331 (__METHOD__, 0xB3, 0x0190, 0x0190, 0x48F0, 0x48F0, "_SIZ")
+        M331 (__METHOD__, 0xB4, 0x01A0, 0x01A0, 0x4900, 0x4900, "_DEC")
+        M331 (__METHOD__, 0xB5, 0x01A8, 0x01A8, 0x4908, 0x4908, "_MIN")
+        M331 (__METHOD__, 0xB6, 0x01B8, 0x01B8, 0x4918, 0x4918, "_MAX")
+        M331 (__METHOD__, 0xB7, 0x01C8, 0x01C8, 0x4928, 0x4928, "_ALN")
+        M331 (__METHOD__, 0xB8, 0x01D0, 0x01D0, 0x4930, 0x4930, "_LEN")
+        M331 (__METHOD__, 0xB9, 0x01E0, 0x01E0, 0x4940, 0x4940, "_BAS")
+        M331 (__METHOD__, 0xBA, 0x01F0, 0x01F0, 0x4950, 0x4950, "_LEN")
+        M331 (__METHOD__, 0xBB, 0x0220, 0x0220, 0x4980, 0x4980, "_HE")
+        M331 (__METHOD__, 0xBC, 0x0223, 0x0223, 0x4983, 0x4983, "_LL")
+        M331 (__METHOD__, 0xBD, 0x0224, 0x0224, 0x4984, 0x4984, "_SHR")
+        M331 (__METHOD__, 0xBE, 0x0255, 0x0255, 0x49B5, 0x49B5, "_TYP")
+        M331 (__METHOD__, 0xBF, 0x0252, 0x0252, 0x49B2, 0x49B2, "_BM")
+        M331 (__METHOD__, 0xC0, 0x0250, 0x0250, 0x49B0, 0x49B0, "_SIZ")
+        M331 (__METHOD__, 0xC1, 0x0260, 0x0260, 0x49C0, 0x49C0, "_DEC")
+        M331 (__METHOD__, 0xC2, 0x0268, 0x0268, 0x49C8, 0x49C8, "_MIN")
+        M331 (__METHOD__, 0xC3, 0x0278, 0x0278, 0x49D8, 0x49D8, "_MAX")
+        M331 (__METHOD__, 0xC4, 0x0288, 0x0288, 0x49E8, 0x49E8, "_ALN")
+        M331 (__METHOD__, 0xC5, 0x0290, 0x0290, 0x49F0, 0x49F0, "_LEN")
+        M331 (__METHOD__, 0xC6, 0x02A0, 0x02A0, 0x4A00, 0x4A00, "_BAS")
+        M331 (__METHOD__, 0xC7, 0x02B0, 0x02B0, 0x4A10, 0x4A10, "_LEN")
+        M331 (__METHOD__, 0xC8, 0x0320, 0x0320, 0x4A80, 0x4A80, "_HE")
+        M331 (__METHOD__, 0xC9, 0x0323, 0x0323, 0x4A83, 0x4A83, "_LL")
+        M331 (__METHOD__, 0xCA, 0x0324, 0x0324, 0x4A84, 0x4A84, "_SHR")
+        M331 (__METHOD__, 0xCB, 0x0355, 0x0355, 0x4AB5, 0x4AB5, "_TYP")
+        M331 (__METHOD__, 0xCC, 0x0352, 0x0352, 0x4AB2, 0x4AB2, "_BM")
+        M331 (__METHOD__, 0xCD, 0x0350, 0x0350, 0x4AB0, 0x4AB0, "_SIZ")
+        M331 (__METHOD__, 0xCE, 0x0360, 0x0360, 0x4AC0, 0x4AC0, "_DEC")
+        M331 (__METHOD__, 0xCF, 0x0368, 0x0368, 0x4AC8, 0x4AC8, "_MIN")
+        M331 (__METHOD__, 0xD0, 0x0378, 0x0378, 0x4AD8, 0x4AD8, "_MAX")
+        M331 (__METHOD__, 0xD1, 0x0388, 0x0388, 0x4AE8, 0x4AE8, "_ALN")
+        M331 (__METHOD__, 0xD2, 0x0390, 0x0390, 0x4AF0, 0x4AF0, "_LEN")
+        M331 (__METHOD__, 0xD3, 0x03A0, 0x03A0, 0x4B00, 0x4B00, "_BAS")
+        M331 (__METHOD__, 0xD4, 0x03B0, 0x03B0, 0x4B10, 0x4B10, "_LEN")
+        M331 (__METHOD__, 0xD5, 0x0410, 0x0410, 0x4B70, 0x4B70, "_RW")
+        M331 (__METHOD__, 0xD6, 0x0418, 0x0418, 0x4B78, 0x4B78, "_MIN")
+        M331 (__METHOD__, 0xD7, 0x0428, 0x0428, 0x4B88, 0x4B88, "_MAX")
+        M331 (__METHOD__, 0xD8, 0x0438, 0x0438, 0x4B98, 0x4B98, "_ALN")
+        M331 (__METHOD__, 0xD9, 0x0448, 0x0448, 0x4BA8, 0x4BA8, "_LEN")
+        M331 (__METHOD__, 0xDA, 0x0480, 0x0480, 0x4BE0, 0x4BE0, "_HE")
+        M331 (__METHOD__, 0xDB, 0x0483, 0x0483, 0x4BE3, 0x4BE3, "_LL")
+        M331 (__METHOD__, 0xDC, 0x0484, 0x0484, 0x4BE4, 0x4BE4, "_SHR")
+        M331 (__METHOD__, 0xDD, 0x04B5, 0x04B5, 0x4C15, 0x4C15, "_TYP")
+        M331 (__METHOD__, 0xDE, 0x04B2, 0x04B2, 0x4C12, 0x4C12, "_BM")
+        M331 (__METHOD__, 0xDF, 0x04B0, 0x04B0, 0x4C10, 0x4C10, "_SIZ")
+        M331 (__METHOD__, 0xE0, 0x04C0, 0x04C0, 0x4C20, 0x4C20, "_DEC")
+        M331 (__METHOD__, 0xE1, 0x04C8, 0x04C8, 0x4C28, 0x4C28, "_MIN")
+        M331 (__METHOD__, 0xE2, 0x04D8, 0x04D8, 0x4C38, 0x4C38, "_MAX")
+        M331 (__METHOD__, 0xE3, 0x04E8, 0x04E8, 0x4C48, 0x4C48, "_ALN")
+        M331 (__METHOD__, 0xE4, 0x04F0, 0x04F0, 0x4C50, 0x4C50, "_LEN")
+        M331 (__METHOD__, 0xE5, 0x0500, 0x0500, 0x4C60, 0x4C60, "_BAS")
+        M331 (__METHOD__, 0xE6, 0x0510, 0x0510, 0x4C70, 0x4C70, "_LEN")
+        M331 (__METHOD__, 0xE7, 0x0570, 0x0570, 0x4CD0, 0x4CD0, "_RW")
+        M331 (__METHOD__, 0xE8, 0x0578, 0x0578, 0x4CD8, 0x4CD8, "_MIN")
+        M331 (__METHOD__, 0xE9, 0x0588, 0x0588, 0x4CE8, 0x4CE8, "_MAX")
+        M331 (__METHOD__, 0xEA, 0x0598, 0x0598, 0x4CF8, 0x4CF8, "_ALN")
+        M331 (__METHOD__, 0xEB, 0x05A8, 0x05A8, 0x4D08, 0x4D08, "_LEN")
+        M331 (__METHOD__, 0xEC, 0x05D0, 0x05D0, 0x4D30, 0x4D30, "_RW")
+        M331 (__METHOD__, 0xED, 0x05D8, 0x05D8, 0x4D38, 0x4D38, "_MIN")
+        M331 (__METHOD__, 0xEE, 0x05F8, 0x05F8, 0x4D58, 0x4D58, "_MAX")
+        M331 (__METHOD__, 0xEF, 0x0618, 0x0618, 0x4D78, 0x4D78, "_ALN")
+        M331 (__METHOD__, 0xF0, 0x0638, 0x0638, 0x4D98, 0x4D98, "_LEN")
         /* Checkings below are not exhaustive */
 
-        M331 (TS, 0xF1, 0x0870, 0x0870, 0x4FD0, 0x4FD0, "_RW")
-        M331 (TS, 0xF2, 0x0878, 0x0878, 0x4FD8, 0x4FD8, "_BAS")
-        M331 (TS, 0xF3, 0x0898, 0x0898, 0x4FF8, 0x4FF8, "_LEN")
-        M331 (TS, 0xF4, 0x43D0, 0x43D0, 0x8B30, 0x8B30, "_RW")
-        M331 (TS, 0xF5, 0x43D8, 0x43D8, 0x8B38, 0x8B38, "_BAS")
-        M331 (TS, 0xF6, 0x43F8, 0x43F8, 0x8B58, 0x8B58, "_LEN")
-        M331 (TS, 0xF7, 0x4640, 0x4640, 0x8DA0, 0x8DA0, "_RW")
-        M331 (TS, 0xF8, 0x4648, 0x4648, 0x8DA8, 0x8DA8, "_BAS")
-        M331 (TS, 0xF9, 0x4668, 0x4668, 0x8DC8, 0x8DC8, "_LEN")
+        M331 (__METHOD__, 0xF1, 0x0870, 0x0870, 0x4FD0, 0x4FD0, "_RW")
+        M331 (__METHOD__, 0xF2, 0x0878, 0x0878, 0x4FD8, 0x4FD8, "_BAS")
+        M331 (__METHOD__, 0xF3, 0x0898, 0x0898, 0x4FF8, 0x4FF8, "_LEN")
+        M331 (__METHOD__, 0xF4, 0x43D0, 0x43D0, 0x8B30, 0x8B30, "_RW")
+        M331 (__METHOD__, 0xF5, 0x43D8, 0x43D8, 0x8B38, 0x8B38, "_BAS")
+        M331 (__METHOD__, 0xF6, 0x43F8, 0x43F8, 0x8B58, 0x8B58, "_LEN")
+        M331 (__METHOD__, 0xF7, 0x4640, 0x4640, 0x8DA0, 0x8DA0, "_RW")
+        M331 (__METHOD__, 0xF8, 0x4648, 0x4648, 0x8DA8, 0x8DA8, "_BAS")
+        M331 (__METHOD__, 0xF9, 0x4668, 0x4668, 0x8DC8, 0x8DC8, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl
index e8f2b50e8..783ba71f8 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl
@@ -2752,21 +2752,20 @@
     })
     Method (RT24, 0, Serialized)
     {
-        Name (TS, "RT24")
         /* Emit test header, set the filename */
 
-        THDR (TS, "SpiSerialBus Resource Descriptor Macro", "spiserialbus.asl")
+        THDR (__METHOD__, "SpiSerialBus Resource Descriptor Macro", "spiserialbus.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P458) != SizeOf (P459)))
         {
-            ERR (TS, 0xB5, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB5, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P458), "p458", P458, P459)
+        M330 (__METHOD__, SizeOf (P458), "p458", P458, P459)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -2788,13 +2787,13 @@
                         0xF0, 0xF1, 0xF2, 0xF3, 0xF4
                     })
             }
-        M331 (TS, 0x01, 0x30, 0x30, 0x0128, 0x0128, "_SLV")
-        M331 (TS, 0x02, 0x38, 0x38, 0x0130, 0x0130, "_MOD")
-        M331 (TS, 0x03, 0x39, 0x39, 0x0131, 0x0131, "_DPL")
-        M331 (TS, 0x04, 0x60, 0x60, 0x0158, 0x0158, "_SPE")
-        M331 (TS, 0x05, 0x80, 0x80, 0x0178, 0x0178, "_LEN")
-        M331 (TS, 0x06, 0x88, 0x88, 0x0180, 0x0180, "_PHA")
-        M331 (TS, 0x07, 0x90, 0x90, 0x0188, 0x0188, "_POL")
-        M331 (TS, 0x08, 0x98, 0x98, 0x0190, 0x0190, "_ADR")
-        M331 (TS, 0x09, 0xA8, 0xA8, 0x01A0, 0x01A0, "_VEN")
+        M331 (__METHOD__, 0x01, 0x30, 0x30, 0x0128, 0x0128, "_SLV")
+        M331 (__METHOD__, 0x02, 0x38, 0x38, 0x0130, 0x0130, "_MOD")
+        M331 (__METHOD__, 0x03, 0x39, 0x39, 0x0131, 0x0131, "_DPL")
+        M331 (__METHOD__, 0x04, 0x60, 0x60, 0x0158, 0x0158, "_SPE")
+        M331 (__METHOD__, 0x05, 0x80, 0x80, 0x0178, 0x0178, "_LEN")
+        M331 (__METHOD__, 0x06, 0x88, 0x88, 0x0180, 0x0180, "_PHA")
+        M331 (__METHOD__, 0x07, 0x90, 0x90, 0x0188, 0x0188, "_POL")
+        M331 (__METHOD__, 0x08, 0x98, 0x98, 0x0190, 0x0190, "_ADR")
+        M331 (__METHOD__, 0x09, 0xA8, 0xA8, 0x01A0, 0x01A0, "_VEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl
index fbc283f34..1192b5d56 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl
@@ -946,21 +946,20 @@
     })
     Method (RT25, 0, Serialized)
     {
-        Name (TS, "RT25")
         /* Emit test header, set the filename */
 
-        THDR (TS, "UartSerialBus Resource Descriptor Macro", "uartserialbus.asl")
+        THDR (__METHOD__, "UartSerialBus Resource Descriptor Macro", "uartserialbus.asl")
         /* The main test packages must have the same number of entries */
 
         If ((SizeOf (P45A) != SizeOf (P45B)))
         {
-            ERR (TS, 0xB6, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
+            ERR (__METHOD__, 0xB6, 0x00, 0x00, 0x00, 0x00, "Incorrect package length")
             Return (Zero)
         }
 
         /* Main test case for packages above */
 
-        M330 (TS, SizeOf (P45A), "p45A", P45A, P45B)
+        M330 (__METHOD__, SizeOf (P45A), "p45A", P45A, P45B)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -982,14 +981,14 @@
                         0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6
                     })
             }
-        M331 (TS, 0x01, 0x38, 0x38, 0x0150, 0x0150, "_FLC")
-        M331 (TS, 0x02, 0x3A, 0x3A, 0x0152, 0x0152, "_STB")
-        M331 (TS, 0x03, 0x3C, 0x3C, 0x0154, 0x0154, "_LEN")
-        M331 (TS, 0x04, 0x3F, 0x3F, 0x0157, 0x0157, "_END")
-        M331 (TS, 0x05, 0x60, 0x60, 0x0178, 0x0178, "_SPE")
-        M331 (TS, 0x06, 0x80, 0x80, 0x0198, 0x0198, "_RXL")
-        M331 (TS, 0x07, 0x90, 0x90, 0x01A8, 0x01A8, "_TXL")
-        M331 (TS, 0x08, 0xA0, 0xA0, 0x01B8, 0x01B8, "_PAR")
-        M331 (TS, 0x09, 0xA8, 0xA8, 0x01C0, 0x01C0, "_LIN")
-        M331 (TS, 0x0A, 0xB0, 0xB0, 0x01C8, 0x01C8, "_VEN")
+        M331 (__METHOD__, 0x01, 0x38, 0x38, 0x0150, 0x0150, "_FLC")
+        M331 (__METHOD__, 0x02, 0x3A, 0x3A, 0x0152, 0x0152, "_STB")
+        M331 (__METHOD__, 0x03, 0x3C, 0x3C, 0x0154, 0x0154, "_LEN")
+        M331 (__METHOD__, 0x04, 0x3F, 0x3F, 0x0157, 0x0157, "_END")
+        M331 (__METHOD__, 0x05, 0x60, 0x60, 0x0178, 0x0178, "_SPE")
+        M331 (__METHOD__, 0x06, 0x80, 0x80, 0x0198, 0x0198, "_RXL")
+        M331 (__METHOD__, 0x07, 0x90, 0x90, 0x01A8, 0x01A8, "_TXL")
+        M331 (__METHOD__, 0x08, 0xA0, 0xA0, 0x01B8, 0x01B8, "_PAR")
+        M331 (__METHOD__, 0x09, 0xA8, 0xA8, 0x01C0, 0x01C0, "_LIN")
+        M331 (__METHOD__, 0x0A, 0xB0, 0xB0, 0x01C8, 0x01C8, "_VEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/vendorlong.asl b/tests/aslts/src/runtime/collections/functional/descriptor/vendorlong.asl
index 9017dd2aa..76d405d0b 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/vendorlong.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/vendorlong.asl
@@ -235,13 +235,12 @@
     })
     Method (RT09, 0, Serialized)
     {
-        Name (TS, "RT09")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Long Vendor Resource Descriptor Macro", "vendorlong.asl")
+        THDR (__METHOD__, "Long Vendor Resource Descriptor Macro", "vendorlong.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x07, "p410", P410, P411)
+        M330 (__METHOD__, 0x07, "p410", P410, P411)
         /* VendorLong has DescriptorName */
         /* but has not fields in it. */
         Local0 = ResourceTemplate ()
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/vendorshort.asl b/tests/aslts/src/runtime/collections/functional/descriptor/vendorshort.asl
index 6542bf273..a1277e252 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/vendorshort.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/vendorshort.asl
@@ -169,11 +169,10 @@
     })
     Method (RT07, 0, Serialized)
     {
-        Name (TS, "RT07")
         /* Emit test header, set the filename */
 
-        THDR (TS, "Short Vendor Resource Descriptor Macro", "vendorshort.asl")
+        THDR (__METHOD__, "Short Vendor Resource Descriptor Macro", "vendorshort.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x08, "p40c", P40C, P40D)
+        M330 (__METHOD__, 0x08, "p40c", P40C, P40D)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/wordbusnumber.asl b/tests/aslts/src/runtime/collections/functional/descriptor/wordbusnumber.asl
index 37971d65e..9f5a19acb 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/wordbusnumber.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/wordbusnumber.asl
@@ -658,13 +658,12 @@
     })
     Method (RT12, 0, Serialized)
     {
-        Name (TS, "RT12")
         /* Emit test header, set the filename */
 
-        THDR (TS, "WordBusNumber Resource Descriptor Macro", "wordbusnumber.asl")
+        THDR (__METHOD__, "WordBusNumber Resource Descriptor Macro", "wordbusnumber.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x19, "p428", P428, P429)
+        M330 (__METHOD__, 0x19, "p428", P428, P429)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -684,12 +683,12 @@
                     0xFEFF,             // Length
                     ,, )
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0xA1, 0xA1, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0xA2, 0xA2, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0xA3, 0xA3, "_MAF")
-        M331 (TS, 0x07, 0x30, 0x30, 0xB0, 0xB0, "_GRA")
-        M331 (TS, 0x08, 0x40, 0x40, 0xC0, 0xC0, "_MIN")
-        M331 (TS, 0x09, 0x50, 0x50, 0xD0, 0xD0, "_MAX")
-        M331 (TS, 0x0A, 0x60, 0x60, 0xE0, 0xE0, "_TRA")
-        M331 (TS, 0x0B, 0x70, 0x70, 0xF0, 0xF0, "_LEN")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0xA1, 0xA1, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0xA2, 0xA2, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0xA3, 0xA3, "_MAF")
+        M331 (__METHOD__, 0x07, 0x30, 0x30, 0xB0, 0xB0, "_GRA")
+        M331 (__METHOD__, 0x08, 0x40, 0x40, 0xC0, 0xC0, "_MIN")
+        M331 (__METHOD__, 0x09, 0x50, 0x50, 0xD0, 0xD0, "_MAX")
+        M331 (__METHOD__, 0x0A, 0x60, 0x60, 0xE0, 0xE0, "_TRA")
+        M331 (__METHOD__, 0x0B, 0x70, 0x70, 0xF0, 0xF0, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/wordio.asl b/tests/aslts/src/runtime/collections/functional/descriptor/wordio.asl
index e8ebf7c0a..092264df4 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/wordio.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/wordio.asl
@@ -953,13 +953,12 @@
     })
     Method (RT0E, 0, Serialized)
     {
-        Name (TS, "RT0e")
         /* Emit test header, set the filename */
 
-        THDR (TS, "WordIO Resource Descriptor Macro", "wordio.asl")
+        THDR (__METHOD__, "WordIO Resource Descriptor Macro", "wordio.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x25, "p420", P420, P421)
+        M330 (__METHOD__, 0x25, "p420", P420, P421)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -979,15 +978,15 @@
                     0xFEFF,             // Length
                     ,, , TypeStatic, DenseTranslation)
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0xA1, 0xA1, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0xA2, 0xA2, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0xA3, 0xA3, "_MAF")
-        M331 (TS, 0x04, 0x28, 0x28, 0xA8, 0xA8, "_RNG")
-        M331 (TS, 0x05, 0x2C, 0x2C, 0xAC, 0xAC, "_TTP")
-        M331 (TS, 0x06, 0x2D, 0x2D, 0xAD, 0xAD, "_TRS")
-        M331 (TS, 0x07, 0x30, 0x30, 0xB0, 0xB0, "_GRA")
-        M331 (TS, 0x08, 0x40, 0x40, 0xC0, 0xC0, "_MIN")
-        M331 (TS, 0x09, 0x50, 0x50, 0xD0, 0xD0, "_MAX")
-        M331 (TS, 0x0A, 0x60, 0x60, 0xE0, 0xE0, "_TRA")
-        M331 (TS, 0x0B, 0x70, 0x70, 0xF0, 0xF0, "_LEN")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0xA1, 0xA1, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0xA2, 0xA2, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0xA3, 0xA3, "_MAF")
+        M331 (__METHOD__, 0x04, 0x28, 0x28, 0xA8, 0xA8, "_RNG")
+        M331 (__METHOD__, 0x05, 0x2C, 0x2C, 0xAC, 0xAC, "_TTP")
+        M331 (__METHOD__, 0x06, 0x2D, 0x2D, 0xAD, 0xAD, "_TRS")
+        M331 (__METHOD__, 0x07, 0x30, 0x30, 0xB0, 0xB0, "_GRA")
+        M331 (__METHOD__, 0x08, 0x40, 0x40, 0xC0, 0xC0, "_MIN")
+        M331 (__METHOD__, 0x09, 0x50, 0x50, 0xD0, 0xD0, "_MAX")
+        M331 (__METHOD__, 0x0A, 0x60, 0x60, 0xE0, 0xE0, "_TRA")
+        M331 (__METHOD__, 0x0B, 0x70, 0x70, 0xF0, 0xF0, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/wordspace.asl b/tests/aslts/src/runtime/collections/functional/descriptor/wordspace.asl
index ed31ecba1..994b4feb2 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/wordspace.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/wordspace.asl
@@ -703,13 +703,12 @@
     })
     Method (RT16, 0, Serialized)
     {
-        Name (TS, "RT16")
         /* Emit test header, set the filename */
 
-        THDR (TS, "WordSpace Resource Descriptor Macro", "wordspace.asl")
+        THDR (__METHOD__, "WordSpace Resource Descriptor Macro", "wordspace.asl")
         /* Main test case for packages above */
 
-        M330 (TS, 0x1B, "p430", P430, P431)
+        M330 (__METHOD__, 0x1B, "p430", P430, P431)
         /* Check resource descriptor tag offsets */
 
         Local0 = ResourceTemplate ()
@@ -729,12 +728,12 @@
                     0xFEFF,             // Length
                     ,, )
             }
-        M331 (TS, 0x01, 0x21, 0x21, 0xA1, 0xA1, "_DEC")
-        M331 (TS, 0x02, 0x22, 0x22, 0xA2, 0xA2, "_MIF")
-        M331 (TS, 0x03, 0x23, 0x23, 0xA3, 0xA3, "_MAF")
-        M331 (TS, 0x07, 0x30, 0x30, 0xB0, 0xB0, "_GRA")
-        M331 (TS, 0x08, 0x40, 0x40, 0xC0, 0xC0, "_MIN")
-        M331 (TS, 0x09, 0x50, 0x50, 0xD0, 0xD0, "_MAX")
-        M331 (TS, 0x0A, 0x60, 0x60, 0xE0, 0xE0, "_TRA")
-        M331 (TS, 0x0B, 0x70, 0x70, 0xF0, 0xF0, "_LEN")
+        M331 (__METHOD__, 0x01, 0x21, 0x21, 0xA1, 0xA1, "_DEC")
+        M331 (__METHOD__, 0x02, 0x22, 0x22, 0xA2, 0xA2, "_MIF")
+        M331 (__METHOD__, 0x03, 0x23, 0x23, 0xA3, 0xA3, "_MAF")
+        M331 (__METHOD__, 0x07, 0x30, 0x30, 0xB0, 0xB0, "_GRA")
+        M331 (__METHOD__, 0x08, 0x40, 0x40, 0xC0, 0xC0, "_MIN")
+        M331 (__METHOD__, 0x09, 0x50, 0x50, 0xD0, 0xD0, "_MAX")
+        M331 (__METHOD__, 0x0A, 0x60, 0x60, 0xE0, 0xE0, "_TRA")
+        M331 (__METHOD__, 0x0B, 0x70, 0x70, 0xF0, 0xF0, "_LEN")
     }
diff --git a/tests/aslts/src/runtime/collections/functional/external/external.asl b/tests/aslts/src/runtime/collections/functional/external/external.asl
index b2c8e1af4..8a24c0913 100644
--- a/tests/aslts/src/runtime/collections/functional/external/external.asl
+++ b/tests/aslts/src/runtime/collections/functional/external/external.asl
@@ -97,26 +97,25 @@
 
     Method (EXT1, 0, Serialized)
     {
-        Name (TS, "EXT1")
         Local1 = ObjectType (E000)
         If ((Local1 != 0x01))
         {
-            ERR (TS, Z204, 0x00, 0x00, 0x00, Local1, 0x01)
+            ERR (__METHOD__, Z204, 0x00, 0x00, 0x00, Local1, 0x01)
         }
 
-        EXT0 (TS, 0x01, E001, NM01)
-        EXT0 (TS, 0x02, E002, NM02)
-        EXT0 (TS, 0x03, E003, NM03)
-        EXT0 (TS, 0x04, E004, NM04)
-        EXT0 (TS, 0x05, E005, NM05)
-        EXT0 (TS, 0x06, E006, NM06)
-        EXT0 (TS, 0x07, E007, NM07)
-        EXT0 (TS, 0x08, E008 (), NM08 ())
-        EXT0 (TS, 0x09, E009, NM09)
-        EXT0 (TS, 0x0A, E010, NM10)
-        EXT0 (TS, 0x0B, E011, NM11)
-        EXT0 (TS, 0x0C, E012, NM12)
-        EXT0 (TS, 0x0D, E013, NM13)
-        EXT0 (TS, 0x0E, E014, NM14)
+        EXT0 (__METHOD__, 0x01, E001, NM01)
+        EXT0 (__METHOD__, 0x02, E002, NM02)
+        EXT0 (__METHOD__, 0x03, E003, NM03)
+        EXT0 (__METHOD__, 0x04, E004, NM04)
+        EXT0 (__METHOD__, 0x05, E005, NM05)
+        EXT0 (__METHOD__, 0x06, E006, NM06)
+        EXT0 (__METHOD__, 0x07, E007, NM07)
+        EXT0 (__METHOD__, 0x08, E008 (), NM08 ())
+        EXT0 (__METHOD__, 0x09, E009, NM09)
+        EXT0 (__METHOD__, 0x0A, E010, NM10)
+        EXT0 (__METHOD__, 0x0B, E011, NM11)
+        EXT0 (__METHOD__, 0x0C, E012, NM12)
+        EXT0 (__METHOD__, 0x0D, E013, NM13)
+        EXT0 (__METHOD__, 0x0E, E014, NM14)
         Return (0x00)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/logic/logical.asl b/tests/aslts/src/runtime/collections/functional/logic/logical.asl
index 27a2f6e0a..a4379a511 100644
--- a/tests/aslts/src/runtime/collections/functional/logic/logical.asl
+++ b/tests/aslts/src/runtime/collections/functional/logic/logical.asl
@@ -861,18 +861,17 @@
     })
     Method (LAN0, 0, Serialized)
     {
-        Name (TS, "LAN0")
         Debug = "TEST: LAN0, Logical And"
         /* Integers */
 
         If ((F64 == 0x01))
         {
-            M003 (TS, C002, "p060", P060, P05D, 0x01)
-            M003 (TS, C003, "p061", P061, P05E, 0x01)
+            M003 (__METHOD__, C002, "p060", P060, P05D, 0x01)
+            M003 (__METHOD__, C003, "p061", P061, P05E, 0x01)
         }
         Else
         {
-            M003 (TS, C002, "p060", P060, P05D, 0x01)
+            M003 (__METHOD__, C002, "p060", P060, P05D, 0x01)
         }
     }
 
@@ -896,18 +895,17 @@
     })
     Method (LN00, 0, Serialized)
     {
-        Name (TS, "LN00")
         Debug = "TEST: LN00, Logical Not"
         /* Integers */
 
         If ((F64 == 0x01))
         {
-            M004 (TS, C004, "p062", P062, P05F, 0x00)
-            M004 (TS, C005, "p063", P063, P070, 0x00)
+            M004 (__METHOD__, C004, "p062", P062, P05F, 0x00)
+            M004 (__METHOD__, C005, "p063", P063, P070, 0x00)
         }
         Else
         {
-            M004 (TS, C004, "p062", P062, P05F, 0x00)
+            M004 (__METHOD__, C004, "p062", P062, P05F, 0x00)
         }
     }
 
@@ -946,18 +944,17 @@
     })
     Method (LOR0, 0, Serialized)
     {
-        Name (TS, "LOR0")
         Debug = "TEST: LOR0, Logical Or"
         /* Integers */
 
         If ((F64 == 0x01))
         {
-            M003 (TS, C002, "p060", P060, P071, 0x02)
-            M003 (TS, C003, "p061", P061, P072, 0x02)
+            M003 (__METHOD__, C002, "p060", P060, P071, 0x02)
+            M003 (__METHOD__, C003, "p061", P061, P072, 0x02)
         }
         Else
         {
-            M003 (TS, C002, "p060", P060, P071, 0x02)
+            M003 (__METHOD__, C002, "p060", P060, P071, 0x02)
         }
     }
 
@@ -1084,32 +1081,31 @@
     })
     Method (LEQ0, 0, Serialized)
     {
-        Name (TS, "LEQ0")
         Debug = "TEST: LEQ0, Logical Equal"
         /* Integers */
 
         If ((F64 == 0x01))
         {
-            M003 (TS, C002, "p060", P060, P073, 0x03)
-            M003 (TS, C003, "p061", P061, P074, 0x03)
+            M003 (__METHOD__, C002, "p060", P060, P073, 0x03)
+            M003 (__METHOD__, C003, "p061", P061, P074, 0x03)
         }
         Else
         {
-            M003 (TS, C002, "p060", P060, P073, 0x03)
+            M003 (__METHOD__, C002, "p060", P060, P073, 0x03)
         }
 
         /* Strings */
 
-        M003 (TS, C006, "p064", P064, P075, 0x03)
+        M003 (__METHOD__, C006, "p064", P064, P075, 0x03)
         Local0 = (BIG0 == BIG0)
         If ((Local0 != Ones))
         {
-            ERR (TS, Z035, 0x0243, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z035, 0x0243, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Buffers */
 
-        M003 (TS, C007, "p065", P065, P076, 0x03)
+        M003 (__METHOD__, C007, "p065", P065, P076, 0x03)
     }
 
     /* ===================================== LGreater */
@@ -1235,32 +1231,31 @@
     })
     Method (LGR0, 0, Serialized)
     {
-        Name (TS, "LGR0")
         Debug = "TEST: LGR0, Logical Greater"
         /* Integers */
 
         If ((F64 == 0x01))
         {
-            M003 (TS, C002, "p060", P060, P077, 0x04)
-            M003 (TS, C003, "p061", P061, P078, 0x04)
+            M003 (__METHOD__, C002, "p060", P060, P077, 0x04)
+            M003 (__METHOD__, C003, "p061", P061, P078, 0x04)
         }
         Else
         {
-            M003 (TS, C002, "p060", P060, P077, 0x04)
+            M003 (__METHOD__, C002, "p060", P060, P077, 0x04)
         }
 
         /* Strings */
 
-        M003 (TS, C006, "p064", P064, P079, 0x04)
+        M003 (__METHOD__, C006, "p064", P064, P079, 0x04)
         Local0 = (BIG0 > BIG0)
         If ((Local0 != Zero))
         {
-            ERR (TS, Z035, 0x0283, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z035, 0x0283, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Buffers */
 
-        M003 (TS, C007, "p065", P065, P07A, 0x04)
+        M003 (__METHOD__, C007, "p065", P065, P07A, 0x04)
     }
 
     /* ===================================== LGreaterEqual */
@@ -1386,32 +1381,31 @@
     })
     Method (LGE0, 0, Serialized)
     {
-        Name (TS, "LGE0")
         Debug = "TEST: LGE0, Logical Greater Than Or Equal"
         /* Integers */
 
         If ((F64 == 0x01))
         {
-            M003 (TS, C002, "p060", P060, P07B, 0x05)
-            M003 (TS, C003, "p061", P061, P07C, 0x05)
+            M003 (__METHOD__, C002, "p060", P060, P07B, 0x05)
+            M003 (__METHOD__, C003, "p061", P061, P07C, 0x05)
         }
         Else
         {
-            M003 (TS, C002, "p060", P060, P07B, 0x05)
+            M003 (__METHOD__, C002, "p060", P060, P07B, 0x05)
         }
 
         /* Strings */
 
-        M003 (TS, C006, "p064", P064, P07D, 0x05)
+        M003 (__METHOD__, C006, "p064", P064, P07D, 0x05)
         Local0 = (BIG0 >= BIG0)
         If ((Local0 != Ones))
         {
-            ERR (TS, Z035, 0x02C3, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z035, 0x02C3, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Buffers */
 
-        M003 (TS, C007, "p065", P065, P07E, 0x05)
+        M003 (__METHOD__, C007, "p065", P065, P07E, 0x05)
     }
 
     /* ===================================== LLess */
@@ -1537,32 +1531,31 @@
     })
     Method (LL00, 0, Serialized)
     {
-        Name (TS, "LL00")
         Debug = "TEST: LL00, Logical Less"
         /* Integers */
 
         If ((F64 == 0x01))
         {
-            M003 (TS, C002, "p060", P060, P07F, 0x06)
-            M003 (TS, C003, "p061", P061, P080, 0x06)
+            M003 (__METHOD__, C002, "p060", P060, P07F, 0x06)
+            M003 (__METHOD__, C003, "p061", P061, P080, 0x06)
         }
         Else
         {
-            M003 (TS, C002, "p060", P060, P07F, 0x06)
+            M003 (__METHOD__, C002, "p060", P060, P07F, 0x06)
         }
 
         /* Strings */
 
-        M003 (TS, C006, "p064", P064, P081, 0x06)
+        M003 (__METHOD__, C006, "p064", P064, P081, 0x06)
         Local0 = (BIG0 < BIG0)
         If ((Local0 != Zero))
         {
-            ERR (TS, Z035, 0x0303, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z035, 0x0303, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Buffers */
 
-        M003 (TS, C007, "p065", P065, P082, 0x06)
+        M003 (__METHOD__, C007, "p065", P065, P082, 0x06)
     }
 
     /* ===================================== LLessEqual */
@@ -1688,32 +1681,31 @@
     })
     Method (LLE0, 0, Serialized)
     {
-        Name (TS, "LLE0")
         Debug = "TEST: LLE0, Logical Less Than Or Equal"
         /* Integers */
 
         If ((F64 == 0x01))
         {
-            M003 (TS, C002, "p060", P060, P083, 0x07)
-            M003 (TS, C003, "p061", P061, P084, 0x07)
+            M003 (__METHOD__, C002, "p060", P060, P083, 0x07)
+            M003 (__METHOD__, C003, "p061", P061, P084, 0x07)
         }
         Else
         {
-            M003 (TS, C002, "p060", P060, P083, 0x07)
+            M003 (__METHOD__, C002, "p060", P060, P083, 0x07)
         }
 
         /* Strings */
 
-        M003 (TS, C006, "p064", P064, P085, 0x07)
+        M003 (__METHOD__, C006, "p064", P064, P085, 0x07)
         Local0 = (BIG0 <= BIG0)
         If ((Local0 != Ones))
         {
-            ERR (TS, Z035, 0x0343, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z035, 0x0343, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Buffers */
 
-        M003 (TS, C007, "p065", P065, P086, 0x07)
+        M003 (__METHOD__, C007, "p065", P065, P086, 0x07)
     }
 
     /* ===================================== LNotEqual */
@@ -1839,32 +1831,31 @@
     })
     Method (LNE0, 0, Serialized)
     {
-        Name (TS, "LNE0")
         Debug = "TEST: LNE0, Logical Not equal"
         /* Integers */
 
         If ((F64 == 0x01))
         {
-            M003 (TS, C002, "p060", P060, P087, 0x00)
-            M003 (TS, C003, "p061", P061, P088, 0x00)
+            M003 (__METHOD__, C002, "p060", P060, P087, 0x00)
+            M003 (__METHOD__, C003, "p061", P061, P088, 0x00)
         }
         Else
         {
-            M003 (TS, C002, "p060", P060, P087, 0x00)
+            M003 (__METHOD__, C002, "p060", P060, P087, 0x00)
         }
 
         /* Strings */
 
-        M003 (TS, C006, "p064", P064, P089, 0x00)
+        M003 (__METHOD__, C006, "p064", P064, P089, 0x00)
         Local0 = (BIG0 != BIG0)
         If ((Local0 != Zero))
         {
-            ERR (TS, Z035, 0x0383, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z035, 0x0383, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Buffers */
 
-        M003 (TS, C007, "p065", P065, P08A, 0x00)
+        M003 (__METHOD__, C007, "p065", P065, P08A, 0x00)
     }
 
     /* Run-method */
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl
index 4c777c182..0c7e8cb56 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/concatenate.asl
@@ -154,7 +154,6 @@
 
     Method (M313, 0, Serialized)
     {
-        Name (TS, "m313")
         Name (P000, Package (0x18)
         {
             0x00,
@@ -337,12 +336,12 @@
         })
         If ((F64 == 0x01))
         {
-            M312 (TS, 0x0C, "p000", P000, P002, 0x00)
-            M312 (TS, 0x02, "p003", P003, P004, 0x00)
+            M312 (__METHOD__, 0x0C, "p000", P000, P002, 0x00)
+            M312 (__METHOD__, 0x02, "p003", P003, P004, 0x00)
         }
         Else
         {
-            M312 (TS, 0x0C, "p000", P000, P001, 0x00)
+            M312 (__METHOD__, 0x0C, "p000", P000, P001, 0x00)
         }
     }
 
@@ -350,7 +349,6 @@
 
     Method (M314, 0, Serialized)
     {
-        Name (TS, "m314")
         Name (P000, Package (0x2C)
         {
             "qwertyuiop",
@@ -424,14 +422,13 @@
             "abcDefabcdef",
             "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
         })
-        M312 (TS, 0x15, "p000", P000, P001, 0x01)
+        M312 (__METHOD__, 0x15, "p000", P000, P001, 0x01)
     }
 
     /* Buffers */
 
     Method (M315, 0, Serialized)
     {
-        Name (TS, "m314")
         Name (P000, Package (0x02)
         {
             Buffer (0x64){},
@@ -531,8 +528,8 @@
                 /* 01C8 */  0x01                                             // .
             }
         })
-        M312 (TS, 0x01, "p000", P000, P001, 0x00)
-        M312 (TS, 0x03, "p325", P325, P002, 0x00)
+        M312 (__METHOD__, 0x01, "p000", P000, P001, 0x00)
+        M312 (__METHOD__, 0x03, "p325", P325, P002, 0x00)
     }
 
     /* Run-method */
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/eisaid.asl b/tests/aslts/src/runtime/collections/functional/manipulation/eisaid.asl
index 1c8cf07fb..42a428a74 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/eisaid.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/eisaid.asl
@@ -62,7 +62,6 @@
 
     Method (EIS0, 0, Serialized)
     {
-        Name (TS, "EIS0")
         Debug = "TEST: EIS0, EISA ID String To Integer Conversion Macro"
-        M302 (TS, 0x0A, "p360", P360, P361, 0x09)
+        M302 (__METHOD__, 0x0A, "p360", P360, P361, 0x09)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl b/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl
index aad885379..47dd96cd4 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/match1.asl
@@ -3136,7 +3136,6 @@
 
     Method (MAT0, 0, Serialized)
     {
-        Name (TS, "MAT0")
         Debug = "TEST: MAT0, Find Object Match"
         /* to do transposition of match objects flag */
 
@@ -3146,36 +3145,36 @@
             TRNS = 0x01
         }
 
-        M308 (TS, 0x22, "p370", P371, P372, P370, TRNS)
+        M308 (__METHOD__, 0x22, "p370", P371, P372, P370, TRNS)
         If (C099)
         {
-            M308 (TS, 0x22, "p373", P371, P372, P373, TRNS)
-            M308 (TS, 0x22, "p374", P371, P372, P374, TRNS)
+            M308 (__METHOD__, 0x22, "p373", P371, P372, P373, TRNS)
+            M308 (__METHOD__, 0x22, "p374", P371, P372, P374, TRNS)
         }
 
-        M308 (TS, 0x22, "p375", P371, P372, P375, TRNS)
+        M308 (__METHOD__, 0x22, "p375", P371, P372, P375, TRNS)
         If ((F64 == 0x01))
         {
-            M308 (TS, 0x22, "p377", P378, P372, P377, TRNS)
+            M308 (__METHOD__, 0x22, "p377", P378, P372, P377, TRNS)
             If (C099)
             {
-                M308 (TS, 0x22, "p389", P38A, P372, P389, TRNS)
-                M308 (TS, 0x22, "p38b", P38C, P372, P38B, TRNS)
-                M308 (TS, 0x22, "p38d", P38E, P372, P38D, TRNS)
+                M308 (__METHOD__, 0x22, "p389", P38A, P372, P389, TRNS)
+                M308 (__METHOD__, 0x22, "p38b", P38C, P372, P38B, TRNS)
+                M308 (__METHOD__, 0x22, "p38d", P38E, P372, P38D, TRNS)
             }
         }
         Else
         {
-            M308 (TS, 0x22, "p389", P38A, P372, P389, TRNS)
+            M308 (__METHOD__, 0x22, "p389", P38A, P372, P389, TRNS)
         }
 
         /* One-element length package special case */
 
-        M308 (TS, 0x06, "p380", P381, P382, P380, TRNS)
+        M308 (__METHOD__, 0x06, "p380", P381, P382, P380, TRNS)
         /* 255-element length package special case */
 
         If (C099)
         {
-            M308 (TS, 0x06, "p383", P384, P385, P383, TRNS)
+            M308 (__METHOD__, 0x06, "p383", P384, P385, P383, TRNS)
         }
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl b/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl
index c01589d92..227040260 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/match2.asl
@@ -399,7 +399,6 @@
     Method (MAT1, 0, Serialized)
     {
         Debug = "TEST: MAT1, Find Object Match"
-        Name (TS, "MAT1")
         /*	m331(ts) */
     /*	m333(ts) */
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl
index b31c36b8b..73f396d50 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/mid.asl
@@ -415,17 +415,16 @@
 
     Method (MID0, 0, Serialized)
     {
-        Name (TS, "MID0")
         Debug = "TEST: MID0, Extract Portion of Buffer or String"
         /* String */
 
-        M304 (TS, 0x0E, "p362", P362, P363, 0x00)
+        M304 (__METHOD__, 0x0E, "p362", P362, P363, 0x00)
         /* String, Size == 200, Length > 0 */
 
-        M304 (TS, 0x08, "p364", P364, P365, 0x01)
+        M304 (__METHOD__, 0x08, "p364", P364, P365, 0x01)
         /* Buffer */
 
-        M304 (TS, 0x08, "p366", P366, P367, 0x00)
+        M304 (__METHOD__, 0x08, "p366", P366, P367, 0x00)
         /* Prepare Package of Buffer(0){} elements */
 
         Local5 = Package (0x06){}
@@ -439,18 +438,18 @@
 
         /* Buffer, Mid() results in Buffer(0){} */
 
-        M304 (TS, 0x06, "p366", P368, Local5, 0x00)
+        M304 (__METHOD__, 0x06, "p366", P368, Local5, 0x00)
         /* Buffer, Mid(Buffer(0){}) */
 
         Mid (Buffer (Local1){}, 0x00, 0x01, Local7)
         If ((Local7 != Buffer (Local1){}))
         {
-            ERR (TS, Z039, 0x011E, 0x00, 0x00, 0x00, "Buffer(0)")
+            ERR (__METHOD__, Z039, 0x011E, 0x00, 0x00, 0x00, "Buffer(0)")
         }
 
         Mid (Buffer (Local1){}, 0x012C, 0x012C, Local7)
         If ((Local7 != Buffer (Local1){}))
         {
-            ERR (TS, Z039, 0x0122, 0x00, 0x00, 0x00, "Buffer(0)")
+            ERR (__METHOD__, Z039, 0x0122, 0x00, 0x00, 0x00, "Buffer(0)")
         }
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl b/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl
index 1c45a8697..c44f1e3d6 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/objecttype.asl
@@ -1421,7 +1421,6 @@
 
     Method (M0F0, 0, Serialized)
     {
-        Name (TS, "m0f0")
         Debug = "TEST: m0f0, ObjectType"
         Local5 = 0x00
         Local4 = 0x23
@@ -1452,7 +1451,7 @@
 
             }
 
-            M0F1 (TS, Local5, Local2, 0x00, 0x00, 0x00, 0x00)
+            M0F1 (__METHOD__, Local5, Local2, 0x00, 0x00, 0x00, 0x00)
             Local5++
             Local4--
         }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl
index e95159cfe..026601514 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/sizeof.asl
@@ -35,7 +35,6 @@
 
     Method (M1EF, 0, Serialized)
     {
-        Name (TS, "m1ef")
         Name (I000, 0x00)
         Name (S000, "vcd")
         Name (B000, Buffer (0x05)
@@ -57,30 +56,30 @@
         {
             If ((Local0 != 0x08))
             {
-                ERR (TS, Z041, 0x32, 0x00, 0x00, Local0, 0x08)
+                ERR (__METHOD__, Z041, 0x32, 0x00, 0x00, Local0, 0x08)
             }
         }
         ElseIf ((Local0 != 0x04))
         {
-            ERR (TS, Z041, 0x36, 0x00, 0x00, Local0, 0x04)
+            ERR (__METHOD__, Z041, 0x36, 0x00, 0x00, Local0, 0x04)
         }
 
         Local0 = SizeOf (S000)
         If ((Local0 != 0x03))
         {
-            ERR (TS, Z041, 0x3C, 0x00, 0x00, Local0, 0x03)
+            ERR (__METHOD__, Z041, 0x3C, 0x00, 0x00, Local0, 0x03)
         }
 
         Local0 = SizeOf (B000)
         If ((Local0 != 0x05))
         {
-            ERR (TS, Z041, 0x41, 0x00, 0x00, Local0, 0x05)
+            ERR (__METHOD__, Z041, 0x41, 0x00, 0x00, Local0, 0x05)
         }
 
         Local0 = SizeOf (P000)
         If ((Local0 != 0x07))
         {
-            ERR (TS, Z041, 0x46, 0x00, 0x00, Local0, 0x07)
+            ERR (__METHOD__, Z041, 0x46, 0x00, 0x00, Local0, 0x07)
         }
     }
 
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl
index 04727ae63..7aac32603 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/store.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/store.asl
@@ -154,14 +154,13 @@
 
     Method (ST00, 0, Serialized)
     {
-        Name (TS, "ST00")
         Debug = "TEST: ST00, Store object"
         /* Store */
 
         Local1 = Local0 = 0xABCDEF12
         If ((Local1 != 0xABCDEF12))
         {
-            ERR (TS, Z042, 0x8D, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x8D, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Integer arithmetic */
@@ -169,29 +168,29 @@
         Local1 = Local0 = (0x12345678 + 0x11111111)
         If ((Local1 != 0x23456789))
         {
-            ERR (TS, Z042, 0x96, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x96, 0x00, 0x00, 0x00, 0x00)
         }
 
         Store ((0x23456781 + 0x11111111), Local0)
         If ((Local0 != 0x34567892))
         {
-            ERR (TS, Z042, 0x9A, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x9A, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local1 = Local0 = (0x12345678 + 0xF0000000)
-        M4C0 (TS, Local1, 0x0000000102345678, 0x02345678)
+        M4C0 (__METHOD__, Local1, 0x0000000102345678, 0x02345678)
         /* Subtract */
 
         Local1 = Local0 = (0x87654321 - 0x11111111)
         If ((Local1 != 0x76543210))
         {
-            ERR (TS, Z042, 0xA4, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xA4, 0x00, 0x00, 0x00, 0x00)
         }
 
         Store ((0x72387654 - 0x22221111), Local0)
         If ((Local0 != 0x50166543))
         {
-            ERR (TS, Z042, 0xA8, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xA8, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Multiply */
@@ -199,13 +198,13 @@
         Local1 = Local0 = (0x00012345 * 0x7ABC)
         If ((Local1 != 0x8BA4C8AC))
         {
-            ERR (TS, Z042, 0xAF, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xAF, 0x00, 0x00, 0x00, 0x00)
         }
 
         Store ((0x000145AB * 0x3247), Local0)
         If ((Local0 != 0x3FF5B86D))
         {
-            ERR (TS, Z042, 0xB3, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xB3, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Divide */
@@ -213,19 +212,19 @@
         Local2 = Divide (0x12345678, 0x1000, Local0, Local1)
         If ((Local2 != 0x00012345))
         {
-            ERR (TS, Z042, 0xBA, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xBA, 0x00, 0x00, 0x00, 0x00)
         }
 
         Store (Divide (0x7ABC56E8, 0x1000, Local0), Local1)
         If ((Local1 != 0x0007ABC5))
         {
-            ERR (TS, Z042, 0xBE, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xBE, 0x00, 0x00, 0x00, 0x00)
         }
 
         Store ((0x55667788 / 0x1000), Local0)
         If ((Local0 != 0x00055667))
         {
-            ERR (TS, Z042, 0xC3, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xC3, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Increment */
@@ -234,7 +233,7 @@
         Local1 = Local0++
         If ((Local1 != 0x12345679))
         {
-            ERR (TS, Z042, 0xCB, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xCB, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Decrement */
@@ -243,7 +242,7 @@
         Local1 = Local0--
         If ((Local1 != 0x67812344))
         {
-            ERR (TS, Z042, 0xD3, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xD3, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* And */
@@ -251,13 +250,13 @@
         Local1 = Local0 = (0x87654321 & 0xAAAAAAAA)
         If ((Local1 != 0x82200220))
         {
-            ERR (TS, Z042, 0xDA, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xDA, 0x00, 0x00, 0x00, 0x00)
         }
 
         Store ((0x88AABBCC & 0xAAAAAAAA), Local0)
         If ((Local0 != 0x88AAAA88))
         {
-            ERR (TS, Z042, 0xDE, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xDE, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* FindSetLeftBit */
@@ -265,13 +264,13 @@
         Local1 = FindSetLeftBit (0xF001, Local0)
         If ((Local1 != 0x10))
         {
-            ERR (TS, Z042, 0xE5, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xE5, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = FindSetLeftBit (0x09007001)
         If ((Local0 != 0x1C))
         {
-            ERR (TS, Z042, 0xE9, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xE9, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* FindSetRightBit */
@@ -279,13 +278,13 @@
         Local1 = FindSetRightBit (0x01080040, Local0)
         If ((Local1 != 0x07))
         {
-            ERR (TS, Z042, 0xF0, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xF0, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = FindSetRightBit (0x09800000)
         If ((Local0 != 0x18))
         {
-            ERR (TS, Z042, 0xF4, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xF4, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Mod */
@@ -293,59 +292,59 @@
         Store ((0x1AFB3C4D % 0x00400000), Local0)
         If ((Local0 != 0x003B3C4D))
         {
-            ERR (TS, Z042, 0xFB, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0xFB, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* ShiftLeft */
 
         Local1 = Local0 = (0x12345678 << 0x09)
-        M4C0 (TS, Local1, 0x0000002468ACF000, 0x68ACF000)
+        M4C0 (__METHOD__, Local1, 0x0000002468ACF000, 0x68ACF000)
         Store ((0x45678ABF << 0x0B), Local0)
-        M4C0 (TS, Local0, 0x0000022B3C55F800, 0x3C55F800)
+        M4C0 (__METHOD__, Local0, 0x0000022B3C55F800, 0x3C55F800)
         /* ShiftRight */
 
         Local1 = Local0 = (0x87654321 >> 0x19)
         If ((Local1 != 0x43))
         {
-            ERR (TS, Z042, 0x010A, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x010A, 0x00, 0x00, 0x00, 0x00)
         }
 
         Store ((0x7654A0CB >> 0x15), Local0)
         If ((Local0 != 0x03B2))
         {
-            ERR (TS, Z042, 0x010E, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x010E, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Nand */
 
         Local1 = NAnd (0xA33553AC, 0x9A9636CA, Local0)
-        M4C0 (TS, Local1, 0xFFFFFFFF7DEBED77, 0x7DEBED77)
+        M4C0 (__METHOD__, Local1, 0xFFFFFFFF7DEBED77, 0x7DEBED77)
         Local0 = NAnd (0xA33553AC, 0x565C36C9)
-        M4C0 (TS, Local0, 0xFFFFFFFFFDEBED77, 0xFDEBED77)
+        M4C0 (__METHOD__, Local0, 0xFFFFFFFFFDEBED77, 0xFDEBED77)
         /* Nor */
 
         Local1 = NOr (0x9A335A3C, 0x39A96C6A, Local0)
-        M4C0 (TS, Local1, 0xFFFFFFFF44448181, 0x44448181)
+        M4C0 (__METHOD__, Local1, 0xFFFFFFFF44448181, 0x44448181)
         Local0 = NOr (0x9A353A3C, 0x39A69C6A)
-        M4C0 (TS, Local0, 0xFFFFFFFF44484181, 0x44484181)
+        M4C0 (__METHOD__, Local0, 0xFFFFFFFF44484181, 0x44484181)
         /* Not */
 
         Local1 = Local0 = ~0x8A345678
-        M4C0 (TS, Local1, 0xFFFFFFFF75CBA987, 0x75CBA987)
+        M4C0 (__METHOD__, Local1, 0xFFFFFFFF75CBA987, 0x75CBA987)
         Store (~0x8AF45678, Local0)
-        M4C0 (TS, Local0, 0xFFFFFFFF750BA987, 0x750BA987)
+        M4C0 (__METHOD__, Local0, 0xFFFFFFFF750BA987, 0x750BA987)
         /* Or */
 
         Local1 = Local0 = (0x9A3533AC | 0x39A696CA)
         If ((Local1 != 0xBBB7B7EE))
         {
-            ERR (TS, Z042, 0x012D, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x012D, 0x00, 0x00, 0x00, 0x00)
         }
 
         Store ((0xCA3533A9 | 0xA9A696C3), Local0)
         If ((Local0 != 0xEBB7B7EB))
         {
-            ERR (TS, Z042, 0x0131, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x0131, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Xor */
@@ -353,13 +352,13 @@
         Local1 = Local0 = (0x9A365AC3 ^ 0x39A96CA6)
         If ((Local1 != 0xA39F3665))
         {
-            ERR (TS, Z042, 0x0138, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x0138, 0x00, 0x00, 0x00, 0x00)
         }
 
         Store ((0xA9365AC3 ^ 0x93A96CA6), Local0)
         If ((Local0 != 0x3A9F3665))
         {
-            ERR (TS, Z042, 0x013C, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x013C, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Logical operators */
@@ -377,7 +376,7 @@
         Local0 = Acquire (MT04, 0x0005)
         If ((Local0 != Zero))
         {
-            ERR (TS, Z042, 0x0151, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x0151, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Release (None) */
@@ -385,13 +384,13 @@
         Local1 = ToInteger ("0x89abcdef", Local0)
         If ((Local1 != 0x89ABCDEF))
         {
-            ERR (TS, Z042, 0x015A, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x015A, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = ToInteger ("0x89abcdef")
         If ((Local0 != 0x89ABCDEF))
         {
-            ERR (TS, Z042, 0x015E, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x015E, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* ToString */
@@ -403,25 +402,25 @@
         Local1 = ToString (Local2, Ones, Local0)
         If ((Local1 != "\x01"))
         {
-            ERR (TS, Z042, 0x0167, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x0167, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = ToString (Local2, Ones)
         If ((Local0 != "\x01"))
         {
-            ERR (TS, Z042, 0x016B, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x016B, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local1 = ToString (Local2, 0x01, Local0)
         If ((Local1 != "\x01"))
         {
-            ERR (TS, Z042, 0x0170, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x0170, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = ToString (Local2, 0x01)
         If ((Local0 != "\x01"))
         {
-            ERR (TS, Z042, 0x0174, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x0174, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* ToBuffer */
@@ -433,7 +432,7 @@
                          0x01, 0x00                                       // ..
                     }))
         {
-            ERR (TS, Z042, 0x017D, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x017D, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = ToBuffer (Local2)
@@ -442,7 +441,7 @@
                          0x01, 0x00                                       // ..
                     }))
         {
-            ERR (TS, Z042, 0x0181, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x0181, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* ToDecimalString */
@@ -451,13 +450,13 @@
         Local1 = ToDecimalString (Local2, Local0)
         If ((Local1 != "12"))
         {
-            ERR (TS, Z042, 0x018A, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x018A, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = ToDecimalString (Local2)
         If ((Local0 != "12"))
         {
-            ERR (TS, Z042, 0x018E, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x018E, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* ToHexString */
@@ -469,13 +468,13 @@
         Local1 = ToHexString (Local2, Local0)
         If ((Local1 != "EF"))
         {
-            ERR (TS, Z042, 0x0197, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x0197, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = ToHexString (Local2)
         If ((Local0 != "EF"))
         {
-            ERR (TS, Z042, 0x019B, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x019B, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* ToBCD */
@@ -484,13 +483,13 @@
         Local1 = ToBCD (Local2, Local0)
         If ((Local1 != 0x10))
         {
-            ERR (TS, Z042, 0x01A4, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01A4, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = ToBCD (Local2)
         If ((Local0 != 0x10))
         {
-            ERR (TS, Z042, 0x01A8, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01A8, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* FromBCD */
@@ -499,13 +498,13 @@
         Local1 = FromBCD (Local2, Local0)
         If ((Local1 != 0x0A))
         {
-            ERR (TS, Z042, 0x01B1, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01B1, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = FromBCD (Local2)
         If ((Local0 != 0x0A))
         {
-            ERR (TS, Z042, 0x01B5, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01B5, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Mid */
@@ -514,13 +513,13 @@
         Local1 = Mid (Local2, 0x01, 0x02, Local0)
         If ((Local1 != "12"))
         {
-            ERR (TS, Z042, 0x01BE, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01BE, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = Mid (Local2, 0x01, 0x02)
         If ((Local0 != "12"))
         {
-            ERR (TS, Z042, 0x01C2, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01C2, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local2 = Buffer (0x04)
@@ -533,7 +532,7 @@
                          0x01, 0x02                                       // ..
                     }))
         {
-            ERR (TS, Z042, 0x01C9, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01C9, 0x00, 0x00, 0x00, 0x00)
         }
 
         Local0 = Mid (Local2, 0x01, 0x02)
@@ -542,7 +541,7 @@
                          0x01, 0x02                                       // ..
                     }))
         {
-            ERR (TS, Z042, 0x01CD, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01CD, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* Match */
@@ -554,7 +553,7 @@
         Local0 = Match (Local2, MTR, 0x00, MTR, 0x00, 0x00)
         If ((Local0 != 0x00))
         {
-            ERR (TS, Z042, 0x01D6, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01D6, 0x00, 0x00, 0x00, 0x00)
         }
 
         /* ConcatenateResTemplate */
@@ -576,7 +575,7 @@
                          0x79, 0x00                                       // y.
                     }))
         {
-            ERR (TS, Z042, 0x01E3, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01E3, 0x00, 0x00, 0x00, 0x00)
         }
 
         /*
@@ -588,7 +587,7 @@
                          0x79, 0x00                                       // y.
                     }))
         {
-            ERR (TS, Z042, 0x01EA, 0x00, 0x00, 0x00, 0x00)
+            ERR (__METHOD__, Z042, 0x01EA, 0x00, 0x00, 0x00, 0x00)
         }
     }
 
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl
index 2b61a600a..cda17cd7e 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/tobuffer.asl
@@ -345,24 +345,23 @@
 
     Method (TOB0, 0, Serialized)
     {
-        Name (TS, "TOB0")
         Debug = "TEST: TOB0, Convert Data to Buffer"
         /* From integer */
 
         If ((F64 == 0x01))
         {
-            M302 (TS, 0x09, "p322", P322, P323, 0x01)
+            M302 (__METHOD__, 0x09, "p322", P322, P323, 0x01)
         }
         Else
         {
-            M302 (TS, 0x06, "p320", P320, P321, 0x01)
+            M302 (__METHOD__, 0x06, "p320", P320, P321, 0x01)
         }
 
         /* From string */
 
-        M321 (TS)
+        M321 (__METHOD__)
         /* From buffer */
 
-        M322 (TS)
-        M302 (TS, 0x06, "p325", P325, P325, 0x01)
+        M322 (__METHOD__)
+        M302 (__METHOD__, 0x06, "p325", P325, P325, 0x01)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/todecimalstring.asl b/tests/aslts/src/runtime/collections/functional/manipulation/todecimalstring.asl
index a272f1978..7f4f2b1d0 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/todecimalstring.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/todecimalstring.asl
@@ -242,24 +242,23 @@
 
     Method (TOD0, 0, Serialized)
     {
-        Name (TS, "TOD0")
         Debug = "TEST: TOD0, Convert Data to Decimal String"
         /* From integer */
 
         If ((F64 == 0x01))
         {
-            M302 (TS, 0x0F, "p338", P338, P339, 0x03)
-            M302 (TS, 0x0B, "p340", P340, P341, 0x03)
+            M302 (__METHOD__, 0x0F, "p338", P338, P339, 0x03)
+            M302 (__METHOD__, 0x0B, "p340", P340, P341, 0x03)
         }
         Else
         {
-            M302 (TS, 0x0F, "p338", P338, P339, 0x03)
+            M302 (__METHOD__, 0x0F, "p338", P338, P339, 0x03)
         }
 
         /* From buffer */
 
-        M302 (TS, 0x0C, "p342", P342, P343, 0x03)
+        M302 (__METHOD__, 0x0C, "p342", P342, P343, 0x03)
         /* From string */
 
-        M302 (TS, 0x06, "p344", P344, P344, 0x03)
+        M302 (__METHOD__, 0x06, "p344", P344, P344, 0x03)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tofrombcd.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tofrombcd.asl
index 3ea036d6d..4557d3dda 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/tofrombcd.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/tofrombcd.asl
@@ -92,31 +92,29 @@
     })
     Method (BCD1, 0, Serialized)
     {
-        Name (TS, "BCD1")
         Debug = "TEST: BCD1, Convert Integer to BCD"
         If ((F64 == 0x01))
         {
-            M302 (TS, 0x0C, "p352", P352, P353, 0x05)
-            M302 (TS, 0x0A, "p354", P354, P355, 0x05)
+            M302 (__METHOD__, 0x0C, "p352", P352, P353, 0x05)
+            M302 (__METHOD__, 0x0A, "p354", P354, P355, 0x05)
         }
         Else
         {
-            M302 (TS, 0x0C, "p352", P352, P353, 0x05)
+            M302 (__METHOD__, 0x0C, "p352", P352, P353, 0x05)
         }
     }
 
     Method (BCD2, 0, Serialized)
     {
-        Name (TS, "BCD2")
         Debug = "TEST: BCD2, Convert BCD To Integer"
         If ((F64 == 0x01))
         {
-            M302 (TS, 0x0C, "p353", P353, P352, 0x06)
-            M302 (TS, 0x0A, "p355", P355, P354, 0x06)
+            M302 (__METHOD__, 0x0C, "p353", P353, P352, 0x06)
+            M302 (__METHOD__, 0x0A, "p355", P355, P354, 0x06)
         }
         Else
         {
-            M302 (TS, 0x0C, "p353", P353, P352, 0x06)
+            M302 (__METHOD__, 0x0C, "p353", P353, P352, 0x06)
         }
     }
 
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tohexstring.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tohexstring.asl
index e64a53c93..630fc06de 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/tohexstring.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/tohexstring.asl
@@ -216,23 +216,22 @@
 
     Method (TOH0, 0, Serialized)
     {
-        Name (TS, "TOH0")
         Debug = "TEST: TOH0, Convert Data to Hexadecimal String"
         /* From integer */
 
         If ((F64 == 0x01))
         {
-            M302 (TS, 0x17, "p348", P348, P349, 0x04)
+            M302 (__METHOD__, 0x17, "p348", P348, P349, 0x04)
         }
         Else
         {
-            M302 (TS, 0x0C, "p346", P346, P347, 0x04)
+            M302 (__METHOD__, 0x0C, "p346", P346, P347, 0x04)
         }
 
         /* From string */
 
-        M302 (TS, 0x06, "p344", P344, P344, 0x04)
+        M302 (__METHOD__, 0x06, "p344", P344, P344, 0x04)
         /* From buffer */
 
-        M302 (TS, 0x0A, "p350", P350, P351, 0x04)
+        M302 (__METHOD__, 0x0A, "p350", P350, P351, 0x04)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl
index 915534bf1..3942d09e0 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/tointeger.asl
@@ -380,68 +380,67 @@
 
     Method (TOI0, 0, Serialized)
     {
-        Name (TS, "TOI0")
         Debug = "TEST: TOI0, Convert data to integer"
         /* From integer */
 
         If ((F64 == 0x01))
         {
-            M302 (TS, 0x06, "p300", P300, P300, 0x00)
-            M302 (TS, 0x05, "p302", P302, P302, 0x00)
+            M302 (__METHOD__, 0x06, "p300", P300, P300, 0x00)
+            M302 (__METHOD__, 0x05, "p302", P302, P302, 0x00)
         }
         Else
         {
-            M302 (TS, 0x06, "p300", P300, P300, 0x00)
+            M302 (__METHOD__, 0x06, "p300", P300, P300, 0x00)
         }
 
         /* From hexadecimal numeric string */
 
         If ((F64 == 0x01))
         {
-            M302 (TS, 0x20, "p304", P304, P305, 0x00)
-            M302 (TS, 0x20, "p306", P306, P307, 0x00)
+            M302 (__METHOD__, 0x20, "p304", P304, P305, 0x00)
+            M302 (__METHOD__, 0x20, "p306", P306, P307, 0x00)
         }
         Else
         {
-            M302 (TS, 0x20, "p304", P304, P305, 0x00)
+            M302 (__METHOD__, 0x20, "p304", P304, P305, 0x00)
         }
 
         /* From decimal numeric string */
 
         If ((F64 == 0x01))
         {
-            M302 (TS, 0x15, "p308", P308, P309, 0x00)
-            M302 (TS, 0x15, "p310", P310, P311, 0x00)
+            M302 (__METHOD__, 0x15, "p308", P308, P309, 0x00)
+            M302 (__METHOD__, 0x15, "p310", P310, P311, 0x00)
         }
         Else
         {
-            M302 (TS, 0x15, "p308", P308, P309, 0x00)
+            M302 (__METHOD__, 0x15, "p308", P308, P309, 0x00)
         }
 
         /* From buffer */
 
         If ((F64 == 0x01))
         {
-            M302 (TS, 0x04, "p312", P312, P313, 0x00)
-            M302 (TS, 0x05, "p314", P314, P315, 0x00)
+            M302 (__METHOD__, 0x04, "p312", P312, P313, 0x00)
+            M302 (__METHOD__, 0x05, "p314", P314, P315, 0x00)
         }
         Else
         {
-            M302 (TS, 0x05, "p312", P312, P313, 0x00)
+            M302 (__METHOD__, 0x05, "p312", P312, P313, 0x00)
         }
 
         /* Suppression of zeroes */
 
         If (Y602)
         {
-            CH03 (TS, Z047, 0x00, 0x018D, 0x00)
+            CH03 (__METHOD__, Z047, 0x00, 0x018D, 0x00)
             Local0 = "0x0123456789abcdefa"
             ToInteger (Local0, Local2)
-            CH04 (TS, 0x00, 0x22, Z047, 0x0190, 0x00, 0x00)
-            CH03 (TS, Z047, 0x02, 0x0192, 0x00)
+            CH04 (__METHOD__, 0x00, 0x22, Z047, 0x0190, 0x00, 0x00)
+            CH03 (__METHOD__, Z047, 0x02, 0x0192, 0x00)
             Local0 = "0x000123456789abcdefa"
             ToInteger (Local0, Local2)
-            CH04 (TS, 0x00, 0x22, Z047, 0x0195, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0x22, Z047, 0x0195, 0x00, 0x00)
         }
         Else
         {
@@ -450,14 +449,14 @@
             ToInteger (Local0, Local2)
             If ((Local2 != Local1))
             {
-                ERR (TS, Z047, 0x019B, 0x00, 0x00, Local0, 0x00)
+                ERR (__METHOD__, Z047, 0x019B, 0x00, 0x00, Local0, 0x00)
             }
 
             Local0 = "0x000123456789abcdefa"
             ToInteger (Local0, Local2)
             If ((Local2 != Local1))
             {
-                ERR (TS, Z047, 0x01A1, 0x00, 0x00, Local0, 0x00)
+                ERR (__METHOD__, Z047, 0x01A1, 0x00, 0x00, Local0, 0x00)
             }
         }
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl
index 1eecb3fb6..17b5f718d 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/tostring.asl
@@ -360,9 +360,8 @@
 
     Method (TOS0, 0, Serialized)
     {
-        Name (TS, "TOS0")
         Debug = "TEST: TOS0, Convert Buffer To String"
-        M30A (TS)
-        M30B (TS)
-        M30C (TS)
+        M30A (__METHOD__)
+        M30B (__METHOD__)
+        M30C (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/touuid.asl b/tests/aslts/src/runtime/collections/functional/manipulation/touuid.asl
index e53e23d06..04f43671c 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/touuid.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/touuid.asl
@@ -61,7 +61,6 @@
 
     Method (TOU0, 0, Serialized)
     {
-        Name (TS, "TOU0")
         Debug = "TEST: TOU0, Convert String to UUID Macro"
-        M302 (TS, 0x02, "p356", P356, P357, 0x07)
+        M302 (__METHOD__, 0x02, "p356", P356, P357, 0x07)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/manipulation/unicode.asl b/tests/aslts/src/runtime/collections/functional/manipulation/unicode.asl
index 7535114b7..7ef6c1bf5 100644
--- a/tests/aslts/src/runtime/collections/functional/manipulation/unicode.asl
+++ b/tests/aslts/src/runtime/collections/functional/manipulation/unicode.asl
@@ -125,7 +125,6 @@
 
     Method (UNI0, 0, Serialized)
     {
-        Name (TS, "UNI0")
         Debug = "TEST: UNI0, String To Unicode Conversion Macro"
-        M302 (TS, 0x04, "p358", P358, P359, 0x08)
+        M302 (__METHOD__, 0x04, "p358", P358, P359, 0x08)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/name/function.asl b/tests/aslts/src/runtime/collections/functional/name/function.asl
index 4cb008ffd..fa059ec79 100644
--- a/tests/aslts/src/runtime/collections/functional/name/function.asl
+++ b/tests/aslts/src/runtime/collections/functional/name/function.asl
@@ -110,7 +110,6 @@
 
     Method (M20E, 0, Serialized)
     {
-        Name (TS, "m20e")
         Method (M316, 0, NotSerialized)
         {
             Method (MM00, 0, NotSerialized)
@@ -123,14 +122,14 @@
                 Return ("\\_SB.m20d.mm00")
             }
 
-            M205 (TS, 0x01, ObjectType (MM00), 0x08)
-            M205 (TS, 0x02, MM00 (), "\\m20e.m316.mm00")
-            M205 (TS, 0x03, ObjectType (\M20E.M316.MM00), 0x08)
-            M205 (TS, 0x04, \M20E.M316.MM00 (), "\\m20e.m316.mm00")
-            M205 (TS, 0x05, ObjectType (^M316.MM00), 0x08)
-            M205 (TS, 0x06, ^M316.MM00 (), "\\m20e.m316.mm00")
-            M205 (TS, 0x07, ObjectType (\_SB.M20D.MM00), 0x08)
-            M205 (TS, 0x08, \_SB.M20D.MM00 (), "\\_SB.m20d.mm00")
+            M205 (__METHOD__, 0x01, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x02, MM00 (), "\\m20e.m316.mm00")
+            M205 (__METHOD__, 0x03, ObjectType (\M20E.M316.MM00), 0x08)
+            M205 (__METHOD__, 0x04, \M20E.M316.MM00 (), "\\m20e.m316.mm00")
+            M205 (__METHOD__, 0x05, ObjectType (^M316.MM00), 0x08)
+            M205 (__METHOD__, 0x06, ^M316.MM00 (), "\\m20e.m316.mm00")
+            M205 (__METHOD__, 0x07, ObjectType (\_SB.M20D.MM00), 0x08)
+            M205 (__METHOD__, 0x08, \_SB.M20D.MM00 (), "\\_SB.m20d.mm00")
         }
 
         Method (M317, 0, NotSerialized)
@@ -150,14 +149,14 @@
                 Return ("\\m20e.m317.mm30")
             }
 
-            M205 (TS, 0x09, ObjectType (MM10), 0x08)
-            M205 (TS, 0x0A, MM10 (), "\\m20e.m317.mm10")
-            M205 (TS, 0x0B, ObjectType (MM20), 0x08)
-            M205 (TS, 0x0C, MM20 (), "\\m20e.m317.mm20")
-            M205 (TS, 0x0D, ObjectType (MM30), 0x08)
+            M205 (__METHOD__, 0x09, ObjectType (MM10), 0x08)
+            M205 (__METHOD__, 0x0A, MM10 (), "\\m20e.m317.mm10")
+            M205 (__METHOD__, 0x0B, ObjectType (MM20), 0x08)
+            M205 (__METHOD__, 0x0C, MM20 (), "\\m20e.m317.mm20")
+            M205 (__METHOD__, 0x0D, ObjectType (MM30), 0x08)
             If (Y157)
             {
-                M205 (TS, 0x0E, MM30 (), "\\m20e.m317.mm30")
+                M205 (__METHOD__, 0x0E, MM30 (), "\\m20e.m317.mm30")
             }
         }
 
@@ -357,53 +356,53 @@
             }
 
             Local0 = 0xFEDCBA9876543210
-            M205 (TS, 0x0F, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x0F, ObjectType (MM00), 0x08)
             /*
              // Bug 148
              mm00(Refof(Local0))
              m205(ts, 16, Local0, 0xfedcba9876543211)
              */
-            M205 (TS, 0x11, ObjectType (MM01), 0x08)
-            M205 (TS, 0x12, MM01 (), INT0)
-            M205 (TS, 0x13, ObjectType (MM02), 0x08)
-            M205 (TS, 0x14, MM02 (), STR0)
-            M205 (TS, 0x15, ObjectType (MM03), 0x08)
-            M205 (TS, 0x16, MM03 (), BUF0)
-            M205 (TS, 0x17, ObjectType (MM04), 0x08)
-            M205 (TS, 0x18, MM04 (), PAC0)
-            M205 (TS, 0x19, ObjectType (MM05), 0x08)
-            M205 (TS, 0x1A, MM05 (), FLU0)
-            M205 (TS, 0x1B, ObjectType (MM06), 0x08)
-            M205 (TS, 0x1C, MM06 (), DEV0)
-            M205 (TS, 0x1D, ObjectType (MM07), 0x08)
-            M205 (TS, 0x1E, MM07 (), EVE0)
-            M205 (TS, 0x1F, ObjectType (MM08), 0x08)
+            M205 (__METHOD__, 0x11, ObjectType (MM01), 0x08)
+            M205 (__METHOD__, 0x12, MM01 (), INT0)
+            M205 (__METHOD__, 0x13, ObjectType (MM02), 0x08)
+            M205 (__METHOD__, 0x14, MM02 (), STR0)
+            M205 (__METHOD__, 0x15, ObjectType (MM03), 0x08)
+            M205 (__METHOD__, 0x16, MM03 (), BUF0)
+            M205 (__METHOD__, 0x17, ObjectType (MM04), 0x08)
+            M205 (__METHOD__, 0x18, MM04 (), PAC0)
+            M205 (__METHOD__, 0x19, ObjectType (MM05), 0x08)
+            M205 (__METHOD__, 0x1A, MM05 (), FLU0)
+            M205 (__METHOD__, 0x1B, ObjectType (MM06), 0x08)
+            M205 (__METHOD__, 0x1C, MM06 (), DEV0)
+            M205 (__METHOD__, 0x1D, ObjectType (MM07), 0x08)
+            M205 (__METHOD__, 0x1E, MM07 (), EVE0)
+            M205 (__METHOD__, 0x1F, ObjectType (MM08), 0x08)
             CopyObject (MMM0 (), Local0)
-            M205 (TS, 0x20, MM08 (), Local0)
-            M205 (TS, 0x21, ObjectType (MM09), 0x08)
-            M205 (TS, 0x22, MM09 (), MTX0)
-            M205 (TS, 0x23, ObjectType (MM0A), 0x08)
-            M205 (TS, 0x24, MM0A (), OPR0)
-            M205 (TS, 0x25, ObjectType (MM0B), 0x08)
-            M205 (TS, 0x26, MM0B (), PWR0)
-            M205 (TS, 0x27, ObjectType (MM0C), 0x08)
-            M205 (TS, 0x28, MM0C (), CPU0)
-            M205 (TS, 0x29, ObjectType (MM0D), 0x08)
+            M205 (__METHOD__, 0x20, MM08 (), Local0)
+            M205 (__METHOD__, 0x21, ObjectType (MM09), 0x08)
+            M205 (__METHOD__, 0x22, MM09 (), MTX0)
+            M205 (__METHOD__, 0x23, ObjectType (MM0A), 0x08)
+            M205 (__METHOD__, 0x24, MM0A (), OPR0)
+            M205 (__METHOD__, 0x25, ObjectType (MM0B), 0x08)
+            M205 (__METHOD__, 0x26, MM0B (), PWR0)
+            M205 (__METHOD__, 0x27, ObjectType (MM0C), 0x08)
+            M205 (__METHOD__, 0x28, MM0C (), CPU0)
+            M205 (__METHOD__, 0x29, ObjectType (MM0D), 0x08)
             If (Y350)
             {
-                M205 (TS, 0x2A, MM0D (), TZN0)
+                M205 (__METHOD__, 0x2A, MM0D (), TZN0)
             }
 
-            M205 (TS, 0x2B, ObjectType (MM0E), 0x08)
-            M205 (TS, 0x2C, MM0E (), BFL0)
-            M205 (TS, 0x2D, ObjectType (MM0F), 0x08)
-            M205 (TS, 0x2E, MM0F (), DDB0)
+            M205 (__METHOD__, 0x2B, ObjectType (MM0E), 0x08)
+            M205 (__METHOD__, 0x2C, MM0E (), BFL0)
+            M205 (__METHOD__, 0x2D, ObjectType (MM0F), 0x08)
+            M205 (__METHOD__, 0x2E, MM0F (), DDB0)
             /*
              m205(ts, 47, ObjectType(mm0g), 8)
              m205(ts, 48, mm0g(), Debug)
              */
-            M205 (TS, 0x31, ObjectType (MM0H), 0x08)
-            M205 (TS, 0x32, DerefOf (MM0H ()), ORF0)
+            M205 (__METHOD__, 0x31, ObjectType (MM0H), 0x08)
+            M205 (__METHOD__, 0x32, DerefOf (MM0H ()), ORF0)
         }
 
         Method (M319, 0, NotSerialized)
@@ -418,10 +417,10 @@
                 Return (INT0) /* \M20E.INT0 */
             }
 
-            M205 (TS, 0x33, ObjectType (MM00), 0x08)
-            M205 (TS, 0x34, MM00 (), STR0)
-            M205 (TS, 0x35, ObjectType (MM01), 0x08)
-            M205 (TS, 0x36, MM01 (), INT0)
+            M205 (__METHOD__, 0x33, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x34, MM00 (), STR0)
+            M205 (__METHOD__, 0x35, ObjectType (MM01), 0x08)
+            M205 (__METHOD__, 0x36, MM01 (), INT0)
         }
 
         Method (M31A, 0, Serialized)
diff --git a/tests/aslts/src/runtime/collections/functional/name/method.asl b/tests/aslts/src/runtime/collections/functional/name/method.asl
index 3e4ec3eec..c55d5da20 100644
--- a/tests/aslts/src/runtime/collections/functional/name/method.asl
+++ b/tests/aslts/src/runtime/collections/functional/name/method.asl
@@ -256,7 +256,6 @@
 
     Method (M207, 0, Serialized)
     {
-        Name (TS, "m207")
         Method (M240, 0, NotSerialized)
         {
             Method (MM00, 0, NotSerialized)
@@ -269,14 +268,14 @@
                 Return ("\\_SB.m206.mm00")
             }
 
-            M205 (TS, 0x01, ObjectType (MM00), 0x08)
-            M205 (TS, 0x02, MM00 (), "\\m207.m240.mm00")
-            M205 (TS, 0x03, ObjectType (\M207.M240.MM00), 0x08)
-            M205 (TS, 0x04, \M207.M240.MM00 (), "\\m207.m240.mm00")
-            M205 (TS, 0x05, ObjectType (^M240.MM00), 0x08)
-            M205 (TS, 0x06, ^M240.MM00 (), "\\m207.m240.mm00")
-            M205 (TS, 0x07, ObjectType (\_SB.M206.MM00), 0x08)
-            M205 (TS, 0x08, \_SB.M206.MM00 (), "\\_SB.m206.mm00")
+            M205 (__METHOD__, 0x01, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x02, MM00 (), "\\m207.m240.mm00")
+            M205 (__METHOD__, 0x03, ObjectType (\M207.M240.MM00), 0x08)
+            M205 (__METHOD__, 0x04, \M207.M240.MM00 (), "\\m207.m240.mm00")
+            M205 (__METHOD__, 0x05, ObjectType (^M240.MM00), 0x08)
+            M205 (__METHOD__, 0x06, ^M240.MM00 (), "\\m207.m240.mm00")
+            M205 (__METHOD__, 0x07, ObjectType (\_SB.M206.MM00), 0x08)
+            M205 (__METHOD__, 0x08, \_SB.M206.MM00 (), "\\_SB.m206.mm00")
         }
 
         Method (M241, 0, NotSerialized)
@@ -354,38 +353,38 @@
             /* Numargs as Type3Opcode (integer) constant expression */
             /* Invalid checksum warning */
             /*		Method(mm09, Add(6, 1)) {Return ("\\m207.m241.mm09")} */
-            M205 (TS, 0x09, ObjectType (MM10), 0x08)
-            M205 (TS, 0x0A, MM10 (), "\\m207.m241.mm10")
-            M205 (TS, 0x0B, ObjectType (MM20), 0x08)
-            M205 (TS, 0x0C, MM20 (), "\\m207.m241.mm20")
-            M205 (TS, 0x0D, ObjectType (MM30), 0x08)
-            M205 (TS, 0x0E, MM30 (), "\\m207.m241.mm30")
-            M205 (TS, 0x0F, ObjectType (MM40), 0x08)
-            M205 (TS, 0x10, MM40 (), "\\m207.m241.mm40")
-            M205 (TS, 0x11, ObjectType (MM50), 0x08)
-            M205 (TS, 0x12, MM50 (), "\\m207.m241.mm50")
-            M205 (TS, 0x13, ObjectType (MM60), 0x08)
+            M205 (__METHOD__, 0x09, ObjectType (MM10), 0x08)
+            M205 (__METHOD__, 0x0A, MM10 (), "\\m207.m241.mm10")
+            M205 (__METHOD__, 0x0B, ObjectType (MM20), 0x08)
+            M205 (__METHOD__, 0x0C, MM20 (), "\\m207.m241.mm20")
+            M205 (__METHOD__, 0x0D, ObjectType (MM30), 0x08)
+            M205 (__METHOD__, 0x0E, MM30 (), "\\m207.m241.mm30")
+            M205 (__METHOD__, 0x0F, ObjectType (MM40), 0x08)
+            M205 (__METHOD__, 0x10, MM40 (), "\\m207.m241.mm40")
+            M205 (__METHOD__, 0x11, ObjectType (MM50), 0x08)
+            M205 (__METHOD__, 0x12, MM50 (), "\\m207.m241.mm50")
+            M205 (__METHOD__, 0x13, ObjectType (MM60), 0x08)
             If (Y157)
             {
-                M205 (TS, 0x14, MM60 (), "\\m207.m241.mm60")
-            }
-
-            M205 (TS, 0x15, ObjectType (MM00), 0x08)
-            M205 (TS, 0x16, MM00 (), "\\m207.m241.mm00")
-            M205 (TS, 0x17, ObjectType (MM01), 0x08)
-            M205 (TS, 0x18, MM01 (0x00), "\\m207.m241.mm01")
-            M205 (TS, 0x19, ObjectType (MM02), 0x08)
-            M205 (TS, 0x1A, MM02 (0x00, 0x01), "\\m207.m241.mm02")
-            M205 (TS, 0x1B, ObjectType (MM03), 0x08)
-            M205 (TS, 0x1C, MM03 (0x00, 0x01, 0x02), "\\m207.m241.mm03")
-            M205 (TS, 0x1D, ObjectType (MM04), 0x08)
-            M205 (TS, 0x1E, MM04 (0x00, 0x01, 0x02, 0x03), "\\m207.m241.mm04")
-            M205 (TS, 0x1F, ObjectType (MM05), 0x08)
-            M205 (TS, 0x20, MM05 (0x00, 0x01, 0x02, 0x03, 0x04), "\\m207.m241.mm05")
-            M205 (TS, 0x21, ObjectType (MM06), 0x08)
-            M205 (TS, 0x22, MM06 (0x00, 0x01, 0x02, 0x03, 0x04, 0x05), "\\m207.m241.mm06")
-            M205 (TS, 0x23, ObjectType (MM07), 0x08)
-            M205 (TS, 0x24, MM07 (0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06), "\\m207.m241.mm07")
+                M205 (__METHOD__, 0x14, MM60 (), "\\m207.m241.mm60")
+            }
+
+            M205 (__METHOD__, 0x15, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x16, MM00 (), "\\m207.m241.mm00")
+            M205 (__METHOD__, 0x17, ObjectType (MM01), 0x08)
+            M205 (__METHOD__, 0x18, MM01 (0x00), "\\m207.m241.mm01")
+            M205 (__METHOD__, 0x19, ObjectType (MM02), 0x08)
+            M205 (__METHOD__, 0x1A, MM02 (0x00, 0x01), "\\m207.m241.mm02")
+            M205 (__METHOD__, 0x1B, ObjectType (MM03), 0x08)
+            M205 (__METHOD__, 0x1C, MM03 (0x00, 0x01, 0x02), "\\m207.m241.mm03")
+            M205 (__METHOD__, 0x1D, ObjectType (MM04), 0x08)
+            M205 (__METHOD__, 0x1E, MM04 (0x00, 0x01, 0x02, 0x03), "\\m207.m241.mm04")
+            M205 (__METHOD__, 0x1F, ObjectType (MM05), 0x08)
+            M205 (__METHOD__, 0x20, MM05 (0x00, 0x01, 0x02, 0x03, 0x04), "\\m207.m241.mm05")
+            M205 (__METHOD__, 0x21, ObjectType (MM06), 0x08)
+            M205 (__METHOD__, 0x22, MM06 (0x00, 0x01, 0x02, 0x03, 0x04, 0x05), "\\m207.m241.mm06")
+            M205 (__METHOD__, 0x23, ObjectType (MM07), 0x08)
+            M205 (__METHOD__, 0x24, MM07 (0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06), "\\m207.m241.mm07")
                 /* Invalid checksum warning */
         /*		m205(ts, 37, ObjectType(mm09), 8) */
         /* Too many arguments ^  (MM09 requires 0) */
@@ -516,63 +515,63 @@
             /* Both Numargs and SyncLevel as Type3Opcode (integer) constant expressions */
             /* Invalid checksum warning */
             /*		Method(mm90, Add(6, 1), Serialized, Add(14, 1)) {Return ("\\m207.m242.mm90")} */
-            M205 (TS, 0x27, ObjectType (MM10), 0x08)
-            M205 (TS, 0x28, MM10 (), "\\m207.m242.mm10")
-            M205 (TS, 0x29, ObjectType (MM10), 0x08)
-            M205 (TS, 0x2A, MM20 (), "\\m207.m242.mm20")
-            M205 (TS, 0x2B, ObjectType (MM10), 0x08)
-            M205 (TS, 0x2C, MM30 (), "\\m207.m242.mm30")
-            M205 (TS, 0x2D, ObjectType (MM10), 0x08)
-            M205 (TS, 0x2E, MM40 (), "\\m207.m242.mm40")
-            M205 (TS, 0x2F, ObjectType (MM10), 0x08)
+            M205 (__METHOD__, 0x27, ObjectType (MM10), 0x08)
+            M205 (__METHOD__, 0x28, MM10 (), "\\m207.m242.mm10")
+            M205 (__METHOD__, 0x29, ObjectType (MM10), 0x08)
+            M205 (__METHOD__, 0x2A, MM20 (), "\\m207.m242.mm20")
+            M205 (__METHOD__, 0x2B, ObjectType (MM10), 0x08)
+            M205 (__METHOD__, 0x2C, MM30 (), "\\m207.m242.mm30")
+            M205 (__METHOD__, 0x2D, ObjectType (MM10), 0x08)
+            M205 (__METHOD__, 0x2E, MM40 (), "\\m207.m242.mm40")
+            M205 (__METHOD__, 0x2F, ObjectType (MM10), 0x08)
             If (Y157)
             {
-                M205 (TS, 0x30, MM50 (), "\\m207.m242.mm50")
+                M205 (__METHOD__, 0x30, MM50 (), "\\m207.m242.mm50")
             }
 
-            M205 (TS, 0x31, ObjectType (MM10), 0x08)
+            M205 (__METHOD__, 0x31, ObjectType (MM10), 0x08)
             If (Y157)
             {
-                M205 (TS, 0x32, MM60 (), "\\m207.m242.mm60")
-            }
-
-            M205 (TS, 0x33, ObjectType (MM00), 0x08)
-            M205 (TS, 0x34, MM00 (), "\\m207.m242.mm00")
-            M205 (TS, 0x35, ObjectType (MM01), 0x08)
-            M205 (TS, 0x36, MM01 (0x00), "\\m207.m242.mm01")
-            M205 (TS, 0x37, ObjectType (MM02), 0x08)
-            M205 (TS, 0x38, MM02 (0x00, 0x01), "\\m207.m242.mm02")
-            M205 (TS, 0x39, ObjectType (MM03), 0x08)
-            M205 (TS, 0x3A, MM03 (0x00, 0x01, 0x02), "\\m207.m242.mm03")
-            M205 (TS, 0x3B, ObjectType (MM04), 0x08)
-            M205 (TS, 0x3C, MM04 (0x00, 0x01, 0x02, 0x03), "\\m207.m242.mm04")
-            M205 (TS, 0x3D, ObjectType (MM05), 0x08)
-            M205 (TS, 0x3E, MM05 (0x00, 0x01, 0x02, 0x03, 0x04), "\\m207.m242.mm05")
-            M205 (TS, 0x3F, ObjectType (MM06), 0x08)
-            M205 (TS, 0x40, MM06 (0x00, 0x01, 0x02, 0x03, 0x04, 0x05), "\\m207.m242.mm06")
-            M205 (TS, 0x41, ObjectType (MM07), 0x08)
-            M205 (TS, 0x42, MM07 (0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06), "\\m207.m242.mm07")
-            M205 (TS, 0x43, ObjectType (MM00), 0x08)
-            M205 (TS, 0x44, MM08 (), "\\m207.m242.mm08")
-            M205 (TS, 0x45, ObjectType (MM01), 0x08)
-            M205 (TS, 0x46, MM09 (0x00), "\\m207.m242.mm09")
-            M205 (TS, 0x47, ObjectType (MM02), 0x08)
-            M205 (TS, 0x48, MM0A (0x00, 0x01), "\\m207.m242.mm0a")
-            M205 (TS, 0x49, ObjectType (MM03), 0x08)
-            M205 (TS, 0x4A, MM0B (0x00, 0x01, 0x02), "\\m207.m242.mm0b")
-            M205 (TS, 0x4B, ObjectType (MM04), 0x08)
-            M205 (TS, 0x4C, MM0C (0x00, 0x01, 0x02, 0x03), "\\m207.m242.mm0c")
-            M205 (TS, 0x4D, ObjectType (MM05), 0x08)
-            M205 (TS, 0x4E, MM0D (0x00, 0x01, 0x02, 0x03, 0x04), "\\m207.m242.mm0d")
-            M205 (TS, 0x4F, ObjectType (MM06), 0x08)
-            M205 (TS, 0x50, MM0E (0x00, 0x01, 0x02, 0x03, 0x04, 0x05), "\\m207.m242.mm0e")
-            M205 (TS, 0x51, ObjectType (MM07), 0x08)
-            M205 (TS, 0x52, MM0F (0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06), "\\m207.m242.mm0f")
+                M205 (__METHOD__, 0x32, MM60 (), "\\m207.m242.mm60")
+            }
+
+            M205 (__METHOD__, 0x33, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x34, MM00 (), "\\m207.m242.mm00")
+            M205 (__METHOD__, 0x35, ObjectType (MM01), 0x08)
+            M205 (__METHOD__, 0x36, MM01 (0x00), "\\m207.m242.mm01")
+            M205 (__METHOD__, 0x37, ObjectType (MM02), 0x08)
+            M205 (__METHOD__, 0x38, MM02 (0x00, 0x01), "\\m207.m242.mm02")
+            M205 (__METHOD__, 0x39, ObjectType (MM03), 0x08)
+            M205 (__METHOD__, 0x3A, MM03 (0x00, 0x01, 0x02), "\\m207.m242.mm03")
+            M205 (__METHOD__, 0x3B, ObjectType (MM04), 0x08)
+            M205 (__METHOD__, 0x3C, MM04 (0x00, 0x01, 0x02, 0x03), "\\m207.m242.mm04")
+            M205 (__METHOD__, 0x3D, ObjectType (MM05), 0x08)
+            M205 (__METHOD__, 0x3E, MM05 (0x00, 0x01, 0x02, 0x03, 0x04), "\\m207.m242.mm05")
+            M205 (__METHOD__, 0x3F, ObjectType (MM06), 0x08)
+            M205 (__METHOD__, 0x40, MM06 (0x00, 0x01, 0x02, 0x03, 0x04, 0x05), "\\m207.m242.mm06")
+            M205 (__METHOD__, 0x41, ObjectType (MM07), 0x08)
+            M205 (__METHOD__, 0x42, MM07 (0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06), "\\m207.m242.mm07")
+            M205 (__METHOD__, 0x43, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x44, MM08 (), "\\m207.m242.mm08")
+            M205 (__METHOD__, 0x45, ObjectType (MM01), 0x08)
+            M205 (__METHOD__, 0x46, MM09 (0x00), "\\m207.m242.mm09")
+            M205 (__METHOD__, 0x47, ObjectType (MM02), 0x08)
+            M205 (__METHOD__, 0x48, MM0A (0x00, 0x01), "\\m207.m242.mm0a")
+            M205 (__METHOD__, 0x49, ObjectType (MM03), 0x08)
+            M205 (__METHOD__, 0x4A, MM0B (0x00, 0x01, 0x02), "\\m207.m242.mm0b")
+            M205 (__METHOD__, 0x4B, ObjectType (MM04), 0x08)
+            M205 (__METHOD__, 0x4C, MM0C (0x00, 0x01, 0x02, 0x03), "\\m207.m242.mm0c")
+            M205 (__METHOD__, 0x4D, ObjectType (MM05), 0x08)
+            M205 (__METHOD__, 0x4E, MM0D (0x00, 0x01, 0x02, 0x03, 0x04), "\\m207.m242.mm0d")
+            M205 (__METHOD__, 0x4F, ObjectType (MM06), 0x08)
+            M205 (__METHOD__, 0x50, MM0E (0x00, 0x01, 0x02, 0x03, 0x04, 0x05), "\\m207.m242.mm0e")
+            M205 (__METHOD__, 0x51, ObjectType (MM07), 0x08)
+            M205 (__METHOD__, 0x52, MM0F (0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06), "\\m207.m242.mm0f")
             /* Invalid checksum warning */
             /*		m205(ts, 83, ObjectType(mm70), 8) */
             /*	Too many arguments ^  (MM70 requires 0) */
             /*		m205(ts, 84, mm70(0, 1, 2, 3, 4, 5, 6), "\\m207.m242.mm70") */
-            M205 (TS, 0x55, ObjectType (MM80), 0x08)
+            M205 (__METHOD__, 0x55, ObjectType (MM80), 0x08)
                 /* Outstanding allocations */
         /*		m205(ts, 86, mm80(0, 1, 2, 3, 4, 5, 6), "\\m207.m242.mm80") */
         /* Invalid checksum warning */
@@ -777,50 +776,50 @@
             }
 
             Local0 = 0xFEDCBA9876543210
-            M205 (TS, 0x59, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x59, ObjectType (MM00), 0x08)
             MM00 (RefOf (Local0))
-            M205 (TS, 0x5A, Local0, 0xFEDCBA9876543211)
-            M205 (TS, 0x5B, ObjectType (MM01), 0x08)
-            M205 (TS, 0x5C, MM01 (), INT0)
-            M205 (TS, 0x5D, ObjectType (MM02), 0x08)
-            M205 (TS, 0x5E, MM02 (), STR0)
-            M205 (TS, 0x5F, ObjectType (MM03), 0x08)
-            M205 (TS, 0x60, MM03 (), BUF0)
-            M205 (TS, 0x61, ObjectType (MM04), 0x08)
-            M205 (TS, 0x62, MM04 (), PAC0)
-            M205 (TS, 0x63, ObjectType (MM05), 0x08)
-            M205 (TS, 0x64, MM05 (), FLU0)
-            M205 (TS, 0x65, ObjectType (MM06), 0x08)
-            M205 (TS, 0x66, MM06 (), DEV0)
-            M205 (TS, 0x67, ObjectType (MM07), 0x08)
-            M205 (TS, 0x68, MM07 (), EVE0)
-            M205 (TS, 0x69, ObjectType (MM08), 0x08)
+            M205 (__METHOD__, 0x5A, Local0, 0xFEDCBA9876543211)
+            M205 (__METHOD__, 0x5B, ObjectType (MM01), 0x08)
+            M205 (__METHOD__, 0x5C, MM01 (), INT0)
+            M205 (__METHOD__, 0x5D, ObjectType (MM02), 0x08)
+            M205 (__METHOD__, 0x5E, MM02 (), STR0)
+            M205 (__METHOD__, 0x5F, ObjectType (MM03), 0x08)
+            M205 (__METHOD__, 0x60, MM03 (), BUF0)
+            M205 (__METHOD__, 0x61, ObjectType (MM04), 0x08)
+            M205 (__METHOD__, 0x62, MM04 (), PAC0)
+            M205 (__METHOD__, 0x63, ObjectType (MM05), 0x08)
+            M205 (__METHOD__, 0x64, MM05 (), FLU0)
+            M205 (__METHOD__, 0x65, ObjectType (MM06), 0x08)
+            M205 (__METHOD__, 0x66, MM06 (), DEV0)
+            M205 (__METHOD__, 0x67, ObjectType (MM07), 0x08)
+            M205 (__METHOD__, 0x68, MM07 (), EVE0)
+            M205 (__METHOD__, 0x69, ObjectType (MM08), 0x08)
             CopyObject (MMM0 (), Local0)
-            M205 (TS, 0x6A, MM08 (), Local0)
-            M205 (TS, 0x6B, ObjectType (MM09), 0x08)
-            M205 (TS, 0x6C, MM09 (), MTX0)
-            M205 (TS, 0x6D, ObjectType (MM0A), 0x08)
-            M205 (TS, 0x6E, MM0A (), OPR0)
-            M205 (TS, 0x6F, ObjectType (MM0B), 0x08)
-            M205 (TS, 0x70, MM0B (), PWR0)
-            M205 (TS, 0x71, ObjectType (MM0C), 0x08)
-            M205 (TS, 0x72, MM0C (), CPU0)
-            M205 (TS, 0x73, ObjectType (MM0D), 0x08)
+            M205 (__METHOD__, 0x6A, MM08 (), Local0)
+            M205 (__METHOD__, 0x6B, ObjectType (MM09), 0x08)
+            M205 (__METHOD__, 0x6C, MM09 (), MTX0)
+            M205 (__METHOD__, 0x6D, ObjectType (MM0A), 0x08)
+            M205 (__METHOD__, 0x6E, MM0A (), OPR0)
+            M205 (__METHOD__, 0x6F, ObjectType (MM0B), 0x08)
+            M205 (__METHOD__, 0x70, MM0B (), PWR0)
+            M205 (__METHOD__, 0x71, ObjectType (MM0C), 0x08)
+            M205 (__METHOD__, 0x72, MM0C (), CPU0)
+            M205 (__METHOD__, 0x73, ObjectType (MM0D), 0x08)
             If (Y350)
             {
-                M205 (TS, 0x74, MM0D (), TZN0)
+                M205 (__METHOD__, 0x74, MM0D (), TZN0)
             }
 
-            M205 (TS, 0x75, ObjectType (MM0E), 0x08)
-            M205 (TS, 0x76, MM0E (), BFL0)
-            M205 (TS, 0x77, ObjectType (MM0F), 0x08)
-            M205 (TS, 0x78, MM0F (), DDB0)
+            M205 (__METHOD__, 0x75, ObjectType (MM0E), 0x08)
+            M205 (__METHOD__, 0x76, MM0E (), BFL0)
+            M205 (__METHOD__, 0x77, ObjectType (MM0F), 0x08)
+            M205 (__METHOD__, 0x78, MM0F (), DDB0)
             /*
              m205(ts, 121, ObjectType(mm0g), 8)
              m205(ts, 122, mm0g(), Debug)
              */
-            M205 (TS, 0x7B, ObjectType (MM0H), 0x08)
-            M205 (TS, 0x7C, DerefOf (MM0H ()), ORF0)
+            M205 (__METHOD__, 0x7B, ObjectType (MM0H), 0x08)
+            M205 (__METHOD__, 0x7C, DerefOf (MM0H ()), ORF0)
         }
 
         Method (M244, 0, NotSerialized)
@@ -835,10 +834,10 @@
                 Return (INT0) /* \M207.INT0 */
             }
 
-            M205 (TS, 0x7D, ObjectType (MM00), 0x08)
-            M205 (TS, 0x7E, MM00 (), STR0)
-            M205 (TS, 0x7F, ObjectType (MM01), 0x08)
-            M205 (TS, 0x80, MM01 (), INT0)
+            M205 (__METHOD__, 0x7D, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x7E, MM00 (), STR0)
+            M205 (__METHOD__, 0x7F, ObjectType (MM01), 0x08)
+            M205 (__METHOD__, 0x80, MM01 (), INT0)
         }
 
         Method (M245, 0, Serialized)
@@ -1024,105 +1023,105 @@
              }) {Store(42, Flag)}
              */
             /* List of types of the parameters contains the same keyword */
-            M205 (TS, 0x81, ObjectType (MM00), 0x08)
+            M205 (__METHOD__, 0x81, ObjectType (MM00), 0x08)
             MM00 (0x01)
-            M205 (TS, 0x82, FLAG, 0x00)
-            M205 (TS, 0x83, ObjectType (MM01), 0x08)
+            M205 (__METHOD__, 0x82, FLAG, 0x00)
+            M205 (__METHOD__, 0x83, ObjectType (MM01), 0x08)
             MM01 (0x01)
-            M205 (TS, 0x84, FLAG, 0x01)
-            M205 (TS, 0x85, ObjectType (MM02), 0x08)
+            M205 (__METHOD__, 0x84, FLAG, 0x01)
+            M205 (__METHOD__, 0x85, ObjectType (MM02), 0x08)
             MM02 (0x01, 0x02)
-            M205 (TS, 0x86, FLAG, 0x02)
-            M205 (TS, 0x87, ObjectType (MM03), 0x08)
+            M205 (__METHOD__, 0x86, FLAG, 0x02)
+            M205 (__METHOD__, 0x87, ObjectType (MM03), 0x08)
             MM03 (0x01, 0x02, 0x03)
-            M205 (TS, 0x88, FLAG, 0x03)
-            M205 (TS, 0x89, ObjectType (MM04), 0x08)
+            M205 (__METHOD__, 0x88, FLAG, 0x03)
+            M205 (__METHOD__, 0x89, ObjectType (MM04), 0x08)
             MM04 (0x01, 0x02, 0x03, 0x04)
-            M205 (TS, 0x8A, FLAG, 0x04)
-            M205 (TS, 0x8B, ObjectType (MM05), 0x08)
+            M205 (__METHOD__, 0x8A, FLAG, 0x04)
+            M205 (__METHOD__, 0x8B, ObjectType (MM05), 0x08)
             MM05 (0x01, 0x02, 0x03, 0x04, 0x05)
-            M205 (TS, 0x8C, FLAG, 0x05)
-            M205 (TS, 0x8D, ObjectType (MM06), 0x08)
+            M205 (__METHOD__, 0x8C, FLAG, 0x05)
+            M205 (__METHOD__, 0x8D, ObjectType (MM06), 0x08)
             MM06 (0x01, 0x02, 0x03, 0x04, 0x05, 0x06)
-            M205 (TS, 0x8E, FLAG, 0x06)
-            M205 (TS, 0x8F, ObjectType (MM07), 0x08)
+            M205 (__METHOD__, 0x8E, FLAG, 0x06)
+            M205 (__METHOD__, 0x8F, ObjectType (MM07), 0x08)
             MM07 (0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07)
-            M205 (TS, 0x90, FLAG, 0x07)
+            M205 (__METHOD__, 0x90, FLAG, 0x07)
             /* List of types of the parameters contains the UnknownObj keyword */
 
-            M205 (TS, 0x91, ObjectType (MM08), 0x08)
+            M205 (__METHOD__, 0x91, ObjectType (MM08), 0x08)
             MM08 (0x01)
-            M205 (TS, 0x92, FLAG, 0x08)
-            M205 (TS, 0x93, ObjectType (MM09), 0x08)
+            M205 (__METHOD__, 0x92, FLAG, 0x08)
+            M205 (__METHOD__, 0x93, ObjectType (MM09), 0x08)
             MM09 (0x01)
-            M205 (TS, 0x94, FLAG, 0x09)
-            M205 (TS, 0x95, ObjectType (MM0A), 0x08)
+            M205 (__METHOD__, 0x94, FLAG, 0x09)
+            M205 (__METHOD__, 0x95, ObjectType (MM0A), 0x08)
             MM0A (0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07)
-            M205 (TS, 0x96, FLAG, 0x0A)
+            M205 (__METHOD__, 0x96, FLAG, 0x0A)
             /* List of types of the parameters contains different keywords */
 
-            M205 (TS, 0x97, ObjectType (MM10), 0x08)
+            M205 (__METHOD__, 0x97, ObjectType (MM10), 0x08)
             MM10 (0x01, 0x02)
-            M205 (TS, 0x98, FLAG, 0x10)
-            M205 (TS, 0x99, ObjectType (MM11), 0x08)
+            M205 (__METHOD__, 0x98, FLAG, 0x10)
+            M205 (__METHOD__, 0x99, ObjectType (MM11), 0x08)
             MM11 (0x01, 0x02)
-            M205 (TS, 0x9A, FLAG, 0x11)
-            M205 (TS, 0x9B, ObjectType (MM12), 0x08)
+            M205 (__METHOD__, 0x9A, FLAG, 0x11)
+            M205 (__METHOD__, 0x9B, ObjectType (MM12), 0x08)
             MM12 (0x01, 0x02)
-            M205 (TS, 0x9C, FLAG, 0x12)
-            M205 (TS, 0x9D, ObjectType (MM13), 0x08)
+            M205 (__METHOD__, 0x9C, FLAG, 0x12)
+            M205 (__METHOD__, 0x9D, ObjectType (MM13), 0x08)
             MM13 (0x01, 0x02, 0x03)
-            M205 (TS, 0x9E, FLAG, 0x13)
-            M205 (TS, 0x9F, ObjectType (MM14), 0x08)
+            M205 (__METHOD__, 0x9E, FLAG, 0x13)
+            M205 (__METHOD__, 0x9F, ObjectType (MM14), 0x08)
             MM14 (0x01, 0x02, 0x03, 0x04)
-            M205 (TS, 0xA0, FLAG, 0x14)
-            M205 (TS, 0xA1, ObjectType (MM15), 0x08)
+            M205 (__METHOD__, 0xA0, FLAG, 0x14)
+            M205 (__METHOD__, 0xA1, ObjectType (MM15), 0x08)
             MM15 (0x01, 0x02, 0x03, 0x04, 0x05)
-            M205 (TS, 0xA2, FLAG, 0x15)
-            M205 (TS, 0xA3, ObjectType (MM16), 0x08)
+            M205 (__METHOD__, 0xA2, FLAG, 0x15)
+            M205 (__METHOD__, 0xA3, ObjectType (MM16), 0x08)
             MM16 (0x01, 0x02, 0x03, 0x04, 0x05, 0x06)
-            M205 (TS, 0xA4, FLAG, 0x16)
-            M205 (TS, 0xA5, ObjectType (MM17), 0x08)
+            M205 (__METHOD__, 0xA4, FLAG, 0x16)
+            M205 (__METHOD__, 0xA5, ObjectType (MM17), 0x08)
             MM17 (0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07)
-            M205 (TS, 0xA6, FLAG, 0x17)
-            M205 (TS, 0xA7, ObjectType (MM18), 0x08)
+            M205 (__METHOD__, 0xA6, FLAG, 0x17)
+            M205 (__METHOD__, 0xA7, ObjectType (MM18), 0x08)
             MM18 (0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07)
-            M205 (TS, 0xA8, FLAG, 0x18)
+            M205 (__METHOD__, 0xA8, FLAG, 0x18)
             /* List of types of the parameters contains keyword packages */
             /* along with different keywords */
-            M205 (TS, 0xA9, ObjectType (MM20), 0x08)
+            M205 (__METHOD__, 0xA9, ObjectType (MM20), 0x08)
             MM20 (0x01)
-            M205 (TS, 0xAA, FLAG, 0x20)
-            M205 (TS, 0xAB, ObjectType (MM21), 0x08)
+            M205 (__METHOD__, 0xAA, FLAG, 0x20)
+            M205 (__METHOD__, 0xAB, ObjectType (MM21), 0x08)
             MM21 (0x01)
-            M205 (TS, 0xAC, FLAG, 0x21)
+            M205 (__METHOD__, 0xAC, FLAG, 0x21)
             /*
              // Bug 148
              m205(ts, 173, ObjectType(mm22), 8)
              mm22(1)
              m205(ts, 174, Flag, 34)
              */
-            M205 (TS, 0xAF, ObjectType (MM23), 0x08)
+            M205 (__METHOD__, 0xAF, ObjectType (MM23), 0x08)
             MM23 (0x01, 0x02)
-            M205 (TS, 0xB0, FLAG, 0x23)
-            M205 (TS, 0xB1, ObjectType (MM24), 0x08)
+            M205 (__METHOD__, 0xB0, FLAG, 0x23)
+            M205 (__METHOD__, 0xB1, ObjectType (MM24), 0x08)
             MM24 (0x01, 0x02)
-            M205 (TS, 0xB2, FLAG, 0x24)
-            M205 (TS, 0xB3, ObjectType (MM25), 0x08)
+            M205 (__METHOD__, 0xB2, FLAG, 0x24)
+            M205 (__METHOD__, 0xB3, ObjectType (MM25), 0x08)
             MM25 (0x01, 0x02)
-            M205 (TS, 0xB4, FLAG, 0x25)
-            M205 (TS, 0xB5, ObjectType (MM26), 0x08)
+            M205 (__METHOD__, 0xB4, FLAG, 0x25)
+            M205 (__METHOD__, 0xB5, ObjectType (MM26), 0x08)
             MM26 (0x01, 0x02)
-            M205 (TS, 0xB6, FLAG, 0x26)
-            M205 (TS, 0xB7, ObjectType (MM27), 0x08)
+            M205 (__METHOD__, 0xB6, FLAG, 0x26)
+            M205 (__METHOD__, 0xB7, ObjectType (MM27), 0x08)
             MM27 (0x01, 0x02)
-            M205 (TS, 0xB8, FLAG, 0x27)
-            M205 (TS, 0xB9, ObjectType (MM28), 0x08)
+            M205 (__METHOD__, 0xB8, FLAG, 0x27)
+            M205 (__METHOD__, 0xB9, ObjectType (MM28), 0x08)
             MM28 (0x01, 0x02)
-            M205 (TS, 0xBA, FLAG, 0x28)
-            M205 (TS, 0xBB, ObjectType (MM29), 0x08)
+            M205 (__METHOD__, 0xBA, FLAG, 0x28)
+            M205 (__METHOD__, 0xBB, ObjectType (MM29), 0x08)
             MM29 (0x01, 0x02)
-            M205 (TS, 0xBC, FLAG, 0x29)
+            M205 (__METHOD__, 0xBC, FLAG, 0x29)
                 /*
          // Bug 148
          m205(ts, 189, ObjectType(mm2a), 8)
@@ -1152,10 +1151,10 @@
 
             I000 = 0x00
             MM00 (0x00)
-            M205 (TS, 0xBF, I000, 0x01)
+            M205 (__METHOD__, 0xBF, I000, 0x01)
             I000 = 0x00
             MM00 (0x01)
-            M205 (TS, 0xC0, I000, 0x02)
+            M205 (__METHOD__, 0xC0, I000, 0x02)
         }
 
         /* Serialized Method can be invoked recursively */
@@ -1179,10 +1178,10 @@
 
             I000 = 0x00
             MM00 (0x00)
-            M205 (TS, 0xC1, I000, 0x01)
+            M205 (__METHOD__, 0xC1, I000, 0x01)
             I000 = 0x00
             MM00 (0x01)
-            M205 (TS, 0xC2, I000, 0x02)
+            M205 (__METHOD__, 0xC2, I000, 0x02)
         }
 
         /* Serialized Method can invoke another Serialized One */
@@ -1206,10 +1205,10 @@
 
             I000 = 0x00
             MM00 (0x00)
-            M205 (TS, 0xC3, I000, 0x01)
+            M205 (__METHOD__, 0xC3, I000, 0x01)
             I000 = 0x00
             MM00 (0x01)
-            M205 (TS, 0xC4, I000, 0x02)
+            M205 (__METHOD__, 0xC4, I000, 0x02)
         }
 
         /* Serialized Method can acquire an Mutex */
@@ -1224,7 +1223,7 @@
                 If (Arg0)
                 {
                     Local0 = Acquire (MTX0, 0x0000)
-                    If (!M205 (TS, 0xC5, Local0, Zero))
+                    If (!M205 (__METHOD__, 0xC5, Local0, Zero))
                     {
                         I000++
                         Release (MTX0)
@@ -1234,10 +1233,10 @@
 
             I000 = 0x00
             MM00 (0x00)
-            M205 (TS, 0xC6, I000, 0x01)
+            M205 (__METHOD__, 0xC6, I000, 0x01)
             I000 = 0x00
             MM00 (0x01)
-            M205 (TS, 0xC7, I000, 0x02)
+            M205 (__METHOD__, 0xC7, I000, 0x02)
         }
 
         /* When Serialized Method calls another one then */
@@ -1258,7 +1257,7 @@
             Method (MM01, 0, NotSerialized)
             {
                 Local0 = Acquire (MTX1, 0x0000)
-                If (!M205 (TS, 0xC8, Local0, Zero))
+                If (!M205 (__METHOD__, 0xC8, Local0, Zero))
                 {
                     I000++
                     Release (MTX1)
@@ -1267,10 +1266,10 @@
 
             I000 = 0x00
             MM00 (0x00)
-            M205 (TS, 0xC9, I000, 0x01)
+            M205 (__METHOD__, 0xC9, I000, 0x01)
             I000 = 0x00
             MM00 (0x01)
-            M205 (TS, 0xCA, I000, 0x02)
+            M205 (__METHOD__, 0xCA, I000, 0x02)
         }
 
         /* UnSerialized Method acquiring an Mutex can invoke */
@@ -1282,7 +1281,7 @@
             Method (MM00, 1, NotSerialized)
             {
                 Local0 = Acquire (MTX0, 0x0000)
-                If (!M205 (TS, 0xCB, Local0, Zero))
+                If (!M205 (__METHOD__, 0xCB, Local0, Zero))
                 {
                     I000++
                     If (Arg0)
@@ -1301,10 +1300,10 @@
 
             I000 = 0x00
             MM00 (0x00)
-            M205 (TS, 0xCC, I000, 0x01)
+            M205 (__METHOD__, 0xCC, I000, 0x01)
             I000 = 0x00
             MM00 (0x01)
-            M205 (TS, 0xCD, I000, 0x02)
+            M205 (__METHOD__, 0xCD, I000, 0x02)
         }
 
         /* When UnSerialized Method acquiring an Mutex invokes */
@@ -1317,7 +1316,7 @@
             Method (MM00, 1, NotSerialized)
             {
                 Local0 = Acquire (MTX0, 0x0000)
-                If (!M205 (TS, 0xCE, Local0, Zero))
+                If (!M205 (__METHOD__, 0xCE, Local0, Zero))
                 {
                     I000++
                     If (Arg0)
@@ -1339,10 +1338,10 @@
 
             I000 = 0x00
             MM00 (0x00)
-            M205 (TS, 0xCF, I000, 0x01)
+            M205 (__METHOD__, 0xCF, I000, 0x01)
             I000 = 0x00
             MM00 (0x01)
-            M205 (TS, 0xD0, I000, 0x02)
+            M205 (__METHOD__, 0xD0, I000, 0x02)
         }
 
         SRMT ("m240")
diff --git a/tests/aslts/src/runtime/collections/functional/name/package.asl b/tests/aslts/src/runtime/collections/functional/name/package.asl
index a7ca9f097..4694cf717 100644
--- a/tests/aslts/src/runtime/collections/functional/name/package.asl
+++ b/tests/aslts/src/runtime/collections/functional/name/package.asl
@@ -55,7 +55,6 @@
 
     Method (M1F0, 0, Serialized)
     {
-        Name (TS, "m1f0")
         Name (P000, Package (0xFF)
         {
             /* 0 */
@@ -322,7 +321,7 @@
             0xFD,
             0xFE
         })
-        TS00 (TS)
+        TS00 (__METHOD__)
         /* Too much time for 1 there, so use {8/16} */
 
         Local6 = C040 /* \C040 */
@@ -338,7 +337,7 @@
             {
                 If ((Local2 != Local3))
                 {
-                    ERR (TS, Z051, 0x93, 0x00, 0x00, Local2, Local3)
+                    ERR (__METHOD__, Z051, 0x93, 0x00, 0x00, Local2, Local3)
                 }
             }
             ElseIf ((Local1 <= 0x9F))
@@ -346,7 +345,7 @@
                 Local3 = (0x8765AC00 + Local4)
                 If ((Local2 != Local3))
                 {
-                    ERR (TS, Z051, 0x98, 0x00, 0x00, Local2, Local3)
+                    ERR (__METHOD__, Z051, 0x98, 0x00, 0x00, Local2, Local3)
                 }
 
                 Local4 += Local6
@@ -356,20 +355,20 @@
                 Local3 = (0x8765ACBA11223300 + Local5)
                 If ((Local2 != Local3))
                 {
-                    ERR (TS, Z051, 0x9E, 0x00, 0x00, Local2, Local3)
+                    ERR (__METHOD__, Z051, 0x9E, 0x00, 0x00, Local2, Local3)
                 }
 
                 Local5 += Local6
             }
             ElseIf ((Local2 != Local3))
             {
-                ERR (TS, Z051, 0xA3, 0x00, 0x00, Local2, Local3)
+                ERR (__METHOD__, Z051, 0xA3, 0x00, 0x00, Local2, Local3)
             }
 
             Local3 = ObjectType (Local2)
             If ((Local3 != 0x01))
             {
-                ERR (TS, Z051, 0xA9, 0x00, 0x00, Local3, 0x01)
+                ERR (__METHOD__, Z051, 0xA9, 0x00, 0x00, Local3, 0x01)
             }
 
             Local1 += Local6
@@ -379,7 +378,7 @@
         Local0 = SizeOf (P000)
         If ((Local0 != 0xFF))
         {
-            ERR (TS, Z051, 0xB2, 0x00, 0x00, Local0, 0xFF)
+            ERR (__METHOD__, Z051, 0xB2, 0x00, 0x00, Local0, 0xFF)
         }
     }
 
@@ -387,7 +386,6 @@
 
     Method (M1F1, 0, Serialized)
     {
-        Name (TS, "m1f1")
         Name (P000, Package (0x0A)
         {
             "",
@@ -401,7 +399,7 @@
             "01234567",
             "01234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
         })
-        TS00 (TS)
+        TS00 (__METHOD__)
         Local0 = 0x0A
         Local1 = 0x00
         Local5 = 0x00
@@ -417,13 +415,13 @@
 
             If ((Local4 != Local3))
             {
-                ERR (TS, Z051, 0xD1, 0x00, 0x00, Local4, Local3)
+                ERR (__METHOD__, Z051, 0xD1, 0x00, 0x00, Local4, Local3)
             }
 
             Local3 = ObjectType (Local2)
             If ((Local3 != 0x02))
             {
-                ERR (TS, Z051, 0xD6, 0x00, 0x00, Local3, 0x02)
+                ERR (__METHOD__, Z051, 0xD6, 0x00, 0x00, Local3, 0x02)
             }
 
             Local1++
@@ -433,7 +431,7 @@
         Local0 = SizeOf (P000)
         If ((Local0 != 0x0A))
         {
-            ERR (TS, Z051, 0xDF, 0x00, 0x00, Local0, 0x0A)
+            ERR (__METHOD__, Z051, 0xDF, 0x00, 0x00, Local0, 0x0A)
         }
     }
 
@@ -441,7 +439,6 @@
 
     Method (M1F2, 0, Serialized)
     {
-        Name (TS, "m1f2")
         Name (P000, Package (0xFF)
         {
             Buffer (0x01){},
@@ -754,7 +751,7 @@
             Buffer (0xFE){},
             Buffer (0xFF){}
         })
-        TS00 (TS)
+        TS00 (__METHOD__)
         /* Too much time for 1 there, so use {8/16} */
 
         Local6 = C040 /* \C040 */
@@ -768,13 +765,13 @@
             Local4 = (Local1 + 0x01)
             If ((Local4 != Local3))
             {
-                ERR (TS, Z051, 0x014E, 0x00, 0x00, Local4, Local3)
+                ERR (__METHOD__, Z051, 0x014E, 0x00, 0x00, Local4, Local3)
             }
 
             Local3 = ObjectType (Local2)
             If ((Local3 != 0x03))
             {
-                ERR (TS, Z051, 0x0153, 0x00, 0x00, Local3, 0x03)
+                ERR (__METHOD__, Z051, 0x0153, 0x00, 0x00, Local3, 0x03)
             }
 
             Local1 += Local6
@@ -784,7 +781,7 @@
         Local0 = SizeOf (P000)
         If ((Local0 != 0xFF))
         {
-            ERR (TS, Z051, 0x015C, 0x00, 0x00, Local0, 0xFF)
+            ERR (__METHOD__, Z051, 0x015C, 0x00, 0x00, Local0, 0xFF)
         }
     }
 
@@ -792,7 +789,6 @@
 
     Method (M1F3, 0, Serialized)
     {
-        Name (TS, "m1f3")
         Name (P000, Package (0xFF)
         {
             Package (0x01){},
@@ -1236,7 +1232,7 @@
             Package (0xFE){},
             Package (0xFF){}
         })
-        TS00 (TS)
+        TS00 (__METHOD__)
         /* Too much time for 1 there, so use {8/16} */
 
         Local6 = C040 /* \C040 */
@@ -1250,13 +1246,13 @@
             Local4 = (Local1 + 0x01)
             If ((Local4 != Local3))
             {
-                ERR (TS, Z051, 0x01CF, 0x00, 0x00, Local4, Local3)
+                ERR (__METHOD__, Z051, 0x01CF, 0x00, 0x00, Local4, Local3)
             }
 
             Local3 = ObjectType (Local2)
             If ((Local3 != 0x04))
             {
-                ERR (TS, Z051, 0x01D4, 0x00, 0x00, Local3, 0x04)
+                ERR (__METHOD__, Z051, 0x01D4, 0x00, 0x00, Local3, 0x04)
             }
 
             Local1 += Local6
@@ -1266,7 +1262,7 @@
         Local0 = SizeOf (P000)
         If ((Local0 != 0xFF))
         {
-            ERR (TS, Z051, 0x01DD, 0x00, 0x00, Local0, 0xFF)
+            ERR (__METHOD__, Z051, 0x01DD, 0x00, 0x00, Local0, 0xFF)
         }
     }
 
@@ -1274,8 +1270,7 @@
 
     Method (M1F4, 0, Serialized)
     {
-        Name (TS, "m1f4")
-        TS00 (TS)
+        TS00 (__METHOD__)
         /* Not implemented yet */
 
         Method (M000, 0, NotSerialized)
@@ -1403,7 +1398,6 @@
     /* - 255 levels in depth */
     Method (M1F6, 0, Serialized)
     {
-        Name (TS, "m1f6")
         Name (P000, Package (0xFF)
         {
             /* 0 */
@@ -4635,7 +4629,7 @@
         /* n000 - step */
         /* n001 - decr cur counter */
         /* n002 - incr cur counter */
-        TS00 (TS)
+        TS00 (__METHOD__)
         Name (N000, 0x00)
         Name (N001, 0x00)
         Name (N002, 0x00)
@@ -4653,7 +4647,7 @@
 
             Local0 = DerefOf (P001 [N002])
             Local1 = ObjectType (Local0)
-            M1F5 (TS, P000, Local0)
+            M1F5 (__METHOD__, P000, Local0)
             N002 += N000 /* \M1F6.N000 */
             N001--
         }
@@ -4661,13 +4655,13 @@
         Local0 = SizeOf (P000)
         If ((Local0 != 0xFF))
         {
-            ERR (TS, Z051, 0x03E2, 0x00, 0x00, Local0, 0xFF)
+            ERR (__METHOD__, Z051, 0x03E2, 0x00, 0x00, Local0, 0xFF)
         }
 
         Local0 = SizeOf (P001)
         If ((Local0 != 0x1D))
         {
-            ERR (TS, Z051, 0x03E7, 0x00, 0x00, Local0, 0x1D)
+            ERR (__METHOD__, Z051, 0x03E7, 0x00, 0x00, Local0, 0x1D)
         }
     }
 
@@ -4677,8 +4671,7 @@
     /* Do this test when ObjectType will be fixed. */
     Method (M1F7, 0, Serialized)
     {
-        Name (TS, "m1f7")
-        TS00 (TS)
+        TS00 (__METHOD__)
         Name (P000, Package (0xFF){})
         /*	Store(DeRefOf(Index(p000, 0)), Local0) */
 
@@ -4692,7 +4685,6 @@
     /* <Package>,<size>,<start value> */
     Method (M1F8, 3, Serialized)
     {
-        Name (TS, "m1f8")
         Name (N000, 0x00)
         Name (NCUR, 0x00)
         /* Writing with indexes */
@@ -4728,7 +4720,7 @@
 
             If ((Local1 != Local0))
             {
-                ERR (TS, Z051, 0x0424, 0x00, 0x00, Local1, Local0)
+                ERR (__METHOD__, Z051, 0x0424, 0x00, 0x00, Local1, Local0)
             }
 
             Local0++
@@ -4739,13 +4731,13 @@
         Local0 = ObjectType (Arg0)
         If ((Local0 != 0x04))
         {
-            ERR (TS, Z051, 0x042D, 0x00, 0x00, Local0, 0x04)
+            ERR (__METHOD__, Z051, 0x042D, 0x00, 0x00, Local0, 0x04)
         }
 
         Local0 = SizeOf (Arg0)
         If ((Local0 != Arg1))
         {
-            ERR (TS, Z051, 0x0432, 0x00, 0x00, Local0, Arg1)
+            ERR (__METHOD__, Z051, 0x0432, 0x00, 0x00, Local0, Arg1)
         }
     }
 
@@ -4764,8 +4756,7 @@
 
     Method (M1FA, 0, Serialized)
     {
-        Name (TS, "m1fa")
-        TS00 (TS)
+        TS00 (__METHOD__)
         M1F9 (0xFF)
     }
 
@@ -4774,7 +4765,6 @@
     /* <Package>,<size>,<start string> */
     Method (M1FB, 3, Serialized)
     {
-        Name (TS, "m1fb")
         Name (N000, 0x00)
         Name (NCUR, 0x00)
         /* Writing with indexes */
@@ -4809,7 +4799,7 @@
 
             If ((Local1 != Local0))
             {
-                ERR (TS, Z051, 0x0470, 0x00, 0x00, Local1, Local0)
+                ERR (__METHOD__, Z051, 0x0470, 0x00, 0x00, Local1, Local0)
             }
 
             N000--
@@ -4819,13 +4809,13 @@
         Local0 = ObjectType (Arg0)
         If ((Local0 != 0x04))
         {
-            ERR (TS, Z051, 0x0478, 0x00, 0x00, Local0, 0x04)
+            ERR (__METHOD__, Z051, 0x0478, 0x00, 0x00, Local0, 0x04)
         }
 
         Local0 = SizeOf (Arg0)
         If ((Local0 != Arg1))
         {
-            ERR (TS, Z051, 0x047D, 0x00, 0x00, Local0, Arg1)
+            ERR (__METHOD__, Z051, 0x047D, 0x00, 0x00, Local0, Arg1)
         }
     }
 
@@ -4844,8 +4834,7 @@
 
     Method (M1FD, 0, Serialized)
     {
-        Name (TS, "m1fd")
-        TS00 (TS)
+        TS00 (__METHOD__)
         M1FC (0xFF)
     }
 
@@ -4854,7 +4843,6 @@
     /* <Package>,<size>,<start buffer> */
     Method (M1FE, 3, Serialized)
     {
-        Name (TS, "m1fe")
         Name (N000, 0x00)
         Name (NCUR, 0x00)
         /* Writing with indexes */
@@ -4891,7 +4879,7 @@
 
             If ((Local1 != Local0))
             {
-                ERR (TS, Z051, 0x04BE, 0x00, 0x00, 0x00, 0x00)
+                ERR (__METHOD__, Z051, 0x04BE, 0x00, 0x00, 0x00, 0x00)
                 Debug = Local0
                 Debug = Local1
                 Return (Ones)
@@ -4904,13 +4892,13 @@
         Local0 = ObjectType (Arg0)
         If ((Local0 != 0x04))
         {
-            ERR (TS, Z051, 0x04C9, 0x00, 0x00, Local0, 0x04)
+            ERR (__METHOD__, Z051, 0x04C9, 0x00, 0x00, Local0, 0x04)
         }
 
         Local0 = SizeOf (Arg0)
         If ((Local0 != Arg1))
         {
-            ERR (TS, Z051, 0x04CE, 0x00, 0x00, Local0, Arg1)
+            ERR (__METHOD__, Z051, 0x04CE, 0x00, 0x00, Local0, Arg1)
         }
 
         Return (Zero)
@@ -4939,8 +4927,7 @@
 
     Method (M200, 0, Serialized)
     {
-        Name (TS, "m200")
-        TS00 (TS)
+        TS00 (__METHOD__)
         M1FF (0xFF)
     }
 
@@ -4950,7 +4937,6 @@
     Method (M201, 3, Serialized)
     {
         Name (PR00, 0x00)
-        Name (TS, "m201")
         Name (N000, 0x00)
         Name (NCUR, 0x00)
         /* Writing with indexes */
@@ -4994,7 +4980,7 @@
             Local0 = ObjectType (Local1)
             If ((Local0 != 0x04))
             {
-                ERR (TS, Z051, 0x0519, 0x00, 0x00, Local0, 0x04)
+                ERR (__METHOD__, Z051, 0x0519, 0x00, 0x00, Local0, 0x04)
                 Return (Ones)
             }
 
@@ -5005,13 +4991,13 @@
         Local0 = ObjectType (Arg0)
         If ((Local0 != 0x04))
         {
-            ERR (TS, Z051, 0x0522, 0x00, 0x00, Local0, 0x04)
+            ERR (__METHOD__, Z051, 0x0522, 0x00, 0x00, Local0, 0x04)
         }
 
         Local0 = SizeOf (Arg0)
         If ((Local0 != Arg1))
         {
-            ERR (TS, Z051, 0x0527, 0x00, 0x00, Local0, Arg1)
+            ERR (__METHOD__, Z051, 0x0527, 0x00, 0x00, Local0, Arg1)
         }
 
         Return (Zero)
@@ -5042,8 +5028,7 @@
     /* performed, too complex. */
     Method (M203, 0, Serialized)
     {
-        Name (TS, "m203")
-        TS00 (TS)
+        TS00 (__METHOD__)
         /*	m202(255) */
 
         M202 (0x01)
diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref05.asl b/tests/aslts/src/runtime/collections/functional/reference/ref05.asl
index 0ca58a041..16ea09cad 100644
--- a/tests/aslts/src/runtime/collections/functional/reference/ref05.asl
+++ b/tests/aslts/src/runtime/collections/functional/reference/ref05.asl
@@ -258,24 +258,23 @@
      */
     Method (M1B1, 0, Serialized)
     {
-        Name (TS, "m1b1")
         C081 = Z108 /* absolute index of file initiating the checking */ /* \Z108 */
         /* All types */
 
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x9E)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x9E)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x9F)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x9F)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xA0)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xA0)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0xA1)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0xA1)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xA2)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xA2)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0xA3)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0xA3)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0xA4)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0xA4)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -285,57 +284,57 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0xA5)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0xA5)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0xA6)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0xA6)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0xA7)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0xA7)
         }
 
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0xA8)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0xA8)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0xA9)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0xA9)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0xAA)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0xAA)
         }
 
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xAB)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xAB)
         /*///////////////////// All after Integer */
 
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xAC)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xAC)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xAD)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xAD)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xAE)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xAE)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xAF)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xAF)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xB0)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xB0)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xB1)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xB1)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0xB2)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0xB2)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xB3)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xB3)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xB4)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xB4)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xB5)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xB5)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0xB6)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0xB6)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xB7)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xB7)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0xB8)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0xB8)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xB9)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xB9)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -345,67 +344,67 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0xBA)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0xBA)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xBB)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xBB)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0xBC)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0xBC)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xBD)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xBD)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0xBE)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0xBE)
         }
 
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xBF)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xBF)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0xC0)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0xC0)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xC1)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xC1)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0xC2)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0xC2)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xC3)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xC3)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0xC4)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0xC4)
         }
 
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xC5)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xC5)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xC6)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xC6)
         CopyObject (I900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xC7)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xC7)
         /*///////////////////// All-Integer after String */
 
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xC8)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xC8)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xC9)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xC9)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xCA)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xCA)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xCB)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xCB)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0xCC)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0xCC)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xCD)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xCD)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xCE)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xCE)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xCF)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xCF)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0xD0)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0xD0)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xD1)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xD1)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0xD2)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0xD2)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xD3)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xD3)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -415,63 +414,63 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0xD4)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0xD4)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xD5)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xD5)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0xD6)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0xD6)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xD7)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xD7)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0xD8)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0xD8)
         }
 
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xD9)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xD9)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0xDA)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0xDA)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xDB)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xDB)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0xDC)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0xDC)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xDD)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xDD)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0xDE)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0xDE)
         }
 
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xDF)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xDF)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xE0)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xE0)
         CopyObject (S900, Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0xE1)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0xE1)
         /*///////////////////// All-(Integer+String) after Buffer */
 
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xE2)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xE2)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xE3)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xE3)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0xE4)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0xE4)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xE5)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xE5)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xE6)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xE6)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xE7)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xE7)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0xE8)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0xE8)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xE9)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xE9)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0xEA)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0xEA)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xEB)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xEB)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -481,59 +480,59 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0xEC)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0xEC)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xED)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xED)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0xEE)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0xEE)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xEF)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xEF)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0xF0)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0xF0)
         }
 
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xF1)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xF1)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0xF2)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0xF2)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xF3)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xF3)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0xF4)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0xF4)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xF5)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xF5)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0xF6)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0xF6)
         }
 
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xF7)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xF7)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xF7)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xF7)
         CopyObject (B900, Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0xF9)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0xF9)
         /*///////////////////// All-(...) after Package */
 
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0xFA)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0xFA)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0xFB)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0xFB)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0xFC)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0xFC)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0xFD)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0xFD)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0xFE)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0xFE)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0xFF)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0xFF)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0100)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0100)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0101)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0101)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -543,55 +542,55 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x0102)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0102)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0103)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0103)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0104)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0104)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0105)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0105)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x0106)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x0106)
         }
 
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0107)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0107)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0108)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0108)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0109)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0109)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x010A)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x010A)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x010B)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x010B)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x010C)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x010C)
         }
 
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x010D)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x010D)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x010E)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x010E)
         CopyObject (P900, Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x010F)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x010F)
         /*///////////////////// All-(...) after Field Unit */
 
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0110)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0110)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0111)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0111)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0112)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0112)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0113)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0113)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0114)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0114)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0115)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0115)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -601,51 +600,51 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x0116)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0116)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0117)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0117)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0118)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0118)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0119)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0119)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x011A)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x011A)
         }
 
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x011B)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x011B)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x011C)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x011C)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x011D)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x011D)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x011E)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x011E)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x011F)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x011F)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x0120)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x0120)
         }
 
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0121)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0121)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0122)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0122)
         CopyObject (F900, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0123)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0123)
         /*///////////////////// All-(...) after Device */
 
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0124)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0124)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0125)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0125)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0126)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0126)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0127)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0127)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -655,47 +654,47 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x0128)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0128)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0129)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0129)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x012A)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x012A)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x012B)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x012B)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x012C)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x012C)
         }
 
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x012D)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x012D)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x012E)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x012E)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x012F)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x012F)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0130)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0130)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0131)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0131)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x0132)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x0132)
         }
 
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0133)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0133)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0134)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0134)
         CopyObject (D900, Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0135)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0135)
         /*///////////////////// All-(...) after Event */
 
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0136)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0136)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0137)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0137)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -705,41 +704,41 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x0138)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0138)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0139)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0139)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x013A)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x013A)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x013B)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x013B)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x013C)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x013C)
         }
 
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x013D)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x013D)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x013E)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x013E)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x013F)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x013F)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0140)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0140)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0141)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0141)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x0142)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x0142)
         }
 
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0143)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0143)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0144)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0144)
         CopyObject (E900, Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0145)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0145)
         /*///////////////////// All-(...) after Method */
 
         If (RN06)
@@ -751,7 +750,7 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x0146)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0146)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -761,9 +760,9 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x0147)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0147)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0148)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0148)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -773,11 +772,11 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x0149)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0149)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x014A)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x014A)
         }
 
         If (RN06)
@@ -789,9 +788,9 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x014B)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x014B)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x014C)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x014C)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -801,9 +800,9 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x014D)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x014D)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x014E)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x014E)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -813,11 +812,11 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x014F)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x014F)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x0150)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x0150)
         }
 
         If (RN06)
@@ -829,9 +828,9 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x0151)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0151)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0152)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0152)
         If (RN06)
         {
             CopyObject (M901 (), Local0)
@@ -841,153 +840,153 @@
             CopyObject (DerefOf (RefOf (M901)), Local0)
         }
 
-        M1A3 (Local0, C010, Z108, TS, 0x0153)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0153)
         /*///////////////////// All-(...) after Mutex */
 
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0154)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0154)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0155)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0155)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x0156)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x0156)
         }
 
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0157)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0157)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0158)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0158)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0159)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0159)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x015A)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x015A)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x015B)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x015B)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x015C)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x015C)
         }
 
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x015D)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x015D)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x015E)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x015E)
         CopyObject (MX90, Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x015F)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x015F)
         /*///////////////////// All-(...) after Operation Region */
 
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x0160)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x0160)
         }
 
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x0161)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x0161)
         }
 
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0162)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0162)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x0163)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x0163)
         }
 
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0164)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0164)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x0165)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x0165)
         }
 
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x0166)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x0166)
         }
 
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x0167)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x0167)
         }
 
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0168)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0168)
         If (Y510)
         {
             CopyObject (R900, Local0)
-            M1A3 (Local0, C012, Z108, TS, 0x0169)
+            M1A3 (Local0, C012, Z108, __METHOD__, 0x0169)
         }
 
         /*///////////////////// All-(...) after Power Resource */
 
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x016A)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x016A)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x016B)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x016B)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x016C)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x016C)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x016D)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x016D)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x016E)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x016E)
         }
 
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x016F)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x016F)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0170)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0170)
         CopyObject (PW90, Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0171)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0171)
         /*///////////////////// All-(...) after Processor */
 
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0172)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0172)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0173)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0173)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x0174)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x0174)
         }
 
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0175)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0175)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0176)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0176)
         CopyObject (PR90, Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0177)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0177)
         /*///////////////////// All-(...) after Thermal Zone */
 
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x0178)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x0178)
         }
 
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x0179)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0179)
         If (Y508)
         {
             CopyObject (TZ90, Local0)
-            M1A3 (Local0, C015, Z108, TS, 0x017A)
+            M1A3 (Local0, C015, Z108, __METHOD__, 0x017A)
         }
 
         /*///////////////////// All-(...) after Buffer Field */
 
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x017B)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x017B)
         CopyObject (BF90, Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x017C)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x017C)
     }
 
     /*
@@ -1001,118 +1000,117 @@
      */
     Method (M1B2, 0, Serialized)
     {
-        Name (TS, "m1b2")
         C081 = Z108 /* absolute index of file initiating the checking */ /* \Z108 */
         /* All available for Store types */
 
         Local0 = I900 /* \I900 */
-        M1A3 (Local0, C009, Z108, TS, 0x017D)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x017D)
         Local0 = S900 /* \S900 */
-        M1A3 (Local0, C00A, Z108, TS, 0x017E)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x017E)
         Local0 = B900 /* \B900 */
-        M1A3 (Local0, C00B, Z108, TS, 0x017F)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x017F)
         Local0 = P900 /* \P900 */
-        M1A3 (Local0, C00C, Z108, TS, 0x0180)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0180)
         Local0 = F900 /* \F900 */
-        M1A3 (Local0, C009, Z108, TS, 0x0181)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0181)
         Local0 = BF90 /* \BF90 */
-        M1A3 (Local0, C009, Z108, TS, 0x0182)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0182)
         /*///////////////////// All after Integer */
 
         Local0 = I900 /* \I900 */
-        M1A3 (Local0, C009, Z108, TS, 0x0183)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0183)
         Local0 = I900 /* \I900 */
-        M1A3 (Local0, C009, Z108, TS, 0x0184)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0184)
         Local0 = S900 /* \S900 */
-        M1A3 (Local0, C00A, Z108, TS, 0x0185)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x0185)
         Local0 = I900 /* \I900 */
-        M1A3 (Local0, C009, Z108, TS, 0x0186)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0186)
         Local0 = B900 /* \B900 */
-        M1A3 (Local0, C00B, Z108, TS, 0x0187)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0187)
         Local0 = I900 /* \I900 */
-        M1A3 (Local0, C009, Z108, TS, 0x0188)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0188)
         Local0 = P900 /* \P900 */
-        M1A3 (Local0, C00C, Z108, TS, 0x0189)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0189)
         Local0 = I900 /* \I900 */
-        M1A3 (Local0, C009, Z108, TS, 0x018A)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x018A)
         Local0 = F900 /* \F900 */
-        M1A3 (Local0, C009, Z108, TS, 0x018B)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x018B)
         Local0 = I900 /* \I900 */
-        M1A3 (Local0, C009, Z108, TS, 0x018C)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x018C)
         Local0 = BF90 /* \BF90 */
-        M1A3 (Local0, C009, Z108, TS, 0x018D)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x018D)
         Local0 = I900 /* \I900 */
-        M1A3 (Local0, C009, Z108, TS, 0x018E)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x018E)
         /*///////////////////// All-Integer after String */
 
         Local0 = S900 /* \S900 */
-        M1A3 (Local0, C00A, Z108, TS, 0x018F)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x018F)
         Local0 = S900 /* \S900 */
-        M1A3 (Local0, C00A, Z108, TS, 0x0190)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x0190)
         Local0 = B900 /* \B900 */
-        M1A3 (Local0, C00B, Z108, TS, 0x0191)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0191)
         Local0 = S900 /* \S900 */
-        M1A3 (Local0, C00A, Z108, TS, 0x0192)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x0192)
         Local0 = P900 /* \P900 */
-        M1A3 (Local0, C00C, Z108, TS, 0x0193)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0193)
         Local0 = S900 /* \S900 */
-        M1A3 (Local0, C00A, Z108, TS, 0x0194)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x0194)
         Local0 = F900 /* \F900 */
-        M1A3 (Local0, C009, Z108, TS, 0x0195)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0195)
         Local0 = S900 /* \S900 */
-        M1A3 (Local0, C00A, Z108, TS, 0x0196)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x0196)
         Local0 = BF90 /* \BF90 */
-        M1A3 (Local0, C009, Z108, TS, 0x0197)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0197)
         Local0 = S900 /* \S900 */
-        M1A3 (Local0, C00A, Z108, TS, 0x0198)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x0198)
         /*///////////////////// All-(Integer+String) after Buffer */
 
         Local0 = B900 /* \B900 */
-        M1A3 (Local0, C00B, Z108, TS, 0x0199)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0199)
         Local0 = B900 /* \B900 */
-        M1A3 (Local0, C00B, Z108, TS, 0x019A)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x019A)
         Local0 = P900 /* \P900 */
-        M1A3 (Local0, C00C, Z108, TS, 0x019B)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x019B)
         Local0 = B900 /* \B900 */
-        M1A3 (Local0, C00B, Z108, TS, 0x019C)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x019C)
         Local0 = F900 /* \F900 */
-        M1A3 (Local0, C009, Z108, TS, 0x019D)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x019D)
         Local0 = B900 /* \B900 */
-        M1A3 (Local0, C00B, Z108, TS, 0x019E)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x019E)
         Local0 = BF90 /* \BF90 */
-        M1A3 (Local0, C009, Z108, TS, 0x019F)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x019F)
         Local0 = B900 /* \B900 */
-        M1A3 (Local0, C00B, Z108, TS, 0x01A0)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01A0)
         /*///////////////////// All-(...) after Package */
 
         Local0 = P900 /* \P900 */
-        M1A3 (Local0, C00C, Z108, TS, 0x01A1)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x01A1)
         Local0 = P900 /* \P900 */
-        M1A3 (Local0, C00C, Z108, TS, 0x01A2)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x01A2)
         Local0 = F900 /* \F900 */
-        M1A3 (Local0, C009, Z108, TS, 0x01A3)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01A3)
         Local0 = P900 /* \P900 */
-        M1A3 (Local0, C00C, Z108, TS, 0x01A4)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x01A4)
         Local0 = BF90 /* \BF90 */
-        M1A3 (Local0, C009, Z108, TS, 0x01A5)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01A5)
         Local0 = P900 /* \P900 */
-        M1A3 (Local0, C00C, Z108, TS, 0x01A6)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x01A6)
         /*///////////////////// All-(...) after Field Unit */
 
         Local0 = F900 /* \F900 */
-        M1A3 (Local0, C009, Z108, TS, 0x01A7)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01A7)
         Local0 = F900 /* \F900 */
-        M1A3 (Local0, C009, Z108, TS, 0x01A8)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01A8)
         Local0 = BF90 /* \BF90 */
-        M1A3 (Local0, C009, Z108, TS, 0x01A9)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01A9)
         Local0 = F900 /* \F900 */
-        M1A3 (Local0, C009, Z108, TS, 0x01AA)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01AA)
         /*///////////////////// All-(...) after Buffer Field */
 
         Local0 = BF90 /* \BF90 */
-        M1A3 (Local0, C009, Z108, TS, 0x01AB)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01AB)
         Local0 = BF90 /* \BF90 */
-        M1A3 (Local0, C009, Z108, TS, 0x01AC)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01AC)
     }
 
     /*
@@ -1127,484 +1125,483 @@
      */
     Method (M1B4, 0, Serialized)
     {
-        Name (TS, "m1b4")
         C081 = Z108 /* absolute index of file initiating the checking */ /* \Z108 */
         /* All types */
 
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01AD)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01AD)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01AE)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01AE)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01AF)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01AF)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x01B0)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x01B0)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x01B1)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x01B1)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x01B2)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x01B2)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x01B3)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x01B3)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x01B4)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x01B4)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x01B5)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x01B5)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x01B6)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x01B6)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x01B7)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x01B7)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x01B8)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x01B8)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x01B9)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x01B9)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x01BA)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x01BA)
         /*///////////////////// All after Integer */
 
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01BB)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01BB)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01BC)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01BC)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01BD)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01BD)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01BE)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01BE)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01BF)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01BF)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01C0)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01C0)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x01C1)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x01C1)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01C2)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01C2)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x01C3)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x01C3)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01C4)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01C4)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x01C5)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x01C5)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01C6)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01C6)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x01C7)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x01C7)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01C8)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01C8)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x01C9)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x01C9)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01CA)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01CA)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x01CB)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x01CB)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01CC)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01CC)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x01CD)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x01CD)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01CE)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01CE)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x01CF)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x01CF)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01D0)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01D0)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x01D1)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x01D1)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01D2)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01D2)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x01D3)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x01D3)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01D4)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01D4)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x01D5)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x01D5)
         CopyObject (RefOf (I900), Local0)
-        M1A3 (Local0, C009, Z108, TS, 0x01D6)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x01D6)
         /*///////////////////// All-Integer after String */
 
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01D7)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01D7)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01D8)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01D8)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01D9)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01D9)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01DA)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01DA)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x01DB)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x01DB)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01DC)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01DC)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x01DD)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x01DD)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01DE)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01DE)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x01DF)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x01DF)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01E0)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01E0)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x01E1)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x01E1)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01E2)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01E2)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x01E3)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x01E3)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01E4)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01E4)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x01E5)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x01E5)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01E6)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01E6)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x01E7)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x01E7)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01E8)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01E8)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x01E9)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x01E9)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01EA)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01EA)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x01EB)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x01EB)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01EC)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01EC)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x01ED)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x01ED)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01EE)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01EE)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x01EF)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x01EF)
         CopyObject (RefOf (S900), Local0)
-        M1A3 (Local0, C00A, Z108, TS, 0x01F0)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x01F0)
         /*///////////////////// All-(Integer+String) after Buffer */
 
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01F1)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01F1)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01F2)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01F2)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x01F3)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x01F3)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01F4)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01F4)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x01F5)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x01F5)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01F6)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01F6)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x01F7)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x01F7)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01F8)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01F8)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x01F9)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x01F9)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01FA)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01FA)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x01FB)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x01FB)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01FC)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01FC)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x01FD)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x01FD)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x01FE)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x01FE)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x01FF)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x01FF)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x0200)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0200)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0201)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0201)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x0202)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0202)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0203)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0203)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x0204)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0204)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x0205)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0205)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x0206)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0206)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x0207)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0207)
         CopyObject (RefOf (B900), Local0)
-        M1A3 (Local0, C00B, Z108, TS, 0x0208)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0208)
         /*///////////////////// All-(...) after Package */
 
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0209)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0209)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x020A)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x020A)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x020B)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x020B)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x020C)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x020C)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x020D)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x020D)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x020E)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x020E)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x020F)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x020F)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0210)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0210)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x0211)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0211)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0230)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0230)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0231)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0231)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0232)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0232)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0233)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0233)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0234)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0234)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0235)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0235)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0236)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0236)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0237)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0237)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x0238)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0238)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x0239)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0239)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x023A)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x023A)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x023B)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x023B)
         CopyObject (RefOf (P900), Local0)
-        M1A3 (Local0, C00C, Z108, TS, 0x023C)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x023C)
         /*///////////////////// All-(...) after Field Unit */
 
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x023D)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x023D)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x023E)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x023E)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x023F)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x023F)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x0240)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0240)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0241)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0241)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x0242)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0242)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x0243)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0243)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x0244)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0244)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0245)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0245)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x0246)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0246)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0247)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0247)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x0248)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0248)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0249)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0249)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x024A)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x024A)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x024B)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x024B)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x024C)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x024C)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x024D)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x024D)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x024E)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x024E)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x024F)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x024F)
         CopyObject (RefOf (F900), Local0)
-        M1A3 (Local0, C00D, Z108, TS, 0x0250)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0250)
         /*///////////////////// All-(...) after Device */
 
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0251)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0251)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0252)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0252)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0253)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0253)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0254)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0254)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x0255)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0255)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0256)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0256)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0257)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0257)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0258)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0258)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0259)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0259)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x025A)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x025A)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x025B)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x025B)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x025C)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x025C)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x025D)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x025D)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x025E)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x025E)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x025F)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x025F)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0260)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0260)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x0261)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0261)
         CopyObject (RefOf (D900), Local0)
-        M1A3 (Local0, C00E, Z108, TS, 0x0262)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0262)
         /*///////////////////// All-(...) after Event */
 
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0263)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0263)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0264)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0264)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x0265)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0265)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0266)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0266)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0267)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0267)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0268)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0268)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0269)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0269)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x026A)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x026A)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x026B)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x026B)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x026C)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x026C)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x026D)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x026D)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x026E)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x026E)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x026F)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x026F)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0270)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0270)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x0271)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0271)
         CopyObject (RefOf (E900), Local0)
-        M1A3 (Local0, C00F, Z108, TS, 0x0272)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0272)
         /*///////////////////// All-(...) after Method */
 
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x0273)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0273)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x0274)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0274)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0275)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0275)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x0276)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0276)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0277)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0277)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x0278)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0278)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0279)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0279)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x027A)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x027A)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x027B)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x027B)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x027C)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x027C)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x027D)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x027D)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x027E)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x027E)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x027F)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x027F)
         CopyObject (RefOf (M901), Local0)
-        M1A3 (Local0, C010, Z108, TS, 0x0280)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0280)
         /*///////////////////// All-(...) after Mutex */
 
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0281)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0281)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0282)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0282)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0283)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0283)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0284)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0284)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0285)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0285)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0286)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0286)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0287)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0287)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x0288)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0288)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x0289)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0289)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x028A)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x028A)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x028B)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x028B)
         CopyObject (RefOf (MX90), Local0)
-        M1A3 (Local0, C011, Z108, TS, 0x028C)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x028C)
         /*///////////////////// All-(...) after Operation Region */
 
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x028D)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x028D)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x028E)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x028E)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x028F)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x028F)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0290)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0290)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0291)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0291)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0292)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0292)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x0293)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0293)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0294)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0294)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x0295)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0295)
         CopyObject (RefOf (R900), Local0)
-        M1A3 (Local0, C012, Z108, TS, 0x0296)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0296)
         /*///////////////////// All-(...) after Power Resource */
 
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0297)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0297)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x0298)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0298)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x0299)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0299)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x029A)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x029A)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x029B)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x029B)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x029C)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x029C)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x029D)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x029D)
         CopyObject (RefOf (PW90), Local0)
-        M1A3 (Local0, C013, Z108, TS, 0x029E)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x029E)
         /*///////////////////// All-(...) after Processor */
 
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x029F)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x029F)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x02A0)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x02A0)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x02A1)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x02A1)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x02A2)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x02A2)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x02A3)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x02A3)
         CopyObject (RefOf (PR90), Local0)
-        M1A3 (Local0, C014, Z108, TS, 0x02A4)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x02A4)
         /*///////////////////// All-(...) after Thermal Zone */
 
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x02A5)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x02A5)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x02A6)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x02A6)
         CopyObject (RefOf (TZ90), Local0)
-        M1A3 (Local0, C015, Z108, TS, 0x02A7)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x02A7)
         /*///////////////////// All-(...) after Buffer Field */
 
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x02A8)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x02A8)
         CopyObject (RefOf (BF90), Local0)
-        M1A3 (Local0, C016, Z108, TS, 0x02A9)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x02A9)
     }
 
     /*
@@ -1614,667 +1611,665 @@
      */
     Method (M1B5, 0, Serialized)
     {
-        Name (TS, "m1b5")
         C081 = Z108 /* absolute index of file initiating the checking */ /* \Z108 */
         /* All types */
 
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02AA)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02AA)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02AB)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02AB)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02AC)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02AC)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x02AD)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x02AD)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x02AE)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x02AE)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x02AF)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x02AF)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x02B0)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x02B0)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x02B1)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x02B1)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x02B2)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x02B2)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x02B3)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x02B3)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x02B4)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x02B4)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x02B5)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x02B5)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x02B6)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x02B6)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x02B7)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x02B7)
         /*///////////////////// All after Integer */
 
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02B8)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02B8)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02B9)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02B9)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02BA)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02BA)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02BB)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02BB)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02BC)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02BC)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02BD)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02BD)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x02BE)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x02BE)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02BF)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02BF)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x02C0)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x02C0)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02C1)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02C1)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x02C2)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x02C2)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02C3)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02C3)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x02C4)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x02C4)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02C5)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02C5)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x02C6)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x02C6)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02C7)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02C7)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x02C8)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x02C8)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02C9)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02C9)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x02CA)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x02CA)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02CB)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02CB)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x02CC)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x02CC)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02CD)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02CD)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x02CE)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x02CE)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02CF)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02CF)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x02D0)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x02D0)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02D1)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02D1)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x02D2)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x02D2)
         Local0 = RefOf (I900)
-        M1A3 (Local0, C009, Z108, TS, 0x02D3)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x02D3)
         /*///////////////////// All-Integer after String */
 
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02D4)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02D4)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02D5)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02D5)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02D6)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02D6)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02D7)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02D7)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x02D8)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x02D8)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02D9)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02D9)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x02DA)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x02DA)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02DB)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02DB)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x02DC)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x02DC)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02DD)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02DD)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x02DE)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x02DE)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02DF)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02DF)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x02E0)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x02E0)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02E1)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02E1)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x02E2)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x02E2)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02E3)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02E3)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x02E4)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x02E4)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02E5)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02E5)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x02E6)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x02E6)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02E7)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02E7)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x02E8)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x02E8)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02E9)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02E9)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x02EA)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x02EA)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02EB)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02EB)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x02EC)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x02EC)
         Local0 = RefOf (S900)
-        M1A3 (Local0, C00A, Z108, TS, 0x02ED)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x02ED)
         /*///////////////////// All-(Integer+String) after Buffer */
 
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02EE)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02EE)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02EF)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02EF)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x02F0)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x02F0)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02F1)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02F1)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x02F2)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x02F2)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02F3)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02F3)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x02F4)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x02F4)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02F5)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02F5)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x02F6)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x02F6)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02F7)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02F7)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x02F8)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x02F8)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02F9)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02F9)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x02FA)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x02FA)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02FB)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02FB)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x02FC)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x02FC)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02FD)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02FD)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x02FE)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x02FE)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x02FF)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x02FF)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x0300)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0300)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x0301)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0301)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x0302)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0302)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x0303)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0303)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x0304)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0304)
         Local0 = RefOf (B900)
-        M1A3 (Local0, C00B, Z108, TS, 0x0305)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0305)
         /*///////////////////// All-(...) after Package */
 
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x0306)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0306)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x0307)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0307)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x0308)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0308)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x0309)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0309)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x030A)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x030A)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x030B)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x030B)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x030C)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x030C)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x030D)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x030D)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x030E)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x030E)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x030F)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x030F)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0310)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0310)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x0311)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0311)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x0312)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0312)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x0313)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0313)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x0314)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0314)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x0315)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0315)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x0316)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0316)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x0317)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0317)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x0318)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0318)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x0319)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0319)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x031A)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x031A)
         Local0 = RefOf (P900)
-        M1A3 (Local0, C00C, Z108, TS, 0x031B)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x031B)
         /*///////////////////// All-(...) after Field Unit */
 
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x031C)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x031C)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x031D)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x031D)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x031E)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x031E)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x031F)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x031F)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x0320)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0320)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x0321)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0321)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x0322)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0322)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x0323)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0323)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0324)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0324)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x0325)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0325)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x0326)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0326)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x0327)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0327)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x0328)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0328)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x0329)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x0329)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x032A)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x032A)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x032B)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x032B)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x032C)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x032C)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x032D)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x032D)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x032E)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x032E)
         Local0 = RefOf (F900)
-        M1A3 (Local0, C00D, Z108, TS, 0x032F)
+        M1A3 (Local0, C00D, Z108, __METHOD__, 0x032F)
         /*///////////////////// All-(...) after Device */
 
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x0330)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0330)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x0331)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0331)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x0332)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0332)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x0333)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0333)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x0334)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0334)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x0335)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0335)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0336)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0336)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x0337)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0337)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x0338)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0338)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x0339)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0339)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x033A)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x033A)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x033B)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x033B)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x033C)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x033C)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x033D)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x033D)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x033E)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x033E)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x033F)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x033F)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x0340)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0340)
         Local0 = RefOf (D900)
-        M1A3 (Local0, C00E, Z108, TS, 0x0341)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0341)
         /*///////////////////// All-(...) after Event */
 
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x0342)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0342)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x0343)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0343)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x0344)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0344)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x0345)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0345)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0346)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0346)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x0347)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0347)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x0348)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0348)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x0349)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0349)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x034A)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x034A)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x034B)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x034B)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x034C)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x034C)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x034D)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x034D)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x034E)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x034E)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x034F)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x034F)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x0350)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0350)
         Local0 = RefOf (E900)
-        M1A3 (Local0, C00F, Z108, TS, 0x0351)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0351)
         /*///////////////////// All-(...) after Method */
 
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x0352)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0352)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x0353)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0353)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0354)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0354)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x0355)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0355)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x0356)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0356)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x0357)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0357)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x03BC)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x03BC)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x0359)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0359)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x035A)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x035A)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x035B)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x035B)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x035C)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x035C)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x035D)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x035D)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x035E)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x035E)
         Local0 = RefOf (M901)
-        M1A3 (Local0, C010, Z108, TS, 0x035F)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x035F)
         /*///////////////////// All-(...) after Mutex */
 
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0360)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0360)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0361)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0361)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x0362)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0362)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0363)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0363)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x0364)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0364)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0365)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0365)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x0366)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0366)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0367)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0367)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x0368)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0368)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x0369)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0369)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x036A)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x036A)
         Local0 = RefOf (MX90)
-        M1A3 (Local0, C011, Z108, TS, 0x036B)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x036B)
         /*///////////////////// All-(...) after Operation Region */
 
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x036C)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x036C)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x036D)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x036D)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x036E)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x036E)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x036F)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x036F)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x0370)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0370)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x0371)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0371)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x0372)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0372)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x0373)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0373)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x0374)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0374)
         Local0 = RefOf (R900)
-        M1A3 (Local0, C012, Z108, TS, 0x0375)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0375)
         /*///////////////////// All-(...) after Power Resource */
 
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x0376)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0376)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x0377)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0377)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x0378)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0378)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x0379)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0379)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x037A)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x037A)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x037B)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x037B)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x037C)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x037C)
         Local0 = RefOf (PW90)
-        M1A3 (Local0, C013, Z108, TS, 0x037D)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x037D)
         /*///////////////////// All-(...) after Processor */
 
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x037E)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x037E)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x037F)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x037F)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x0380)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0380)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x0381)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0381)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x0382)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0382)
         Local0 = RefOf (PR90)
-        M1A3 (Local0, C014, Z108, TS, 0x0383)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x0383)
         /*///////////////////// All-(...) after Thermal Zone */
 
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x0384)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0384)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x0385)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0385)
         Local0 = RefOf (TZ90)
-        M1A3 (Local0, C015, Z108, TS, 0x0386)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x0386)
         /*///////////////////// All-(...) after Buffer Field */
 
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x0387)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0387)
         Local0 = RefOf (BF90)
-        M1A3 (Local0, C016, Z108, TS, 0x0388)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0388)
     }
 
     /* CopyObject the result of Index to LocalX */
 
     Method (M1B6, 0, Serialized)
     {
-        Name (TS, "m1b6")
         C081 = Z108 /* absolute index of file initiating the checking */ /* \Z108 */
         /* Computational Data */
 
         CopyObject (Local0 = S900 [0x01], Local1)
-        M1A3 (Local0, C016, Z108, TS, 0x0389)
-        M1A3 (Local1, C016, Z108, TS, 0x038A)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x0389)
+        M1A3 (Local1, C016, Z108, __METHOD__, 0x038A)
         CopyObject (Local0 = B900 [0x01], Local1)
-        M1A3 (Local0, C016, Z108, TS, 0x038B)
-        M1A3 (Local1, C016, Z108, TS, 0x038C)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x038B)
+        M1A3 (Local1, C016, Z108, __METHOD__, 0x038C)
         /* Elements of Package are Uninitialized */
 
         If (Y127)
         {
             CopyObject (Local0 = P900 [0x00], Local1)
-            M1A3 (Local0, C008, Z108, TS, 0x038D)
-            M1A3 (Local1, C008, Z108, TS, 0x038E)
+            M1A3 (Local0, C008, Z108, __METHOD__, 0x038D)
+            M1A3 (Local1, C008, Z108, __METHOD__, 0x038E)
         }
 
         /* Elements of Package are Computational Data */
 
         CopyObject (Local0 = P901 [0x01], Local1)
-        M1A3 (Local0, C009, Z108, TS, 0x038F)
-        M1A3 (Local1, C009, Z108, TS, 0x0390)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x038F)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x0390)
         CopyObject (Local0 = P904 [0x01], Local1)
-        M1A3 (Local0, C00B, Z108, TS, 0x0391)
-        M1A3 (Local1, C00B, Z108, TS, 0x0392)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0391)
+        M1A3 (Local1, C00B, Z108, __METHOD__, 0x0392)
         CopyObject (Local0 = P905 [0x00], Local1)
-        M1A3 (Local0, C00C, Z108, TS, 0x0393)
-        M1A3 (Local1, C00C, Z108, TS, 0x0394)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x0393)
+        M1A3 (Local1, C00C, Z108, __METHOD__, 0x0394)
         CopyObject (Local0 = P90D [0x00], Local1)
-        M1A3 (Local0, C009, Z108, TS, 0x0395)
-        M1A3 (Local1, C009, Z108, TS, 0x0396)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0395)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x0396)
         CopyObject (Local0 = P90E [0x00], Local1)
-        M1A3 (Local0, C009, Z108, TS, 0x0397)
-        M1A3 (Local1, C009, Z108, TS, 0x0398)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0397)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x0398)
         CopyObject (Local0 = P90F [0x00], Local1)
-        M1A3 (Local0, C00A, Z108, TS, 0x0399)
-        M1A3 (Local1, C00A, Z108, TS, 0x039A)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x0399)
+        M1A3 (Local1, C00A, Z108, __METHOD__, 0x039A)
         CopyObject (Local0 = P910 [0x00], Local1)
-        M1A3 (Local0, C00A, Z108, TS, 0x039B)
-        M1A3 (Local1, C00A, Z108, TS, 0x039C)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x039B)
+        M1A3 (Local1, C00A, Z108, __METHOD__, 0x039C)
         CopyObject (Local0 = P911 [0x00], Local1)
-        M1A3 (Local0, C00B, Z108, TS, 0x039D)
-        M1A3 (Local1, C00B, Z108, TS, 0x039E)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x039D)
+        M1A3 (Local1, C00B, Z108, __METHOD__, 0x039E)
         /* These objects become an integer in a package */
 
         CopyObject (Local0 = P912 [0x00], Local1)
-        M1A3 (Local0, C009, Z108, TS, 0x039F)
-        M1A3 (Local1, C009, Z108, TS, 0x03A0)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x039F)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x03A0)
         CopyObject (Local0 = P913 [0x00], Local1)
-        M1A3 (Local0, C009, Z108, TS, 0x03A1)
-        M1A3 (Local1, C009, Z108, TS, 0x03A2)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x03A1)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x03A2)
         CopyObject (Local0 = P914 [0x00], Local1)
-        M1A3 (Local0, C009, Z108, TS, 0x03A3)
-        M1A3 (Local1, C009, Z108, TS, 0x03A4)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x03A3)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x03A4)
         CopyObject (Local0 = P915 [0x00], Local1)
-        M1A3 (Local0, C009, Z108, TS, 0x03A5)
-        M1A3 (Local1, C009, Z108, TS, 0x03A6)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x03A5)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x03A6)
         /* Elements of Package are NOT Computational Data */
 
         CopyObject (Local0 = P916 [0x00], Local1)
-        M1A3 (Local0, C00E, Z108, TS, 0x03A7)
-        M1A3 (Local1, C00E, Z108, TS, 0x03A8)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x03A7)
+        M1A3 (Local1, C00E, Z108, __METHOD__, 0x03A8)
         CopyObject (Local0 = P917 [0x00], Local1)
-        M1A3 (Local0, C00F, Z108, TS, 0x03A9)
-        M1A3 (Local1, C00F, Z108, TS, 0x03AA)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x03A9)
+        M1A3 (Local1, C00F, Z108, __METHOD__, 0x03AA)
         CopyObject (Local0 = P918 [0x00], Local1)
-        M1A3 (Local0, C011, Z108, TS, 0x03AB)
-        M1A3 (Local1, C011, Z108, TS, 0x03AC)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x03AB)
+        M1A3 (Local1, C011, Z108, __METHOD__, 0x03AC)
         CopyObject (Local0 = P919 [0x00], Local1)
-        M1A3 (Local0, C012, Z108, TS, 0x03AD)
-        M1A3 (Local1, C012, Z108, TS, 0x03AE)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x03AD)
+        M1A3 (Local1, C012, Z108, __METHOD__, 0x03AE)
         CopyObject (Local0 = P91A [0x00], Local1)
-        M1A3 (Local0, C013, Z108, TS, 0x03AF)
-        M1A3 (Local1, C013, Z108, TS, 0x03B0)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x03AF)
+        M1A3 (Local1, C013, Z108, __METHOD__, 0x03B0)
         CopyObject (Local0 = P91B [0x00], Local1)
-        M1A3 (Local0, C014, Z108, TS, 0x03B1)
-        M1A3 (Local1, C014, Z108, TS, 0x03B2)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x03B1)
+        M1A3 (Local1, C014, Z108, __METHOD__, 0x03B2)
         CopyObject (Local0 = P91C [0x00], Local1)
-        M1A3 (Local0, C015, Z108, TS, 0x03B3)
-        M1A3 (Local1, C015, Z108, TS, 0x03B4)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x03B3)
+        M1A3 (Local1, C015, Z108, __METHOD__, 0x03B4)
         /* Elements of Package are Methods */
 
         CopyObject (Local0 = P91D [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03B5)
-        M1A3 (Local1, C010, Z108, TS, 0x03B6)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03B5)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03B6)
         CopyObject (Local0 = P91E [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03B7)
-        M1A3 (Local1, C010, Z108, TS, 0x03B8)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03B7)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03B8)
         CopyObject (Local0 = P91F [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03B9)
-        M1A3 (Local1, C010, Z108, TS, 0x03BA)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03B9)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03BA)
         CopyObject (Local0 = P920 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03BB)
-        M1A3 (Local1, C010, Z108, TS, 0x03BC)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03BB)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03BC)
         CopyObject (Local0 = P921 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03BD)
-        M1A3 (Local1, C010, Z108, TS, 0x03BE)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03BD)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03BE)
         CopyObject (Local0 = P922 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03BF)
-        M1A3 (Local1, C010, Z108, TS, 0x03C0)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03BF)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03C0)
         CopyObject (Local0 = P923 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03C1)
-        M1A3 (Local1, C010, Z108, TS, 0x03C2)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03C1)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03C2)
         CopyObject (Local0 = P924 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03C3)
-        M1A3 (Local1, C010, Z108, TS, 0x03C4)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03C3)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03C4)
         CopyObject (Local0 = P925 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03C5)
-        M1A3 (Local1, C010, Z108, TS, 0x03C6)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03C5)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03C6)
         CopyObject (Local0 = P926 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03C7)
-        M1A3 (Local1, C010, Z108, TS, 0x03C8)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03C7)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03C8)
         CopyObject (Local0 = P927 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03C9)
-        M1A3 (Local1, C010, Z108, TS, 0x03CA)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03C9)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03CA)
         CopyObject (Local0 = P928 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03CB)
-        M1A3 (Local1, C010, Z108, TS, 0x03CC)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03CB)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03CC)
         CopyObject (Local0 = P929 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03CD)
-        M1A3 (Local1, C010, Z108, TS, 0x03CE)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03CD)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03CE)
         CopyObject (Local0 = P92A [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03CF)
-        M1A3 (Local1, C010, Z108, TS, 0x03D0)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03CF)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03D0)
         CopyObject (Local0 = P92B [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03D1)
-        M1A3 (Local1, C010, Z108, TS, 0x03D2)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03D1)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03D2)
         CopyObject (Local0 = P92C [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03D3)
-        M1A3 (Local1, C010, Z108, TS, 0x03D4)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03D3)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03D4)
         CopyObject (Local0 = P92D [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03D5)
-        M1A3 (Local1, C010, Z108, TS, 0x03D6)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03D5)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03D6)
         CopyObject (Local0 = P92E [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03D7)
-        M1A3 (Local1, C010, Z108, TS, 0x03D8)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03D7)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03D8)
         CopyObject (Local0 = P92F [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03D9)
-        M1A3 (Local1, C010, Z108, TS, 0x03DA)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03D9)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03DA)
         CopyObject (Local0 = P930 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03DB)
-        M1A3 (Local1, C010, Z108, TS, 0x03DC)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03DB)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03DC)
         CopyObject (Local0 = P931 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03DD)
-        M1A3 (Local1, C010, Z108, TS, 0x03DE)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03DD)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03DE)
         CopyObject (Local0 = P932 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03DF)
-        M1A3 (Local1, C010, Z108, TS, 0x03E0)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03DF)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03E0)
         CopyObject (Local0 = P933 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03E1)
-        M1A3 (Local1, C010, Z108, TS, 0x03E2)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03E1)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03E2)
         CopyObject (Local0 = P934 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03E3)
-        M1A3 (Local1, C010, Z108, TS, 0x03E4)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03E3)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03E4)
         CopyObject (Local0 = P935 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03E5)
-        M1A3 (Local1, C010, Z108, TS, 0x03E6)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03E5)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03E6)
         CopyObject (Local0 = P936 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03E7)
-        M1A3 (Local1, C010, Z108, TS, 0x03E8)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03E7)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03E8)
         CopyObject (Local0 = P937 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03E9)
-        M1A3 (Local1, C010, Z108, TS, 0x03EA)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03E9)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03EA)
         CopyObject (Local0 = P938 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03EB)
-        M1A3 (Local1, C010, Z108, TS, 0x03EC)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03EB)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03EC)
         CopyObject (Local0 = P939 [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03ED)
-        M1A3 (Local1, C010, Z108, TS, 0x03EE)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03ED)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03EE)
         CopyObject (Local0 = P93A [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03EF)
-        M1A3 (Local1, C010, Z108, TS, 0x03F0)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03EF)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03F0)
         CopyObject (Local0 = P93B [0x00], Local1)
-        M1A3 (Local0, C010, Z108, TS, 0x03F1)
-        M1A3 (Local1, C010, Z108, TS, 0x03F2)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x03F1)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x03F2)
         M1A6 ()
     }
 
@@ -2283,179 +2278,178 @@
     /* The same as m1b6 but Store instead of CopyObject. */
     Method (M1B7, 0, Serialized)
     {
-        Name (TS, "m1b7")
         C081 = Z108 /* absolute index of file initiating the checking */ /* \Z108 */
         /* Computational Data */
 
         Local1 = Local0 = S900 [0x01]
-        M1A3 (Local0, C016, Z108, TS, 0x03F3)
-        M1A3 (Local1, C016, Z108, TS, 0x03F4)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x03F3)
+        M1A3 (Local1, C016, Z108, __METHOD__, 0x03F4)
         Local1 = Local0 = B900 [0x01]
-        M1A3 (Local0, C016, Z108, TS, 0x03F5)
-        M1A3 (Local1, C016, Z108, TS, 0x03F6)
+        M1A3 (Local0, C016, Z108, __METHOD__, 0x03F5)
+        M1A3 (Local1, C016, Z108, __METHOD__, 0x03F6)
         /* Elements of Package are Uninitialized */
 
         Local1 = Local0 = P900 [0x00]
-        M1A3 (Local0, C008, Z108, TS, 0x03F7)
-        M1A3 (Local1, C008, Z108, TS, 0x03F8)
+        M1A3 (Local0, C008, Z108, __METHOD__, 0x03F7)
+        M1A3 (Local1, C008, Z108, __METHOD__, 0x03F8)
         /* Elements of Package are Computational Data */
 
         Local1 = Local0 = P901 [0x01]
-        M1A3 (Local0, C009, Z108, TS, 0x03F9)
-        M1A3 (Local1, C009, Z108, TS, 0x03FA)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x03F9)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x03FA)
         Local1 = Local0 = P904 [0x01]
-        M1A3 (Local0, C00B, Z108, TS, 0x03FB)
-        M1A3 (Local1, C00B, Z108, TS, 0x03FC)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x03FB)
+        M1A3 (Local1, C00B, Z108, __METHOD__, 0x03FC)
         Local1 = Local0 = P905 [0x00]
-        M1A3 (Local0, C00C, Z108, TS, 0x03FD)
-        M1A3 (Local1, C00C, Z108, TS, 0x03FE)
+        M1A3 (Local0, C00C, Z108, __METHOD__, 0x03FD)
+        M1A3 (Local1, C00C, Z108, __METHOD__, 0x03FE)
         Local1 = Local0 = P90D [0x00]
-        M1A3 (Local0, C009, Z108, TS, 0x03FF)
-        M1A3 (Local1, C009, Z108, TS, 0x0400)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x03FF)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x0400)
         Local1 = Local0 = P90E [0x00]
-        M1A3 (Local0, C009, Z108, TS, 0x0401)
-        M1A3 (Local1, C009, Z108, TS, 0x0402)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0401)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x0402)
         Local1 = Local0 = P90F [0x00]
-        M1A3 (Local0, C00A, Z108, TS, 0x0403)
-        M1A3 (Local1, C00A, Z108, TS, 0x0404)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x0403)
+        M1A3 (Local1, C00A, Z108, __METHOD__, 0x0404)
         Local1 = Local0 = P910 [0x00]
-        M1A3 (Local0, C00A, Z108, TS, 0x0405)
-        M1A3 (Local1, C00A, Z108, TS, 0x0406)
+        M1A3 (Local0, C00A, Z108, __METHOD__, 0x0405)
+        M1A3 (Local1, C00A, Z108, __METHOD__, 0x0406)
         Local1 = Local0 = P911 [0x00]
-        M1A3 (Local0, C00B, Z108, TS, 0x0407)
-        M1A3 (Local1, C00B, Z108, TS, 0x0408)
+        M1A3 (Local0, C00B, Z108, __METHOD__, 0x0407)
+        M1A3 (Local1, C00B, Z108, __METHOD__, 0x0408)
         /* These objects become an integer in a package */
 
         Local1 = Local0 = P912 [0x00]
-        M1A3 (Local0, C009, Z108, TS, 0x0409)
-        M1A3 (Local1, C009, Z108, TS, 0x040A)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x0409)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x040A)
         Local1 = Local0 = P913 [0x00]
-        M1A3 (Local0, C009, Z108, TS, 0x040B)
-        M1A3 (Local1, C009, Z108, TS, 0x040C)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x040B)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x040C)
         Local1 = Local0 = P914 [0x00]
-        M1A3 (Local0, C009, Z108, TS, 0x040D)
-        M1A3 (Local1, C009, Z108, TS, 0x040E)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x040D)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x040E)
         Local1 = Local0 = P915 [0x00]
-        M1A3 (Local0, C009, Z108, TS, 0x040F)
-        M1A3 (Local1, C009, Z108, TS, 0x0410)
+        M1A3 (Local0, C009, Z108, __METHOD__, 0x040F)
+        M1A3 (Local1, C009, Z108, __METHOD__, 0x0410)
         /* Elements of Package are NOT Computational Data */
 
         Local1 = Local0 = P916 [0x00]
-        M1A3 (Local0, C00E, Z108, TS, 0x0411)
-        M1A3 (Local1, C00E, Z108, TS, 0x0412)
+        M1A3 (Local0, C00E, Z108, __METHOD__, 0x0411)
+        M1A3 (Local1, C00E, Z108, __METHOD__, 0x0412)
         Local1 = Local0 = P917 [0x00]
-        M1A3 (Local0, C00F, Z108, TS, 0x0413)
-        M1A3 (Local1, C00F, Z108, TS, 0x0414)
+        M1A3 (Local0, C00F, Z108, __METHOD__, 0x0413)
+        M1A3 (Local1, C00F, Z108, __METHOD__, 0x0414)
         Local1 = Local0 = P918 [0x00]
-        M1A3 (Local0, C011, Z108, TS, 0x0415)
-        M1A3 (Local1, C011, Z108, TS, 0x0416)
+        M1A3 (Local0, C011, Z108, __METHOD__, 0x0415)
+        M1A3 (Local1, C011, Z108, __METHOD__, 0x0416)
         Local1 = Local0 = P919 [0x00]
-        M1A3 (Local0, C012, Z108, TS, 0x0417)
-        M1A3 (Local1, C012, Z108, TS, 0x0418)
+        M1A3 (Local0, C012, Z108, __METHOD__, 0x0417)
+        M1A3 (Local1, C012, Z108, __METHOD__, 0x0418)
         Local1 = Local0 = P91A [0x00]
-        M1A3 (Local0, C013, Z108, TS, 0x0419)
-        M1A3 (Local1, C013, Z108, TS, 0x041A)
+        M1A3 (Local0, C013, Z108, __METHOD__, 0x0419)
+        M1A3 (Local1, C013, Z108, __METHOD__, 0x041A)
         Local1 = Local0 = P91B [0x00]
-        M1A3 (Local0, C014, Z108, TS, 0x041B)
-        M1A3 (Local1, C014, Z108, TS, 0x041C)
+        M1A3 (Local0, C014, Z108, __METHOD__, 0x041B)
+        M1A3 (Local1, C014, Z108, __METHOD__, 0x041C)
         Local1 = Local0 = P91C [0x00]
-        M1A3 (Local0, C015, Z108, TS, 0x041D)
-        M1A3 (Local1, C015, Z108, TS, 0x041E)
+        M1A3 (Local0, C015, Z108, __METHOD__, 0x041D)
+        M1A3 (Local1, C015, Z108, __METHOD__, 0x041E)
         /* Elements of Package are Methods */
 
         Local1 = Local0 = P91D [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x041F)
-        M1A3 (Local1, C010, Z108, TS, 0x0420)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x041F)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0420)
         Local1 = Local0 = P91E [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0421)
-        M1A3 (Local1, C010, Z108, TS, 0x0422)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0421)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0422)
         Local1 = Local0 = P91F [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0423)
-        M1A3 (Local1, C010, Z108, TS, 0x0424)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0423)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0424)
         Local1 = Local0 = P920 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0425)
-        M1A3 (Local1, C010, Z108, TS, 0x0426)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0425)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0426)
         Local1 = Local0 = P921 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0427)
-        M1A3 (Local1, C010, Z108, TS, 0x0428)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0427)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0428)
         Local1 = Local0 = P922 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0429)
-        M1A3 (Local1, C010, Z108, TS, 0x042A)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0429)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x042A)
         Local1 = Local0 = P923 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x042B)
-        M1A3 (Local1, C010, Z108, TS, 0x042C)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x042B)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x042C)
         Local1 = Local0 = P924 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x042D)
-        M1A3 (Local1, C010, Z108, TS, 0x042E)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x042D)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x042E)
         Local1 = Local0 = P925 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x042F)
-        M1A3 (Local1, C010, Z108, TS, 0x0430)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x042F)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0430)
         Local1 = Local0 = P926 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0431)
-        M1A3 (Local1, C010, Z108, TS, 0x0432)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0431)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0432)
         Local1 = Local0 = P927 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0433)
-        M1A3 (Local1, C010, Z108, TS, 0x0434)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0433)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0434)
         Local1 = Local0 = P928 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0435)
-        M1A3 (Local1, C010, Z108, TS, 0x0436)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0435)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0436)
         Local1 = Local0 = P929 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0437)
-        M1A3 (Local1, C010, Z108, TS, 0x0438)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0437)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0438)
         Local1 = Local0 = P92A [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0439)
-        M1A3 (Local1, C010, Z108, TS, 0x043A)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0439)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x043A)
         Local1 = Local0 = P92B [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x043B)
-        M1A3 (Local1, C010, Z108, TS, 0x043C)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x043B)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x043C)
         Local1 = Local0 = P92C [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x043D)
-        M1A3 (Local1, C010, Z108, TS, 0x043E)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x043D)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x043E)
         Local1 = Local0 = P92D [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x043F)
-        M1A3 (Local1, C010, Z108, TS, 0x0440)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x043F)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0440)
         Local1 = Local0 = P92E [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0441)
-        M1A3 (Local1, C010, Z108, TS, 0x0442)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0441)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0442)
         Local1 = Local0 = P92F [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0443)
-        M1A3 (Local1, C010, Z108, TS, 0x0444)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0443)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0444)
         Local1 = Local0 = P930 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0445)
-        M1A3 (Local1, C010, Z108, TS, 0x0446)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0445)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0446)
         Local1 = Local0 = P931 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0447)
-        M1A3 (Local1, C010, Z108, TS, 0x0448)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0447)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0448)
         Local1 = Local0 = P932 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0449)
-        M1A3 (Local1, C010, Z108, TS, 0x044A)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0449)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x044A)
         Local1 = Local0 = P933 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x044B)
-        M1A3 (Local1, C010, Z108, TS, 0x044C)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x044B)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x044C)
         Local1 = Local0 = P934 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x044D)
-        M1A3 (Local1, C010, Z108, TS, 0x044E)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x044D)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x044E)
         Local1 = Local0 = P935 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x044F)
-        M1A3 (Local1, C010, Z108, TS, 0x0450)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x044F)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0450)
         Local1 = Local0 = P936 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0451)
-        M1A3 (Local1, C010, Z108, TS, 0x0452)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0451)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0452)
         Local1 = Local0 = P937 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0453)
-        M1A3 (Local1, C010, Z108, TS, 0x0454)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0453)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0454)
         Local1 = Local0 = P938 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0455)
-        M1A3 (Local1, C010, Z108, TS, 0x0456)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0455)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0456)
         Local1 = Local0 = P939 [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0457)
-        M1A3 (Local1, C010, Z108, TS, 0x0458)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0457)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x0458)
         Local1 = Local0 = P93A [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x0459)
-        M1A3 (Local1, C010, Z108, TS, 0x045A)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x0459)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x045A)
         Local1 = Local0 = P93B [0x00]
-        M1A3 (Local0, C010, Z108, TS, 0x045B)
-        M1A3 (Local1, C010, Z108, TS, 0x045C)
+        M1A3 (Local0, C010, Z108, __METHOD__, 0x045B)
+        M1A3 (Local1, C010, Z108, __METHOD__, 0x045C)
         M1A6 ()
     }
 
diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl
index 2f8bcc50a..4751a093f 100644
--- a/tests/aslts/src/runtime/collections/functional/reference/ref06.asl
+++ b/tests/aslts/src/runtime/collections/functional/reference/ref06.asl
@@ -147,7 +147,6 @@
          _TCI(c200, LLL0)
          // ################################## Check all the test.
          */
-        Name (TS, "m1e0")
         Name (PR, 0x00)
         Name (IND0, 0x00)
         Name (LPN0, 0x00)
@@ -196,37 +195,37 @@
                 Case (0x00)
                 {
                     CopyObject (I900, Local0)
-                    M1A3 (Local0, C009, Z110, TS, 0x00)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x00)
                 }
                 Case (0x01)
                 {
                     CopyObject (S900, Local0)
-                    M1A3 (Local0, C00A, Z110, TS, 0x01)
+                    M1A3 (Local0, C00A, Z110, __METHOD__, 0x01)
                 }
                 Case (0x02)
                 {
                     CopyObject (B900, Local0)
-                    M1A3 (Local0, C00B, Z110, TS, 0x02)
+                    M1A3 (Local0, C00B, Z110, __METHOD__, 0x02)
                 }
                 Case (0x03)
                 {
                     CopyObject (P900, Local0)
-                    M1A3 (Local0, C00C, Z110, TS, 0x03)
+                    M1A3 (Local0, C00C, Z110, __METHOD__, 0x03)
                 }
                 Case (0x04)
                 {
                     CopyObject (F900, Local0)
-                    M1A3 (Local0, C009, Z110, TS, 0x04)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x04)
                 }
                 Case (0x05)
                 {
                     CopyObject (RefOf (D900), Local0)
-                    M1A3 (Local0, C00E, Z110, TS, 0x05)
+                    M1A3 (Local0, C00E, Z110, __METHOD__, 0x05)
                 }
                 Case (0x06)
                 {
                     CopyObject (RefOf (E900), Local0)
-                    M1A3 (Local0, C00F, Z110, TS, 0x06)
+                    M1A3 (Local0, C00F, Z110, __METHOD__, 0x06)
                 }
                 Case (0x07)
                 {
@@ -239,43 +238,43 @@
                         CopyObject (RefOf (M901), Local0)
                     }
 
-                    M1A3 (Local0, C010, Z110, TS, 0x07)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x07)
                 }
                 Case (0x08)
                 {
                     CopyObject (RefOf (MX90), Local0)
-                    M1A3 (Local0, C011, Z110, TS, 0x08)
+                    M1A3 (Local0, C011, Z110, __METHOD__, 0x08)
                 }
                 Case (0x09)
                 {
                     If (Y510)
                     {
                         CopyObject (RefOf (R900), Local0)
-                        M1A3 (Local0, C012, Z110, TS, 0x09)
+                        M1A3 (Local0, C012, Z110, __METHOD__, 0x09)
                     }
                 }
                 Case (0x0A)
                 {
                     CopyObject (RefOf (PW90), Local0)
-                    M1A3 (Local0, C013, Z110, TS, 0x0A)
+                    M1A3 (Local0, C013, Z110, __METHOD__, 0x0A)
                 }
                 Case (0x0B)
                 {
                     CopyObject (RefOf (PR90), Local0)
-                    M1A3 (Local0, C014, Z110, TS, 0x0B)
+                    M1A3 (Local0, C014, Z110, __METHOD__, 0x0B)
                 }
                 Case (0x0C)
                 {
                     If (Y508)
                     {
                         CopyObject (RefOf (TZ90), Local0)
-                        M1A3 (Local0, C015, Z110, TS, 0x0C)
+                        M1A3 (Local0, C015, Z110, __METHOD__, 0x0C)
                     }
                 }
                 Case (0x0D)
                 {
                     CopyObject (BF90, Local0)
-                    M1A3 (Local0, C009, Z110, TS, 0x0D)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x0D)
                 }
                 Case                /* ========================= Group 1: */
                 /* All available for Store types */
@@ -283,32 +282,32 @@
  (0x0E)
                 {
                     Local0 = I900 /* \I900 */
-                    M1A3 (Local0, C009, Z110, TS, 0x0E)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x0E)
                 }
                 Case (0x0F)
                 {
                     Local0 = S900 /* \S900 */
-                    M1A3 (Local0, C00A, Z110, TS, 0x0F)
+                    M1A3 (Local0, C00A, Z110, __METHOD__, 0x0F)
                 }
                 Case (0x10)
                 {
                     Local0 = B900 /* \B900 */
-                    M1A3 (Local0, C00B, Z110, TS, 0x10)
+                    M1A3 (Local0, C00B, Z110, __METHOD__, 0x10)
                 }
                 Case (0x11)
                 {
                     Local0 = P900 /* \P900 */
-                    M1A3 (Local0, C00C, Z110, TS, 0x11)
+                    M1A3 (Local0, C00C, Z110, __METHOD__, 0x11)
                 }
                 Case (0x12)
                 {
                     Local0 = F900 /* \F900 */
-                    M1A3 (Local0, C009, Z110, TS, 0x12)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x12)
                 }
                 Case (0x13)
                 {
                     Local0 = BF90 /* \BF90 */
-                    M1A3 (Local0, C009, Z110, TS, 0x13)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x13)
                 }
                 Case                /* ========================= Group 2: */
                 /* All types */
@@ -316,72 +315,72 @@
  (0x14)
                 {
                     CopyObject (RefOf (I900), Local0)
-                    M1A3 (Local0, C009, Z110, TS, 0x14)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x14)
                 }
                 Case (0x15)
                 {
                     CopyObject (RefOf (S900), Local0)
-                    M1A3 (Local0, C00A, Z110, TS, 0x15)
+                    M1A3 (Local0, C00A, Z110, __METHOD__, 0x15)
                 }
                 Case (0x16)
                 {
                     CopyObject (RefOf (B900), Local0)
-                    M1A3 (Local0, C00B, Z110, TS, 0x16)
+                    M1A3 (Local0, C00B, Z110, __METHOD__, 0x16)
                 }
                 Case (0x17)
                 {
                     CopyObject (RefOf (P900), Local0)
-                    M1A3 (Local0, C00C, Z110, TS, 0x17)
+                    M1A3 (Local0, C00C, Z110, __METHOD__, 0x17)
                 }
                 Case (0x18)
                 {
                     CopyObject (RefOf (F900), Local0)
-                    M1A3 (Local0, C00D, Z110, TS, 0x18)
+                    M1A3 (Local0, C00D, Z110, __METHOD__, 0x18)
                 }
                 Case (0x19)
                 {
                     CopyObject (RefOf (D900), Local0)
-                    M1A3 (Local0, C00E, Z110, TS, 0x19)
+                    M1A3 (Local0, C00E, Z110, __METHOD__, 0x19)
                 }
                 Case (0x1A)
                 {
                     CopyObject (RefOf (E900), Local0)
-                    M1A3 (Local0, C00F, Z110, TS, 0x1A)
+                    M1A3 (Local0, C00F, Z110, __METHOD__, 0x1A)
                 }
                 Case (0x1B)
                 {
                     CopyObject (RefOf (M901), Local0)
-                    M1A3 (Local0, C010, Z110, TS, 0x1B)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x1B)
                 }
                 Case (0x1C)
                 {
                     CopyObject (RefOf (MX90), Local0)
-                    M1A3 (Local0, C011, Z110, TS, 0x1C)
+                    M1A3 (Local0, C011, Z110, __METHOD__, 0x1C)
                 }
                 Case (0x1D)
                 {
                     CopyObject (RefOf (R900), Local0)
-                    M1A3 (Local0, C012, Z110, TS, 0x1D)
+                    M1A3 (Local0, C012, Z110, __METHOD__, 0x1D)
                 }
                 Case (0x1E)
                 {
                     CopyObject (RefOf (PW90), Local0)
-                    M1A3 (Local0, C013, Z110, TS, 0x1E)
+                    M1A3 (Local0, C013, Z110, __METHOD__, 0x1E)
                 }
                 Case (0x1F)
                 {
                     CopyObject (RefOf (PR90), Local0)
-                    M1A3 (Local0, C014, Z110, TS, 0x1F)
+                    M1A3 (Local0, C014, Z110, __METHOD__, 0x1F)
                 }
                 Case (0x20)
                 {
                     CopyObject (RefOf (TZ90), Local0)
-                    M1A3 (Local0, C015, Z110, TS, 0x20)
+                    M1A3 (Local0, C015, Z110, __METHOD__, 0x20)
                 }
                 Case (0x21)
                 {
                     CopyObject (RefOf (BF90), Local0)
-                    M1A3 (Local0, C016, Z110, TS, 0x21)
+                    M1A3 (Local0, C016, Z110, __METHOD__, 0x21)
                 }
                 Case                /* ========================= Group 3: */
                 /* All types */
@@ -389,72 +388,72 @@
  (0x22)
                 {
                     Local0 = RefOf (I900)
-                    M1A3 (Local0, C009, Z110, TS, 0x22)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x22)
                 }
                 Case (0x23)
                 {
                     Local0 = RefOf (S900)
-                    M1A3 (Local0, C00A, Z110, TS, 0x23)
+                    M1A3 (Local0, C00A, Z110, __METHOD__, 0x23)
                 }
                 Case (0x24)
                 {
                     Local0 = RefOf (B900)
-                    M1A3 (Local0, C00B, Z110, TS, 0x24)
+                    M1A3 (Local0, C00B, Z110, __METHOD__, 0x24)
                 }
                 Case (0x25)
                 {
                     Local0 = RefOf (P900)
-                    M1A3 (Local0, C00C, Z110, TS, 0x25)
+                    M1A3 (Local0, C00C, Z110, __METHOD__, 0x25)
                 }
                 Case (0x26)
                 {
                     Local0 = RefOf (F900)
-                    M1A3 (Local0, C00D, Z110, TS, 0x26)
+                    M1A3 (Local0, C00D, Z110, __METHOD__, 0x26)
                 }
                 Case (0x27)
                 {
                     Local0 = RefOf (D900)
-                    M1A3 (Local0, C00E, Z110, TS, 0x27)
+                    M1A3 (Local0, C00E, Z110, __METHOD__, 0x27)
                 }
                 Case (0x28)
                 {
                     Local0 = RefOf (E900)
-                    M1A3 (Local0, C00F, Z110, TS, 0x28)
+                    M1A3 (Local0, C00F, Z110, __METHOD__, 0x28)
                 }
                 Case (0x29)
                 {
                     Local0 = RefOf (M901)
-                    M1A3 (Local0, C010, Z110, TS, 0x29)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x29)
                 }
                 Case (0x2A)
                 {
                     Local0 = RefOf (MX90)
-                    M1A3 (Local0, C011, Z110, TS, 0x2A)
+                    M1A3 (Local0, C011, Z110, __METHOD__, 0x2A)
                 }
                 Case (0x2B)
                 {
                     Local0 = RefOf (R900)
-                    M1A3 (Local0, C012, Z110, TS, 0x2B)
+                    M1A3 (Local0, C012, Z110, __METHOD__, 0x2B)
                 }
                 Case (0x2C)
                 {
                     Local0 = RefOf (PW90)
-                    M1A3 (Local0, C013, Z110, TS, 0x2C)
+                    M1A3 (Local0, C013, Z110, __METHOD__, 0x2C)
                 }
                 Case (0x2D)
                 {
                     Local0 = RefOf (PR90)
-                    M1A3 (Local0, C014, Z110, TS, 0x2D)
+                    M1A3 (Local0, C014, Z110, __METHOD__, 0x2D)
                 }
                 Case (0x2E)
                 {
                     Local0 = RefOf (TZ90)
-                    M1A3 (Local0, C015, Z110, TS, 0x2E)
+                    M1A3 (Local0, C015, Z110, __METHOD__, 0x2E)
                 }
                 Case (0x2F)
                 {
                     Local0 = RefOf (BF90)
-                    M1A3 (Local0, C016, Z110, TS, 0x2F)
+                    M1A3 (Local0, C016, Z110, __METHOD__, 0x2F)
                 }
                 Case                /* ========================= Group 4: */
                 /* From m1b6: CopyObject the result of Index to LocalX */
@@ -462,14 +461,14 @@
  (0x30)
                 {
                     CopyObject (Local0 = S900 [0x01], Local1)
-                    M1A3 (Local0, C016, Z110, TS, 0x30)
-                    M1A3 (Local1, C016, Z110, TS, 0x31)
+                    M1A3 (Local0, C016, Z110, __METHOD__, 0x30)
+                    M1A3 (Local1, C016, Z110, __METHOD__, 0x31)
                 }
                 Case (0x31)
                 {
                     CopyObject (Local0 = B900 [0x01], Local1)
-                    M1A3 (Local0, C016, Z110, TS, 0x32)
-                    M1A3 (Local1, C016, Z110, TS, 0x33)
+                    M1A3 (Local0, C016, Z110, __METHOD__, 0x32)
+                    M1A3 (Local1, C016, Z110, __METHOD__, 0x33)
                 }
                 Case                /* Elements of Package are Uninitialized */
 
@@ -478,8 +477,8 @@
                     If (Y127)
                     {
                         CopyObject (Local0 = P900 [0x00], Local1)
-                        M1A3 (Local0, C008, Z110, TS, 0x34)
-                        M1A3 (Local1, C008, Z110, TS, 0x35)
+                        M1A3 (Local0, C008, Z110, __METHOD__, 0x34)
+                        M1A3 (Local1, C008, Z110, __METHOD__, 0x35)
                     }
                 }
                 Case                /* Elements of Package are Computational Data */
@@ -487,144 +486,144 @@
  (0x33)
                 {
                     CopyObject (Local0 = P901 [0x01], Local1)
-                    M1A3 (Local0, C009, Z110, TS, 0x36)
-                    M1A3 (Local1, C009, Z110, TS, 0x37)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x36)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x37)
                 }
                 Case (0x34)
                 {
                     CopyObject (Local0 = P904 [0x01], Local1)
-                    M1A3 (Local0, C00B, Z110, TS, 0x38)
-                    M1A3 (Local1, C00B, Z110, TS, 0x39)
+                    M1A3 (Local0, C00B, Z110, __METHOD__, 0x38)
+                    M1A3 (Local1, C00B, Z110, __METHOD__, 0x39)
                 }
                 Case (0x35)
                 {
                     CopyObject (Local0 = P905 [0x00], Local1)
-                    M1A3 (Local0, C00C, Z110, TS, 0x3A)
-                    M1A3 (Local1, C00C, Z110, TS, 0x3B)
+                    M1A3 (Local0, C00C, Z110, __METHOD__, 0x3A)
+                    M1A3 (Local1, C00C, Z110, __METHOD__, 0x3B)
                 }
                 Case (0x36)
                 {
                     CopyObject (Local0 = P90D [0x00], Local1)
-                    M1A3 (Local0, C009, Z110, TS, 0x3C)
-                    M1A3 (Local1, C009, Z110, TS, 0x3D)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x3C)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x3D)
                 }
                 Case (0x37)
                 {
                     CopyObject (Local0 = P90E [0x00], Local1)
-                    M1A3 (Local0, C009, Z110, TS, 0x3E)
-                    M1A3 (Local1, C009, Z110, TS, 0x3F)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x3E)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x3F)
                 }
                 Case (0x38)
                 {
                     CopyObject (Local0 = P90F [0x00], Local1)
-                    M1A3 (Local0, C00A, Z110, TS, 0x40)
-                    M1A3 (Local1, C00A, Z110, TS, 0x41)
+                    M1A3 (Local0, C00A, Z110, __METHOD__, 0x40)
+                    M1A3 (Local1, C00A, Z110, __METHOD__, 0x41)
                 }
                 Case (0x39)
                 {
                     CopyObject (Local0 = P910 [0x00], Local1)
-                    M1A3 (Local0, C00A, Z110, TS, 0x42)
-                    M1A3 (Local1, C00A, Z110, TS, 0x43)
+                    M1A3 (Local0, C00A, Z110, __METHOD__, 0x42)
+                    M1A3 (Local1, C00A, Z110, __METHOD__, 0x43)
                 }
                 Case (0x3A)
                 {
                     CopyObject (Local0 = P911 [0x00], Local1)
-                    M1A3 (Local0, C00B, Z110, TS, 0x44)
-                    M1A3 (Local1, C00B, Z110, TS, 0x45)
+                    M1A3 (Local0, C00B, Z110, __METHOD__, 0x44)
+                    M1A3 (Local1, C00B, Z110, __METHOD__, 0x45)
                 }
                 Case (0x3B)
                 {
                     CopyObject (Local0 = P912 [0x00], Local1)
-                    M1A3 (Local0, C009, Z110, TS, 0x46)
-                    M1A3 (Local1, C009, Z110, TS, 0x47)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x46)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x47)
                 }
                 Case (0x3C)
                 {
                     CopyObject (Local0 = P913 [0x00], Local1)
-                    M1A3 (Local0, C009, Z110, TS, 0x48)
-                    M1A3 (Local1, C009, Z110, TS, 0x49)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x48)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x49)
                 }
                 Case (0x3D)
                 {
                     CopyObject (Local0 = P914 [0x00], Local1)
-                    M1A3 (Local0, C009, Z110, TS, 0x4A)
-                    M1A3 (Local1, C009, Z110, TS, 0x4B)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x4A)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x4B)
                 }
                 Case (0x3E)
                 {
                     CopyObject (Local0 = P915 [0x00], Local1)
-                    M1A3 (Local0, C009, Z110, TS, 0x4C)
-                    M1A3 (Local1, C009, Z110, TS, 0x4D)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x4C)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x4D)
                 }
                 Case                /* Elements of Package are NOT Computational Data */
 
  (0x3F)
                 {
                     CopyObject (Local0 = P916 [0x00], Local1)
-                    M1A3 (Local0, C00E, Z110, TS, 0x4E)
-                    M1A3 (Local1, C00E, Z110, TS, 0x4F)
+                    M1A3 (Local0, C00E, Z110, __METHOD__, 0x4E)
+                    M1A3 (Local1, C00E, Z110, __METHOD__, 0x4F)
                 }
                 Case (0x40)
                 {
                     CopyObject (Local0 = P917 [0x00], Local1)
-                    M1A3 (Local0, C00F, Z110, TS, 0x50)
-                    M1A3 (Local1, C00F, Z110, TS, 0x51)
+                    M1A3 (Local0, C00F, Z110, __METHOD__, 0x50)
+                    M1A3 (Local1, C00F, Z110, __METHOD__, 0x51)
                 }
                 Case (0x41)
                 {
                     CopyObject (Local0 = P918 [0x00], Local1)
-                    M1A3 (Local0, C011, Z110, TS, 0x52)
-                    M1A3 (Local1, C011, Z110, TS, 0x53)
+                    M1A3 (Local0, C011, Z110, __METHOD__, 0x52)
+                    M1A3 (Local1, C011, Z110, __METHOD__, 0x53)
                 }
                 Case (0x42)
                 {
                     CopyObject (Local0 = P919 [0x00], Local1)
-                    M1A3 (Local0, C012, Z110, TS, 0x54)
-                    M1A3 (Local1, C012, Z110, TS, 0x55)
+                    M1A3 (Local0, C012, Z110, __METHOD__, 0x54)
+                    M1A3 (Local1, C012, Z110, __METHOD__, 0x55)
                 }
                 Case (0x43)
                 {
                     CopyObject (Local0 = P91A [0x00], Local1)
-                    M1A3 (Local0, C013, Z110, TS, 0x56)
-                    M1A3 (Local1, C013, Z110, TS, 0x57)
+                    M1A3 (Local0, C013, Z110, __METHOD__, 0x56)
+                    M1A3 (Local1, C013, Z110, __METHOD__, 0x57)
                 }
                 Case (0x44)
                 {
                     CopyObject (Local0 = P91B [0x00], Local1)
-                    M1A3 (Local0, C014, Z110, TS, 0x58)
-                    M1A3 (Local1, C014, Z110, TS, 0x59)
+                    M1A3 (Local0, C014, Z110, __METHOD__, 0x58)
+                    M1A3 (Local1, C014, Z110, __METHOD__, 0x59)
                 }
                 Case (0x45)
                 {
                     CopyObject (Local0 = P91C [0x00], Local1)
-                    M1A3 (Local0, C015, Z110, TS, 0x5A)
-                    M1A3 (Local1, C015, Z110, TS, 0x5B)
+                    M1A3 (Local0, C015, Z110, __METHOD__, 0x5A)
+                    M1A3 (Local1, C015, Z110, __METHOD__, 0x5B)
                 }
                 Case                /* Elements of Package are Methods */
 
  (0x46)
                 {
                     CopyObject (Local0 = P91D [0x00], Local1)
-                    M1A3 (Local0, C010, Z110, TS, 0x5C)
-                    M1A3 (Local1, C010, Z110, TS, 0x5D)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x5C)
+                    M1A3 (Local1, C010, Z110, __METHOD__, 0x5D)
                 }
                 Case (0x47)
                 {
                     CopyObject (Local0 = P91E [0x00], Local1)
-                    M1A3 (Local0, C010, Z110, TS, 0x5E)
-                    M1A3 (Local1, C010, Z110, TS, 0x5F)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x5E)
+                    M1A3 (Local1, C010, Z110, __METHOD__, 0x5F)
                 }
                 Case (0x48)
                 {
                     CopyObject (Local0 = P91F [0x00], Local1)
-                    M1A3 (Local0, C010, Z110, TS, 0x60)
-                    M1A3 (Local1, C010, Z110, TS, 0x61)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x60)
+                    M1A3 (Local1, C010, Z110, __METHOD__, 0x61)
                 }
                 Case (0x49)
                 {
                     CopyObject (Local0 = P920 [0x00], Local1)
-                    M1A3 (Local0, C010, Z110, TS, 0x62)
-                    M1A3 (Local1, C010, Z110, TS, 0x63)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x62)
+                    M1A3 (Local1, C010, Z110, __METHOD__, 0x63)
                 }
                 Case                /* ========================= Group 5: */
                 /* From m1b7: Store the result of Index to LocalX */
@@ -632,170 +631,170 @@
  (0x4A)
                 {
                     Local1 = Local0 = S900 [0x01]
-                    M1A3 (Local0, C016, Z110, TS, 0x64)
-                    M1A3 (Local1, C016, Z110, TS, 0x65)
+                    M1A3 (Local0, C016, Z110, __METHOD__, 0x64)
+                    M1A3 (Local1, C016, Z110, __METHOD__, 0x65)
                 }
                 Case (0x4B)
                 {
                     Local1 = Local0 = B900 [0x01]
-                    M1A3 (Local0, C016, Z110, TS, 0x66)
-                    M1A3 (Local1, C016, Z110, TS, 0x67)
+                    M1A3 (Local0, C016, Z110, __METHOD__, 0x66)
+                    M1A3 (Local1, C016, Z110, __METHOD__, 0x67)
                 }
                 Case                /* Elements of Package are Uninitialized */
 
  (0x4C)
                 {
                     Local1 = Local0 = P900 [0x00]
-                    M1A3 (Local0, C008, Z110, TS, 0x68)
-                    M1A3 (Local1, C008, Z110, TS, 0x69)
+                    M1A3 (Local0, C008, Z110, __METHOD__, 0x68)
+                    M1A3 (Local1, C008, Z110, __METHOD__, 0x69)
                 }
                 Case                /* Elements of Package are Computational Data */
 
  (0x4D)
                 {
                     Local1 = Local0 = P901 [0x01]
-                    M1A3 (Local0, C009, Z110, TS, 0x6A)
-                    M1A3 (Local1, C009, Z110, TS, 0x6B)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x6A)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x6B)
                 }
                 Case (0x4E)
                 {
                     Local1 = Local0 = P904 [0x01]
-                    M1A3 (Local0, C00B, Z110, TS, 0x6C)
-                    M1A3 (Local1, C00B, Z110, TS, 0x6D)
+                    M1A3 (Local0, C00B, Z110, __METHOD__, 0x6C)
+                    M1A3 (Local1, C00B, Z110, __METHOD__, 0x6D)
                 }
                 Case (0x4F)
                 {
                     Local1 = Local0 = P905 [0x00]
-                    M1A3 (Local0, C00C, Z110, TS, 0x6E)
-                    M1A3 (Local1, C00C, Z110, TS, 0x6F)
+                    M1A3 (Local0, C00C, Z110, __METHOD__, 0x6E)
+                    M1A3 (Local1, C00C, Z110, __METHOD__, 0x6F)
                 }
                 Case (0x50)
                 {
                     Local1 = Local0 = P90D [0x00]
-                    M1A3 (Local0, C009, Z110, TS, 0x70)
-                    M1A3 (Local1, C009, Z110, TS, 0x71)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x70)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x71)
                 }
                 Case (0x51)
                 {
                     Local1 = Local0 = P90E [0x00]
-                    M1A3 (Local0, C009, Z110, TS, 0x72)
-                    M1A3 (Local1, C009, Z110, TS, 0x73)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x72)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x73)
                 }
                 Case (0x52)
                 {
                     Local1 = Local0 = P90F [0x00]
-                    M1A3 (Local0, C00A, Z110, TS, 0x74)
-                    M1A3 (Local1, C00A, Z110, TS, 0x75)
+                    M1A3 (Local0, C00A, Z110, __METHOD__, 0x74)
+                    M1A3 (Local1, C00A, Z110, __METHOD__, 0x75)
                 }
                 Case (0x53)
                 {
                     Local1 = Local0 = P910 [0x00]
-                    M1A3 (Local0, C00A, Z110, TS, 0x76)
-                    M1A3 (Local1, C00A, Z110, TS, 0x77)
+                    M1A3 (Local0, C00A, Z110, __METHOD__, 0x76)
+                    M1A3 (Local1, C00A, Z110, __METHOD__, 0x77)
                 }
                 Case (0x54)
                 {
                     Local1 = Local0 = P911 [0x00]
-                    M1A3 (Local0, C00B, Z110, TS, 0x78)
-                    M1A3 (Local1, C00B, Z110, TS, 0x79)
+                    M1A3 (Local0, C00B, Z110, __METHOD__, 0x78)
+                    M1A3 (Local1, C00B, Z110, __METHOD__, 0x79)
                 }
                 Case (0x55)
                 {
                     Local1 = Local0 = P912 [0x00]
-                    M1A3 (Local0, C009, Z110, TS, 0x7A)
-                    M1A3 (Local1, C009, Z110, TS, 0x7B)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x7A)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x7B)
                 }
                 Case (0x56)
                 {
                     Local1 = Local0 = P913 [0x00]
-                    M1A3 (Local0, C009, Z110, TS, 0x7C)
-                    M1A3 (Local1, C009, Z110, TS, 0x7D)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x7C)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x7D)
                 }
                 Case (0x57)
                 {
                     Local1 = Local0 = P914 [0x00]
-                    M1A3 (Local0, C009, Z110, TS, 0x7E)
-                    M1A3 (Local1, C009, Z110, TS, 0x7F)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x7E)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x7F)
                 }
                 Case (0x58)
                 {
                     Local1 = Local0 = P915 [0x00]
-                    M1A3 (Local0, C009, Z110, TS, 0x80)
-                    M1A3 (Local1, C009, Z110, TS, 0x81)
+                    M1A3 (Local0, C009, Z110, __METHOD__, 0x80)
+                    M1A3 (Local1, C009, Z110, __METHOD__, 0x81)
                 }
                 Case                /* Elements of Package are NOT Computational Data */
 
  (0x59)
                 {
                     Local1 = Local0 = P916 [0x00]
-                    M1A3 (Local0, C00E, Z110, TS, 0x82)
-                    M1A3 (Local1, C00E, Z110, TS, 0x83)
+                    M1A3 (Local0, C00E, Z110, __METHOD__, 0x82)
+                    M1A3 (Local1, C00E, Z110, __METHOD__, 0x83)
                 }
                 Case (0x5A)
                 {
                     Local1 = Local0 = P917 [0x00]
-                    M1A3 (Local0, C00F, Z110, TS, 0x84)
-                    M1A3 (Local1, C00F, Z110, TS, 0x85)
+                    M1A3 (Local0, C00F, Z110, __METHOD__, 0x84)
+                    M1A3 (Local1, C00F, Z110, __METHOD__, 0x85)
                 }
                 Case (0x5B)
                 {
                     Local1 = Local0 = P918 [0x00]
-                    M1A3 (Local0, C011, Z110, TS, 0x86)
-                    M1A3 (Local1, C011, Z110, TS, 0x87)
+                    M1A3 (Local0, C011, Z110, __METHOD__, 0x86)
+                    M1A3 (Local1, C011, Z110, __METHOD__, 0x87)
                 }
                 Case (0x5C)
                 {
                     Local1 = Local0 = P919 [0x00]
-                    M1A3 (Local0, C012, Z110, TS, 0x88)
-                    M1A3 (Local1, C012, Z110, TS, 0x89)
+                    M1A3 (Local0, C012, Z110, __METHOD__, 0x88)
+                    M1A3 (Local1, C012, Z110, __METHOD__, 0x89)
                 }
                 Case (0x5D)
                 {
                     Local1 = Local0 = P91A [0x00]
-                    M1A3 (Local0, C013, Z110, TS, 0x8A)
-                    M1A3 (Local1, C013, Z110, TS, 0x8B)
+                    M1A3 (Local0, C013, Z110, __METHOD__, 0x8A)
+                    M1A3 (Local1, C013, Z110, __METHOD__, 0x8B)
                 }
                 Case (0x5E)
                 {
                     Local1 = Local0 = P91B [0x00]
-                    M1A3 (Local0, C014, Z110, TS, 0x8C)
-                    M1A3 (Local1, C014, Z110, TS, 0x8D)
+                    M1A3 (Local0, C014, Z110, __METHOD__, 0x8C)
+                    M1A3 (Local1, C014, Z110, __METHOD__, 0x8D)
                 }
                 Case (0x5F)
                 {
                     Local1 = Local0 = P91C [0x00]
-                    M1A3 (Local0, C015, Z110, TS, 0x8E)
-                    M1A3 (Local1, C015, Z110, TS, 0x8F)
+                    M1A3 (Local0, C015, Z110, __METHOD__, 0x8E)
+                    M1A3 (Local1, C015, Z110, __METHOD__, 0x8F)
                 }
                 Case                /* Elements of Package are Methods */
 
  (0x60)
                 {
                     Local1 = Local0 = P91D [0x00]
-                    M1A3 (Local0, C010, Z110, TS, 0x90)
-                    M1A3 (Local1, C010, Z110, TS, 0x91)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x90)
+                    M1A3 (Local1, C010, Z110, __METHOD__, 0x91)
                 }
                 Case (0x61)
                 {
                     Local1 = Local0 = P91E [0x00]
-                    M1A3 (Local0, C010, Z110, TS, 0x92)
-                    M1A3 (Local1, C010, Z110, TS, 0x93)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x92)
+                    M1A3 (Local1, C010, Z110, __METHOD__, 0x93)
                 }
                 Case (0x62)
                 {
                     Local1 = Local0 = P91F [0x00]
-                    M1A3 (Local0, C010, Z110, TS, 0x94)
-                    M1A3 (Local1, C010, Z110, TS, 0x95)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x94)
+                    M1A3 (Local1, C010, Z110, __METHOD__, 0x95)
                 }
                 Case (0x63)
                 {
                     Local1 = Local0 = P920 [0x00]
-                    M1A3 (Local0, C010, Z110, TS, 0x96)
-                    M1A3 (Local1, C010, Z110, TS, 0x97)
+                    M1A3 (Local0, C010, Z110, __METHOD__, 0x96)
+                    M1A3 (Local1, C010, Z110, __METHOD__, 0x97)
                 }
                 Default
                 {
-                    ERR (TS, Z110, 0x02CA, 0x00, 0x00, IND0, 0x00)
+                    ERR (__METHOD__, Z110, 0x02CA, 0x00, 0x00, IND0, 0x00)
                 }
 
             }
diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl
index 9d69eff18..4c44d5e46 100644
--- a/tests/aslts/src/runtime/collections/functional/reference/ref07.asl
+++ b/tests/aslts/src/runtime/collections/functional/reference/ref07.asl
@@ -84,7 +84,6 @@
      */
     Method (M1C2, 0, Serialized)
     {
-        Name (TS, "m1c2")
         Name (I000, 0x77)
         Name (S000, "qwer0000")
         Name (B000, Buffer (0x04)
@@ -117,10 +116,10 @@
         V000 = C00C /* type of the Standard Data object */ /* \C00C */
         V001 = 0x03    /* index of element of Package */
         M1C3 (PPP0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
-        M380 (TS, I000, 0x00, 0x00)
-        M381 (TS, S000, 0x00, 0x01)
-        M382 (TS, B000, 0x00, 0x02)
-        M383 (TS, P000, 0x00, 0x03)
+        M380 (__METHOD__, I000, 0x00, 0x00)
+        M381 (__METHOD__, S000, 0x00, 0x01)
+        M382 (__METHOD__, B000, 0x00, 0x02)
+        M383 (__METHOD__, P000, 0x00, 0x03)
     }
 
     /* All the ways reading element of Package given by ArgX */
@@ -133,7 +132,6 @@
     /* arg6 - auxiliary, for arbitrary use */
     Method (M1C3, 7, Serialized)
     {
-        Name (TS, "m1c3")
         Name (I000, 0x00)
         Name (I001, 0x00)
         Name (I002, 0x00)
@@ -220,43 +218,43 @@
         If (FL00)
         {
             Store (P000 [0x00], Local5)
-            CH03 (TS, Z116, 0x00, 0xE2, 0x00)
+            CH03 (__METHOD__, Z116, 0x00, 0xE2, 0x00)
             Local6 = (Local5 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0xE4, 0x00, 0x00)
-            CH03 (TS, Z116, 0x02, 0xE6, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xE4, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x02, 0xE6, 0x00)
             Local6 = (DerefOf (Local5) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0xE8, 0x00, 0x00)
-            CH03 (TS, Z116, 0x04, 0xEA, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xE8, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x04, 0xEA, 0x00)
             M390 (Local5, V000, 0x00, 0x00)
-            CH04 (TS, 0x00, 0xFF, Z116, 0xEC, 0x00, 0x00)
-            CH03 (TS, Z116, 0x06, 0xEE, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xEC, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x06, 0xEE, 0x00)
             M390 (DerefOf (Local5), V000, 0x00, 0x00)
-            CH04 (TS, 0x00, 0xFF, Z116, 0xF0, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xF0, 0x00, 0x00)
             Local5 = Local2 = P000 [0x00]
-            CH03 (TS, Z116, 0x08, 0xF4, 0x00)
+            CH03 (__METHOD__, Z116, 0x08, 0xF4, 0x00)
             Local6 = (Local5 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0xF6, 0x00, 0x00)
-            CH03 (TS, Z116, 0x0A, 0xF8, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xF6, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x0A, 0xF8, 0x00)
             Local6 = (DerefOf (Local5) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0xFA, 0x00, 0x00)
-            CH03 (TS, Z116, 0x0C, 0xFC, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xFA, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x0C, 0xFC, 0x00)
             M390 (Local5, V000, 0x00, 0x00)
-            CH04 (TS, 0x00, 0xFF, Z116, 0xFE, 0x00, 0x00)
-            CH03 (TS, Z116, 0x0E, 0x0100, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0xFE, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x0E, 0x0100, 0x00)
             M390 (DerefOf (Local5), V000, 0x00, 0x00)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0102, 0x00, 0x00)
-            CH03 (TS, Z116, 0x10, 0x0104, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0102, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x10, 0x0104, 0x00)
             Local6 = (Local2 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0106, 0x00, 0x00)
-            CH03 (TS, Z116, 0x12, 0x0108, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0106, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x12, 0x0108, 0x00)
             Local6 = (DerefOf (Local2) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x010A, 0x00, 0x00)
-            CH03 (TS, Z116, 0x14, 0x010C, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x010A, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x14, 0x010C, 0x00)
             M390 (Local2, V000, 0x00, 0x00)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x010E, 0x00, 0x00)
-            CH03 (TS, Z116, 0x16, 0x0110, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x010E, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x16, 0x0110, 0x00)
             M390 (DerefOf (Local2), V000, 0x00, 0x00)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0112, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0112, 0x00, 0x00)
         }
 
         If (Q001)
@@ -282,43 +280,43 @@
         If (FL00)
         {
             Store (P000 [0x01], Local5)
-            CH03 (TS, Z116, 0x18, 0x0131, 0x00)
+            CH03 (__METHOD__, Z116, 0x18, 0x0131, 0x00)
             Local6 = (Local5 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0133, 0x00, 0x00)
-            CH03 (TS, Z116, 0x1A, 0x0135, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0133, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x1A, 0x0135, 0x00)
             Local6 = (DerefOf (Local5) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0137, 0x00, 0x00)
-            CH03 (TS, Z116, 0x1C, 0x0139, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0137, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x1C, 0x0139, 0x00)
             M390 (Local5, V000, 0x00, 0x21)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x013B, 0x00, 0x00)
-            CH03 (TS, Z116, 0x1E, 0x013D, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x013B, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x1E, 0x013D, 0x00)
             M390 (DerefOf (Local5), V000, 0x00, 0x22)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x013F, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x013F, 0x00, 0x00)
             Local5 = Local2 = P000 [0x01]
-            CH03 (TS, Z116, 0x20, 0x0143, 0x00)
+            CH03 (__METHOD__, Z116, 0x20, 0x0143, 0x00)
             Local6 = (Local5 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0145, 0x00, 0x00)
-            CH03 (TS, Z116, 0x22, 0x0147, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0145, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x22, 0x0147, 0x00)
             Local6 = (DerefOf (Local5) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0149, 0x00, 0x00)
-            CH03 (TS, Z116, 0x24, 0x014B, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0149, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x24, 0x014B, 0x00)
             M390 (Local5, V000, 0x00, 0x23)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x014D, 0x00, 0x00)
-            CH03 (TS, Z116, 0x26, 0x014F, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x014D, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x26, 0x014F, 0x00)
             M390 (DerefOf (Local5), V000, 0x00, 0x24)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0151, 0x00, 0x00)
-            CH03 (TS, Z116, 0x28, 0x0153, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0151, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x28, 0x0153, 0x00)
             Local6 = (Local2 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0155, 0x00, 0x00)
-            CH03 (TS, Z116, 0x2A, 0x0157, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0155, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x2A, 0x0157, 0x00)
             Local6 = (DerefOf (Local2) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0159, 0x00, 0x00)
-            CH03 (TS, Z116, 0x2C, 0x015B, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0159, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x2C, 0x015B, 0x00)
             M390 (Local2, V000, 0x00, 0x25)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x015D, 0x00, 0x00)
-            CH03 (TS, Z116, 0x2E, 0x015F, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x015D, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x2E, 0x015F, 0x00)
             M390 (DerefOf (Local2), V000, 0x00, 0x26)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0161, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0161, 0x00, 0x00)
         }
 
         If (Q001)
@@ -344,43 +342,43 @@
         If (FL00)
         {
             Store (P000 [0x00], Arg5)
-            CH03 (TS, Z116, 0x30, 0x0180, 0x00)
+            CH03 (__METHOD__, Z116, 0x30, 0x0180, 0x00)
             Arg6 = (Arg5 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0182, 0x00, 0x00)
-            CH03 (TS, Z116, 0x32, 0x0184, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0182, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x32, 0x0184, 0x00)
             Arg6 = (DerefOf (Arg5) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0186, 0x00, 0x00)
-            CH03 (TS, Z116, 0x34, 0x0188, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0186, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x34, 0x0188, 0x00)
             M390 (Arg5, V000, 0x00, 0x2D)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x018A, 0x00, 0x00)
-            CH03 (TS, Z116, 0x36, 0x018C, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x018A, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x36, 0x018C, 0x00)
             M390 (DerefOf (Arg5), V000, 0x00, 0x2E)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x018E, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x018E, 0x00, 0x00)
             Arg5 = Arg2 = P000 [0x00]
-            CH03 (TS, Z116, 0x38, 0x0192, 0x00)
+            CH03 (__METHOD__, Z116, 0x38, 0x0192, 0x00)
             Arg6 = (Arg5 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0194, 0x00, 0x00)
-            CH03 (TS, Z116, 0x3A, 0x0196, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0194, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x3A, 0x0196, 0x00)
             Arg6 = (DerefOf (Arg5) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0198, 0x00, 0x00)
-            CH03 (TS, Z116, 0x3C, 0x019A, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0198, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x3C, 0x019A, 0x00)
             M390 (Arg5, V000, 0x00, 0x2F)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x019C, 0x00, 0x00)
-            CH03 (TS, Z116, 0x3E, 0x019E, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x019C, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x3E, 0x019E, 0x00)
             M390 (DerefOf (Arg5), V000, 0x00, 0x30)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01A0, 0x00, 0x00)
-            CH03 (TS, Z116, 0x40, 0x01A2, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01A0, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x40, 0x01A2, 0x00)
             Arg6 = (Arg2 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01A4, 0x00, 0x00)
-            CH03 (TS, Z116, 0x42, 0x01A6, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01A4, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x42, 0x01A6, 0x00)
             Arg6 = (DerefOf (Arg2) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01A8, 0x00, 0x00)
-            CH03 (TS, Z116, 0x44, 0x01AA, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01A8, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x44, 0x01AA, 0x00)
             M390 (Arg2, V000, 0x00, 0x31)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01AC, 0x00, 0x00)
-            CH03 (TS, Z116, 0x46, 0x01AE, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01AC, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x46, 0x01AE, 0x00)
             M390 (DerefOf (Arg2), V000, 0x00, 0x32)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01B0, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01B0, 0x00, 0x00)
         }
 
         If (Q001)
@@ -406,43 +404,43 @@
         If (FL00)
         {
             Store (P000 [0x01], Arg5)
-            CH03 (TS, Z116, 0x48, 0x01CF, 0x00)
+            CH03 (__METHOD__, Z116, 0x48, 0x01CF, 0x00)
             Arg6 = (Arg5 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01D1, 0x00, 0x00)
-            CH03 (TS, Z116, 0x4A, 0x01D3, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01D1, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x4A, 0x01D3, 0x00)
             Arg6 = (DerefOf (Arg5) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01D5, 0x00, 0x00)
-            CH03 (TS, Z116, 0x4C, 0x01D7, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01D5, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x4C, 0x01D7, 0x00)
             M390 (Arg5, V000, 0x00, 0x39)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01D9, 0x00, 0x00)
-            CH03 (TS, Z116, 0x4E, 0x01DB, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01D9, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x4E, 0x01DB, 0x00)
             M390 (DerefOf (Arg5), V000, 0x00, 0x3A)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01DD, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01DD, 0x00, 0x00)
             Arg5 = Arg2 = P000 [0x01]
-            CH03 (TS, Z116, 0x50, 0x01E1, 0x00)
+            CH03 (__METHOD__, Z116, 0x50, 0x01E1, 0x00)
             Arg6 = (Arg5 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01E3, 0x00, 0x00)
-            CH03 (TS, Z116, 0x52, 0x01E5, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01E3, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x52, 0x01E5, 0x00)
             Arg6 = (DerefOf (Arg5) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01E7, 0x00, 0x00)
-            CH03 (TS, Z116, 0x54, 0x01E9, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01E7, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x54, 0x01E9, 0x00)
             M390 (Arg5, V000, 0x00, 0x3B)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01EB, 0x00, 0x00)
-            CH03 (TS, Z116, 0x56, 0x01ED, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01EB, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x56, 0x01ED, 0x00)
             M390 (DerefOf (Arg5), V000, 0x00, 0x3C)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01EF, 0x00, 0x00)
-            CH03 (TS, Z116, 0x58, 0x01F1, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01EF, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x58, 0x01F1, 0x00)
             Arg6 = (Arg2 + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01F3, 0x00, 0x00)
-            CH03 (TS, Z116, 0x5A, 0x01F5, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01F3, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x5A, 0x01F5, 0x00)
             Arg6 = (DerefOf (Arg2) + 0x01)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01F7, 0x00, 0x00)
-            CH03 (TS, Z116, 0x5C, 0x01F9, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01F7, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x5C, 0x01F9, 0x00)
             M390 (Arg2, V000, 0x00, 0x3D)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01FB, 0x00, 0x00)
-            CH03 (TS, Z116, 0x5E, 0x01FD, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01FB, 0x00, 0x00)
+            CH03 (__METHOD__, Z116, 0x5E, 0x01FD, 0x00)
             M390 (DerefOf (Arg2), V000, 0x00, 0x3E)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x01FF, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x01FF, 0x00, 0x00)
         }
 
         If (Q001)
@@ -473,43 +471,43 @@
             {
                 CopyObject (PPP0 [0x00], I005) /* \M1C3.I005 */
                 Store (P000 [0x00], I005) /* \M1C3.I005 */
-                CH03 (TS, Z116, 0x60, 0x0221, 0x00)
+                CH03 (__METHOD__, Z116, 0x60, 0x0221, 0x00)
                 I006 = (I005 + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0223, 0x00, 0x00)
-                CH03 (TS, Z116, 0x62, 0x0225, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0223, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x62, 0x0225, 0x00)
                 I006 = (DerefOf (I005) + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0227, 0x00, 0x00)
-                CH03 (TS, Z116, 0x64, 0x0229, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0227, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x64, 0x0229, 0x00)
                 M390 (I005, V000, 0x00, 0x45)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x022B, 0x00, 0x00)
-                CH03 (TS, Z116, 0x66, 0x022D, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x022B, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x66, 0x022D, 0x00)
                 M390 (DerefOf (I005), V000, 0x00, 0x46)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x022F, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x022F, 0x00, 0x00)
                 I005 = I002 = P000 [0x00]
-                CH03 (TS, Z116, 0x68, 0x0233, 0x00)
+                CH03 (__METHOD__, Z116, 0x68, 0x0233, 0x00)
                 I006 = (I005 + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0235, 0x00, 0x00)
-                CH03 (TS, Z116, 0x6A, 0x0237, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0235, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x6A, 0x0237, 0x00)
                 I006 = (DerefOf (I005) + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0239, 0x00, 0x00)
-                CH03 (TS, Z116, 0x6C, 0x023B, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0239, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x6C, 0x023B, 0x00)
                 M390 (I005, V000, 0x00, 0x47)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x023D, 0x00, 0x00)
-                CH03 (TS, Z116, 0x6E, 0x023F, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x023D, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x6E, 0x023F, 0x00)
                 M390 (DerefOf (I005), V000, 0x00, 0x48)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0241, 0x00, 0x00)
-                CH03 (TS, Z116, 0x70, 0x0243, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0241, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x70, 0x0243, 0x00)
                 I006 = (I002 + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0245, 0x00, 0x00)
-                CH03 (TS, Z116, 0x72, 0x0247, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0245, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x72, 0x0247, 0x00)
                 I006 = (DerefOf (I002) + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0249, 0x00, 0x00)
-                CH03 (TS, Z116, 0x74, 0x024B, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0249, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x74, 0x024B, 0x00)
                 M390 (I002, V000, 0x00, 0x49)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x024D, 0x00, 0x00)
-                CH03 (TS, Z116, 0x76, 0x024F, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x024D, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x76, 0x024F, 0x00)
                 M390 (DerefOf (I002), V000, 0x00, 0x4A)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0251, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0251, 0x00, 0x00)
             }
 
             If (Q001)
@@ -535,43 +533,43 @@
             If (FL00)
             {
                 Store (P000 [0x01], I005) /* \M1C3.I005 */
-                CH03 (TS, Z116, 0x78, 0x0270, 0x00)
+                CH03 (__METHOD__, Z116, 0x78, 0x0270, 0x00)
                 I006 = (I005 + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0272, 0x00, 0x00)
-                CH03 (TS, Z116, 0x7A, 0x0274, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0272, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x7A, 0x0274, 0x00)
                 I006 = (DerefOf (I005) + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0276, 0x00, 0x00)
-                CH03 (TS, Z116, 0x7C, 0x0278, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0276, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x7C, 0x0278, 0x00)
                 M390 (I005, V000, 0x00, 0x51)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x027A, 0x00, 0x00)
-                CH03 (TS, Z116, 0x7E, 0x027C, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x027A, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x7E, 0x027C, 0x00)
                 M390 (DerefOf (I005), V000, 0x00, 0x52)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x027E, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x027E, 0x00, 0x00)
                 I005 = I002 = P000 [0x01]
-                CH03 (TS, Z116, 0x80, 0x0282, 0x00)
+                CH03 (__METHOD__, Z116, 0x80, 0x0282, 0x00)
                 I006 = (I005 + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0284, 0x00, 0x00)
-                CH03 (TS, Z116, 0x82, 0x0286, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0284, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x82, 0x0286, 0x00)
                 I006 = (DerefOf (I005) + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0288, 0x00, 0x00)
-                CH03 (TS, Z116, 0x84, 0x028A, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0288, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x84, 0x028A, 0x00)
                 M390 (I005, V000, 0x00, 0x53)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x028C, 0x00, 0x00)
-                CH03 (TS, Z116, 0x86, 0x028E, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x028C, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x86, 0x028E, 0x00)
                 M390 (DerefOf (I005), V000, 0x00, 0x54)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0290, 0x00, 0x00)
-                CH03 (TS, Z116, 0x88, 0x0292, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0290, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x88, 0x0292, 0x00)
                 I006 = (I002 + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0294, 0x00, 0x00)
-                CH03 (TS, Z116, 0x8A, 0x0296, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0294, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x8A, 0x0296, 0x00)
                 I006 = (DerefOf (I002) + 0x01)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x0298, 0x00, 0x00)
-                CH03 (TS, Z116, 0x8C, 0x029A, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0298, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x8C, 0x029A, 0x00)
                 M390 (I002, V000, 0x00, 0x55)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x029C, 0x00, 0x00)
-                CH03 (TS, Z116, 0x8E, 0x029E, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x029C, 0x00, 0x00)
+                CH03 (__METHOD__, Z116, 0x8E, 0x029E, 0x00)
                 M390 (DerefOf (I002), V000, 0x00, 0x56)
-                CH04 (TS, 0x00, 0xFF, Z116, 0x02A0, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x02A0, 0x00, 0x00)
             }
 
             If (Q001)
@@ -698,7 +696,6 @@
     /* Methods without parameters */
     Method (M1C7, 0, Serialized)
     {
-        Name (TS, "m1c7")
         Name (I000, 0x77)
         Method (M000, 0, NotSerialized)
         {
@@ -736,33 +733,32 @@
             I000
         })
         Store (P000 [0x00], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x6E)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x6E)
         Store (P000 [0x01], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x6F)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x6F)
         Store (P000 [0x02], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x70)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x70)
         Store (P000 [0x03], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x71)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x71)
         Store (P000 [0x04], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x72)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x72)
         Store (P000 [0x05], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x73)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x73)
         Store (P000 [0x06], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x74)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x74)
         Store (P000 [0x07], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x75)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x75)
         Store (P000 [0x08], Local0)
-        M1A3 (Local0, C009, Z116, TS, 0x76)
+        M1A3 (Local0, C009, Z116, __METHOD__, 0x76)
         Store (P000 [0x09], Local0)
-        M1A3 (Local0, C009, Z116, TS, 0x77)
-        M380 (TS, I000, 0x00, 0x00)
+        M1A3 (Local0, C009, Z116, __METHOD__, 0x77)
+        M380 (__METHOD__, I000, 0x00, 0x00)
     }
 
     /* CURRENTLY: compiler failed, Too few arguments (M002 requires X) */
     /* Methods with parameters */
     Method (M1C8, 0, Serialized)
     {
-        Name (TS, "m1c8")
         /*
      Name(i000, 0x77)
      Method(m000) {
@@ -818,7 +814,6 @@
 
     Method (M1C9, 0, Serialized)
     {
-        Name (TS, "m1c9")
         Name (I000, 0x77)
         Method (M000, 0, NotSerialized)
         {
@@ -856,59 +851,58 @@
             I000
         })
         Store (P000 [0x00], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x83)
-        CH03 (TS, Z116, 0x90, 0x03A8, 0x00)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x83)
+        CH03 (__METHOD__, Z116, 0x90, 0x03A8, 0x00)
         Local1 = DerefOf (Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x03AA, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03AA, 0x00, 0x00)
         Store (P000 [0x01], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x84)
-        CH03 (TS, Z116, 0x92, 0x03AE, 0x00)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x84)
+        CH03 (__METHOD__, Z116, 0x92, 0x03AE, 0x00)
         Local1 = DerefOf (Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x03B0, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03B0, 0x00, 0x00)
         Store (P000 [0x02], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x85)
-        CH03 (TS, Z116, 0x94, 0x03B4, 0x00)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x85)
+        CH03 (__METHOD__, Z116, 0x94, 0x03B4, 0x00)
         Local1 = DerefOf (Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x03B6, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03B6, 0x00, 0x00)
         Store (P000 [0x03], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x86)
-        CH03 (TS, Z116, 0x96, 0x03BA, 0x00)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x86)
+        CH03 (__METHOD__, Z116, 0x96, 0x03BA, 0x00)
         Local1 = DerefOf (Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x03BC, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03BC, 0x00, 0x00)
         Store (P000 [0x04], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x87)
-        CH03 (TS, Z116, 0x98, 0x03C0, 0x00)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x87)
+        CH03 (__METHOD__, Z116, 0x98, 0x03C0, 0x00)
         Local1 = DerefOf (Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x03C2, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03C2, 0x00, 0x00)
         Store (P000 [0x05], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x88)
-        CH03 (TS, Z116, 0x9A, 0x03C6, 0x00)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x88)
+        CH03 (__METHOD__, Z116, 0x9A, 0x03C6, 0x00)
         Local1 = DerefOf (Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x03C8, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03C8, 0x00, 0x00)
         Store (P000 [0x06], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x89)
-        CH03 (TS, Z116, 0x9C, 0x03CC, 0x00)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x89)
+        CH03 (__METHOD__, Z116, 0x9C, 0x03CC, 0x00)
         Local1 = DerefOf (Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x03CE, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03CE, 0x00, 0x00)
         Store (P000 [0x07], Local0)
-        M1A3 (Local0, C010, Z116, TS, 0x8A)
-        CH03 (TS, Z116, 0x9E, 0x03D2, 0x00)
+        M1A3 (Local0, C010, Z116, __METHOD__, 0x8A)
+        CH03 (__METHOD__, Z116, 0x9E, 0x03D2, 0x00)
         Local1 = DerefOf (Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x03D4, 0x00, 0x00)
-        M380 (TS, I000, 0x00, 0x8B)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03D4, 0x00, 0x00)
+        M380 (__METHOD__, I000, 0x00, 0x8B)
     }
 
     /* Size of Package */
 
     Method (M1CA, 0, Serialized)
     {
-        Name (TS, "m1ca")
         Method (M000, 1, Serialized)
         {
             Name (P000, Package (Arg0){})
-            CH03 (TS, Z116, 0xA0, 0x03E2, 0x00)
+            CH03 (__METHOD__, Z116, 0xA0, 0x03E2, 0x00)
             Store (P000 [Arg0], Local0)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x03E4, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x03E4, 0x00, 0x00)
         }
 
         Method (M001, 1, Serialized)
@@ -937,7 +931,7 @@
                 Local1 = DerefOf (Local0)
                 If ((Local1 != LPC0))
                 {
-                    ERR (TS, Z116, 0x0402, Z116, 0x00, Local1, LPC0)
+                    ERR (__METHOD__, Z116, 0x0402, Z116, 0x00, Local1, LPC0)
                     Break
                 }
 
@@ -949,17 +943,17 @@
         Method (M003, 0, Serialized)
         {
             Name (P000, Package (0x02){})
-            CH03 (TS, Z116, 0xA2, 0x040E, 0x00)
+            CH03 (__METHOD__, Z116, 0xA2, 0x040E, 0x00)
             Store (P000 [0x02], Local0)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0410, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0410, 0x00, 0x00)
         }
 
         Method (M004, 0, Serialized)
         {
             Name (P000, Package (0xFF){})
-            CH03 (TS, Z116, 0xA4, 0x0417, 0x00)
+            CH03 (__METHOD__, Z116, 0xA4, 0x0417, 0x00)
             Store (P000 [0xFF], Local0)
-            CH04 (TS, 0x00, 0xFF, Z116, 0x0419, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0419, 0x00, 0x00)
         }
 
         /* Size not greater than 255 */
@@ -979,7 +973,6 @@
 
     Method (M1CB, 0, Serialized)
     {
-        Name (TS, "m1cb")
         Name (P000, Package (0x06)
         {
             0x01,
@@ -992,7 +985,7 @@
         Local0 = SizeOf (P000)
         If ((Local0 != 0x06))
         {
-            ERR (TS, Z116, 0x0435, 0x00, 0x00, Local0, 0x06)
+            ERR (__METHOD__, Z116, 0x0435, 0x00, 0x00, Local0, 0x06)
         }
     }
 
@@ -1035,44 +1028,41 @@
     /* when accessing element of Package. */
     Method (M1CE, 0, Serialized)
     {
-        Name (TS, "m1ce")
         Name (P000, Package (0x01)
         {
             0x77
         })
-        M1CC (TS, Local0 = P000 [0x00], 0x78, 0x00)
-        M1CD (TS, P000 [0x00], 0x78, 0x00)
+        M1CC (__METHOD__, Local0 = P000 [0x00], 0x78, 0x00)
+        M1CD (__METHOD__, P000 [0x00], 0x78, 0x00)
     }
 
     Method (M1CF, 0, Serialized)
     {
-        Name (TS, "m1cf")
         Name (P000, Package (0x01)
         {
             0x77
         })
         Local0 = P000 [0x00]
-        M1CC (TS, Local0, 0x78, 0x00)
-        M1CD (TS, Local0, 0x78, 0x00)
+        M1CC (__METHOD__, Local0, 0x78, 0x00)
+        M1CD (__METHOD__, Local0, 0x78, 0x00)
         Local1 = Local0 = P000 [0x00]
-        M1CC (TS, Local0, 0x78, 0x00)
-        M1CD (TS, Local0, 0x78, 0x00)
-        M1CC (TS, Local1, 0x78, 0x00)
-        M1CD (TS, Local1, 0x78, 0x00)
+        M1CC (__METHOD__, Local0, 0x78, 0x00)
+        M1CD (__METHOD__, Local0, 0x78, 0x00)
+        M1CC (__METHOD__, Local1, 0x78, 0x00)
+        M1CD (__METHOD__, Local1, 0x78, 0x00)
     }
 
     Method (M1D0, 0, Serialized)
     {
-        Name (TS, "m1d0")
         Name (P000, Package (0x01)
         {
             0x77
         })
         CopyObject (Local0 = P000 [0x00], Local1)
-        M1CC (TS, Local0, 0x78, 0x00)
-        M1CD (TS, Local0, 0x78, 0x00)
-        M1CC (TS, Local1, 0x78, 0x00)
-        M1CD (TS, Local1, 0x78, 0x00)
+        M1CC (__METHOD__, Local0, 0x78, 0x00)
+        M1CD (__METHOD__, Local0, 0x78, 0x00)
+        M1CC (__METHOD__, Local1, 0x78, 0x00)
+        M1CD (__METHOD__, Local1, 0x78, 0x00)
     }
 
     /* EXCEPTIONS */
@@ -1091,73 +1081,68 @@
     /* LocalX */
     Method (M1D1, 0, Serialized)
     {
-        Name (TS, "m1d1")
         Name (P000, Package (0x01)
         {
             0x77
         })
         Local1 = Local0 = P000 [0x00]
-        CH03 (TS, Z116, 0xAC, 0x04A6, 0x00)
+        CH03 (__METHOD__, Z116, 0xAC, 0x04A6, 0x00)
         Local7 = (Local0 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x04AA, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04AA, 0x00, 0x00)
         Local7 = (Local1 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x04AE, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04AE, 0x00, 0x00)
     }
 
     Method (M1D2, 0, Serialized)
     {
-        Name (TS, "m1d2")
         Name (P000, Package (0x01)
         {
             0x77
         })
         CopyObject (Local0 = P000 [0x00], Local1)
-        CH03 (TS, Z116, 0xAF, 0x04B9, 0x00)
+        CH03 (__METHOD__, Z116, 0xAF, 0x04B9, 0x00)
         Local7 = (Local0 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x04BD, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04BD, 0x00, 0x00)
         Local7 = (Local1 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x04C1, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04C1, 0x00, 0x00)
     }
 
     /* ArgX */
 
     Method (M1D3, 2, Serialized)
     {
-        Name (TS, "m1d3")
         Name (P000, Package (0x01)
         {
             0x77
         })
         Arg1 = Arg0 = P000 [0x00]
-        CH03 (TS, Z116, 0xB2, 0x04CE, 0x00)
+        CH03 (__METHOD__, Z116, 0xB2, 0x04CE, 0x00)
         Local7 = (Arg0 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x04D2, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04D2, 0x00, 0x00)
         Local7 = (Arg1 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x04D6, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04D6, 0x00, 0x00)
     }
 
     Method (M1D4, 2, Serialized)
     {
-        Name (TS, "m1d4")
         Name (P000, Package (0x01)
         {
             0x77
         })
         CopyObject (Arg0 = P000 [0x00], Arg1)
-        CH03 (TS, Z116, 0xB5, 0x04E1, 0x00)
+        CH03 (__METHOD__, Z116, 0xB5, 0x04E1, 0x00)
         Local7 = (Arg0 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x04E5, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04E5, 0x00, 0x00)
         /* Type of Arg1 should be IRef here, */
         /* so, exception is expected. */
         Local7 = (Arg1 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x04EC, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x04EC, 0x00, 0x00)
     }
 
     /* NamedX */
 
     Method (M1D5, 0, Serialized)
     {
-        Name (TS, "m1d5")
         Name (I001, 0x00)
         Name (P000, Package (0x02)
         {
@@ -1168,13 +1153,13 @@
         Name (HG00, 0x00) /* if non-zero - the test hangs */
         Name (HG01, 0x00) /* if non-zero - the test hangs */
         Name (HG02, 0x00) /* if non-zero - the test hangs */
-        CH03 (TS, Z116, 0xB8, 0x04FD, 0x00)
+        CH03 (__METHOD__, Z116, 0xB8, 0x04FD, 0x00)
         CopyObject (Local0 = P000 [0x01], I001) /* \M1D5.I001 */
-        CH03 (TS, Z116, 0xB9, 0x0501, 0x00)
+        CH03 (__METHOD__, Z116, 0xB9, 0x0501, 0x00)
         /* Type of i001 should be already IRef here, */
         /* so, don't expect exception. */
         I001 = Local0 = P000 [0x00]
-        CH03 (TS, Z116, 0xBA, 0x0508, 0x00)
+        CH03 (__METHOD__, Z116, 0xBA, 0x0508, 0x00)
         Local7 = (Local0 + 0x01)
         If (Y248)
         {
@@ -1211,9 +1196,9 @@
             Debug = Local7
         }
 
-        CH04 (TS, 0x00, 0xFF, Z116, 0x0529, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0529, 0x00, 0x00)
         Local7 = (I001 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x052D, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x052D, 0x00, 0x00)
         /*
          * Looks identical to b248: "Incorrect ReferenceCount on Switch operation":
          *
@@ -1233,68 +1218,64 @@
 
     Method (M1D6, 0, Serialized)
     {
-        Name (TS, "m1d6")
         Name (I001, 0x00)
         Name (P000, Package (0x01)
         {
             0x77
         })
-        CH03 (TS, Z116, 0xBD, 0x0548, 0x00)
+        CH03 (__METHOD__, Z116, 0xBD, 0x0548, 0x00)
         CopyObject (Local0 = P000 [0x00], I001) /* \M1D6.I001 */
-        CH03 (TS, Z116, 0xBE, 0x054C, 0x00)
+        CH03 (__METHOD__, Z116, 0xBE, 0x054C, 0x00)
         Local7 = (I001 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x0550, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0550, 0x00, 0x00)
     }
 
     /* Out of Package */
 
     Method (M1D7, 0, Serialized)
     {
-        Name (TS, "m1d7")
         Name (P000, Package (0x01)
         {
             0x77
         })
-        CH03 (TS, Z116, 0xC1, 0x055B, 0x00)
+        CH03 (__METHOD__, Z116, 0xC1, 0x055B, 0x00)
         Store (P000 [0x01], Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x055F, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x055F, 0x00, 0x00)
         Local1 = Local0 = P000 [0x01]
-        CH04 (TS, 0x00, 0xFF, Z116, 0x0563, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0563, 0x00, 0x00)
     }
 
     Method (M1D8, 0, Serialized)
     {
-        Name (TS, "m1d8")
         Name (P000, Package (0x01)
         {
             0x77
         })
-        CH03 (TS, Z116, 0xC4, 0x056C, 0x00)
+        CH03 (__METHOD__, Z116, 0xC4, 0x056C, 0x00)
         CopyObject (P000 [0x01], Local0)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x0570, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0570, 0x00, 0x00)
         CopyObject (Local0 = P000 [0x01], Local1)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x0574, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x0574, 0x00, 0x00)
     }
 
     Method (M1DB, 0, Serialized)
     {
-        Name (TS, "m1db")
         Name (I001, 0x00)
         Name (P000, Package (0x02)
         {
             0x77,
             0x88
         })
-        CH03 (TS, Z116, 0xC7, 0x057F, 0x00)
+        CH03 (__METHOD__, Z116, 0xC7, 0x057F, 0x00)
         CopyObject (P000 [0x01], I001) /* \M1DB.I001 */
-        CH03 (TS, Z116, 0xC8, 0x0583, 0x00)
+        CH03 (__METHOD__, Z116, 0xC8, 0x0583, 0x00)
         /* Type of i001 should be already IRef here, */
         /* so, don't expect exception. Writing to i001 */
         /* is here identical to Store into it. */
         I001 = P000 [0x00]
-        CH03 (TS, Z116, 0xC9, 0x058B, 0x00)
+        CH03 (__METHOD__, Z116, 0xC9, 0x058B, 0x00)
         Local7 = (I001 + 0x01)
-        CH04 (TS, 0x00, 0xFF, Z116, 0x058F, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0xFF, Z116, 0x058F, 0x00, 0x00)
     }
 
     /* WRITE */
diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl
index 953a7365a..6f5075d76 100644
--- a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl
+++ b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl
@@ -52,9 +52,8 @@
 
     Method (M221, 0, Serialized)
     {
-        Name (TS, "m221")
-        TS00 (TS)
-        M1AD (TS, 0x00, 0x01, 0x01, 0x01, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x00, 0x01, 0x01, 0x01, 0x00)
         M341 ()
         If (C088)
         {
@@ -66,9 +65,8 @@
 
     Method (M222, 0, Serialized)
     {
-        Name (TS, "m222")
-        TS00 (TS)
-        M1AD (TS, 0x00, 0x01, 0x01, 0x00, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x00, 0x01, 0x01, 0x00, 0x00)
         If (Y507)
         {
             M342 ()
@@ -79,7 +77,7 @@
         }
         Else
         {
-            M1AE (TS, "read of ArgX-ORef without DerefOf", "AE_AML_OPERAND_TYPE exception instead of automatic dereference")
+            M1AE (__METHOD__, "read of ArgX-ORef without DerefOf", "AE_AML_OPERAND_TYPE exception instead of automatic dereference")
         }
     }
 
@@ -87,9 +85,8 @@
 
     Method (M223, 0, Serialized)
     {
-        Name (TS, "m223")
-        TS00 (TS)
-        M1AD (TS, 0x00, 0x01, 0x01, 0x01, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x00, 0x01, 0x01, 0x01, 0x00)
         M343 ()
         If (C088)
         {
@@ -101,9 +98,8 @@
 
     Method (M224, 0, Serialized)
     {
-        Name (TS, "m224")
-        TS00 (TS)
-        M1AD (TS, 0x00, 0x01, 0x01, 0x00, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x00, 0x01, 0x01, 0x00, 0x00)
         If (Y507)
         {
             M344 ()
@@ -114,7 +110,7 @@
         }
         Else
         {
-            M1AE (TS, "read of ArgX-IRef without DerefOf", "AE_AML_OPERAND_TYPE exception instead of automatic dereference")
+            M1AE (__METHOD__, "read of ArgX-IRef without DerefOf", "AE_AML_OPERAND_TYPE exception instead of automatic dereference")
         }
     }
 
@@ -122,9 +118,8 @@
 
     Method (M225, 0, Serialized)
     {
-        Name (TS, "m225")
-        TS00 (TS)
-        M1AD (TS, 0x01, 0x01, 0x00, 0x00, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x01, 0x01, 0x00, 0x00, 0x00)
         M1C0 ()
     }
 
@@ -132,9 +127,8 @@
 
     Method (M226, 0, Serialized)
     {
-        Name (TS, "m226")
-        TS00 (TS)
-        M1AD (TS, 0x02, 0x01, 0x00, 0x00, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x02, 0x01, 0x00, 0x00, 0x00)
         M1C0 ()
     }
 
@@ -142,14 +136,13 @@
 
     Method (M227, 0, Serialized)
     {
-        Name (TS, "m227")
-        TS00 (TS)
+        TS00 (__METHOD__)
         M362 ()
         M363 ()
         M364 ()
         If (C088)
         {
-            M1AD (TS, 0x01, 0x01, 0x01, 0x01, 0x00)
+            M1AD (__METHOD__, 0x01, 0x01, 0x01, 0x01, 0x00)
             M4D0 ()
         }
     }
@@ -158,9 +151,8 @@
 
     Method (M228, 0, Serialized)
     {
-        Name (TS, "m228")
-        TS00 (TS)
-        M1AD (TS, 0x02, 0x01, 0x01, 0x01, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x02, 0x01, 0x01, 0x01, 0x00)
         M4D0 ()
     }
 
@@ -169,9 +161,8 @@
     /* ACTUALLY: doesn't write to the original object. */
     Method (M229, 0, Serialized)
     {
-        Name (TS, "m229")
-        TS00 (TS)
-        M1AD (TS, 0x01, 0x01, 0x01, 0x01, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x01, 0x01, 0x01, 0x01, 0x00)
         M4D1 ()
     }
 
@@ -180,9 +171,8 @@
     /* ACTUALLY: doesn't write to the original object. */
     Method (M22A, 0, Serialized)
     {
-        Name (TS, "m22a")
-        TS00 (TS)
-        M1AD (TS, 0x02, 0x01, 0x01, 0x01, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x02, 0x01, 0x01, 0x01, 0x00)
         M4D1 ()
     }
 
@@ -206,14 +196,13 @@
     /* ACTUALLY: writes to the original object. */
     Method (M22C, 0, Serialized)
     {
-        Name (TS, "m22c")
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M22C.TS__ */
+            Debug = __METHOD__ /* \M22C.TS__ */
         }
 
         Name (B000, Buffer (0x04)
@@ -229,13 +218,13 @@
             CreateField (Arg0, 0x08, 0x08, BF90)
             If ((BF90 != 0x77))
             {
-                ERR (TS, Z111, 0xEF, 0x00, 0x00, BF90, 0x77)
+                ERR (__METHOD__, Z111, 0xEF, 0x00, 0x00, BF90, 0x77)
             }
 
             BF90 = 0x9999992B
             If ((BF90 != 0x2B))
             {
-                ERR (TS, Z111, 0xF3, 0x00, 0x00, BF90, 0x2B)
+                ERR (__METHOD__, Z111, 0xF3, 0x00, 0x00, BF90, 0x2B)
             }
         }
 
@@ -244,28 +233,28 @@
             CreateField (Arg0, 0x08, 0x08, BF90)
             If ((BF90 != 0x77))
             {
-                ERR (TS, Z111, 0xFB, 0x00, 0x00, BF90, 0x77)
+                ERR (__METHOD__, Z111, 0xFB, 0x00, 0x00, BF90, 0x77)
             }
 
             BF90 = 0x2B
             CopyObject (0x9999992B, BF90) /* \M22C.M001.BF90 */
             If ((BF90 != 0x2B))
             {
-                ERR (TS, Z111, 0x0101, 0x00, 0x00, BF90, 0x2B)
+                ERR (__METHOD__, Z111, 0x0101, 0x00, 0x00, BF90, 0x2B)
             }
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         M000 (B000)
         If (X191)
         {
             M001 (B010)
         }
 
-        M386 (TS, B000, 0x00, 0x04)
+        M386 (__METHOD__, B000, 0x00, 0x04)
         If (X191)
         {
-            M386 (TS, B010, 0x00, 0x05)
+            M386 (__METHOD__, B010, 0x00, 0x05)
         }
 
         END0 ()
@@ -275,20 +264,19 @@
 
     Method (M22D, 0, Serialized)
     {
-        Name (TS, "m22d")
-        TS00 (TS)
+        TS00 (__METHOD__)
         M346 ()
         If (C088)
         {
             /* RefOf */
 
             C08B = 0x01 /* do RefOf(ArgX) checkings */
-            M1AD (TS, 0x00, 0x01, 0x00, 0x00, 0x00)
+            M1AD (__METHOD__, 0x00, 0x01, 0x00, 0x00, 0x00)
             M1C0 ()
             /* CondRefOf */
 
             C08B = 0x02 /* do RefOf(ArgX) checkings */
-            M1AD (TS, 0x00, 0x01, 0x00, 0x00, 0x00)
+            M1AD (__METHOD__, 0x00, 0x01, 0x00, 0x00, 0x00)
             M1C0 ()
             C08B = 0x00 /* do RefOf(ArgX) checkings */
         }
@@ -353,14 +341,13 @@
     /* ACTUALLY: doesn't write to the original object. */
     Method (M234, 0, Serialized)
     {
-        Name (TS, "m234")
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M234.TS__ */
+            Debug = __METHOD__ /* \M234.TS__ */
         }
 
         Name (B000, Buffer (0x04)
@@ -373,13 +360,13 @@
             CreateField (Local2, 0x08, 0x08, BF90)
             If ((BF90 != 0x77))
             {
-                ERR (TS, Z111, 0x0178, 0x00, 0x00, BF90, 0x77)
+                ERR (__METHOD__, Z111, 0x0178, 0x00, 0x00, BF90, 0x77)
             }
 
             BF90 = 0x9999992B
             If ((BF90 != 0x2B))
             {
-                ERR (TS, Z111, 0x017C, 0x00, 0x00, BF90, 0x2B)
+                ERR (__METHOD__, Z111, 0x017C, 0x00, 0x00, BF90, 0x2B)
             }
         }
 
@@ -389,13 +376,13 @@
             CreateField (Local2, 0x08, 0x08, BF90)
             If ((BF90 != 0x77))
             {
-                ERR (TS, Z111, 0x0186, 0x00, 0x00, BF90, 0x77)
+                ERR (__METHOD__, Z111, 0x0186, 0x00, 0x00, BF90, 0x77)
             }
 
             CopyObject (0x9999992B, BF90) /* \M234.M001.BF90 */
             If ((BF90 != 0x2B))
             {
-                ERR (TS, Z111, 0x018A, 0x00, 0x00, BF90, 0x2B)
+                ERR (__METHOD__, Z111, 0x018A, 0x00, 0x00, BF90, 0x2B)
             }
         }
 
@@ -405,15 +392,15 @@
             M000 (Local0)
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x0100)
+                M381 (__METHOD__, Arg0, 0x00, 0x0100)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x0101)
+                M382 (__METHOD__, Arg0, 0x00, 0x0101)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x0102)
+                M383 (__METHOD__, Arg0, 0x00, 0x0102)
             }
         }
 
@@ -422,15 +409,15 @@
             M000 (RefOf (Arg0))
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x0103)
+                M381 (__METHOD__, Arg0, 0x00, 0x0103)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x0104)
+                M382 (__METHOD__, Arg0, 0x00, 0x0104)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x0105)
+                M383 (__METHOD__, Arg0, 0x00, 0x0105)
             }
         }
 
@@ -440,15 +427,15 @@
             M001 (Local0)
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x0106)
+                M381 (__METHOD__, Arg0, 0x00, 0x0106)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x0107)
+                M382 (__METHOD__, Arg0, 0x00, 0x0107)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x0108)
+                M383 (__METHOD__, Arg0, 0x00, 0x0108)
             }
         }
 
@@ -457,33 +444,33 @@
             M001 (RefOf (Arg0))
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x0109)
+                M381 (__METHOD__, Arg0, 0x00, 0x0109)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x010A)
+                M382 (__METHOD__, Arg0, 0x00, 0x010A)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x010B)
+                M383 (__METHOD__, Arg0, 0x00, 0x010B)
             }
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         M010 (B000, C00B)
-        M382 (TS, B000, 0x00, 0x010C)
+        M382 (__METHOD__, B000, 0x00, 0x010C)
         M020 (B000, C00B)
-        M382 (TS, B000, 0x00, 0x010D)
+        M382 (__METHOD__, B000, 0x00, 0x010D)
         If (X191)
         {
             M011 (B000, C00B)
-            M382 (TS, B000, 0x00, 0x010E)
+            M382 (__METHOD__, B000, 0x00, 0x010E)
         }
 
         If (X191)
         {
             M021 (B000, C00B)
-            M382 (TS, B000, 0x00, 0x010F)
+            M382 (__METHOD__, B000, 0x00, 0x010F)
         }
 
         END0 ()
@@ -513,14 +500,13 @@
      */
     Method (M235, 0, Serialized)
     {
-        Name (TS, "m235")
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M235.TS__ */
+            Debug = __METHOD__ /* \M235.TS__ */
         }
 
         Name (I000, 0x77)
@@ -542,19 +528,19 @@
             Arg1 = Arg0
             If ((Arg2 == C009))
             {
-                M380 (TS, Arg1, 0x00, 0x00)
+                M380 (__METHOD__, Arg1, 0x00, 0x00)
             }
             ElseIf ((Arg2 == C00A))
             {
-                M381 (TS, Arg1, 0x00, 0x01)
+                M381 (__METHOD__, Arg1, 0x00, 0x01)
             }
             ElseIf ((Arg2 == C00B))
             {
-                M382 (TS, Arg1, 0x00, 0x02)
+                M382 (__METHOD__, Arg1, 0x00, 0x02)
             }
             ElseIf ((Arg2 == C00C))
             {
-                M383 (TS, Arg1, 0x00, 0x03)
+                M383 (__METHOD__, Arg1, 0x00, 0x03)
             }
         }
 
@@ -563,19 +549,19 @@
             CopyObject (Arg0, Arg1)
             If ((Arg2 == C009))
             {
-                M380 (TS, Arg1, 0x00, 0x04)
+                M380 (__METHOD__, Arg1, 0x00, 0x04)
             }
             ElseIf ((Arg2 == C00A))
             {
-                M381 (TS, Arg1, 0x00, 0x05)
+                M381 (__METHOD__, Arg1, 0x00, 0x05)
             }
             ElseIf ((Arg2 == C00B))
             {
-                M382 (TS, Arg1, 0x00, 0x06)
+                M382 (__METHOD__, Arg1, 0x00, 0x06)
             }
             ElseIf ((Arg2 == C00C))
             {
-                M383 (TS, Arg1, 0x00, 0x07)
+                M383 (__METHOD__, Arg1, 0x00, 0x07)
             }
         }
 
@@ -585,19 +571,19 @@
             Local2 = DerefOf (Arg1)
             If ((Arg2 == C009))
             {
-                M380 (TS, Local2, 0x00, 0x08)
+                M380 (__METHOD__, Local2, 0x00, 0x08)
             }
             ElseIf ((Arg2 == C00A))
             {
-                M381 (TS, Local2, 0x00, 0x09)
+                M381 (__METHOD__, Local2, 0x00, 0x09)
             }
             ElseIf ((Arg2 == C00B))
             {
-                M382 (TS, Local2, 0x00, 0x0A)
+                M382 (__METHOD__, Local2, 0x00, 0x0A)
             }
             ElseIf ((Arg2 == C00C))
             {
-                M383 (TS, Local2, 0x00, 0x0B)
+                M383 (__METHOD__, Local2, 0x00, 0x0B)
             }
         }
 
@@ -607,26 +593,26 @@
             Local2 = DerefOf (Arg1)
             If ((Arg2 == C009))
             {
-                M380 (TS, Local2, 0x00, 0x0C)
+                M380 (__METHOD__, Local2, 0x00, 0x0C)
             }
             ElseIf ((Arg2 == C00A))
             {
-                M381 (TS, Local2, 0x00, 0x0D)
+                M381 (__METHOD__, Local2, 0x00, 0x0D)
             }
             ElseIf ((Arg2 == C00B))
             {
-                M382 (TS, Local2, 0x00, 0x0E)
+                M382 (__METHOD__, Local2, 0x00, 0x0E)
             }
             ElseIf ((Arg2 == C00C))
             {
-                M383 (TS, Local2, 0x00, 0x0F)
+                M383 (__METHOD__, Local2, 0x00, 0x0F)
             }
         }
 
         Method (M004, 2, NotSerialized)
         {
             Arg1 = Arg0
-            M380 (TS, Arg1, 0x00, 0x10)
+            M380 (__METHOD__, Arg1, 0x00, 0x10)
         }
 
         Method (M005, 2, NotSerialized)
@@ -634,121 +620,121 @@
             Arg1 = Arg0
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* ArgX-Object -->> ArgY-Object */
 
         M000 (I000, I001, C009)
-        M380 (TS, I000, 0x00, 0x11)
-        M384 (TS, I001, 0x00, 0x12)
+        M380 (__METHOD__, I000, 0x00, 0x11)
+        M384 (__METHOD__, I001, 0x00, 0x12)
         M001 (I000, I001, C009)
-        M380 (TS, I000, 0x00, 0x13)
-        M384 (TS, I001, 0x00, 0x14)
+        M380 (__METHOD__, I000, 0x00, 0x13)
+        M384 (__METHOD__, I001, 0x00, 0x14)
         /* ArgX-Object -->> ArgY-ORef */
 
         M002 (I000, RefOf (I001), C009)
-        M380 (TS, I000, 0x00, 0x15)
-        M380 (TS, I001, 0x00, 0x16)
+        M380 (__METHOD__, I000, 0x00, 0x15)
+        M380 (__METHOD__, I001, 0x00, 0x16)
         M003 (I000, RefOf (I021), C009)
-        M380 (TS, I000, 0x00, 0x17)
-        M380 (TS, I021, 0x00, 0x18)
+        M380 (__METHOD__, I000, 0x00, 0x17)
+        M380 (__METHOD__, I021, 0x00, 0x18)
         Local0 = RefOf (I031)
         M002 (I000, Local0, C009)
-        M380 (TS, I000, 0x00, 0x19)
-        M380 (TS, I031, 0x00, 0x1A)
+        M380 (__METHOD__, I000, 0x00, 0x19)
+        M380 (__METHOD__, I031, 0x00, 0x1A)
         Local2 = DerefOf (Local0)
-        M380 (TS, Local2, 0x00, 0x1B)
+        M380 (__METHOD__, Local2, 0x00, 0x1B)
         Local0 = RefOf (I041)
         M003 (I000, Local0, C009)
-        M380 (TS, I000, 0x00, 0x1C)
-        M380 (TS, I041, 0x00, 0x1D)
+        M380 (__METHOD__, I000, 0x00, 0x1C)
+        M380 (__METHOD__, I041, 0x00, 0x1D)
         Local2 = DerefOf (Local0)
-        M380 (TS, Local2, 0x00, 0x1E)
+        M380 (__METHOD__, Local2, 0x00, 0x1E)
         /* ArgX-Object -->> ArgY-IRef */
 
         M004 (I000, Local0 = S021 [0x01])
-        M380 (TS, I000, 0x00, 0x1F)
-        M385 (TS, S021, 0x00, 0x20)
+        M380 (__METHOD__, I000, 0x00, 0x1F)
+        M385 (__METHOD__, S021, 0x00, 0x20)
         Local2 = DerefOf (Local0)
-        M384 (TS, Local2, 0x00, 0x21)
+        M384 (__METHOD__, Local2, 0x00, 0x21)
         Local1 = Local0 = S021 [0x01]
         M004 (I000, Local0)
-        M380 (TS, I000, 0x00, 0x22)
-        M385 (TS, S021, 0x00, 0x23)
+        M380 (__METHOD__, I000, 0x00, 0x22)
+        M385 (__METHOD__, S021, 0x00, 0x23)
         Local2 = DerefOf (Local0)
-        M384 (TS, Local2, 0x00, 0x24)
+        M384 (__METHOD__, Local2, 0x00, 0x24)
         M004 (I000, Local1)
-        M380 (TS, I000, 0x00, 0x25)
-        M385 (TS, S021, 0x00, 0x26)
+        M380 (__METHOD__, I000, 0x00, 0x25)
+        M385 (__METHOD__, S021, 0x00, 0x26)
         Local2 = DerefOf (Local1)
-        M384 (TS, Local2, 0x00, 0x27)
+        M384 (__METHOD__, Local2, 0x00, 0x27)
         /* ArgX-ORef -->> ArgY-Object */
 
         M005 (RefOf (I000), S000)
-        M380 (TS, I000, 0x00, 0x28)
-        M381 (TS, S000, 0x00, 0x29)
+        M380 (__METHOD__, I000, 0x00, 0x28)
+        M381 (__METHOD__, S000, 0x00, 0x29)
         M005 (RefOf (I000), I051)
-        M380 (TS, I000, 0x00, 0x2A)
-        M384 (TS, I051, 0x00, 0x2B)
+        M380 (__METHOD__, I000, 0x00, 0x2A)
+        M384 (__METHOD__, I051, 0x00, 0x2B)
         Local0 = RefOf (I000)
         M005 (Local0, S000)
-        M380 (TS, I000, 0x00, 0x2C)
-        M381 (TS, S000, 0x00, 0x2D)
+        M380 (__METHOD__, I000, 0x00, 0x2C)
+        M381 (__METHOD__, S000, 0x00, 0x2D)
         M005 (Local0, I051)
-        M380 (TS, I000, 0x00, 0x2E)
-        M384 (TS, I051, 0x00, 0x2F)
+        M380 (__METHOD__, I000, 0x00, 0x2E)
+        M384 (__METHOD__, I051, 0x00, 0x2F)
         /* ArgX-IRef -->> ArgY-Object */
 
         M005 (Local0 = S000 [0x01], I000)
-        M381 (TS, S000, 0x00, 0x30)
-        M380 (TS, I000, 0x00, 0x31)
+        M381 (__METHOD__, S000, 0x00, 0x30)
+        M380 (__METHOD__, I000, 0x00, 0x31)
         /* The entire expression (exercised below): */
         /* m005(Index(s021, 1, Local0), RefOf(i010)) */
         /* here is executed step by step: */
-        M385 (TS, S021, 0x00, 0x32)
-        M380 (TS, I010, 0x00, 0x33)
+        M385 (__METHOD__, S021, 0x00, 0x32)
+        M380 (__METHOD__, I010, 0x00, 0x33)
         M005 (Local0 = S021 [0x01], I010)
-        M385 (TS, S021, 0x00, 0x34)
-        M380 (TS, I010, 0x00, 0x35)
+        M385 (__METHOD__, S021, 0x00, 0x34)
+        M380 (__METHOD__, I010, 0x00, 0x35)
         M005 (I051, RefOf (I010))
-        M385 (TS, S021, 0x00, 0x36)
-        M384 (TS, I051, 0x00, 0x37)
-        M384 (TS, I010, 0x00, 0x38)
+        M385 (__METHOD__, S021, 0x00, 0x36)
+        M384 (__METHOD__, I051, 0x00, 0x37)
+        M384 (__METHOD__, I010, 0x00, 0x38)
         If (Y513)
         {
             /* ArgX-IRef -->> ArgY-ORef */
 
             M005 (Local0 = S021 [0x01], RefOf (I020))
-            M385 (TS, S021, 0x00, 0x39)
-            M384 (TS, I020, 0x00, 0x3A)
+            M385 (__METHOD__, S021, 0x00, 0x39)
+            M384 (__METHOD__, I020, 0x00, 0x3A)
             Local1 = DerefOf (Local0)
-            M384 (TS, Local1, 0x00, 0x3B)
+            M384 (__METHOD__, Local1, 0x00, 0x3B)
         }
 
         /* ArgX-IRef -->> ArgY-IRef */
 
         M005 (Local0 = S021 [0x01], Local1 = S010 [0x01])
-        M385 (TS, S021, 0x00, 0x3C)
-        M381 (TS, S010, 0x00, 0x3D)
+        M385 (__METHOD__, S021, 0x00, 0x3C)
+        M381 (__METHOD__, S010, 0x00, 0x3D)
         Local2 = DerefOf (Local0)
-        M384 (TS, Local2, 0x00, 0x3E)
+        M384 (__METHOD__, Local2, 0x00, 0x3E)
         Local2 = DerefOf (Local1)
-        M380 (TS, Local2, 0x00, 0x3F)
+        M380 (__METHOD__, Local2, 0x00, 0x3F)
         If (Y513)
         {
             /* ArgX-ORef -->> ArgY-ORef */
 
             M005 (RefOf (I000), RefOf (I061))
-            M380 (TS, I000, 0x00, 0x40)
-            M380 (TS, I061, 0x00, 0x41)
+            M380 (__METHOD__, I000, 0x00, 0x40)
+            M380 (__METHOD__, I061, 0x00, 0x41)
         }
 
         /* ArgX-ORef -->> ArgY-IRef */
 
         M005 (RefOf (I000), Local0 = S031 [0x01])
-        M380 (TS, I000, 0x00, 0x42)
-        M385 (TS, S031, 0x00, 0x43)
+        M380 (__METHOD__, I000, 0x00, 0x42)
+        M385 (__METHOD__, S031, 0x00, 0x43)
         Local2 = DerefOf (Local0)
-        M384 (TS, Local2, 0x00, 0x44)
+        M384 (__METHOD__, Local2, 0x00, 0x44)
         END0 ()
     }
 
@@ -763,14 +749,13 @@
      */
     Method (M236, 0, Serialized)
     {
-        Name (TS, "m236")
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M236.TS__ */
+            Debug = __METHOD__ /* \M236.TS__ */
         }
 
         Name (I000, 0x77)
@@ -792,19 +777,19 @@
             Local0 = Arg0
             If ((Arg1 == C009))
             {
-                M380 (TS, Local0, 0x00, 0x00)
+                M380 (__METHOD__, Local0, 0x00, 0x00)
             }
             ElseIf ((Arg1 == C00A))
             {
-                M381 (TS, Local0, 0x00, 0x01)
+                M381 (__METHOD__, Local0, 0x00, 0x01)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Local0, 0x00, 0x02)
+                M382 (__METHOD__, Local0, 0x00, 0x02)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Local0, 0x00, 0x03)
+                M383 (__METHOD__, Local0, 0x00, 0x03)
             }
 
             Local0 = 0x11
@@ -816,7 +801,7 @@
             Local0 = ObjectType (Arg0)
             If ((Local0 != Arg1))
             {
-                ERR (TS, Z111, 0x0318, 0x00, 0x00, Local0, Arg1)
+                ERR (__METHOD__, Z111, 0x0318, 0x00, 0x00, Local0, Arg1)
             }
 
             /* Overwrite LocalX which contains either */
@@ -824,36 +809,36 @@
             Local0 = 0x11
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* ArgX-Object -->> LocalX */
 
         M000 (I000, C009)
         M000 (S000, C00A)
         M000 (B000, C00B)
         M000 (P000, C00C)
-        M380 (TS, I000, 0x00, 0x04)
-        M381 (TS, S000, 0x00, 0x05)
-        M382 (TS, B000, 0x00, 0x06)
-        M383 (TS, P000, 0x00, 0x07)
+        M380 (__METHOD__, I000, 0x00, 0x04)
+        M381 (__METHOD__, S000, 0x00, 0x05)
+        M382 (__METHOD__, B000, 0x00, 0x06)
+        M383 (__METHOD__, P000, 0x00, 0x07)
         /* ArgX-ORef -->> LocalX */
 
         M001 (RefOf (I000), C009)
         M001 (RefOf (S000), C00A)
         M001 (RefOf (B000), C00B)
         M001 (RefOf (P000), C00C)
-        M380 (TS, I000, 0x00, 0x08)
-        M381 (TS, S000, 0x00, 0x09)
-        M382 (TS, B000, 0x00, 0x0A)
-        M383 (TS, P000, 0x00, 0x0B)
+        M380 (__METHOD__, I000, 0x00, 0x08)
+        M381 (__METHOD__, S000, 0x00, 0x09)
+        M382 (__METHOD__, B000, 0x00, 0x0A)
+        M383 (__METHOD__, P000, 0x00, 0x0B)
         /* ArgX-IRef -->> LocalX */
 
         M001 (S000 [0x01], C016)
         M001 (B000 [0x01], C016)
         M001 (P000 [0x01], C009)
-        M380 (TS, I000, 0x00, 0x0C)
-        M381 (TS, S000, 0x00, 0x0D)
-        M382 (TS, B000, 0x00, 0x0E)
-        M383 (TS, P000, 0x00, 0x0F)
+        M380 (__METHOD__, I000, 0x00, 0x0C)
+        M381 (__METHOD__, S000, 0x00, 0x0D)
+        M382 (__METHOD__, B000, 0x00, 0x0E)
+        M383 (__METHOD__, P000, 0x00, 0x0F)
         END0 ()
     }
 
@@ -864,14 +849,13 @@
      */
     Method (M237, 0, Serialized)
     {
-        Name (TS, "m237")
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M237.TS__ */
+            Debug = __METHOD__ /* \M237.TS__ */
         }
 
         Name (I000, 0x77)
@@ -902,15 +886,15 @@
             Local0 = 0x11
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         M000 (I000)
         M000 (S000)
         M000 (B000)
         M000 (P000)
-        M380 (TS, I000, 0x00, 0x00)
-        M381 (TS, S000, 0x00, 0x01)
-        M382 (TS, B000, 0x00, 0x02)
-        M383 (TS, P000, 0x00, 0x03)
+        M380 (__METHOD__, I000, 0x00, 0x00)
+        M381 (__METHOD__, S000, 0x00, 0x01)
+        M382 (__METHOD__, B000, 0x00, 0x02)
+        M383 (__METHOD__, P000, 0x00, 0x03)
         END0 ()
     }
 
@@ -921,14 +905,13 @@
      */
     Method (M238, 0, Serialized)
     {
-        Name (TS, "m238")
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M238.TS__ */
+            Debug = __METHOD__ /* \M238.TS__ */
         }
 
         Name (I000, 0x77)
@@ -977,21 +960,21 @@
             CopyObject (0x22, Local1)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         M000 (S000)
         M000 (B000)
         M000 (P000)
-        M380 (TS, I000, 0x00, 0x00)
-        M381 (TS, S000, 0x00, 0x01)
-        M382 (TS, B000, 0x00, 0x02)
-        M383 (TS, P000, 0x00, 0x03)
+        M380 (__METHOD__, I000, 0x00, 0x00)
+        M381 (__METHOD__, S000, 0x00, 0x01)
+        M382 (__METHOD__, B000, 0x00, 0x02)
+        M383 (__METHOD__, P000, 0x00, 0x03)
         M001 (S000)
         M001 (B000)
         M001 (P000)
-        M380 (TS, I000, 0x00, 0x04)
-        M381 (TS, S000, 0x00, 0x05)
-        M382 (TS, B000, 0x00, 0x06)
-        M383 (TS, P000, 0x00, 0x07)
+        M380 (__METHOD__, I000, 0x00, 0x04)
+        M381 (__METHOD__, S000, 0x00, 0x05)
+        M382 (__METHOD__, B000, 0x00, 0x06)
+        M383 (__METHOD__, P000, 0x00, 0x07)
         END0 ()
     }
 
@@ -1005,14 +988,13 @@
      */
     Method (M239, 0, Serialized)
     {
-        Name (TS, "m239")
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M239.TS__ */
+            Debug = __METHOD__ /* \M239.TS__ */
         }
 
         /* Local Objects */
@@ -1065,21 +1047,21 @@
             CopyObject (0x11, Arg1)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* m000 */
 
         M000 (IA00, IA10)
         M000 (SA00, SA10)
         M000 (BA00, BA10)
         M000 (PA00, PA10)
-        M380 (TS, IA00, 0x00, 0x00)
-        M381 (TS, SA00, 0x00, 0x01)
-        M382 (TS, BA00, 0x00, 0x02)
-        M383 (TS, PA00, 0x00, 0x03)
-        M380 (TS, IA10, 0x00, 0x04)
-        M381 (TS, SA10, 0x00, 0x05)
-        M382 (TS, BA10, 0x00, 0x06)
-        M383 (TS, PA10, 0x00, 0x07)
+        M380 (__METHOD__, IA00, 0x00, 0x00)
+        M381 (__METHOD__, SA00, 0x00, 0x01)
+        M382 (__METHOD__, BA00, 0x00, 0x02)
+        M383 (__METHOD__, PA00, 0x00, 0x03)
+        M380 (__METHOD__, IA10, 0x00, 0x04)
+        M381 (__METHOD__, SA10, 0x00, 0x05)
+        M382 (__METHOD__, BA10, 0x00, 0x06)
+        M383 (__METHOD__, PA10, 0x00, 0x07)
         If (Y514)
         {
             /* m001 */
@@ -1088,28 +1070,28 @@
             M001 (SA00, SA10)
             M001 (BA00, BA10)
             M001 (PA00, PA10)
-            M380 (TS, IA00, 0x00, 0x08)
-            M381 (TS, SA00, 0x00, 0x09)
-            M382 (TS, BA00, 0x00, 0x0A)
-            M383 (TS, PA00, 0x00, 0x0B)
-            M380 (TS, IA10, 0x00, 0x0C)
-            M381 (TS, SA10, 0x00, 0x0D)
-            M382 (TS, BA10, 0x00, 0x0E)
-            M383 (TS, PA10, 0x00, 0x0F)
+            M380 (__METHOD__, IA00, 0x00, 0x08)
+            M381 (__METHOD__, SA00, 0x00, 0x09)
+            M382 (__METHOD__, BA00, 0x00, 0x0A)
+            M383 (__METHOD__, PA00, 0x00, 0x0B)
+            M380 (__METHOD__, IA10, 0x00, 0x0C)
+            M381 (__METHOD__, SA10, 0x00, 0x0D)
+            M382 (__METHOD__, BA10, 0x00, 0x0E)
+            M383 (__METHOD__, PA10, 0x00, 0x0F)
             /* m002 */
 
             M002 (IA00, IA10)
             M002 (SA00, SA10)
             M002 (BA00, BA10)
             M002 (PA00, PA10)
-            M380 (TS, IA00, 0x00, 0x10)
-            M381 (TS, SA00, 0x00, 0x11)
-            M382 (TS, BA00, 0x00, 0x12)
-            M383 (TS, PA00, 0x00, 0x13)
-            M380 (TS, IA10, 0x00, 0x14)
-            M381 (TS, SA10, 0x00, 0x15)
-            M382 (TS, BA10, 0x00, 0x16)
-            M383 (TS, PA10, 0x00, 0x17)
+            M380 (__METHOD__, IA00, 0x00, 0x10)
+            M381 (__METHOD__, SA00, 0x00, 0x11)
+            M382 (__METHOD__, BA00, 0x00, 0x12)
+            M383 (__METHOD__, PA00, 0x00, 0x13)
+            M380 (__METHOD__, IA10, 0x00, 0x14)
+            M381 (__METHOD__, SA10, 0x00, 0x15)
+            M382 (__METHOD__, BA10, 0x00, 0x16)
+            M383 (__METHOD__, PA10, 0x00, 0x17)
         }
 
         /* m003 */
@@ -1118,14 +1100,14 @@
         M003 (SA00, SA10)
         M003 (BA00, BA10)
         M003 (PA00, PA10)
-        M380 (TS, IA00, 0x00, 0x18)
-        M381 (TS, SA00, 0x00, 0x19)
-        M382 (TS, BA00, 0x00, 0x1A)
-        M383 (TS, PA00, 0x00, 0x1B)
-        M380 (TS, IA10, 0x00, 0x1C)
-        M381 (TS, SA10, 0x00, 0x1D)
-        M382 (TS, BA10, 0x00, 0x1E)
-        M383 (TS, PA10, 0x00, 0x1F)
+        M380 (__METHOD__, IA00, 0x00, 0x18)
+        M381 (__METHOD__, SA00, 0x00, 0x19)
+        M382 (__METHOD__, BA00, 0x00, 0x1A)
+        M383 (__METHOD__, PA00, 0x00, 0x1B)
+        M380 (__METHOD__, IA10, 0x00, 0x1C)
+        M381 (__METHOD__, SA10, 0x00, 0x1D)
+        M382 (__METHOD__, BA10, 0x00, 0x1E)
+        M383 (__METHOD__, PA10, 0x00, 0x1F)
         END0 ()
     }
 
@@ -1139,14 +1121,13 @@
      */
     Method (M23A, 0, Serialized)
     {
-        Name (TS, "m23a")
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M23A.TS__ */
+            Debug = __METHOD__ /* \M23A.TS__ */
         }
 
         /* Local Objects */
@@ -1223,21 +1204,21 @@
             CopyObject (0x11, Arg1)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* m000 */
 
         M000 (I000, I010)
         M000 (S000, S010)
         M000 (B000, B010)
         M000 (P000, P010)
-        M380 (TS, I000, 0x00, 0x00)
-        M381 (TS, S000, 0x00, 0x01)
-        M382 (TS, B000, 0x00, 0x02)
-        M383 (TS, P000, 0x00, 0x03)
-        M380 (TS, I010, 0x00, 0x04)
-        M381 (TS, S010, 0x00, 0x05)
-        M382 (TS, B010, 0x00, 0x06)
-        M383 (TS, P010, 0x00, 0x07)
+        M380 (__METHOD__, I000, 0x00, 0x00)
+        M381 (__METHOD__, S000, 0x00, 0x01)
+        M382 (__METHOD__, B000, 0x00, 0x02)
+        M383 (__METHOD__, P000, 0x00, 0x03)
+        M380 (__METHOD__, I010, 0x00, 0x04)
+        M381 (__METHOD__, S010, 0x00, 0x05)
+        M382 (__METHOD__, B010, 0x00, 0x06)
+        M383 (__METHOD__, P010, 0x00, 0x07)
         If (Y514)
         {
             /* m001 */
@@ -1246,28 +1227,28 @@
             M001 (S000, S010)
             M001 (B000, B010)
             M001 (P000, P010)
-            M380 (TS, I000, 0x00, 0x08)
-            M381 (TS, S000, 0x00, 0x09)
-            M382 (TS, B000, 0x00, 0x0A)
-            M383 (TS, P000, 0x00, 0x0B)
-            M380 (TS, I010, 0x00, 0x0C)
-            M381 (TS, S010, 0x00, 0x0D)
-            M382 (TS, B010, 0x00, 0x0E)
-            M383 (TS, P010, 0x00, 0x0F)
+            M380 (__METHOD__, I000, 0x00, 0x08)
+            M381 (__METHOD__, S000, 0x00, 0x09)
+            M382 (__METHOD__, B000, 0x00, 0x0A)
+            M383 (__METHOD__, P000, 0x00, 0x0B)
+            M380 (__METHOD__, I010, 0x00, 0x0C)
+            M381 (__METHOD__, S010, 0x00, 0x0D)
+            M382 (__METHOD__, B010, 0x00, 0x0E)
+            M383 (__METHOD__, P010, 0x00, 0x0F)
             /* m002 */
 
             M002 (I000, I010)
             M002 (S000, S010)
             M002 (B000, B010)
             M002 (P000, P010)
-            M380 (TS, I000, 0x00, 0x10)
-            M381 (TS, S000, 0x00, 0x11)
-            M382 (TS, B000, 0x00, 0x12)
-            M383 (TS, P000, 0x00, 0x13)
-            M380 (TS, I010, 0x00, 0x14)
-            M381 (TS, S010, 0x00, 0x15)
-            M382 (TS, B010, 0x00, 0x16)
-            M383 (TS, P010, 0x00, 0x17)
+            M380 (__METHOD__, I000, 0x00, 0x10)
+            M381 (__METHOD__, S000, 0x00, 0x11)
+            M382 (__METHOD__, B000, 0x00, 0x12)
+            M383 (__METHOD__, P000, 0x00, 0x13)
+            M380 (__METHOD__, I010, 0x00, 0x14)
+            M381 (__METHOD__, S010, 0x00, 0x15)
+            M382 (__METHOD__, B010, 0x00, 0x16)
+            M383 (__METHOD__, P010, 0x00, 0x17)
         }
 
         /* m003 */
@@ -1276,14 +1257,14 @@
         M003 (S000, S010)
         M003 (B000, B010)
         M003 (P000, P010)
-        M380 (TS, I000, 0x00, 0x18)
-        M381 (TS, S000, 0x00, 0x19)
-        M382 (TS, B000, 0x00, 0x1A)
-        M383 (TS, P000, 0x00, 0x1B)
-        M380 (TS, I010, 0x00, 0x1C)
-        M381 (TS, S010, 0x00, 0x1D)
-        M382 (TS, B010, 0x00, 0x1E)
-        M383 (TS, P010, 0x00, 0x1F)
+        M380 (__METHOD__, I000, 0x00, 0x18)
+        M381 (__METHOD__, S000, 0x00, 0x19)
+        M382 (__METHOD__, B000, 0x00, 0x1A)
+        M383 (__METHOD__, P000, 0x00, 0x1B)
+        M380 (__METHOD__, I010, 0x00, 0x1C)
+        M381 (__METHOD__, S010, 0x00, 0x1D)
+        M382 (__METHOD__, B010, 0x00, 0x1E)
+        M383 (__METHOD__, P010, 0x00, 0x1F)
         END0 ()
     }
 
@@ -1381,9 +1362,8 @@
      */
     Method (M252, 0, Serialized)
     {
-        Name (TS, "m252")
-        TS00 (TS)
-        M1AD (TS, 0x00, 0x01, 0x01, 0x01, 0x00)
+        TS00 (__METHOD__)
+        M1AD (__METHOD__, 0x00, 0x01, 0x01, 0x01, 0x00)
         /* NamedX-ORef */
 
         M4D2 ()
@@ -1447,18 +1427,17 @@
      */
     Method (M256, 0, Serialized)
     {
-        Name (TS, "m256")
-        TS00 (TS)
+        TS00 (__METHOD__)
         Name (S000, "qwer0000")
         Name (S010, "qwer0000")
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* Store */
 
         S000 [0x01] = 0x2B
-        M385 (TS, S000, 0x00, 0x00)
+        M385 (__METHOD__, S000, 0x00, 0x00)
         Local0 = S010 [0x01]
         S010 [0x01] = 0x2B
-        M385 (TS, S010, 0x00, 0x01)
+        M385 (__METHOD__, S010, 0x00, 0x01)
         /* CopyObject */
         /* CURRENTLY: compiler failed CopyObject(xx, Index(xx,xx)) */
         /* CopyObject(0x2b, Index(s020, 1)) */
@@ -1471,8 +1450,7 @@
      */
     Method (M257, 0, Serialized)
     {
-        Name (TS, "m257")
-        TS00 (TS)
+        TS00 (__METHOD__)
         Name (B000, Buffer (0x04)
         {
              0x01, 0x77, 0x03, 0x04                           // .w..
@@ -1481,14 +1459,14 @@
         {
              0x01, 0x77, 0x03, 0x04                           // .w..
         })
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* Store */
 
         B000 [0x01] = 0x2B
-        M386 (TS, B000, 0x00, 0x00)
+        M386 (__METHOD__, B000, 0x00, 0x00)
         Local0 = B010 [0x01]
         B010 [0x01] = 0x2B
-        M386 (TS, B010, 0x00, 0x01)
+        M386 (__METHOD__, B010, 0x00, 0x01)
         END0 ()
     }
 
@@ -1497,8 +1475,7 @@
      */
     Method (M258, 1, Serialized)
     {
-        Name (TS, "m258")
-        TS00 (TS)
+        TS00 (__METHOD__)
         Name (P100, Package (0x12){})
         P100 [0x00] = 0x00
         P100 [0x01] = I900 /* \I900 */
@@ -1594,8 +1571,7 @@
      */
     Method (M25C, 0, Serialized)
     {
-        Name (TS, "m25c")
-        TS00 (TS)
+        TS00 (__METHOD__)
         Name (P000, Package (0x03)
         {
             0x05,
@@ -1608,14 +1584,14 @@
             0x77,
             0x07
         })
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* Store */
 
         P000 [0x01] = 0x2B
-        M387 (TS, P000, 0x00, 0x00)
+        M387 (__METHOD__, P000, 0x00, 0x00)
         Local0 = P010 [0x01]
         P010 [0x01] = 0x2B
-        M387 (TS, P010, 0x00, 0x01)
+        M387 (__METHOD__, P010, 0x00, 0x01)
         END0 ()
     }
 
@@ -1698,7 +1674,6 @@
 
     Method (M354, 0, Serialized)
     {
-        Name (TS, "m354")
         Name (I000, 0x77)
         Name (S000, "qwer0000")
         Name (B000, Buffer (0x04)
@@ -1721,46 +1696,45 @@
             Arg0 = 0x2B
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         Local0 = RefOf (I000)
         If (0x00)
         {
             /* This is a reference */
 
-            CH03 (TS, 0x00, 0x00, 0x06F1, 0x00)
+            CH03 (__METHOD__, 0x00, 0x00, 0x06F1, 0x00)
             Local7 = (Local0 + 0x01)
-            CH04 (TS, 0x00, 0xFF, 0x00, 0x06F3, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x06F3, 0x00, 0x00)
         }
 
         M1A3 (Local0, C009, 0x00, 0x00, 0x02)
-        M380 (TS, DerefOf (Local0), 0x00, 0x03)
+        M380 (__METHOD__, DerefOf (Local0), 0x00, 0x03)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x04)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x04)
         Local0 = RefOf (S000)
         M1A3 (Local0, C00A, 0x00, 0x00, 0x05)
-        M381 (TS, DerefOf (Local0), 0x00, 0x06)
+        M381 (__METHOD__, DerefOf (Local0), 0x00, 0x06)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x07)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x07)
         Local0 = RefOf (B000)
         M1A3 (Local0, C00B, 0x00, 0x00, 0x08)
-        M382 (TS, DerefOf (Local0), 0x00, 0x09)
+        M382 (__METHOD__, DerefOf (Local0), 0x00, 0x09)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x0A)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0A)
         Local0 = RefOf (P000)
         M1A3 (Local0, C00C, 0x00, 0x00, 0x0B)
-        M383 (TS, DerefOf (Local0), 0x00, 0x0C)
+        M383 (__METHOD__, DerefOf (Local0), 0x00, 0x0C)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x0D)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0D)
         Local0 = RefOf (D000)
         M1A3 (Local0, C00E, 0x00, 0x00, 0x0E)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x0F)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0F)
         END0 ()
     }
 
     Method (M355, 0, Serialized)
     {
-        Name (TS, "m355")
         Name (I000, 0x77)
         Name (S000, "qwer0000")
         Name (B000, Buffer (0x04)
@@ -1783,40 +1757,40 @@
             CopyObject (0x2B, Arg0)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         CopyObject (RefOf (I000), Local0)
         If (0x00)
         {
             /* This is a reference */
 
-            CH03 (TS, 0x00, 0x02, 0x0729, 0x00)
+            CH03 (__METHOD__, 0x00, 0x02, 0x0729, 0x00)
             Local7 = (Local0 + 0x01)
-            CH04 (TS, 0x00, 0xFF, 0x00, 0x072B, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x072B, 0x00, 0x00)
         }
 
         M1A3 (Local0, C009, 0x00, 0x00, 0x00)
-        M380 (TS, DerefOf (Local0), 0x00, 0x01)
+        M380 (__METHOD__, DerefOf (Local0), 0x00, 0x01)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x02)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x02)
         CopyObject (RefOf (S000), Local0)
         M1A3 (Local0, C00A, 0x00, 0x00, 0x03)
-        M381 (TS, DerefOf (Local0), 0x00, 0x04)
+        M381 (__METHOD__, DerefOf (Local0), 0x00, 0x04)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x05)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x05)
         CopyObject (RefOf (B000), Local0)
         M1A3 (Local0, C00B, 0x00, 0x00, 0x06)
-        M382 (TS, DerefOf (Local0), 0x00, 0x07)
+        M382 (__METHOD__, DerefOf (Local0), 0x00, 0x07)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x08)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x08)
         CopyObject (RefOf (P000), Local0)
         M1A3 (Local0, C00C, 0x00, 0x00, 0x09)
-        M383 (TS, DerefOf (Local0), 0x00, 0x0A)
+        M383 (__METHOD__, DerefOf (Local0), 0x00, 0x0A)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x0B)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0B)
         CopyObject (RefOf (D000), Local0)
         M1A3 (Local0, C00E, 0x00, 0x00, 0x0C)
         M000 (Local0)
-        M384 (TS, DerefOf (Local0), 0x00, 0x0D)
+        M384 (__METHOD__, DerefOf (Local0), 0x00, 0x0D)
         END0 ()
     }
 
@@ -1825,21 +1799,20 @@
      */
     Method (M261, 0, Serialized)
     {
-        Name (TS, "m261")
-        TS00 (TS)
+        TS00 (__METHOD__)
         Name (I000, 0x77)
         Name (I001, 0x77)
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* Store */
 
         If (Y519)
         {
             M356 (I000)
-            M380 (TS, I000, 0x00, 0x00)
+            M380 (__METHOD__, I000, 0x00, 0x00)
         }
         Else
         {
-            M1AE (TS, "Store ORef to ArgX", "AE_AML_OPERAND_TYPE exception occurs")
+            M1AE (__METHOD__, "Store ORef to ArgX", "AE_AML_OPERAND_TYPE exception occurs")
         }
 
         /* CopyObject */
@@ -1847,11 +1820,11 @@
         If (Y520)
         {
             M357 (I001)
-            M380 (TS, I001, 0x00, 0x01)
+            M380 (__METHOD__, I001, 0x00, 0x01)
         }
         Else
         {
-            M1AE (TS, "CopyObject ORef to ArgX", "AE_AML_OPERAND_TYPE exception occurs")
+            M1AE (__METHOD__, "CopyObject ORef to ArgX", "AE_AML_OPERAND_TYPE exception occurs")
         }
 
         END0 ()
@@ -1859,7 +1832,6 @@
 
     Method (M356, 1, Serialized)
     {
-        Name (TS, "m356")
         Name (I000, 0x77)
         Name (S000, "qwer0000")
         Name (B000, Buffer (0x04)
@@ -1882,46 +1854,45 @@
             Arg0 = 0x2B
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         Arg0 = RefOf (I000)
         If (0x00)
         {
             /* This is a reference */
 
-            CH03 (TS, 0x00, 0x04, 0x0784, 0x00)
+            CH03 (__METHOD__, 0x00, 0x04, 0x0784, 0x00)
             Local7 = (Arg0 + 0x01)
-            CH04 (TS, 0x00, 0xFF, 0x00, 0x0786, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x0786, 0x00, 0x00)
         }
 
         M1A3 (Arg0, C009, 0x00, 0x00, 0x00)
-        M380 (TS, DerefOf (Arg0), 0x00, 0x01)
+        M380 (__METHOD__, DerefOf (Arg0), 0x00, 0x01)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x02)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x02)
         Arg0 = RefOf (S000)
         M1A3 (Arg0, C00A, 0x00, 0x00, 0x03)
-        M381 (TS, DerefOf (Arg0), 0x00, 0x04)
+        M381 (__METHOD__, DerefOf (Arg0), 0x00, 0x04)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x05)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x05)
         Arg0 = RefOf (B000)
         M1A3 (Arg0, C00B, 0x00, 0x00, 0x06)
-        M382 (TS, DerefOf (Arg0), 0x00, 0x07)
+        M382 (__METHOD__, DerefOf (Arg0), 0x00, 0x07)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x08)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x08)
         Arg0 = RefOf (P000)
         M1A3 (Arg0, C00C, 0x00, 0x00, 0x09)
-        M383 (TS, DerefOf (Arg0), 0x00, 0x0A)
+        M383 (__METHOD__, DerefOf (Arg0), 0x00, 0x0A)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x0B)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x0B)
         Arg0 = RefOf (D000)
         M1A3 (Arg0, C00E, 0x00, 0x00, 0x0C)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x0D)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x0D)
         END0 ()
     }
 
     Method (M357, 1, Serialized)
     {
-        Name (TS, "m357")
         Name (I000, 0x77)
         Name (S000, "qwer0000")
         Name (B000, Buffer (0x04)
@@ -1944,40 +1915,40 @@
             CopyObject (0x2B, Arg0)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         CopyObject (RefOf (I000), Arg0)
         If (0x00)
         {
             /* This is a reference */
 
-            CH03 (TS, 0x00, 0x06, 0x07BC, 0x00)
+            CH03 (__METHOD__, 0x00, 0x06, 0x07BC, 0x00)
             Local7 = (Arg0 + 0x01)
-            CH04 (TS, 0x00, 0xFF, 0x00, 0x07BE, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x07BE, 0x00, 0x00)
         }
 
         M1A3 (Arg0, C009, 0x00, 0x00, 0x00)
-        M380 (TS, DerefOf (Arg0), 0x00, 0x01)
+        M380 (__METHOD__, DerefOf (Arg0), 0x00, 0x01)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x02)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x02)
         CopyObject (RefOf (S000), Arg0)
         M1A3 (Arg0, C00A, 0x00, 0x00, 0x03)
-        M381 (TS, DerefOf (Arg0), 0x00, 0x04)
+        M381 (__METHOD__, DerefOf (Arg0), 0x00, 0x04)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x05)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x05)
         CopyObject (RefOf (B000), Arg0)
         M1A3 (Arg0, C00B, 0x00, 0x00, 0x06)
-        M382 (TS, DerefOf (Arg0), 0x00, 0x07)
+        M382 (__METHOD__, DerefOf (Arg0), 0x00, 0x07)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x08)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x08)
         CopyObject (RefOf (P000), Arg0)
         M1A3 (Arg0, C00C, 0x00, 0x00, 0x09)
-        M383 (TS, DerefOf (Arg0), 0x00, 0x0A)
+        M383 (__METHOD__, DerefOf (Arg0), 0x00, 0x0A)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x0B)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x0B)
         CopyObject (RefOf (D000), Arg0)
         M1A3 (Arg0, C00E, 0x00, 0x00, 0x0C)
         M000 (Arg0)
-        M384 (TS, DerefOf (Arg0), 0x00, 0x0D)
+        M384 (__METHOD__, DerefOf (Arg0), 0x00, 0x0D)
         END0 ()
     }
 
@@ -1986,8 +1957,7 @@
      */
     Method (M262, 0, Serialized)
     {
-        Name (TS, "m262")
-        TS00 (TS)
+        TS00 (__METHOD__)
         /* Store */
 
         If (Y521)
@@ -1996,7 +1966,7 @@
         }
         Else
         {
-            M1AE (TS, "Store ORef to NamedX", "AE_AML_OPERAND_TYPE exception occurs")
+            M1AE (__METHOD__, "Store ORef to NamedX", "AE_AML_OPERAND_TYPE exception occurs")
         }
 
         /* CopyObject */
@@ -2007,13 +1977,12 @@
         }
         Else
         {
-            M1AE (TS, "CopyObject ORef to NamedX", "AE_AML_OPERAND_TYPE exception occurs")
+            M1AE (__METHOD__, "CopyObject ORef to NamedX", "AE_AML_OPERAND_TYPE exception occurs")
         }
     }
 
     Method (M358, 0, Serialized)
     {
-        Name (TS, "m358")
         Name (III0, 0x00)
         Name (I000, 0x77)
         Name (S000, "qwer0000")
@@ -2037,46 +2006,45 @@
             Arg0 = 0x2B
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         III0 = RefOf (I000)
         If (0x00)
         {
             /* This is a reference */
 
-            CH03 (TS, 0x00, 0x08, 0x0810, 0x00)
+            CH03 (__METHOD__, 0x00, 0x08, 0x0810, 0x00)
             Local7 = (III0 + 0x01)
-            CH04 (TS, 0x00, 0xFF, 0x00, 0x0812, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x0812, 0x00, 0x00)
         }
 
         M1A3 (III0, C009, 0x00, 0x00, 0x00)
-        M380 (TS, DerefOf (III0), 0x00, 0x01)
+        M380 (__METHOD__, DerefOf (III0), 0x00, 0x01)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x02)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x02)
         III0 = RefOf (S000)
         M1A3 (III0, C00A, 0x00, 0x00, 0x03)
-        M381 (TS, DerefOf (III0), 0x00, 0x04)
+        M381 (__METHOD__, DerefOf (III0), 0x00, 0x04)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x05)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x05)
         III0 = RefOf (B000)
         M1A3 (III0, C00B, 0x00, 0x00, 0x06)
-        M382 (TS, DerefOf (III0), 0x00, 0x07)
+        M382 (__METHOD__, DerefOf (III0), 0x00, 0x07)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x08)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x08)
         III0 = RefOf (P000)
         M1A3 (III0, C00C, 0x00, 0x00, 0x09)
-        M383 (TS, DerefOf (III0), 0x00, 0x0A)
+        M383 (__METHOD__, DerefOf (III0), 0x00, 0x0A)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x0B)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x0B)
         III0 = RefOf (D000)
         M1A3 (III0, C00E, 0x00, 0x00, 0x0C)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x0D)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x0D)
         END0 ()
     }
 
     Method (M359, 0, Serialized)
     {
-        Name (TS, "m359")
         Name (III0, 0x00)
         Name (I000, 0x77)
         Name (S000, "qwer0000")
@@ -2100,40 +2068,40 @@
             CopyObject (0x2B, Arg0)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         CopyObject (RefOf (I000), III0) /* \M359.III0 */
         If (0x00)
         {
             /* This is a reference */
 
-            CH03 (TS, 0x00, 0x0A, 0x084A, 0x00)
+            CH03 (__METHOD__, 0x00, 0x0A, 0x084A, 0x00)
             Local7 = (III0 + 0x01)
-            CH04 (TS, 0x00, 0xFF, 0x00, 0x084C, 0x00, 0x00)
+            CH04 (__METHOD__, 0x00, 0xFF, 0x00, 0x084C, 0x00, 0x00)
         }
 
         M1A3 (III0, C009, 0x00, 0x00, 0x00)
-        M380 (TS, DerefOf (III0), 0x00, 0x01)
+        M380 (__METHOD__, DerefOf (III0), 0x00, 0x01)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x02)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x02)
         CopyObject (RefOf (S000), III0) /* \M359.III0 */
         M1A3 (III0, C00A, 0x00, 0x00, 0x03)
-        M381 (TS, DerefOf (III0), 0x00, 0x04)
+        M381 (__METHOD__, DerefOf (III0), 0x00, 0x04)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x05)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x05)
         CopyObject (RefOf (B000), III0) /* \M359.III0 */
         M1A3 (III0, C00B, 0x00, 0x00, 0x06)
-        M382 (TS, DerefOf (III0), 0x00, 0x07)
+        M382 (__METHOD__, DerefOf (III0), 0x00, 0x07)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x08)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x08)
         CopyObject (RefOf (P000), III0) /* \M359.III0 */
         M1A3 (III0, C00C, 0x00, 0x00, 0x09)
-        M383 (TS, DerefOf (III0), 0x00, 0x0A)
+        M383 (__METHOD__, DerefOf (III0), 0x00, 0x0A)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x0B)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x0B)
         CopyObject (RefOf (D000), III0) /* \M359.III0 */
         M1A3 (III0, C00E, 0x00, 0x00, 0x0C)
         M000 (III0)
-        M384 (TS, DerefOf (III0), 0x00, 0x0D)
+        M384 (__METHOD__, DerefOf (III0), 0x00, 0x0D)
         END0 ()
     }
 
@@ -2153,7 +2121,6 @@
 
     Method (M35A, 0, Serialized)
     {
-        Name (TS, "m35a")
         Name (PPP0, Package (0x05){})
         Name (I000, 0x77)
         Name (S000, "qwer0000")
@@ -2172,7 +2139,7 @@
             Name (I000, 0xABCD0017)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         PPP0 [0x00] = RefOf (I000)
         PPP0 [0x01] = RefOf (S000)
         PPP0 [0x02] = RefOf (B000)
@@ -2180,16 +2147,16 @@
         PPP0 [0x04] = RefOf (D000)
         Local0 = DerefOf (PPP0 [0x00])
         M1A3 (Local0, C009, 0x00, 0x00, 0x00)
-        M380 (TS, DerefOf (Local0), 0x00, 0x01)
+        M380 (__METHOD__, DerefOf (Local0), 0x00, 0x01)
         Local0 = DerefOf (PPP0 [0x01])
         M1A3 (Local0, C00A, 0x00, 0x00, 0x02)
-        M381 (TS, DerefOf (Local0), 0x00, 0x03)
+        M381 (__METHOD__, DerefOf (Local0), 0x00, 0x03)
         Local0 = DerefOf (PPP0 [0x02])
         M1A3 (Local0, C00B, 0x00, 0x00, 0x04)
-        M382 (TS, DerefOf (Local0), 0x00, 0x05)
+        M382 (__METHOD__, DerefOf (Local0), 0x00, 0x05)
         Local0 = DerefOf (PPP0 [0x03])
         M1A3 (Local0, C00C, 0x00, 0x00, 0x06)
-        M383 (TS, DerefOf (Local0), 0x00, 0x07)
+        M383 (__METHOD__, DerefOf (Local0), 0x00, 0x07)
         Local0 = DerefOf (PPP0 [0x04])
         M1A3 (Local0, C00E, 0x00, 0x00, 0x08)
         /* Replace */
@@ -2197,19 +2164,19 @@
         PPP0 [0x00] = RefOf (I000)
         Local0 = DerefOf (PPP0 [0x00])
         M1A3 (Local0, C009, 0x00, 0x00, 0x09)
-        M380 (TS, DerefOf (Local0), 0x00, 0x0A)
+        M380 (__METHOD__, DerefOf (Local0), 0x00, 0x0A)
         PPP0 [0x00] = RefOf (S000)
         Local0 = DerefOf (PPP0 [0x00])
         M1A3 (Local0, C00A, 0x00, 0x00, 0x0B)
-        M381 (TS, DerefOf (Local0), 0x00, 0x0C)
+        M381 (__METHOD__, DerefOf (Local0), 0x00, 0x0C)
         PPP0 [0x00] = RefOf (B000)
         Local0 = DerefOf (PPP0 [0x00])
         M1A3 (Local0, C00B, 0x00, 0x00, 0x0D)
-        M382 (TS, DerefOf (Local0), 0x00, 0x0E)
+        M382 (__METHOD__, DerefOf (Local0), 0x00, 0x0E)
         PPP0 [0x00] = RefOf (P000)
         Local0 = DerefOf (PPP0 [0x00])
         M1A3 (Local0, C00C, 0x00, 0x00, 0x0F)
-        M383 (TS, DerefOf (Local0), 0x00, 0x10)
+        M383 (__METHOD__, DerefOf (Local0), 0x00, 0x10)
         PPP0 [0x00] = RefOf (D000)
         Local0 = DerefOf (PPP0 [0x00])
         M1A3 (Local0, C00E, 0x00, 0x00, 0x11)
@@ -2288,9 +2255,8 @@
 
     Method (M35C, 0, Serialized)
     {
-        Name (TS, "m35c")
         Name (P000, Package (0x12){})
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* Construct the p955-like Package p000 applying LocalX-IRef */
 
         Store (P956 [0x00], Local0)
@@ -2395,25 +2361,23 @@
      */
     Method (M265, 0, Serialized)
     {
-        Name (TS, "m265")
-        TS00 (TS)
+        TS00 (__METHOD__)
         Name (I000, 0x77)
         Name (I010, 0x77)
         /* Store */
 
         M35E (I000)
-        M380 (TS, I000, Z111, 0x00)
+        M380 (__METHOD__, I000, Z111, 0x00)
         /* CopyObject */
 
         M35F (I010)
-        M380 (TS, I010, Z111, 0x01)
+        M380 (__METHOD__, I010, Z111, 0x01)
     }
 
     Method (M35E, 1, Serialized)
     {
-        Name (TS, "m35e")
         Name (P000, Package (0x12){})
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* Construct the p955-like Package p000 applying LocalX-IRef */
 
         Store (P956 [0x00], Arg0)
@@ -2518,8 +2482,7 @@
      */
     Method (M266, 0, Serialized)
     {
-        Name (TS, "m266")
-        TS00 (TS)
+        TS00 (__METHOD__)
         /* Store */
 
         If (Y521)
@@ -2528,7 +2491,7 @@
         }
         Else
         {
-            M1AE (TS, "Store IRef to NamedX", "AE_AML_OPERAND_TYPE exception occurs")
+            M1AE (__METHOD__, "Store IRef to NamedX", "AE_AML_OPERAND_TYPE exception occurs")
         }
 
         /* CopyObject */
@@ -2538,10 +2501,9 @@
 
     Method (M360, 0, Serialized)
     {
-        Name (TS, "m360")
         Name (III0, 0x00)
         Name (P000, Package (0x12){})
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* Construct the p955-like Package p000 applying LocalX-IRef */
 
         Store (P956 [0x00], III0) /* \M360.III0 */
@@ -2693,8 +2655,7 @@
      */
     Method (M26B, 0, Serialized)
     {
-        Name (TS, "m26b")
-        TS00 (TS)
+        TS00 (__METHOD__)
         Name (I000, 0x77)
         Name (I001, 0x77)
         /* READ */
@@ -2748,15 +2709,15 @@
         }
 
         M1D3 (I000, I001)
-        M380 (TS, I000, 0x00, 0x00)
-        M380 (TS, I001, 0x00, 0x01)
+        M380 (__METHOD__, I000, 0x00, 0x00)
+        M380 (__METHOD__, I001, 0x00, 0x01)
         If (X127)
         {
             M1D4 (I000, I001) /* bug 127 */
         }
 
-        M380 (TS, I000, 0x00, 0x02)
-        M380 (TS, I001, 0x00, 0x03)
+        M380 (__METHOD__, I000, 0x00, 0x02)
+        M380 (__METHOD__, I001, 0x00, 0x03)
         If (X127)
         {
             M1D5 () /* bug 127 */
@@ -2803,29 +2764,27 @@
      */
     Method (M26E, 0, Serialized)
     {
-        Name (TS, "m26e")
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M26E.TS__ */
+            Debug = __METHOD__ /* \M26E.TS__ */
         }
 
-        CH03 (TS, 0x00, 0x00, 0x0BC7, 0x00)
+        CH03 (__METHOD__, 0x00, 0x00, 0x0BC7, 0x00)
         /* Store */
 
         M365 ()
         /* CopyObject */
 
         M366 ()
-        CH03 (TS, 0x00, 0x01, 0x0BCF, 0x00)
+        CH03 (__METHOD__, 0x00, 0x01, 0x0BCF, 0x00)
     }
 
     Method (M365, 0, Serialized)
     {
-        Name (TS, "m365")
         Name (I000, 0x77)
         Name (I001, 0x77)
         Name (I002, 0x77)
@@ -2848,8 +2807,8 @@
         {
             Name (I002, 0x77)
             Arg0 = RefOf (I002)
-            M380 (TS, DerefOf (Arg0), 0x00, 0x00)
-            M380 (TS, I002, 0x00, 0x01)
+            M380 (__METHOD__, DerefOf (Arg0), 0x00, 0x00)
+            M380 (__METHOD__, I002, 0x00, 0x01)
         }
 
         Method (M001, 1, NotSerialized)
@@ -2862,7 +2821,7 @@
             Arg0 = 0x00
             M001 (RefOf (Arg0))
             Arg1 = DerefOf (Arg0)
-            M380 (TS, Arg1, 0x00, 0x02)
+            M380 (__METHOD__, Arg1, 0x00, 0x02)
         }
 
         Method (M003, 0, NotSerialized)
@@ -2892,7 +2851,7 @@
             Arg0 = 0x00
             M005 (RefOf (Arg0))
             Arg1 = DerefOf (Arg0)
-            M380 (TS, Arg1, 0x00, 0x03)
+            M380 (__METHOD__, Arg1, 0x00, 0x03)
         }
 
         Method (M007, 1, NotSerialized)
@@ -2905,26 +2864,26 @@
             DerefOf (Arg0) = RefOf (I004)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* 1. */
 
         Local0 = RefOf (I000)
         Local1 = DerefOf (Local0)
-        M380 (TS, Local1, 0x00, 0x04)
-        M380 (TS, I000, 0x00, 0x05)
+        M380 (__METHOD__, Local1, 0x00, 0x04)
+        M380 (__METHOD__, I000, 0x00, 0x05)
         /* 2. */
 
         M000 (I001)
-        M380 (TS, I001, 0x00, 0x06)
+        M380 (__METHOD__, I001, 0x00, 0x06)
         /* 3. */
 
         CopyObject (RefOf (I000), III0) /* \M365.III0 */
         III0 = RefOf (I001)
         Local1 = DerefOf (III0)
-        M380 (TS, I001, 0x00, 0x07)
+        M380 (__METHOD__, I001, 0x00, 0x07)
         If (Y523)
         {
-            M380 (TS, Local1, 0x00, 0x08)
+            M380 (__METHOD__, Local1, 0x00, 0x08)
         }
 
         /* 4. */
@@ -2932,12 +2891,12 @@
         Local0 = 0x00
         M001 (RefOf (Local0))
         Local1 = DerefOf (Local0)
-        M380 (TS, Local1, 0x00, 0x09)
+        M380 (__METHOD__, Local1, 0x00, 0x09)
         /* 5. */
 
         M002 (I001, I002)
-        M380 (TS, I001, 0x00, 0x0A)
-        M380 (TS, I002, 0x00, 0x0B)
+        M380 (__METHOD__, I001, 0x00, 0x0A)
+        M380 (__METHOD__, I002, 0x00, 0x0B)
         /* 6. */
 
         If (Y526)
@@ -2945,7 +2904,7 @@
             CopyObject (RefOf (I003), III5) /* \M365.III5 */
             M007 (RefOf (III5))
             Local1 = DerefOf (III5)
-            M380 (TS, Local1, 0x00, 0x0C)
+            M380 (__METHOD__, Local1, 0x00, 0x0C)
         }
 
         /* 7. */
@@ -2956,7 +2915,7 @@
             Store (PPP0 [0x00], Local0)
             Local1 = DerefOf (Local0)
             Local2 = DerefOf (Local1)
-            M380 (TS, Local2, 0x00, 0x0D)
+            M380 (__METHOD__, Local2, 0x00, 0x0D)
         }
 
         /* 8. */
@@ -2966,8 +2925,8 @@
             CopyObject (RefOf (III3), III4) /* \M365.III4 */
             RefOf (III4) = RefOf (I000)
             Local1 = DerefOf (III4)
-            M380 (TS, I000, 0x00, 0x0E)
-            M380 (TS, Local1, 0x00, 0x0F)
+            M380 (__METHOD__, I000, 0x00, 0x0E)
+            M380 (__METHOD__, Local1, 0x00, 0x0F)
         }
 
         /* 9. */
@@ -2975,8 +2934,8 @@
         PPP1 [0x00] = RefOf (I000)
         Local2 = DerefOf (PPP1 [0x00])
         Local1 = DerefOf (Local2)
-        M380 (TS, Local1, 0x00, 0x10)
-        M380 (TS, I000, 0x00, 0x11)
+        M380 (__METHOD__, Local1, 0x00, 0x10)
+        M380 (__METHOD__, I000, 0x00, 0x11)
         /* 10. */
         /*
          * There are some statements try to pass a value of an integer to a LocalX via reference,
@@ -2990,8 +2949,8 @@
             Local6 = RefOf (Local7)
             DerefOf (Local6) = RefOf (I000)
             Local0 = DerefOf (Local7)
-            M380 (TS, Local0, 0x00, 0x18)
-            M380 (TS, I000, 0x00, 0x19)
+            M380 (__METHOD__, Local0, 0x00, 0x18)
+            M380 (__METHOD__, I000, 0x00, 0x19)
         }
 
         /* Particular cases of (12): */
@@ -3003,12 +2962,12 @@
             Local0 = 0x00
             M005 (RefOf (Local0))
             Local1 = DerefOf (Local0)
-            M380 (TS, Local1, 0x00, 0x1A)
+            M380 (__METHOD__, Local1, 0x00, 0x1A)
             /* 14. (5) */
 
             M006 (I001, I002)
-            M380 (TS, I001, 0x00, 0x1B)
-            M380 (TS, I002, 0x00, 0x1C)
+            M380 (__METHOD__, I001, 0x00, 0x1B)
+            M380 (__METHOD__, I002, 0x00, 0x1C)
             /* 15. (6) */
 
             If (Y526)
@@ -3016,7 +2975,7 @@
                 CopyObject (RefOf (I003), III6) /* \M365.III6 */
                 M008 (RefOf (III6))
                 Local1 = DerefOf (III6)
-                M380 (TS, Local1, 0x00, 0x1D)
+                M380 (__METHOD__, Local1, 0x00, 0x1D)
             }
 
             /* 16. (7) */
@@ -3027,7 +2986,7 @@
                 Store (PPP0 [0x00], Local0)
                 Local1 = DerefOf (Local0)
                 Local2 = DerefOf (Local1)
-                M380 (TS, Local2, 0x00, 0x1E)
+                M380 (__METHOD__, Local2, 0x00, 0x1E)
             }
 
             /* 17. (8) */
@@ -3037,8 +2996,8 @@
                 CopyObject (RefOf (III3), III4) /* \M365.III4 */
                 DerefOf (RefOf (III4)) = RefOf (I000)
                 Local1 = DerefOf (III4)
-                M380 (TS, I000, 0x00, 0x1F)
-                M380 (TS, Local1, 0x00, 0x20)
+                M380 (__METHOD__, I000, 0x00, 0x1F)
+                M380 (__METHOD__, Local1, 0x00, 0x20)
             }
 
             /* 18. (9) */
@@ -3046,20 +3005,20 @@
             DerefOf (PPP1 [0x00]) = RefOf (I000)
             Local2 = DerefOf (PPP1 [0x00])
             Local1 = DerefOf (Local2)
-            M380 (TS, Local1, 0x00, 0x21)
-            M380 (TS, I000, 0x00, 0x22)
+            M380 (__METHOD__, Local1, 0x00, 0x21)
+            M380 (__METHOD__, I000, 0x00, 0x22)
             /* 19. (10) */
 
             DerefOf (M003 ()) = RefOf (I000)
             Local1 = DerefOf (III1)
-            M380 (TS, I000, 0x00, 0x23)
-            M380 (TS, Local1, 0x00, 0x24)
+            M380 (__METHOD__, I000, 0x00, 0x23)
+            M380 (__METHOD__, Local1, 0x00, 0x24)
             /* 20. (11) */
 
             DerefOf (M004 (0x00)) = RefOf (I000)
             Local1 = DerefOf (III2)
-            M380 (TS, I000, 0x00, 0x25)
-            M380 (TS, Local1, 0x00, 0x26)
+            M380 (__METHOD__, I000, 0x00, 0x25)
+            M380 (__METHOD__, Local1, 0x00, 0x26)
         }
 
         END0 ()
@@ -3067,7 +3026,6 @@
 
     Method (M366, 0, Serialized)
     {
-        Name (TS, "m366")
         Name (I000, 0x77)
         Name (I001, 0x77)
         Name (I002, 0x77)
@@ -3082,8 +3040,8 @@
         {
             Name (I002, 0x77)
             CopyObject (RefOf (I002), Arg0)
-            M380 (TS, DerefOf (Arg0), 0x00, 0x00)
-            M380 (TS, I002, 0x00, 0x01)
+            M380 (__METHOD__, DerefOf (Arg0), 0x00, 0x00)
+            M380 (__METHOD__, I002, 0x00, 0x01)
         }
 
         Method (M001, 1, NotSerialized)
@@ -3096,28 +3054,28 @@
             Arg0 = 0x00
             M001 (RefOf (Arg0))
             Arg1 = DerefOf (Arg0)
-            M380 (TS, Arg1, 0x00, 0x02)
+            M380 (__METHOD__, Arg1, 0x00, 0x02)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* 21. */
 
         CopyObject (RefOf (I000), Local0)
         Local1 = DerefOf (Local0)
-        M380 (TS, Local1, 0x00, 0x03)
-        M380 (TS, I000, 0x00, 0x04)
+        M380 (__METHOD__, Local1, 0x00, 0x03)
+        M380 (__METHOD__, I000, 0x00, 0x04)
         /* 22. */
 
         M000 (I001)
-        M380 (TS, I001, 0x00, 0x05)
+        M380 (__METHOD__, I001, 0x00, 0x05)
         /* 23. */
 
         If (Y128)
         {
             CopyObject (RefOf (I000), III0) /* \M366.III0 */
             Local1 = DerefOf (III0)
-            M380 (TS, Local1, 0x00, 0x06)
-            M380 (TS, I000, 0x00, 0x07)
+            M380 (__METHOD__, Local1, 0x00, 0x06)
+            M380 (__METHOD__, I000, 0x00, 0x07)
         }
 
         /* 24. */
@@ -3125,12 +3083,12 @@
         Local0 = 0x00
         M001 (RefOf (Local0))
         Local1 = DerefOf (Local0)
-        M380 (TS, Local1, 0x00, 0x08)
+        M380 (__METHOD__, Local1, 0x00, 0x08)
         /* 25. */
 
         M002 (I001, I002)
-        M380 (TS, I001, 0x00, 0x09)
-        M380 (TS, I002, 0x00, 0x0A)
+        M380 (__METHOD__, I001, 0x00, 0x09)
+        M380 (__METHOD__, I002, 0x00, 0x0A)
         /* 26. */
 
         If (Y526)
@@ -3138,7 +3096,7 @@
             III1 = 0x00
             M001 (RefOf (III1))
             Local1 = DerefOf (III1)
-            M380 (TS, Local1, 0x00, 0x0B)
+            M380 (__METHOD__, Local1, 0x00, 0x0B)
         }
 
         /* 27. */
@@ -3149,7 +3107,7 @@
             Store (PPP1 [0x00], Local0)
             Local1 = DerefOf (Local0)
             Local2 = DerefOf (Local1)
-            M380 (TS, Local2, 0x00, 0x0C)
+            M380 (__METHOD__, Local2, 0x00, 0x0C)
         }
 
         /*
@@ -3179,33 +3137,31 @@
      */
     Method (M270, 0, Serialized)
     {
-        Name (TS, "m270")
-        CH03 (TS, 0x00, 0x00, 0x0D2D, 0x00)
+        CH03 (__METHOD__, 0x00, 0x00, 0x0D2D, 0x00)
         If (Y100)
         {
-            TS00 (TS)
+            TS00 (__METHOD__)
         }
         Else
         {
-            Debug = TS /* \M270.TS__ */
+            Debug = __METHOD__ /* \M270.TS__ */
         }
 
-        CH03 (TS, 0x00, 0x01, 0x0D35, 0x00)
+        CH03 (__METHOD__, 0x00, 0x01, 0x0D35, 0x00)
         /* Store */
 
         M367 ()
-        CH03 (TS, 0x00, 0x02, 0x0D3A, 0x00)
+        CH03 (__METHOD__, 0x00, 0x02, 0x0D3A, 0x00)
         /* CopyObject */
 
         M368 ()
-        CH03 (TS, 0x00, 0x03, 0x0D3F, 0x00)
+        CH03 (__METHOD__, 0x00, 0x03, 0x0D3F, 0x00)
         M1AE ("m270", "All the legal sources of references (ORef and IRef)", "Started, but not implemented yet")
-        CH03 (TS, 0x00, 0x04, 0x0D44, 0x00)
+        CH03 (__METHOD__, 0x00, 0x04, 0x0D44, 0x00)
     }
 
     Method (M367, 0, Serialized)
     {
-        Name (TS, "m367")
         Name (I000, 0x77)
         Name (I001, 0x77)
         Name (I002, 0x77)
@@ -3226,19 +3182,19 @@
             Arg5 = Local0
             Arg6 = Local0
             Local7 = DerefOf (Arg0)
-            M380 (TS, Local7, 0x00, 0x00)
+            M380 (__METHOD__, Local7, 0x00, 0x00)
             Local7 = DerefOf (Arg1)
-            M380 (TS, Local7, 0x00, 0x01)
+            M380 (__METHOD__, Local7, 0x00, 0x01)
             Local7 = DerefOf (Arg2)
-            M380 (TS, Local7, 0x00, 0x02)
+            M380 (__METHOD__, Local7, 0x00, 0x02)
             Local7 = DerefOf (Arg3)
-            M380 (TS, Local7, 0x00, 0x03)
+            M380 (__METHOD__, Local7, 0x00, 0x03)
             Local7 = DerefOf (Arg4)
-            M380 (TS, Local7, 0x00, 0x04)
+            M380 (__METHOD__, Local7, 0x00, 0x04)
             Local7 = DerefOf (Arg5)
-            M380 (TS, Local7, 0x00, 0x05)
+            M380 (__METHOD__, Local7, 0x00, 0x05)
             Local7 = DerefOf (Arg6)
-            M380 (TS, Local7, 0x00, 0x06)
+            M380 (__METHOD__, Local7, 0x00, 0x06)
         }
 
         Method (M002, 7, NotSerialized)
@@ -3250,22 +3206,22 @@
             Arg4 = Arg3
             Arg5 = Arg4
             Arg6 = Arg5
-            M380 (TS, DerefOf (Arg6), 0x00, 0x07)
+            M380 (__METHOD__, DerefOf (Arg6), 0x00, 0x07)
             Arg6 = DerefOf (Arg0)
-            M380 (TS, Arg6, 0x00, 0x08)
+            M380 (__METHOD__, Arg6, 0x00, 0x08)
             Arg6 = DerefOf (Arg1)
-            M380 (TS, Arg6, 0x00, 0x09)
+            M380 (__METHOD__, Arg6, 0x00, 0x09)
             Arg6 = DerefOf (Arg2)
-            M380 (TS, Arg6, 0x00, 0x0A)
+            M380 (__METHOD__, Arg6, 0x00, 0x0A)
             Arg6 = DerefOf (Arg3)
-            M380 (TS, Arg6, 0x00, 0x0B)
+            M380 (__METHOD__, Arg6, 0x00, 0x0B)
             Arg6 = DerefOf (Arg4)
-            M380 (TS, Arg6, 0x00, 0x0C)
+            M380 (__METHOD__, Arg6, 0x00, 0x0C)
             Arg6 = DerefOf (Arg5)
-            M380 (TS, Arg6, 0x00, 0x0D)
+            M380 (__METHOD__, Arg6, 0x00, 0x0D)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* 1. ORef-LocalX */
 
         Local0 = RefOf (I000)
@@ -3276,43 +3232,43 @@
         Local5 = Local4
         Local6 = Local5
         Local7 = Local6
-        M380 (TS, DerefOf (Local7), 0x00, 0x0E)
+        M380 (__METHOD__, DerefOf (Local7), 0x00, 0x0E)
         Local7 = DerefOf (Local0)
-        M380 (TS, Local7, 0x00, 0x0F)
+        M380 (__METHOD__, Local7, 0x00, 0x0F)
         Local7 = DerefOf (Local1)
-        M380 (TS, Local7, 0x00, 0x10)
+        M380 (__METHOD__, Local7, 0x00, 0x10)
         Local7 = DerefOf (Local2)
-        M380 (TS, Local7, 0x00, 0x11)
+        M380 (__METHOD__, Local7, 0x00, 0x11)
         Local7 = DerefOf (Local3)
-        M380 (TS, Local7, 0x00, 0x12)
+        M380 (__METHOD__, Local7, 0x00, 0x12)
         Local7 = DerefOf (Local4)
-        M380 (TS, Local7, 0x00, 0x13)
+        M380 (__METHOD__, Local7, 0x00, 0x13)
         Local7 = DerefOf (Local5)
-        M380 (TS, Local7, 0x00, 0x14)
+        M380 (__METHOD__, Local7, 0x00, 0x14)
         Local7 = DerefOf (Local6)
-        M380 (TS, Local7, 0x00, 0x15)
+        M380 (__METHOD__, Local7, 0x00, 0x15)
         /* 2. ORef-LocalX */
 
         M001 (I000, I001, I002, I003, I004, I005, I006)
-        M380 (TS, I000, 0x00, 0x16)
-        M380 (TS, I001, 0x00, 0x17)
-        M380 (TS, I002, 0x00, 0x18)
-        M380 (TS, I003, 0x00, 0x19)
-        M380 (TS, I004, 0x00, 0x1A)
-        M380 (TS, I005, 0x00, 0x1B)
-        M380 (TS, I006, 0x00, 0x1C)
+        M380 (__METHOD__, I000, 0x00, 0x16)
+        M380 (__METHOD__, I001, 0x00, 0x17)
+        M380 (__METHOD__, I002, 0x00, 0x18)
+        M380 (__METHOD__, I003, 0x00, 0x19)
+        M380 (__METHOD__, I004, 0x00, 0x1A)
+        M380 (__METHOD__, I005, 0x00, 0x1B)
+        M380 (__METHOD__, I006, 0x00, 0x1C)
         If (Y134)
         {
             /* 2. ORef-ArgX */
 
             M002 (I000, I001, I002, I003, I004, I005, I006)
-            M380 (TS, I000, 0x00, 0x1D)
-            M380 (TS, I001, 0x00, 0x1E)
-            M380 (TS, I002, 0x00, 0x1F)
-            M380 (TS, I003, 0x00, 0x20)
-            M380 (TS, I004, 0x00, 0x21)
-            M380 (TS, I005, 0x00, 0x22)
-            M380 (TS, I006, 0x00, 0x23)
+            M380 (__METHOD__, I000, 0x00, 0x1D)
+            M380 (__METHOD__, I001, 0x00, 0x1E)
+            M380 (__METHOD__, I002, 0x00, 0x1F)
+            M380 (__METHOD__, I003, 0x00, 0x20)
+            M380 (__METHOD__, I004, 0x00, 0x21)
+            M380 (__METHOD__, I005, 0x00, 0x22)
+            M380 (__METHOD__, I006, 0x00, 0x23)
         }
 
         /* 3. ORef-LocalX */
@@ -3325,10 +3281,10 @@
             Local0 = RefOf (I000)
             III0 = Local0
             Local1 = DerefOf (III0)
-            M380 (TS, I000, 0x00, 0x24)
+            M380 (__METHOD__, I000, 0x00, 0x24)
             If (Y523)
             {
-                M380 (TS, Local1, 0x00, 0x25)
+                M380 (__METHOD__, Local1, 0x00, 0x25)
             }
         }
 
@@ -3337,9 +3293,8 @@
 
     Method (M368, 0, Serialized)
     {
-        Name (TS, "m368")
         Name (I000, 0x77)
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* 21. ORef-LocalX */
 
         CopyObject (RefOf (I000), Local0)
@@ -3350,21 +3305,21 @@
         CopyObject (Local4, Local5)
         CopyObject (Local5, Local6)
         CopyObject (Local6, Local7)
-        M380 (TS, DerefOf (Local7), 0x00, 0x00)
+        M380 (__METHOD__, DerefOf (Local7), 0x00, 0x00)
         CopyObject (DerefOf (Local0), Local7)
-        M380 (TS, Local7, 0x00, 0x01)
+        M380 (__METHOD__, Local7, 0x00, 0x01)
         CopyObject (DerefOf (Local1), Local7)
-        M380 (TS, Local7, 0x00, 0x02)
+        M380 (__METHOD__, Local7, 0x00, 0x02)
         CopyObject (DerefOf (Local2), Local7)
-        M380 (TS, Local7, 0x00, 0x03)
+        M380 (__METHOD__, Local7, 0x00, 0x03)
         CopyObject (DerefOf (Local3), Local7)
-        M380 (TS, Local7, 0x00, 0x04)
+        M380 (__METHOD__, Local7, 0x00, 0x04)
         CopyObject (DerefOf (Local4), Local7)
-        M380 (TS, Local7, 0x00, 0x05)
+        M380 (__METHOD__, Local7, 0x00, 0x05)
         CopyObject (DerefOf (Local5), Local7)
-        M380 (TS, Local7, 0x00, 0x06)
+        M380 (__METHOD__, Local7, 0x00, 0x06)
         CopyObject (DerefOf (Local6), Local7)
-        M380 (TS, Local7, 0x00, 0x07)
+        M380 (__METHOD__, Local7, 0x00, 0x07)
         END0 ()
     }
 
@@ -3442,7 +3397,6 @@
     /* Simple TEST 1: read of ArgX-ORef with DerefOf */
     Method (M341, 0, Serialized)
     {
-        Name (TS, "m341")
         Name (I000, 0x19283746)
         Local0 = RefOf (I000)
         Method (M000, 1, NotSerialized)
@@ -3451,7 +3405,7 @@
             Local7 = (Local0 + 0x05)
             If ((Local7 != 0x1928374B))
             {
-                ERR (TS, Z111, 0x0E3E, 0x00, 0x00, Local7, 0x1928374B)
+                ERR (__METHOD__, Z111, 0x0E3E, 0x00, 0x00, Local7, 0x1928374B)
             }
         }
 
@@ -3462,14 +3416,13 @@
 
     Method (M342, 0, Serialized)
     {
-        Name (TS, "m342")
         Name (I000, 0x00)
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         Local0 = RefOf (I000)
-        M1CC (TS, Local0, 0x01, 0x00)
-        M1CD (TS, Local0, 0x01, 0x00)
-        M1CC (TS, RefOf (I000), 0x01, 0x00)
-        M1CD (TS, RefOf (I000), 0x01, 0x00)
+        M1CC (__METHOD__, Local0, 0x01, 0x00)
+        M1CD (__METHOD__, Local0, 0x01, 0x00)
+        M1CC (__METHOD__, RefOf (I000), 0x01, 0x00)
+        M1CD (__METHOD__, RefOf (I000), 0x01, 0x00)
         END0 ()
     }
 
@@ -3477,7 +3430,6 @@
 
     Method (M343, 0, Serialized)
     {
-        Name (TS, "m343")
         Name (P000, Package (0x05)
         {
             0x0B,
@@ -3493,7 +3445,7 @@
             Local7 = (Local0 + 0x05)
             If ((Local7 != 0x13))
             {
-                ERR (TS, Z111, 0x0E66, 0x00, 0x00, Local7, 0x13)
+                ERR (__METHOD__, Z111, 0x0E66, 0x00, 0x00, Local7, 0x13)
             }
         }
 
@@ -3504,7 +3456,6 @@
 
     Method (M344, 0, Serialized)
     {
-        Name (TS, "m344")
         Name (P000, Package (0x05)
         {
             0x0B,
@@ -3519,7 +3470,7 @@
             Local7 = (Arg0 + 0x05)
             If ((Local7 != 0x13))
             {
-                ERR (TS, Z111, 0x0E79, 0x00, 0x00, Local7, 0x13)
+                ERR (__METHOD__, Z111, 0x0E79, 0x00, 0x00, Local7, 0x13)
             }
         }
 
@@ -3530,7 +3481,6 @@
 
     Method (M345, 0, Serialized)
     {
-        Name (TS, "m345")
         Name (S000, "qwer0000")
         Name (B000, Buffer (0x04)
         {
@@ -3561,13 +3511,13 @@
             Local0 = 0x90
             If ((Local0 != 0x90))
             {
-                ERR (TS, Z111, 0x0E94, 0x00, 0x00, Local0, 0x90)
+                ERR (__METHOD__, Z111, 0x0E94, 0x00, 0x00, Local0, 0x90)
             }
 
             Local1 = 0x91
             If ((Local1 != 0x91))
             {
-                ERR (TS, Z111, 0x0E98, 0x00, 0x00, Local1, 0x91)
+                ERR (__METHOD__, Z111, 0x0E98, 0x00, 0x00, Local1, 0x91)
             }
         }
 
@@ -3579,13 +3529,13 @@
             CopyObject (0x94, Local0)
             If ((Local0 != 0x94))
             {
-                ERR (TS, Z111, 0x0EA3, 0x00, 0x00, Local0, 0x94)
+                ERR (__METHOD__, Z111, 0x0EA3, 0x00, 0x00, Local0, 0x94)
             }
 
             CopyObject (0x95, Local1)
             If ((Local1 != 0x95))
             {
-                ERR (TS, Z111, 0x0EA7, 0x00, 0x00, Local1, 0x95)
+                ERR (__METHOD__, Z111, 0x0EA7, 0x00, 0x00, Local1, 0x95)
             }
         }
 
@@ -3612,37 +3562,36 @@
         /* CopyObject(0x97, Index(arg0, 1, Local0)) */
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         M000 (S000)
         M000 (B000)
         M000 (P000)
-        M381 (TS, S000, 0x00, 0x00)
-        M382 (TS, B000, 0x00, 0x01)
-        M383 (TS, P000, 0x00, 0x02)
+        M381 (__METHOD__, S000, 0x00, 0x00)
+        M382 (__METHOD__, B000, 0x00, 0x01)
+        M383 (__METHOD__, P000, 0x00, 0x02)
         M001 (S000)
         M001 (B000)
         M001 (P000)
-        M381 (TS, S000, 0x00, 0x03)
-        M382 (TS, B000, 0x00, 0x04)
-        M383 (TS, P000, 0x00, 0x05)
+        M381 (__METHOD__, S000, 0x00, 0x03)
+        M382 (__METHOD__, B000, 0x00, 0x04)
+        M383 (__METHOD__, P000, 0x00, 0x05)
         M002 (S000)
         M002 (B000)
         M002 (P000)
-        M385 (TS, S000, 0x00, 0x06)
-        M386 (TS, B000, 0x00, 0x07)
-        M387 (TS, P000, 0x00, 0x08)
+        M385 (__METHOD__, S000, 0x00, 0x06)
+        M386 (__METHOD__, B000, 0x00, 0x07)
+        M387 (__METHOD__, P000, 0x00, 0x08)
         M003 (S010)
         M003 (B010)
         M003 (P010)
-        M385 (TS, S010, 0x00, 0x09)
-        M386 (TS, B010, 0x00, 0x0A)
-        M387 (TS, P010, 0x00, 0x0B)
+        M385 (__METHOD__, S010, 0x00, 0x09)
+        M386 (__METHOD__, B010, 0x00, 0x0A)
+        M387 (__METHOD__, P010, 0x00, 0x0B)
         END0 ()
     }
 
     Method (M346, 0, Serialized)
     {
-        Name (TS, "m346")
         Name (I000, 0xABCD0000)
         Method (M000, 1, NotSerialized)
         {
@@ -3655,24 +3604,24 @@
             Local1 = ObjectType (Local0)
             If ((Local1 != C009))
             {
-                ERR (TS, Z111, 0x0EF6, 0x00, 0x00, Local1, C009)
+                ERR (__METHOD__, Z111, 0x0EF6, 0x00, 0x00, Local1, C009)
             }
             Else
             {
                 Local1 = SizeOf (Local0)
                 If ((Local1 != ISZ0))
                 {
-                    ERR (TS, Z111, 0x0EFA, 0x00, 0x00, Local1, ISZ0)
+                    ERR (__METHOD__, Z111, 0x0EFA, 0x00, 0x00, Local1, ISZ0)
                 }
 
                 If ((Local6 != 0xABCD0000))
                 {
-                    ERR (TS, Z111, 0x0EFD, 0x00, 0x00, Local6, 0xABCD0000)
+                    ERR (__METHOD__, Z111, 0x0EFD, 0x00, 0x00, Local6, 0xABCD0000)
                 }
 
                 If ((Local7 != 0x11111111))
                 {
-                    ERR (TS, Z111, 0x0F00, 0x00, 0x00, Local7, 0x11111111)
+                    ERR (__METHOD__, Z111, 0x0F00, 0x00, 0x00, Local7, 0x11111111)
                 }
             }
         }
@@ -3680,13 +3629,12 @@
         M000 (I000)
         If ((I000 != 0xABCD0000))
         {
-            ERR (TS, Z111, 0x0F07, 0x00, 0x00, I000, 0xABCD0000)
+            ERR (__METHOD__, Z111, 0x0F07, 0x00, 0x00, I000, 0xABCD0000)
         }
     }
 
     Method (M347, 0, Serialized)
     {
-        Name (TS, "m347")
         Name (I000, 0xABCD0000)
         Method (M000, 1, NotSerialized)
         {
@@ -3694,19 +3642,19 @@
             Local1 = ObjectType (Local0)
             If ((Local1 != C009))
             {
-                ERR (TS, Z111, 0x0F16, 0x00, 0x00, Local1, C009)
+                ERR (__METHOD__, Z111, 0x0F16, 0x00, 0x00, Local1, C009)
             }
             Else
             {
                 Local1 = SizeOf (Local0)
                 If ((Local1 != ISZ0))
                 {
-                    ERR (TS, Z111, 0x0F1A, 0x00, 0x00, Local1, ISZ0)
+                    ERR (__METHOD__, Z111, 0x0F1A, 0x00, 0x00, Local1, ISZ0)
                 }
 
                 If ((Local0 != 0xABCD0000))
                 {
-                    ERR (TS, Z111, 0x0F1D, 0x00, 0x00, Local0, 0xABCD0000)
+                    ERR (__METHOD__, Z111, 0x0F1D, 0x00, 0x00, Local0, 0xABCD0000)
                 }
             }
         }
@@ -3714,13 +3662,12 @@
         M000 (I000)
         If ((I000 != 0xABCD0000))
         {
-            ERR (TS, Z111, 0x0F24, 0x00, 0x00, I000, 0xABCD0000)
+            ERR (__METHOD__, Z111, 0x0F24, 0x00, 0x00, I000, 0xABCD0000)
         }
     }
 
     Method (M348, 0, Serialized)
     {
-        Name (TS, "m348")
         Name (I000, 0xABCD0000)
         Method (M000, 1, NotSerialized)
         {
@@ -3729,7 +3676,7 @@
             Local2 = DerefOf (Local1)
             If ((Local2 != 0xABCD0000))
             {
-                ERR (TS, Z111, 0x0F34, 0x00, 0x00, Local2, 0xABCD0000)
+                ERR (__METHOD__, Z111, 0x0F34, 0x00, 0x00, Local2, 0xABCD0000)
             }
 
             RefOf (Arg0) = 0x11111111
@@ -3737,33 +3684,32 @@
             Local0 = 0x11111111
             If ((Local0 != 0x11111111))
             {
-                ERR (TS, Z111, 0x0F3C, 0x00, 0x00, Local0, 0x11111111)
+                ERR (__METHOD__, Z111, 0x0F3C, 0x00, 0x00, Local0, 0x11111111)
             }
         }
 
         M000 (RefOf (I000))
         If ((I000 != 0xABCD0000))
         {
-            ERR (TS, Z111, 0x0F42, 0x00, 0x00, I000, 0xABCD0000)
+            ERR (__METHOD__, Z111, 0x0F42, 0x00, 0x00, I000, 0xABCD0000)
         }
 
         Local0 = RefOf (I000)
         M000 (Local0)
         If ((I000 != 0xABCD0000))
         {
-            ERR (TS, Z111, 0x0F48, 0x00, 0x00, I000, 0xABCD0000)
+            ERR (__METHOD__, Z111, 0x0F48, 0x00, 0x00, I000, 0xABCD0000)
         }
 
         Local2 = DerefOf (Local0)
         If ((Local2 != 0xABCD0000))
         {
-            ERR (TS, Z111, 0x0F4C, 0x00, 0x00, Local2, 0xABCD0000)
+            ERR (__METHOD__, Z111, 0x0F4C, 0x00, 0x00, Local2, 0xABCD0000)
         }
     }
 
     Method (M349, 0, Serialized)
     {
-        Name (TS, "m349")
         Name (I000, 0xABCD0000)
         Name (I001, 0xABCD0001)
         Method (M000, 1, NotSerialized)
@@ -3772,7 +3718,7 @@
             Local2 = DerefOf (Local1)
             If ((Local2 != 0xABCD0000))
             {
-                ERR (TS, Z111, 0x0F5C, 0x00, 0x00, Local2, 0xABCD0000)
+                ERR (__METHOD__, Z111, 0x0F5C, 0x00, 0x00, Local2, 0xABCD0000)
             }
         }
 
@@ -3787,14 +3733,14 @@
         M000 (RefOf (I000))
         If ((I000 != 0xABCD0000))
         {
-            ERR (TS, Z111, 0x0F6A, 0x00, 0x00, I000, 0xABCD0000)
+            ERR (__METHOD__, Z111, 0x0F6A, 0x00, 0x00, I000, 0xABCD0000)
         }
 
         Local0 = RefOf (I000)
         M000 (Local0)
         If ((I000 != 0xABCD0000))
         {
-            ERR (TS, Z111, 0x0F70, 0x00, 0x00, I000, 0xABCD0000)
+            ERR (__METHOD__, Z111, 0x0F70, 0x00, 0x00, I000, 0xABCD0000)
         }
 
         If (Y512)
@@ -3802,7 +3748,7 @@
             Local2 = DerefOf (Local0)
             If ((Local2 != 0xABCD0000))
             {
-                ERR (TS, Z111, 0x0F75, 0x00, 0x00, Local2, 0xABCD0000)
+                ERR (__METHOD__, Z111, 0x0F75, 0x00, 0x00, Local2, 0xABCD0000)
             }
         }
 
@@ -3811,14 +3757,14 @@
         M001 (RefOf (I001))
         If ((I001 != 0x11111111))
         {
-            ERR (TS, Z111, 0x0F7D, 0x00, 0x00, I001, 0x11111111)
+            ERR (__METHOD__, Z111, 0x0F7D, 0x00, 0x00, I001, 0x11111111)
         }
 
         Local0 = RefOf (I001)
         M001 (Local0)
         If ((I001 != 0x11111111))
         {
-            ERR (TS, Z111, 0x0F83, 0x00, 0x00, I001, 0x11111111)
+            ERR (__METHOD__, Z111, 0x0F83, 0x00, 0x00, I001, 0x11111111)
         }
 
         If (Y512)
@@ -3826,14 +3772,13 @@
             Local2 = DerefOf (Local0)
             If ((Local2 != 0x11111111))
             {
-                ERR (TS, Z111, 0x0F88, 0x00, 0x00, Local2, 0x11111111)
+                ERR (__METHOD__, Z111, 0x0F88, 0x00, 0x00, Local2, 0x11111111)
             }
         }
     }
 
     Method (M34A, 0, Serialized)
     {
-        Name (TS, "m34a")
         Name (B000, Buffer (0x05)
         {
              0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
@@ -3843,7 +3788,7 @@
             Local2 = DerefOf (Arg0)
             If ((Local2 != 0x69))
             {
-                ERR (TS, Z111, 0x0F97, 0x00, 0x00, Local2, 0x69)
+                ERR (__METHOD__, Z111, 0x0F97, 0x00, 0x00, Local2, 0x69)
             }
         }
 
@@ -3856,7 +3801,7 @@
             Local2 = DerefOf (Local1)
             If ((Local2 != 0x69))
             {
-                ERR (TS, Z111, 0x0FA3, 0x00, 0x00, Local2, 0x69)
+                ERR (__METHOD__, Z111, 0x0FA3, 0x00, 0x00, Local2, 0x69)
             }
         }
 
@@ -3867,7 +3812,7 @@
             Local0 = 0x11111111
             If ((Local0 != 0x11111111))
             {
-                ERR (TS, Z111, 0x0FAE, 0x00, 0x00, Local0, 0x11111111)
+                ERR (__METHOD__, Z111, 0x0FAE, 0x00, 0x00, Local0, 0x11111111)
             }
         }
 
@@ -3879,7 +3824,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x0FB6, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x0FB6, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -3892,7 +3837,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x0FBC, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x0FBC, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -3901,7 +3846,7 @@
         Local2 = DerefOf (Local0)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x0FC0, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x0FC0, 0x00, 0x00, Local2, 0x69)
         }
 
         Local1 = Local0 = B000 [0x02]
@@ -3911,7 +3856,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x0FC6, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x0FC6, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -3920,7 +3865,7 @@
         Local2 = DerefOf (Local0)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x0FCA, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x0FCA, 0x00, 0x00, Local2, 0x69)
         }
 
         M000 (Local1)
@@ -3929,7 +3874,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x0FCE, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x0FCE, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -3938,7 +3883,7 @@
         Local2 = DerefOf (Local1)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x0FD2, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x0FD2, 0x00, 0x00, Local2, 0x69)
         }
 
         /* m001 */
@@ -3949,7 +3894,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x0FD9, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x0FD9, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -3962,7 +3907,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x0FDF, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x0FDF, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -3971,7 +3916,7 @@
         Local2 = DerefOf (Local0)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x0FE3, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x0FE3, 0x00, 0x00, Local2, 0x69)
         }
 
         Local1 = Local0 = B000 [0x02]
@@ -3981,7 +3926,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x0FE9, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x0FE9, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -3990,7 +3935,7 @@
         Local2 = DerefOf (Local0)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x0FED, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x0FED, 0x00, 0x00, Local2, 0x69)
         }
 
         M001 (Local1)
@@ -3999,7 +3944,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x0FF1, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x0FF1, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4008,7 +3953,7 @@
         Local2 = DerefOf (Local1)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x0FF5, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x0FF5, 0x00, 0x00, Local2, 0x69)
         }
 
         /* m002 */
@@ -4019,7 +3964,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x0FFC, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x0FFC, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4032,7 +3977,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x1002, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1002, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4041,7 +3986,7 @@
         Local2 = DerefOf (Local0)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x1006, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x1006, 0x00, 0x00, Local2, 0x69)
         }
 
         Local1 = Local0 = B000 [0x02]
@@ -4051,7 +3996,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x100C, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x100C, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4060,7 +4005,7 @@
         Local2 = DerefOf (Local0)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x1010, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x1010, 0x00, 0x00, Local2, 0x69)
         }
 
         M002 (Local1)
@@ -4069,7 +4014,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x1014, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1014, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4078,13 +4023,12 @@
         Local2 = DerefOf (Local1)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x1018, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x1018, 0x00, 0x00, Local2, 0x69)
         }
     }
 
     Method (M34B, 0, Serialized)
     {
-        Name (TS, "m34b")
         Name (B000, Buffer (0x05)
         {
              0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
@@ -4098,7 +4042,7 @@
             Local2 = DerefOf (Arg0)
             If ((Local2 != 0x69))
             {
-                ERR (TS, Z111, 0x1027, 0x00, 0x00, Local2, 0x69)
+                ERR (__METHOD__, Z111, 0x1027, 0x00, 0x00, Local2, 0x69)
             }
         }
 
@@ -4110,7 +4054,7 @@
             Local2 = DerefOf (Local1)
             If ((Local2 != 0x69))
             {
-                ERR (TS, Z111, 0x1032, 0x00, 0x00, Local2, 0x69)
+                ERR (__METHOD__, Z111, 0x1032, 0x00, 0x00, Local2, 0x69)
             }
         }
 
@@ -4128,7 +4072,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x1040, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1040, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4141,7 +4085,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x1046, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1046, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4150,7 +4094,7 @@
         Local2 = DerefOf (Local0)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x104A, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x104A, 0x00, 0x00, Local2, 0x69)
         }
 
         Local1 = Local0 = B000 [0x02]
@@ -4160,7 +4104,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x1050, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1050, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4169,7 +4113,7 @@
         Local2 = DerefOf (Local0)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x1054, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x1054, 0x00, 0x00, Local2, 0x69)
         }
 
         M000 (Local1)
@@ -4178,7 +4122,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x1058, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1058, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4187,7 +4131,7 @@
         Local2 = DerefOf (Local1)
         If ((Local2 != 0x69))
         {
-            ERR (TS, Z111, 0x105C, 0x00, 0x00, Local2, 0x69)
+            ERR (__METHOD__, Z111, 0x105C, 0x00, 0x00, Local2, 0x69)
         }
 
         /* m001 */
@@ -4198,7 +4142,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x1063, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1063, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4211,7 +4155,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x1069, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1069, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4222,7 +4166,7 @@
             Local2 = DerefOf (Local0)
             If ((Local2 != 0x69))
             {
-                ERR (TS, Z111, 0x106E, 0x00, 0x00, Local2, 0x69)
+                ERR (__METHOD__, Z111, 0x106E, 0x00, 0x00, Local2, 0x69)
             }
         }
 
@@ -4233,7 +4177,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x1075, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1075, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4244,7 +4188,7 @@
             Local2 = DerefOf (Local0)
             If ((Local2 != 0x69))
             {
-                ERR (TS, Z111, 0x107A, 0x00, 0x00, Local2, 0x69)
+                ERR (__METHOD__, Z111, 0x107A, 0x00, 0x00, Local2, 0x69)
             }
         }
 
@@ -4254,7 +4198,7 @@
                          0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                     }))
         {
-            ERR (TS, Z111, 0x107F, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x107F, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x69, 0x04, 0x05                     // ..i..
                 })
@@ -4265,7 +4209,7 @@
             Local2 = DerefOf (Local1)
             If ((Local2 != 0x69))
             {
-                ERR (TS, Z111, 0x1084, 0x00, 0x00, Local2, 0x69)
+                ERR (__METHOD__, Z111, 0x1084, 0x00, 0x00, Local2, 0x69)
             }
         }
 
@@ -4277,7 +4221,7 @@
                          0x01, 0x02, 0x11, 0x04, 0x05                     // .....
                     }))
         {
-            ERR (TS, Z111, 0x108C, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x108C, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x11, 0x04, 0x05                     // .....
                 })
@@ -4290,7 +4234,7 @@
                          0x01, 0x02, 0x11, 0x04, 0x05                     // .....
                     }))
         {
-            ERR (TS, Z111, 0x1092, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x1092, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x11, 0x04, 0x05                     // .....
                 })
@@ -4301,7 +4245,7 @@
             Local2 = DerefOf (Local0)
             If ((Local2 != 0x11))
             {
-                ERR (TS, Z111, 0x1097, 0x00, 0x00, Local2, 0x11)
+                ERR (__METHOD__, Z111, 0x1097, 0x00, 0x00, Local2, 0x11)
             }
         }
 
@@ -4312,7 +4256,7 @@
                          0x01, 0x02, 0x11, 0x04, 0x05                     // .....
                     }))
         {
-            ERR (TS, Z111, 0x109E, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x109E, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x11, 0x04, 0x05                     // .....
                 })
@@ -4323,7 +4267,7 @@
             Local2 = DerefOf (Local0)
             If ((Local2 != 0x11))
             {
-                ERR (TS, Z111, 0x10A3, 0x00, 0x00, Local2, 0x11)
+                ERR (__METHOD__, Z111, 0x10A3, 0x00, 0x00, Local2, 0x11)
             }
         }
 
@@ -4333,7 +4277,7 @@
                          0x01, 0x02, 0x11, 0x04, 0x05                     // .....
                     }))
         {
-            ERR (TS, Z111, 0x10A8, 0x00, 0x00, B000, Buffer (0x05)
+            ERR (__METHOD__, Z111, 0x10A8, 0x00, 0x00, B000, Buffer (0x05)
                 {
                      0x01, 0x02, 0x11, 0x04, 0x05                     // .....
                 })
@@ -4344,7 +4288,7 @@
             Local2 = DerefOf (Local1)
             If ((Local2 != 0x11))
             {
-                ERR (TS, Z111, 0x10AD, 0x00, 0x00, Local2, 0x11)
+                ERR (__METHOD__, Z111, 0x10AD, 0x00, 0x00, Local2, 0x11)
             }
         }
     }
@@ -4353,7 +4297,6 @@
 
     Method (M34C, 0, Serialized)
     {
-        Name (TS, "m34c")
         Name (S000, "qwer0000")
         Name (B000, Buffer (0x04)
         {
@@ -4406,20 +4349,20 @@
             Local3 = ObjectType (Local2)
             If ((Local3 != Arg1))
             {
-                ERR (TS, Z111, 0x10CE, 0x00, 0x00, Local3, Arg1)
+                ERR (__METHOD__, Z111, 0x10CE, 0x00, 0x00, Local3, Arg1)
             }
 
             Local1 = Local0 = Local2 [0x01]
             Local0 = 0x90
             If ((Local0 != 0x90))
             {
-                ERR (TS, Z111, 0x10D5, 0x00, 0x00, Local0, 0x90)
+                ERR (__METHOD__, Z111, 0x10D5, 0x00, 0x00, Local0, 0x90)
             }
 
             Local1 = 0x91
             If ((Local1 != 0x91))
             {
-                ERR (TS, Z111, 0x10D9, 0x00, 0x00, Local1, 0x91)
+                ERR (__METHOD__, Z111, 0x10D9, 0x00, 0x00, Local1, 0x91)
             }
         }
 
@@ -4432,13 +4375,13 @@
             CopyObject (0x94, Local0)
             If ((Local0 != 0x94))
             {
-                ERR (TS, Z111, 0x10E6, 0x00, 0x00, Local0, 0x94)
+                ERR (__METHOD__, Z111, 0x10E6, 0x00, 0x00, Local0, 0x94)
             }
 
             CopyObject (0x95, Local1)
             If ((Local1 != 0x95))
             {
-                ERR (TS, Z111, 0x10EA, 0x00, 0x00, Local1, 0x95)
+                ERR (__METHOD__, Z111, 0x10EA, 0x00, 0x00, Local1, 0x95)
             }
         }
 
@@ -4450,15 +4393,15 @@
             Local2 [0x01] = 0x2B
             If ((Arg1 == C00A))
             {
-                M385 (TS, Local2, 0x00, 0x00)
+                M385 (__METHOD__, Local2, 0x00, 0x00)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M386 (TS, Local2, 0x00, 0x01)
+                M386 (__METHOD__, Local2, 0x00, 0x01)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M387 (TS, Local2, 0x00, 0x02)
+                M387 (__METHOD__, Local2, 0x00, 0x02)
             }
         }
 
@@ -4471,21 +4414,21 @@
             Local2 [0x01] = 0x2B
             If ((Arg1 == C00A))
             {
-                M385 (TS, Local2, 0x00, 0x03)
+                M385 (__METHOD__, Local2, 0x00, 0x03)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M386 (TS, Local2, 0x00, 0x04)
+                M386 (__METHOD__, Local2, 0x00, 0x04)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M387 (TS, Local2, 0x00, 0x05)
+                M387 (__METHOD__, Local2, 0x00, 0x05)
             }
 
             Local2 = DerefOf (Local0)
             If ((Local2 != 0x2B))
             {
-                ERR (TS, Z111, 0x1110, 0x00, 0x00, Local2, 0x2B)
+                ERR (__METHOD__, Z111, 0x1110, 0x00, 0x00, Local2, 0x2B)
             }
         }
 
@@ -4496,15 +4439,15 @@
             M000 (RefOf (Arg0), Arg1)
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x06)
+                M381 (__METHOD__, Arg0, 0x00, 0x06)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x07)
+                M382 (__METHOD__, Arg0, 0x00, 0x07)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x08)
+                M383 (__METHOD__, Arg0, 0x00, 0x08)
             }
         }
 
@@ -4515,15 +4458,15 @@
             M001 (RefOf (Arg0))
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x09)
+                M381 (__METHOD__, Arg0, 0x00, 0x09)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x0A)
+                M382 (__METHOD__, Arg0, 0x00, 0x0A)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x0B)
+                M383 (__METHOD__, Arg0, 0x00, 0x0B)
             }
         }
 
@@ -4533,15 +4476,15 @@
             M002 (Local0, Arg1)
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x0C)
+                M381 (__METHOD__, Arg0, 0x00, 0x0C)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x0D)
+                M382 (__METHOD__, Arg0, 0x00, 0x0D)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x0E)
+                M383 (__METHOD__, Arg0, 0x00, 0x0E)
             }
         }
 
@@ -4550,15 +4493,15 @@
             M002 (RefOf (Arg0), Arg1)
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x0F)
+                M381 (__METHOD__, Arg0, 0x00, 0x0F)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x10)
+                M382 (__METHOD__, Arg0, 0x00, 0x10)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x11)
+                M383 (__METHOD__, Arg0, 0x00, 0x11)
             }
         }
 
@@ -4568,15 +4511,15 @@
             M003 (Local0, Arg1)
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x12)
+                M381 (__METHOD__, Arg0, 0x00, 0x12)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x13)
+                M382 (__METHOD__, Arg0, 0x00, 0x13)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x14)
+                M383 (__METHOD__, Arg0, 0x00, 0x14)
             }
         }
 
@@ -4585,61 +4528,60 @@
             M003 (RefOf (Arg0), Arg1)
             If ((Arg1 == C00A))
             {
-                M381 (TS, Arg0, 0x00, 0x15)
+                M381 (__METHOD__, Arg0, 0x00, 0x15)
             }
             ElseIf ((Arg1 == C00B))
             {
-                M382 (TS, Arg0, 0x00, 0x16)
+                M382 (__METHOD__, Arg0, 0x00, 0x16)
             }
             ElseIf ((Arg1 == C00C))
             {
-                M383 (TS, Arg0, 0x00, 0x17)
+                M383 (__METHOD__, Arg0, 0x00, 0x17)
             }
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         M010 (S000, C00A)
         M010 (B000, C00B)
         M010 (P000, C00C)
-        M381 (TS, S000, 0x00, 0x18)
-        M382 (TS, B000, 0x00, 0x19)
-        M383 (TS, P000, 0x00, 0x1A)
+        M381 (__METHOD__, S000, 0x00, 0x18)
+        M382 (__METHOD__, B000, 0x00, 0x19)
+        M383 (__METHOD__, P000, 0x00, 0x1A)
         M011 (S000, C00A)
         M011 (B000, C00B)
         M011 (P000, C00C)
-        M381 (TS, S000, 0x00, 0x1B)
-        M382 (TS, B000, 0x00, 0x1C)
-        M383 (TS, P000, 0x00, 0x1D)
+        M381 (__METHOD__, S000, 0x00, 0x1B)
+        M382 (__METHOD__, B000, 0x00, 0x1C)
+        M383 (__METHOD__, P000, 0x00, 0x1D)
         M012 (S000, C00A)
         M012 (B000, C00B)
         M012 (P000, C00C)
-        M381 (TS, S000, 0x00, 0x1E)
-        M382 (TS, B000, 0x00, 0x1F)
-        M383 (TS, P000, 0x00, 0x20)
+        M381 (__METHOD__, S000, 0x00, 0x1E)
+        M382 (__METHOD__, B000, 0x00, 0x1F)
+        M383 (__METHOD__, P000, 0x00, 0x20)
         M022 (S010, C00A)
         M022 (B010, C00B)
         M022 (P010, C00C)
-        M381 (TS, S010, 0x00, 0x21)
-        M382 (TS, B010, 0x00, 0x22)
-        M383 (TS, P010, 0x00, 0x23)
+        M381 (__METHOD__, S010, 0x00, 0x21)
+        M382 (__METHOD__, B010, 0x00, 0x22)
+        M383 (__METHOD__, P010, 0x00, 0x23)
         M013 (S020, C00A)
         M013 (B020, C00B)
         M013 (P020, C00C)
-        M381 (TS, S020, 0x00, 0x24)
-        M382 (TS, B020, 0x00, 0x25)
-        M383 (TS, P020, 0x00, 0x26)
+        M381 (__METHOD__, S020, 0x00, 0x24)
+        M382 (__METHOD__, B020, 0x00, 0x25)
+        M383 (__METHOD__, P020, 0x00, 0x26)
         M023 (S030, C00A)
         M023 (B030, C00B)
         M023 (P030, C00C)
-        M381 (TS, S030, 0x00, 0x27)
-        M382 (TS, B030, 0x00, 0x28)
-        M383 (TS, P030, 0x00, 0x29)
+        M381 (__METHOD__, S030, 0x00, 0x27)
+        M382 (__METHOD__, B030, 0x00, 0x28)
+        M383 (__METHOD__, P030, 0x00, 0x29)
         END0 ()
     }
 
     Method (M34D, 1, Serialized)
     {
-        Name (TS, "m34d")
         Name (OP00, 0x00)
         Name (OP01, 0x01)
         OP00 = Arg0
@@ -4762,7 +4704,7 @@
                         Local0 = ObjectType (Arg0)
                         If ((Local0 != Arg2))
                         {
-                            ERR (TS, Z111, 0x11DE, 0x00, 0x00, Local0, Arg2)
+                            ERR (__METHOD__, Z111, 0x11DE, 0x00, 0x00, Local0, Arg2)
                         }
 
                         If (OP00)
@@ -4840,7 +4782,7 @@
             M391 (Local0, Arg1, 0x00, 0x03)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* Write Integer */
 
         Local0 = RefOf (I000)
@@ -4969,7 +4911,6 @@
 
     Method (M34E, 1, Serialized)
     {
-        Name (TS, "m34e")
         Name (OP00, 0x00)
         OP00 = Arg0
         Name (S000, "qwer0000")
@@ -4994,7 +4935,7 @@
                         Local0 = ObjectType (Arg0)
                         If ((Local0 != Arg2))
                         {
-                            ERR (TS, Z111, 0x12B0, 0x00, 0x00, Local0, Arg2)
+                            ERR (__METHOD__, Z111, 0x12B0, 0x00, 0x00, Local0, Arg2)
                         }
 
                         If (OP00)
@@ -5024,68 +4965,67 @@
             M390 (Local0, Arg1, 0x00, 0x03)
         }
 
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         /* String */
 
         Store (S000 [0x01], Local0)
         M000 (Local0, C009, C016)
         M390 (S000, C00A, 0x00, 0x04)
         Local2 = DerefOf (Local0)
-        M380 (TS, Local2, 0x00, 0x05)
+        M380 (__METHOD__, Local2, 0x00, 0x05)
         /* Buffer */
 
         Store (B000 [0x01], Local0)
         M000 (Local0, C009, C016)
         M390 (B000, C00B, 0x00, 0x06)
         Local2 = DerefOf (Local0)
-        M380 (TS, Local2, 0x00, 0x07)
+        M380 (__METHOD__, Local2, 0x00, 0x07)
         /* Package */
 
         Store (P000 [0x01], Local0)
         M000 (Local0, C009, C009)
         M390 (P000, C00C, 0x00, 0x08)
         Local2 = DerefOf (Local0)
-        M380 (TS, Local2, 0x00, 0x09)
+        M380 (__METHOD__, Local2, 0x00, 0x09)
         END0 ()
     }
 
     Method (M34F, 0, Serialized)
     {
-        Name (TS, "m34f")
-        BEG0 (Z111, TS)
+        BEG0 (Z111, __METHOD__)
         RefOf (I900) = 0x77
-        M380 (TS, I900, 0x00, 0x00)
+        M380 (__METHOD__, I900, 0x00, 0x00)
         RefOf (S900) = 0x77
-        M4C0 (TS, S900, "0000000000000077", "00000077")
+        M4C0 (__METHOD__, S900, "0000000000000077", "00000077")
         RefOf (B900) = 0x77
-        M1AA (TS, B900, C00B, Buffer (0x05)
+        M1AA (__METHOD__, B900, C00B, Buffer (0x05)
             {
                  0x77, 0x00, 0x00, 0x00, 0x00                     // w....
             }, 0x01)
         RefOf (P953) = 0x77
-        M380 (TS, P953, 0x00, 0x02)
+        M380 (__METHOD__, P953, 0x00, 0x02)
         RefOf (E900) = 0x77
-        M380 (TS, E900, 0x00, 0x03)
+        M380 (__METHOD__, E900, 0x00, 0x03)
         RefOf (MX90) = 0x77
-        M380 (TS, MX90, 0x00, 0x04)
+        M380 (__METHOD__, MX90, 0x00, 0x04)
         RefOf (D900) = 0x77
-        M380 (TS, D900, 0x00, 0x05)
+        M380 (__METHOD__, D900, 0x00, 0x05)
         If (Y508)
         {
             RefOf (TZ90) = 0x77
-            M380 (TS, TZ90, 0x00, 0x06)
+            M380 (__METHOD__, TZ90, 0x00, 0x06)
         }
 
         RefOf (PR90) = 0x77
-        M380 (TS, PR90, 0x00, 0x07)
+        M380 (__METHOD__, PR90, 0x00, 0x07)
         If (Y510)
         {
             RefOf (R900) = 0x77
-            M380 (TS, R900, 0x00, 0x08)
+            M380 (__METHOD__, R900, 0x00, 0x08)
         }
 
         RefOf (PW90) = 0x77
-        M380 (TS, PW90, 0x00, 0x09)
+        M380 (__METHOD__, PW90, 0x00, 0x09)
         M1AC ()
         M1A6 ()
         END0 ()
@@ -5095,7 +5035,6 @@
 
     Method (M350, 0, Serialized)
     {
-        Name (TS, "m350")
         /* CopyObject(0x77, RefOf(i900)) */
     }
 
@@ -5103,7 +5042,6 @@
     /* arg0 - Package */
     Method (M351, 1, Serialized)
     {
-        Name (TS, "m351")
         Name (LPN0, 0x11)
         Name (LPC0, 0x00)
         Local6 = 0x10
@@ -5126,14 +5064,14 @@
             Local1 = ObjectType (Local0)
             If ((Local1 != C009))
             {
-                ERR (TS, Z111, 0x1334, 0x00, 0x00, Local1, C009)
+                ERR (__METHOD__, Z111, 0x1334, 0x00, 0x00, Local1, C009)
             }
             Else
             {
                 Local1 = DerefOf (Local0)
                 If ((Local1 != Local6))
                 {
-                    ERR (TS, Z111, 0x1338, 0x00, 0x00, Local1, Local6)
+                    ERR (__METHOD__, Z111, 0x1338, 0x00, 0x00, Local1, Local6)
                 }
             }
 
diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl
index 5cff1b7a6..58f2eff44 100644
--- a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl
+++ b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl
@@ -39,7 +39,6 @@
 
     Method (M1A7, 7, Serialized)
     {
-        Name (TS, "m1a7")
         FLG3 = 0x01
         FLG4 = 0x01
         /* flag, run test till the first error */
@@ -54,7 +53,7 @@
             }
         }
 
-        CH03 (TS, Z081, 0x0200, 0x3A, Arg6)
+        CH03 (__METHOD__, Z081, 0x0200, 0x3A, Arg6)
         /*
          // FILE BUG: hangs without printing error
          Store(CH03(ts, z081, 0x200, __LINE__, arg6), Local0)
@@ -122,7 +121,6 @@
     /* arg2 - index of checking (inside the file) */
     Method (M1A8, 3, Serialized)
     {
-        Name (TS, "m1a8")
         /* Return */
 
         Method (M000, 1, NotSerialized)
@@ -134,7 +132,7 @@
 
         Method (M001, 1, NotSerialized)
         {
-            CH03 (TS, Z081, 0x0202, 0x83, 0x36)
+            CH03 (__METHOD__, Z081, 0x0202, 0x83, 0x36)
             If (Arg0)
             {
                 Local7 = 0x00
@@ -147,7 +145,7 @@
 
         Method (M002, 1, NotSerialized)
         {
-            CH03 (TS, Z081, 0x0204, 0x8D, 0x37)
+            CH03 (__METHOD__, Z081, 0x0204, 0x8D, 0x37)
             If (0x00)
             {
                 Local7 = 0x00
@@ -164,7 +162,7 @@
 
         Method (M004, 1, NotSerialized)
         {
-            CH03 (TS, Z081, 0x0208, 0x99, 0x3A)
+            CH03 (__METHOD__, Z081, 0x0208, 0x99, 0x3A)
             While (Arg0)
             {
                 Local7 = 0x00
@@ -230,36 +228,36 @@
         {
             /* CondRefOf */
 
-            CH03 (TS, Z081, 0x020A, 0xC8, 0x00)
+            CH03 (__METHOD__, Z081, 0x020A, 0xC8, 0x00)
             M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05)
-            CH03 (TS, Z081, 0x020B, 0xCA, 0x00)
+            CH03 (__METHOD__, Z081, 0x020B, 0xCA, 0x00)
         }
 
         If (RN01)
         {
             /* DerefOf */
 
-            CH03 (TS, Z081, 0x020C, 0xD0, 0x00)
+            CH03 (__METHOD__, Z081, 0x020C, 0xD0, 0x00)
             M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08)
-            CH03 (TS, Z081, 0x020D, 0xD2, 0x00)
+            CH03 (__METHOD__, Z081, 0x020D, 0xD2, 0x00)
         }
 
         If (RN02)
         {
             /* ObjectType */
 
-            CH03 (TS, Z081, 0x020E, 0xD8, 0x00)
+            CH03 (__METHOD__, Z081, 0x020E, 0xD8, 0x00)
             M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20)
-            CH03 (TS, Z081, 0x020F, 0xDA, 0x00)
+            CH03 (__METHOD__, Z081, 0x020F, 0xDA, 0x00)
         }
 
         If (RN03)
         {
             /* RefOf */
 
-            CH03 (TS, Z081, 0x0210, 0xE0, 0x00)
+            CH03 (__METHOD__, Z081, 0x0210, 0xE0, 0x00)
             M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22)
-            CH03 (TS, Z081, 0x0211, 0xE2, 0x00)
+            CH03 (__METHOD__, Z081, 0x0211, 0xE2, 0x00)
         }
 
         If (RN04)
@@ -321,9 +319,9 @@
 
             If (Local0)
             {
-                CH03 (TS, Z081, 0x0212, 0x010A, 0x00)
+                CH03 (__METHOD__, Z081, 0x0212, 0x010A, 0x00)
                 M480 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29)
-                CH03 (TS, Z081, 0x0213, 0x010C, 0x00)
+                CH03 (__METHOD__, Z081, 0x0213, 0x010C, 0x00)
             }
             Else
             {
@@ -337,18 +335,18 @@
         {
             /* CopyObject */
 
-            CH03 (TS, Z081, 0x0214, 0x0117, 0x00)
+            CH03 (__METHOD__, Z081, 0x0214, 0x0117, 0x00)
             CopyObject (Arg0, Local7)
-            CH03 (TS, Z081, 0x0215, 0x0119, 0x00)
+            CH03 (__METHOD__, Z081, 0x0215, 0x0119, 0x00)
         }
 
         If (RN06)
         {
             /* Return */
 
-            CH03 (TS, Z081, 0x0216, 0x0120, 0x00)
+            CH03 (__METHOD__, Z081, 0x0216, 0x0120, 0x00)
             M000 (Arg0)
-            CH03 (TS, Z081, 0x0217, 0x0122, 0x00)
+            CH03 (__METHOD__, Z081, 0x0217, 0x0122, 0x00)
         }
 
         If (RN07)
@@ -515,9 +513,9 @@
             M1A7 (Arg0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2B)
             /* Store */
 
-            CH03 (TS, Z081, 0x0218, 0x01ED, 0x00)
+            CH03 (__METHOD__, Z081, 0x0218, 0x01ED, 0x00)
             Local7 = Arg0
-            CH03 (TS, Z081, 0x0219, 0x01EF, 0x00)
+            CH03 (__METHOD__, Z081, 0x0219, 0x01EF, 0x00)
             /* Subtract */
 
             M1A7 (Arg0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x2D)
@@ -805,11 +803,10 @@
 
     Method (M106, 0, Serialized)
     {
-        Name (TS, "m106")
         Name (I000, 0xABCD0000)
         Method (M000, 1, NotSerialized)
         {
-            CH03 (TS, Z081, 0x48, 0x0334, 0x00)
+            CH03 (__METHOD__, Z081, 0x48, 0x0334, 0x00)
             Debug = DerefOf (RefOf (DerefOf (RefOf (Arg0))))
             CH04 (C080, 0x00, 0xFF, Z081, 0x0338, 0x00, 0x00)
         }
diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl
index 406472009..00412b4de 100644
--- a/tests/aslts/src/runtime/collections/functional/reference/ref71.asl
+++ b/tests/aslts/src/runtime/collections/functional/reference/ref71.asl
@@ -36,7 +36,6 @@
      */
     Method (M1B3, 0, Serialized)
     {
-        Name (TS, "m1b3")
         C081 = Z109 /* absolute index of file initiating the checking */ /* \Z109 */
         Method (M000, 1, NotSerialized)
         {
@@ -45,11 +44,11 @@
                 Local7 = 0x00
             }
 
-            CH03 (TS, Z109, 0x00, 0x33, 0x00)
+            CH03 (__METHOD__, Z109, 0x00, 0x33, 0x00)
             Local0 = Local7
             If (!SLCK)
             {
-                CH04 (TS, 0x00, 0xFF, Z109, 0x37, 0x00, 0x00)
+                CH04 (__METHOD__, 0x00, 0xFF, Z109, 0x37, 0x00, 0x00)
             }
         }
 
@@ -63,35 +62,35 @@
         Local7 = ObjectType (Local0)
         If ((Local7 != C009))
         {
-            ERR (TS, Z109, 0x42, 0x00, 0x00, Local7, C009)
+            ERR (__METHOD__, Z109, 0x42, 0x00, 0x00, Local7, C009)
         }
 
         Local0 = S900 /* \S900 */
         Local7 = ObjectType (Local0)
         If ((Local7 != C00A))
         {
-            ERR (TS, Z109, 0x48, 0x00, 0x00, Local7, C00A)
+            ERR (__METHOD__, Z109, 0x48, 0x00, 0x00, Local7, C00A)
         }
 
         Local0 = B900 /* \B900 */
         Local7 = ObjectType (Local0)
         If ((Local7 != C00B))
         {
-            ERR (TS, Z109, 0x4E, 0x00, 0x00, Local7, C00B)
+            ERR (__METHOD__, Z109, 0x4E, 0x00, 0x00, Local7, C00B)
         }
 
         Local0 = P900 /* \P900 */
         Local7 = ObjectType (Local0)
         If ((Local7 != C00C))
         {
-            ERR (TS, Z109, 0x54, 0x00, 0x00, Local7, C00C)
+            ERR (__METHOD__, Z109, 0x54, 0x00, 0x00, Local7, C00C)
         }
 
         Local0 = F900 /* \F900 */
         Local7 = ObjectType (Local0)
         If ((Local7 != C009))
         {
-            ERR (TS, Z109, 0x5A, 0x00, 0x00, Local7, C009)
+            ERR (__METHOD__, Z109, 0x5A, 0x00, 0x00, Local7, C009)
         }
 
         /*
@@ -117,7 +116,7 @@
          */
         If (X114)
         {
-            CH03 (TS, Z109, 0x0B, 0x75, 0x00)
+            CH03 (__METHOD__, Z109, 0x0B, 0x75, 0x00)
             Local0 = M901 ()
                 /*CH04(ts, 0, 0xff, z109, __LINE__, 0, 0) */
         }
@@ -155,6 +154,6 @@
         Local7 = ObjectType (Local0)
         If ((Local7 != C009))
         {
-            ERR (TS, Z109, 0xA0, 0x00, 0x00, Local7, C009)
+            ERR (__METHOD__, Z109, 0xA0, 0x00, 0x00, Local7, C009)
         }
     }
diff --git a/tests/aslts/src/runtime/collections/functional/region/bankfield.asl b/tests/aslts/src/runtime/collections/functional/region/bankfield.asl
index ff7a7b5c3..5e79ecf04 100644
--- a/tests/aslts/src/runtime/collections/functional/region/bankfield.asl
+++ b/tests/aslts/src/runtime/collections/functional/region/bankfield.asl
@@ -18827,17 +18827,16 @@
 
     Method (BFC0, 0, Serialized)
     {
-        Name (TS, "BFC0")
         /* Simple BankField test */
 
         SRMT ("m7c0")
-        M7C0 (TS)
+        M7C0 (__METHOD__)
         /* Check BankField access: ByteAcc, NoLock, Preserve */
 
         SRMT ("m7c1")
         If (Y192)
         {
-            M7C1 (TS)
+            M7C1 (__METHOD__)
         }
         Else
         {
@@ -18849,7 +18848,7 @@
         SRMT ("m7c2")
         If (Y192)
         {
-            M7C2 (TS)
+            M7C2 (__METHOD__)
         }
         Else
         {
@@ -18861,7 +18860,7 @@
         SRMT ("m7c3")
         If (Y192)
         {
-            M7C3 (TS)
+            M7C3 (__METHOD__)
         }
         Else
         {
@@ -18873,7 +18872,7 @@
         SRMT ("m7c4")
         If (Y192)
         {
-            M7C4 (TS)
+            M7C4 (__METHOD__)
         }
         Else
         {
@@ -18885,7 +18884,7 @@
         SRMT ("m7c5")
         If (Y192)
         {
-            M7C5 (TS)
+            M7C5 (__METHOD__)
         }
         Else
         {
@@ -18897,7 +18896,7 @@
         SRMT ("m7c6")
         If (Y192)
         {
-            M7C6 (TS)
+            M7C6 (__METHOD__)
         }
         Else
         {
@@ -18909,7 +18908,7 @@
         SRMT ("m7c7")
         If (Y178)
         {
-            M7C7 (TS)
+            M7C7 (__METHOD__)
         }
         Else
         {
@@ -18921,7 +18920,7 @@
         SRMT ("m7c8")
         If (Y178)
         {
-            M7C8 (TS)
+            M7C8 (__METHOD__)
         }
         Else
         {
diff --git a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl
index 53a6b3682..e6fc82316 100644
--- a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl
+++ b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl
@@ -404,25 +404,24 @@
 
     Method (DRC0, 0, Serialized)
     {
-        Name (TS, "DRC0")
         /* Global DataTableRegions */
 
         SRMT ("m7f0")
-        M7F0 (TS)
+        M7F0 (__METHOD__)
         /* Dynamic DataTableRegions */
 
         SRMT ("m7f1")
-        M7F1 (TS)
+        M7F1 (__METHOD__)
         /* DataTableRegion Lengths */
 
         SRMT ("m7f2")
-        M7F2 (TS)
+        M7F2 (__METHOD__)
         /* Non-constant DataTableRegion *String arguments */
 
         SRMT ("m7f3")
         If (Y223)
         {
-            M7F3 (TS)
+            M7F3 (__METHOD__)
         }
         Else
         {
@@ -434,7 +433,7 @@
         SRMT ("m7f4")
         If (Y223)
         {
-            M7F4 (TS)
+            M7F4 (__METHOD__)
         }
         Else
         {
diff --git a/tests/aslts/src/runtime/collections/functional/region/indexfield.asl b/tests/aslts/src/runtime/collections/functional/region/indexfield.asl
index a03297651..7e2724f79 100644
--- a/tests/aslts/src/runtime/collections/functional/region/indexfield.asl
+++ b/tests/aslts/src/runtime/collections/functional/region/indexfield.asl
@@ -17824,27 +17824,26 @@
 
     Method (IFC0, 0, Serialized)
     {
-        Name (TS, "IFC0")
         SRMT ("m770")
-        M770 (TS)
+        M770 (__METHOD__)
         /* Access to 1-bit IndexFields, ByteAcc */
 
         SRMT ("m771")
-        M771 (TS)
+        M771 (__METHOD__)
         /* Access to 1-bit IndexFields, WordAcc */
 
         SRMT ("m772")
-        M772 (TS)
+        M772 (__METHOD__)
         /* Access to 1-bit IndexFields, DWordAcc */
 
         SRMT ("m773")
-        M773 (TS)
+        M773 (__METHOD__)
         /* Access to 1-bit IndexFields, QWordAcc */
 
         SRMT ("m774")
         If (Y215)
         {
-            M774 (TS)
+            M774 (__METHOD__)
         }
         Else
         {
@@ -17854,13 +17853,13 @@
         /* Splitting of IndexFields */
 
         SRMT ("m775")
-        M775 (TS)
+        M775 (__METHOD__)
         /* Check IndexField access: ByteAcc, NoLock, Preserve */
 
         SRMT ("m776")
         If (Y224)
         {
-            M776 (TS)
+            M776 (__METHOD__)
         }
         Else
         {
@@ -17872,7 +17871,7 @@
         SRMT ("m777")
         If (Y224)
         {
-            M777 (TS)
+            M777 (__METHOD__)
         }
         Else
         {
@@ -17884,7 +17883,7 @@
         SRMT ("m778")
         If (Y224)
         {
-            M778 (TS)
+            M778 (__METHOD__)
         }
         Else
         {
@@ -17896,7 +17895,7 @@
         SRMT ("m779")
         If (Y224)
         {
-            M779 (TS)
+            M779 (__METHOD__)
         }
         Else
         {
@@ -17908,7 +17907,7 @@
         SRMT ("m77a")
         If (Y224)
         {
-            M77A (TS)
+            M77A (__METHOD__)
         }
         Else
         {
diff --git a/tests/aslts/src/runtime/collections/functional/region/opregions.asl b/tests/aslts/src/runtime/collections/functional/region/opregions.asl
index afb64bbfe..3fe94eb8b 100644
--- a/tests/aslts/src/runtime/collections/functional/region/opregions.asl
+++ b/tests/aslts/src/runtime/collections/functional/region/opregions.asl
@@ -1367,13 +1367,12 @@ Package (NRSK)
 
     Method (ORC0, 0, Serialized)
     {
-        Name (TS, "ORC0")
         /* Global OpRegions */
 
         SRMT ("m700")
         If (Y220)
         {
-            M700 (TS)
+            M700 (__METHOD__)
         }
         Else
         {
@@ -1385,7 +1384,7 @@ Package (NRSK)
         SRMT ("m701")
         If (Y217)
         {
-            M701 (TS)
+            M701 (__METHOD__)
         }
         Else
         {
@@ -1395,13 +1394,13 @@ Package (NRSK)
         /* OpRegion Lengths */
 
         SRMT ("m702")
-        M702 (TS)
+        M702 (__METHOD__)
         /* Overlapping of OpRegions */
 
         SRMT ("m703")
         If (Y221)
         {
-            M703 (TS)
+            M703 (__METHOD__)
         }
         Else
         {
@@ -1413,7 +1412,7 @@ Package (NRSK)
         SRMT ("m704")
         If (Y222)
         {
-            M704 (TS)
+            M704 (__METHOD__)
         }
         Else
         {
@@ -1423,13 +1422,13 @@ Package (NRSK)
         /* Non-constant OpRegion arguments */
 
         SRMT ("m705")
-        M705 (TS)
+        M705 (__METHOD__)
         /* Non-Integer OpRegion arguments */
 
         SRMT ("m706")
-        M706 (TS)
+        M706 (__METHOD__)
         /* Overlapping OpRegions algorithm test */
 
         SRMT ("m707")
-        M707 (TS)
+        M707 (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl
index 67374cb63..34d7ed26f 100644
--- a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl
+++ b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl
@@ -47292,93 +47292,92 @@
 
     Method (RFC0, 0, Serialized)
     {
-        Name (TS, "RFC0")
         /* Check common access: ByteAcc, NoLock, Preserve */
 
         SRMT ("m710")
-        M710 (TS)
+        M710 (__METHOD__)
         /* Check common access: ByteAcc, NoLock, WriteAsOnes */
 
         SRMT ("m711")
-        M711 (TS)
+        M711 (__METHOD__)
         /* Check common access: ByteAcc, NoLock, WriteAsZeros */
 
         SRMT ("m712")
-        M712 (TS)
+        M712 (__METHOD__)
         /* Check common access: WordAcc, NoLock, Preserve */
 
         SRMT ("m713")
-        M713 (TS)
+        M713 (__METHOD__)
         /* Check common access: WordAcc, NoLock, WriteAsOnes */
 
         SRMT ("m714")
-        M714 (TS)
+        M714 (__METHOD__)
         /* Check common access: WordAcc, NoLock, WriteAsZeros */
 
         SRMT ("m715")
-        M715 (TS)
+        M715 (__METHOD__)
         /* Check common access: DWordAcc, NoLock, Preserve */
 
         SRMT ("m716")
-        M716 (TS)
+        M716 (__METHOD__)
         /* Check common access: DWordAcc, NoLock, WriteAsOnes */
 
         SRMT ("m717")
-        M717 (TS)
+        M717 (__METHOD__)
         /* Check common access: DWordAcc, NoLock, WriteAsZeros */
 
         SRMT ("m718")
-        M718 (TS)
+        M718 (__METHOD__)
         /* Check common access: QWordAcc, NoLock, Preserve */
 
         SRMT ("m719")
-        M719 (TS)
+        M719 (__METHOD__)
         /* Check common access: QWordAcc, NoLock, WriteAsOnes */
 
         SRMT ("m71a")
-        M71A (TS)
+        M71A (__METHOD__)
         /* Check common access: QWordAcc, NoLock, WriteAsZeros */
 
         SRMT ("m71b")
-        M71B (TS)
+        M71B (__METHOD__)
         /* Check common access: AnyAcc, NoLock, Preserve */
 
         SRMT ("m71c")
-        M71C (TS)
+        M71C (__METHOD__)
         /* Check common access: AnyAcc, NoLock, WriteAsOnes */
 
         SRMT ("m71d")
-        M71D (TS)
+        M71D (__METHOD__)
         /* Check common access: AnyAcc, NoLock, WriteAsZeros */
 
         SRMT ("m71e")
-        M71E (TS)
+        M71E (__METHOD__)
         /* Check SMBus/BufferAcc access */
 
         SRMT ("m71f")
-        M71F (TS)
+        M71F (__METHOD__)
         /* Check GeneralPurposeIo/ByteAcc access */
 
         SRMT ("m764")
-        M764 (TS)
+        M764 (__METHOD__)
         /* Check IPMI/BufferAcc access */
 
         SRMT ("m768")
-        M768 (TS)
+        M768 (__METHOD__)
         /* Check GenericSerialBus/BufferAcc access */
 
         SRMT ("m740")
-        M740 (TS)
+        M740 (__METHOD__)
         /* Splitting of Fields */
 
         SRMT ("m742")
-        M742 (TS)
+        M742 (__METHOD__)
         /* Long List of Fields */
 
         SRMT ("m743")
-        M743 (TS)
+        M743 (__METHOD__)
         /* Large Offset */
 
         SRMT ("m744")
-        M744 (TS)
+        M744 (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/event.asl b/tests/aslts/src/runtime/collections/functional/synchronization/event.asl
index 48e83fc95..48ffdf165 100644
--- a/tests/aslts/src/runtime/collections/functional/synchronization/event.asl
+++ b/tests/aslts/src/runtime/collections/functional/synchronization/event.asl
@@ -517,9 +517,8 @@
 
     Method (WAI0, 0, Serialized)
     {
-        Name (TS, "WAI0")
         Debug = "TEST: WAI0, Wait for Events"
-        M060 (TS, 0x28, P011, "p011")
+        M060 (__METHOD__, 0x28, P011, "p011")
     }
 
     /* Run-method */
diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl
index 9f62198a4..b086c36dd 100644
--- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl
+++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex.asl
@@ -1461,10 +1461,9 @@
 
     Method (MUX0, 0, Serialized)
     {
-        Name (TS, "MUX0")
         Debug = "TEST: MUX0, Acquire/Release Mutex"
         SRMT ("m032")
-        M032 (TS, 0x38, P010, "p010")
+        M032 (__METHOD__, 0x38, P010, "p010")
         SRMT ("m034")
         M034 ()
     }
diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl
index 6ebf080f4..7bb1b149d 100644
--- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl
+++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl
@@ -67,12 +67,11 @@
         Mutex (MTD0, 0x0D)
         Mutex (MTE0, 0x0E)
         Mutex (MTF0, 0x0F)
-        Name (TS, "m301")
-        CH03 (TS, Z150, 0x00, 0x4F, 0x00)
+        CH03 (__METHOD__, Z150, 0x00, 0x4F, 0x00)
         Local0 = Acquire (MT00, 0xFFFF)
         If (Local0)
         {
-            ERR (TS, Z150, 0x53, 0x00, 0x00, 0x00, Local0)
+            ERR (__METHOD__, Z150, 0x53, 0x00, 0x00, 0x00, Local0)
         }
         Else
         {
@@ -81,112 +80,112 @@
 
             If (Local0)
             {
-                ERR (TS, Z150, 0x57, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x57, 0x00, 0x00, 0x00, Local0)
             }
             Else
             {
                 Local0 = Acquire (MT10, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x5B, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x5B, 0x00, 0x00, 0x00, Local0)
                 }
                 Else
                 {
                     Local0 = Acquire (MT20, 0xFFFF)
                     If (Local0)
                     {
-                        ERR (TS, Z150, 0x5F, 0x00, 0x00, 0x00, Local0)
+                        ERR (__METHOD__, Z150, 0x5F, 0x00, 0x00, 0x00, Local0)
                     }
                     Else
                     {
                         Local0 = Acquire (MT30, 0xFFFF)
                         If (Local0)
                         {
-                            ERR (TS, Z150, 0x63, 0x00, 0x00, 0x00, Local0)
+                            ERR (__METHOD__, Z150, 0x63, 0x00, 0x00, 0x00, Local0)
                         }
                         Else
                         {
                             Local0 = Acquire (MT40, 0xFFFF)
                             If (Local0)
                             {
-                                ERR (TS, Z150, 0x67, 0x00, 0x00, 0x00, Local0)
+                                ERR (__METHOD__, Z150, 0x67, 0x00, 0x00, 0x00, Local0)
                             }
                             Else
                             {
                                 Local0 = Acquire (MT50, 0xFFFF)
                                 If (Local0)
                                 {
-                                    ERR (TS, Z150, 0x6B, 0x00, 0x00, 0x00, Local0)
+                                    ERR (__METHOD__, Z150, 0x6B, 0x00, 0x00, 0x00, Local0)
                                 }
                                 Else
                                 {
                                     Local0 = Acquire (MT60, 0xFFFF)
                                     If (Local0)
                                     {
-                                        ERR (TS, Z150, 0x6F, 0x00, 0x00, 0x00, Local0)
+                                        ERR (__METHOD__, Z150, 0x6F, 0x00, 0x00, 0x00, Local0)
                                     }
                                     Else
                                     {
                                         Local0 = Acquire (MT70, 0xFFFF)
                                         If (Local0)
                                         {
-                                            ERR (TS, Z150, 0x73, 0x00, 0x00, 0x00, Local0)
+                                            ERR (__METHOD__, Z150, 0x73, 0x00, 0x00, 0x00, Local0)
                                         }
                                         Else
                                         {
                                             Local0 = Acquire (MT80, 0xFFFF)
                                             If (Local0)
                                             {
-                                                ERR (TS, Z150, 0x77, 0x00, 0x00, 0x00, Local0)
+                                                ERR (__METHOD__, Z150, 0x77, 0x00, 0x00, 0x00, Local0)
                                             }
                                             Else
                                             {
                                                 Local0 = Acquire (MT90, 0xFFFF)
                                                 If (Local0)
                                                 {
-                                                    ERR (TS, Z150, 0x7B, 0x00, 0x00, 0x00, Local0)
+                                                    ERR (__METHOD__, Z150, 0x7B, 0x00, 0x00, 0x00, Local0)
                                                 }
                                                 Else
                                                 {
                                                     Local0 = Acquire (MTA0, 0xFFFF)
                                                     If (Local0)
                                                     {
-                                                        ERR (TS, Z150, 0x7F, 0x00, 0x00, 0x00, Local0)
+                                                        ERR (__METHOD__, Z150, 0x7F, 0x00, 0x00, 0x00, Local0)
                                                     }
                                                     Else
                                                     {
                                                         Local0 = Acquire (MTB0, 0xFFFF)
                                                         If (Local0)
                                                         {
-                                                            ERR (TS, Z150, 0x83, 0x00, 0x00, 0x00, Local0)
+                                                            ERR (__METHOD__, Z150, 0x83, 0x00, 0x00, 0x00, Local0)
                                                         }
                                                         Else
                                                         {
                                                             Local0 = Acquire (MTC0, 0xFFFF)
                                                             If (Local0)
                                                             {
-                                                                ERR (TS, Z150, 0x87, 0x00, 0x00, 0x00, Local0)
+                                                                ERR (__METHOD__, Z150, 0x87, 0x00, 0x00, 0x00, Local0)
                                                             }
                                                             Else
                                                             {
                                                                 Local0 = Acquire (MTD0, 0xFFFF)
                                                                 If (Local0)
                                                                 {
-                                                                    ERR (TS, Z150, 0x8B, 0x00, 0x00, 0x00, Local0)
+                                                                    ERR (__METHOD__, Z150, 0x8B, 0x00, 0x00, 0x00, Local0)
                                                                 }
                                                                 Else
                                                                 {
                                                                     Local0 = Acquire (MTE0, 0xFFFF)
                                                                     If (Local0)
                                                                     {
-                                                                        ERR (TS, Z150, 0x8F, 0x00, 0x00, 0x00, Local0)
+                                                                        ERR (__METHOD__, Z150, 0x8F, 0x00, 0x00, 0x00, Local0)
                                                                     }
                                                                     Else
                                                                     {
                                                                         Local0 = Acquire (MTF0, 0xFFFF)
                                                                         If (Local0)
                                                                         {
-                                                                            ERR (TS, Z150, 0x93, 0x00, 0x00, 0x00, Local0)
+                                                                            ERR (__METHOD__, Z150, 0x93, 0x00, 0x00, 0x00, Local0)
                                                                         }
                                                                         Else
                                                                         {
@@ -225,7 +224,7 @@
             }
         }
 
-        CH03 (TS, Z150, 0x11, 0xB8, 0x00)
+        CH03 (__METHOD__, Z150, 0x11, 0xB8, 0x00)
     }
 
     /*
@@ -240,8 +239,7 @@
      */
     Method (M369, 1, Serialized)
     {
-        Name (TS, "m369")
-        CH03 (TS, Z150, 0x22, 0xC9, 0x00)
+        CH03 (__METHOD__, Z150, 0x22, 0xC9, 0x00)
         Mutex (MT00, 0x00)
         Mutex (MT10, 0x01)
         Mutex (MT20, 0x02)
@@ -286,7 +284,7 @@
         Local0 = Acquire (MT00, 0xFFFF)
         If (Local0)
         {
-            ERR (TS, Z150, 0xF6, 0x00, 0x00, 0x00, Local0)
+            ERR (__METHOD__, Z150, 0xF6, 0x00, 0x00, 0x00, Local0)
         }
         Else
         {
@@ -295,7 +293,7 @@
 
             If (Local0)
             {
-                ERR (TS, Z150, 0xFA, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0xFA, 0x00, 0x00, 0x00, Local0)
             }
             Else
             {
@@ -304,210 +302,210 @@
 
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0xFE, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0xFE, 0x00, 0x00, 0x00, Local0)
                 }
                 Else
                 {
                     Local0 = Acquire (MT10, 0xFFFF)
                     If (Local0)
                     {
-                        ERR (TS, Z150, 0x0102, 0x00, 0x00, 0x00, Local0)
+                        ERR (__METHOD__, Z150, 0x0102, 0x00, 0x00, 0x00, Local0)
                     }
                     Else
                     {
                         Local0 = Acquire (MT11, 0xFFFF)
                         If (Local0)
                         {
-                            ERR (TS, Z150, 0x0106, 0x00, 0x00, 0x00, Local0)
+                            ERR (__METHOD__, Z150, 0x0106, 0x00, 0x00, 0x00, Local0)
                         }
                         Else
                         {
                             Local0 = Acquire (MT20, 0xFFFF)
                             If (Local0)
                             {
-                                ERR (TS, Z150, 0x010A, 0x00, 0x00, 0x00, Local0)
+                                ERR (__METHOD__, Z150, 0x010A, 0x00, 0x00, 0x00, Local0)
                             }
                             Else
                             {
                                 Local0 = Acquire (MT21, 0xFFFF)
                                 If (Local0)
                                 {
-                                    ERR (TS, Z150, 0x010E, 0x00, 0x00, 0x00, Local0)
+                                    ERR (__METHOD__, Z150, 0x010E, 0x00, 0x00, 0x00, Local0)
                                 }
                                 Else
                                 {
                                     Local0 = Acquire (MT30, 0xFFFF)
                                     If (Local0)
                                     {
-                                        ERR (TS, Z150, 0x0112, 0x00, 0x00, 0x00, Local0)
+                                        ERR (__METHOD__, Z150, 0x0112, 0x00, 0x00, 0x00, Local0)
                                     }
                                     Else
                                     {
                                         Local0 = Acquire (MT31, 0xFFFF)
                                         If (Local0)
                                         {
-                                            ERR (TS, Z150, 0x0116, 0x00, 0x00, 0x00, Local0)
+                                            ERR (__METHOD__, Z150, 0x0116, 0x00, 0x00, 0x00, Local0)
                                         }
                                         Else
                                         {
                                             Local0 = Acquire (MT40, 0xFFFF)
                                             If (Local0)
                                             {
-                                                ERR (TS, Z150, 0x011A, 0x00, 0x00, 0x00, Local0)
+                                                ERR (__METHOD__, Z150, 0x011A, 0x00, 0x00, 0x00, Local0)
                                             }
                                             Else
                                             {
                                                 Local0 = Acquire (MT41, 0xFFFF)
                                                 If (Local0)
                                                 {
-                                                    ERR (TS, Z150, 0x011E, 0x00, 0x00, 0x00, Local0)
+                                                    ERR (__METHOD__, Z150, 0x011E, 0x00, 0x00, 0x00, Local0)
                                                 }
                                                 Else
                                                 {
                                                     Local0 = Acquire (MT50, 0xFFFF)
                                                     If (Local0)
                                                     {
-                                                        ERR (TS, Z150, 0x0122, 0x00, 0x00, 0x00, Local0)
+                                                        ERR (__METHOD__, Z150, 0x0122, 0x00, 0x00, 0x00, Local0)
                                                     }
                                                     Else
                                                     {
                                                         Local0 = Acquire (MT51, 0xFFFF)
                                                         If (Local0)
                                                         {
-                                                            ERR (TS, Z150, 0x0126, 0x00, 0x00, 0x00, Local0)
+                                                            ERR (__METHOD__, Z150, 0x0126, 0x00, 0x00, 0x00, Local0)
                                                         }
                                                         Else
                                                         {
                                                             Local0 = Acquire (MT60, 0xFFFF)
                                                             If (Local0)
                                                             {
-                                                                ERR (TS, Z150, 0x012A, 0x00, 0x00, 0x00, Local0)
+                                                                ERR (__METHOD__, Z150, 0x012A, 0x00, 0x00, 0x00, Local0)
                                                             }
                                                             Else
                                                             {
                                                                 Local0 = Acquire (MT61, 0xFFFF)
                                                                 If (Local0)
                                                                 {
-                                                                    ERR (TS, Z150, 0x012E, 0x00, 0x00, 0x00, Local0)
+                                                                    ERR (__METHOD__, Z150, 0x012E, 0x00, 0x00, 0x00, Local0)
                                                                 }
                                                                 Else
                                                                 {
                                                                     Local0 = Acquire (MT70, 0xFFFF)
                                                                     If (Local0)
                                                                     {
-                                                                        ERR (TS, Z150, 0x0132, 0x00, 0x00, 0x00, Local0)
+                                                                        ERR (__METHOD__, Z150, 0x0132, 0x00, 0x00, 0x00, Local0)
                                                                     }
                                                                     Else
                                                                     {
                                                                         Local0 = Acquire (MT71, 0xFFFF)
                                                                         If (Local0)
                                                                         {
-                                                                            ERR (TS, Z150, 0x0136, 0x00, 0x00, 0x00, Local0)
+                                                                            ERR (__METHOD__, Z150, 0x0136, 0x00, 0x00, 0x00, Local0)
                                                                         }
                                                                         Else
                                                                         {
                                                                             Local0 = Acquire (MT80, 0xFFFF)
                                                                             If (Local0)
                                                                             {
-                                                                                ERR (TS, Z150, 0x013A, 0x00, 0x00, 0x00, Local0)
+                                                                                ERR (__METHOD__, Z150, 0x013A, 0x00, 0x00, 0x00, Local0)
                                                                             }
                                                                             Else
                                                                             {
                                                                                 Local0 = Acquire (MT81, 0xFFFF)
                                                                                 If (Local0)
                                                                                 {
-                                                                                    ERR (TS, Z150, 0x013E, 0x00, 0x00, 0x00, Local0)
+                                                                                    ERR (__METHOD__, Z150, 0x013E, 0x00, 0x00, 0x00, Local0)
                                                                                 }
                                                                                 Else
                                                                                 {
                                                                                     Local0 = Acquire (MT90, 0xFFFF)
                                                                                     If (Local0)
                                                                                     {
-                                                                                        ERR (TS, Z150, 0x0142, 0x00, 0x00, 0x00, Local0)
+                                                                                        ERR (__METHOD__, Z150, 0x0142, 0x00, 0x00, 0x00, Local0)
                                                                                     }
                                                                                     Else
                                                                                     {
                                                                                         Local0 = Acquire (MT91, 0xFFFF)
                                                                                         If (Local0)
                                                                                         {
-                                                                                            ERR (TS, Z150, 0x0146, 0x00, 0x00, 0x00, Local0)
+                                                                                            ERR (__METHOD__, Z150, 0x0146, 0x00, 0x00, 0x00, Local0)
                                                                                         }
                                                                                         Else
                                                                                         {
                                                                                             Local0 = Acquire (MTA0, 0xFFFF)
                                                                                             If (Local0)
                                                                                             {
-                                                                                                ERR (TS, Z150, 0x014A, 0x00, 0x00, 0x00, Local0)
+                                                                                                ERR (__METHOD__, Z150, 0x014A, 0x00, 0x00, 0x00, Local0)
                                                                                             }
                                                                                             Else
                                                                                             {
                                                                                                 Local0 = Acquire (MTA1, 0xFFFF)
                                                                                                 If (Local0)
                                                                                                 {
-                                                                                                    ERR (TS, Z150, 0x014E, 0x00, 0x00, 0x00, Local0)
+                                                                                                    ERR (__METHOD__, Z150, 0x014E, 0x00, 0x00, 0x00, Local0)
                                                                                                 }
                                                                                                 Else
                                                                                                 {
                                                                                                     Local0 = Acquire (MTB0, 0xFFFF)
                                                                                                     If (Local0)
                                                                                                     {
-                                                                                                        ERR (TS, Z150, 0x0152, 0x00, 0x00, 0x00, Local0)
+                                                                                                        ERR (__METHOD__, Z150, 0x0152, 0x00, 0x00, 0x00, Local0)
                                                                                                     }
                                                                                                     Else
                                                                                                     {
                                                                                                         Local0 = Acquire (MTB1, 0xFFFF)
                                                                                                         If (Local0)
                                                                                                         {
-                                                                                                            ERR (TS, Z150, 0x0156, 0x00, 0x00, 0x00, Local0)
+                                                                                                            ERR (__METHOD__, Z150, 0x0156, 0x00, 0x00, 0x00, Local0)
                                                                                                         }
                                                                                                         Else
                                                                                                         {
                                                                                                             Local0 = Acquire (MTC0, 0xFFFF)
                                                                                                             If (Local0)
                                                                                                             {
-                                                                                                                ERR (TS, Z150, 0x015A, 0x00, 0x00, 0x00, Local0)
+                                                                                                                ERR (__METHOD__, Z150, 0x015A, 0x00, 0x00, 0x00, Local0)
                                                                                                             }
                                                                                                             Else
                                                                                                             {
                                                                                                                 Local0 = Acquire (MTC1, 0xFFFF)
                                                                                                                 If (Local0)
                                                                                                                 {
-                                                                                                                    ERR (TS, Z150, 0x015E, 0x00, 0x00, 0x00, Local0)
+                                                                                                                    ERR (__METHOD__, Z150, 0x015E, 0x00, 0x00, 0x00, Local0)
                                                                                                                 }
                                                                                                                 Else
                                                                                                                 {
                                                                                                                     Local0 = Acquire (MTD0, 0xFFFF)
                                                                                                                     If (Local0)
                                                                                                                     {
-                                                                                                                        ERR (TS, Z150, 0x0162, 0x00, 0x00, 0x00, Local0)
+                                                                                                                        ERR (__METHOD__, Z150, 0x0162, 0x00, 0x00, 0x00, Local0)
                                                                                                                     }
                                                                                                                     Else
                                                                                                                     {
                                                                                                                         Local0 = Acquire (MTD1, 0xFFFF)
                                                                                                                         If (Local0)
                                                                                                                         {
-                                                                                                                            ERR (TS, Z150, 0x0166, 0x00, 0x00, 0x00, Local0)
+                                                                                                                            ERR (__METHOD__, Z150, 0x0166, 0x00, 0x00, 0x00, Local0)
                                                                                                                         }
                                                                                                                         Else
                                                                                                                         {
                                                                                                                             Local0 = Acquire (MTE0, 0xFFFF)
                                                                                                                             If (Local0)
                                                                                                                             {
-                                                                                                                                ERR (TS, Z150, 0x016A, 0x00, 0x00, 0x00, Local0)
+                                                                                                                                ERR (__METHOD__, Z150, 0x016A, 0x00, 0x00, 0x00, Local0)
                                                                                                                             }
                                                                                                                             Else
                                                                                                                             {
                                                                                                                                 Local0 = Acquire (MTE1, 0xFFFF)
                                                                                                                                 If (Local0)
                                                                                                                                 {
-                                                                                                                                    ERR (TS, Z150, 0x016E, 0x00, 0x00, 0x00, Local0)
+                                                                                                                                    ERR (__METHOD__, Z150, 0x016E, 0x00, 0x00, 0x00, Local0)
                                                                                                                                 }
                                                                                                                                 Else
                                                                                                                                 {
                                                                                                                                     Local0 = Acquire (MTF0, 0xFFFF)
                                                                                                                                     If (Local0)
                                                                                                                                     {
-                                                                                                                                        ERR (TS, Z150, 0x0172, 0x00, 0x00, 0x00, Local0)
+                                                                                                                                        ERR (__METHOD__, Z150, 0x0172, 0x00, 0x00, 0x00, Local0)
                                                                                                                                     }
                                                                                                                                     Else
                                                                                                                                     {
@@ -522,7 +520,7 @@
 
                                                                                                                                         If (Local0)
                                                                                                                                         {
-                                                                                                                                            ERR (TS, Z150, 0x017A, 0x00, 0x00, 0x00, Local0)
+                                                                                                                                            ERR (__METHOD__, Z150, 0x017A, 0x00, 0x00, 0x00, Local0)
                                                                                                                                         }
                                                                                                                                         Else
                                                                                                                                         {
@@ -599,11 +597,11 @@
 
         If (Arg0)
         {
-            CH04 (TS, 0x01, 0x12, Z150, 0x01C2, 0x00, 0x00) /* AE_LIMIT */
+            CH04 (__METHOD__, 0x01, 0x12, Z150, 0x01C2, 0x00, 0x00) /* AE_LIMIT */
         }
         Else
         {
-            CH03 (TS, Z150, 0x0123, 0x01C4, 0x00)
+            CH03 (__METHOD__, Z150, 0x0123, 0x01C4, 0x00)
         }
     }
 
@@ -635,125 +633,124 @@
         Mutex (MTD0, 0x0D)
         Mutex (MTE0, 0x0E)
         Mutex (MTF0, 0x0F)
-        Name (TS, "m36a")
         Method (M000, 0, NotSerialized)
         {
             Local0 = Acquire (MT00, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x01EC, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x01EC, 0x00, 0x00, 0x00, Local0)
             }
             Else
             {
                 Local0 = Acquire (\_GL, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x01F0, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x01F0, 0x00, 0x00, 0x00, Local0)
                 }
                 Else
                 {
                     Local0 = Acquire (MT10, 0xFFFF)
                     If (Local0)
                     {
-                        ERR (TS, Z150, 0x01F4, 0x00, 0x00, 0x00, Local0)
+                        ERR (__METHOD__, Z150, 0x01F4, 0x00, 0x00, 0x00, Local0)
                     }
                     Else
                     {
                         Local0 = Acquire (MT20, 0xFFFF)
                         If (Local0)
                         {
-                            ERR (TS, Z150, 0x01F8, 0x00, 0x00, 0x00, Local0)
+                            ERR (__METHOD__, Z150, 0x01F8, 0x00, 0x00, 0x00, Local0)
                         }
                         Else
                         {
                             Local0 = Acquire (MT30, 0xFFFF)
                             If (Local0)
                             {
-                                ERR (TS, Z150, 0x01FC, 0x00, 0x00, 0x00, Local0)
+                                ERR (__METHOD__, Z150, 0x01FC, 0x00, 0x00, 0x00, Local0)
                             }
                             Else
                             {
                                 Local0 = Acquire (MT40, 0xFFFF)
                                 If (Local0)
                                 {
-                                    ERR (TS, Z150, 0x0200, 0x00, 0x00, 0x00, Local0)
+                                    ERR (__METHOD__, Z150, 0x0200, 0x00, 0x00, 0x00, Local0)
                                 }
                                 Else
                                 {
                                     Local0 = Acquire (MT50, 0xFFFF)
                                     If (Local0)
                                     {
-                                        ERR (TS, Z150, 0x0204, 0x00, 0x00, 0x00, Local0)
+                                        ERR (__METHOD__, Z150, 0x0204, 0x00, 0x00, 0x00, Local0)
                                     }
                                     Else
                                     {
                                         Local0 = Acquire (MT60, 0xFFFF)
                                         If (Local0)
                                         {
-                                            ERR (TS, Z150, 0x0208, 0x00, 0x00, 0x00, Local0)
+                                            ERR (__METHOD__, Z150, 0x0208, 0x00, 0x00, 0x00, Local0)
                                         }
                                         Else
                                         {
                                             Local0 = Acquire (MT70, 0xFFFF)
                                             If (Local0)
                                             {
-                                                ERR (TS, Z150, 0x020C, 0x00, 0x00, 0x00, Local0)
+                                                ERR (__METHOD__, Z150, 0x020C, 0x00, 0x00, 0x00, Local0)
                                             }
                                             Else
                                             {
                                                 Local0 = Acquire (MT80, 0xFFFF)
                                                 If (Local0)
                                                 {
-                                                    ERR (TS, Z150, 0x0210, 0x00, 0x00, 0x00, Local0)
+                                                    ERR (__METHOD__, Z150, 0x0210, 0x00, 0x00, 0x00, Local0)
                                                 }
                                                 Else
                                                 {
                                                     Local0 = Acquire (MT90, 0xFFFF)
                                                     If (Local0)
                                                     {
-                                                        ERR (TS, Z150, 0x0214, 0x00, 0x00, 0x00, Local0)
+                                                        ERR (__METHOD__, Z150, 0x0214, 0x00, 0x00, 0x00, Local0)
                                                     }
                                                     Else
                                                     {
                                                         Local0 = Acquire (MTA0, 0xFFFF)
                                                         If (Local0)
                                                         {
-                                                            ERR (TS, Z150, 0x0218, 0x00, 0x00, 0x00, Local0)
+                                                            ERR (__METHOD__, Z150, 0x0218, 0x00, 0x00, 0x00, Local0)
                                                         }
                                                         Else
                                                         {
                                                             Local0 = Acquire (MTB0, 0xFFFF)
                                                             If (Local0)
                                                             {
-                                                                ERR (TS, Z150, 0x021C, 0x00, 0x00, 0x00, Local0)
+                                                                ERR (__METHOD__, Z150, 0x021C, 0x00, 0x00, 0x00, Local0)
                                                             }
                                                             Else
                                                             {
                                                                 Local0 = Acquire (MTC0, 0xFFFF)
                                                                 If (Local0)
                                                                 {
-                                                                    ERR (TS, Z150, 0x0220, 0x00, 0x00, 0x00, Local0)
+                                                                    ERR (__METHOD__, Z150, 0x0220, 0x00, 0x00, 0x00, Local0)
                                                                 }
                                                                 Else
                                                                 {
                                                                     Local0 = Acquire (MTD0, 0xFFFF)
                                                                     If (Local0)
                                                                     {
-                                                                        ERR (TS, Z150, 0x0224, 0x00, 0x00, 0x00, Local0)
+                                                                        ERR (__METHOD__, Z150, 0x0224, 0x00, 0x00, 0x00, Local0)
                                                                     }
                                                                     Else
                                                                     {
                                                                         Local0 = Acquire (MTE0, 0xFFFF)
                                                                         If (Local0)
                                                                         {
-                                                                            ERR (TS, Z150, 0x0228, 0x00, 0x00, 0x00, Local0)
+                                                                            ERR (__METHOD__, Z150, 0x0228, 0x00, 0x00, 0x00, Local0)
                                                                         }
                                                                         Else
                                                                         {
                                                                             Local0 = Acquire (MTF0, 0xFFFF)
                                                                             If (Local0)
                                                                             {
-                                                                                ERR (TS, Z150, 0x022C, 0x00, 0x00, 0x00, Local0)
+                                                                                ERR (__METHOD__, Z150, 0x022C, 0x00, 0x00, 0x00, Local0)
                                                                             }
                                                                             Else
                                                                             {
@@ -800,9 +797,9 @@
             Release (MT00)
         }
 
-        CH03 (TS, Z150, 0x12, 0x0257, 0x00)
+        CH03 (__METHOD__, Z150, 0x12, 0x0257, 0x00)
         M000 ()
-        CH03 (TS, Z150, 0x13, 0x0259, 0x00)
+        CH03 (__METHOD__, Z150, 0x13, 0x0259, 0x00)
     }
 
     /*
@@ -833,125 +830,124 @@
         Mutex (MTD0, 0x0D)
         Mutex (MTE0, 0x0E)
         Mutex (MTF0, 0x0F)
-        Name (TS, "m36b")
         Method (M000, 0, NotSerialized)
         {
             Local0 = Acquire (MT00, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x0280, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x0280, 0x00, 0x00, 0x00, Local0)
             }
             Else
             {
                 Local0 = Acquire (\_GL, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0284, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0284, 0x00, 0x00, 0x00, Local0)
                 }
                 Else
                 {
                     Local0 = Acquire (MT10, 0xFFFF)
                     If (Local0)
                     {
-                        ERR (TS, Z150, 0x0288, 0x00, 0x00, 0x00, Local0)
+                        ERR (__METHOD__, Z150, 0x0288, 0x00, 0x00, 0x00, Local0)
                     }
                     Else
                     {
                         Local0 = Acquire (MT20, 0xFFFF)
                         If (Local0)
                         {
-                            ERR (TS, Z150, 0x028C, 0x00, 0x00, 0x00, Local0)
+                            ERR (__METHOD__, Z150, 0x028C, 0x00, 0x00, 0x00, Local0)
                         }
                         Else
                         {
                             Local0 = Acquire (MT30, 0xFFFF)
                             If (Local0)
                             {
-                                ERR (TS, Z150, 0x0290, 0x00, 0x00, 0x00, Local0)
+                                ERR (__METHOD__, Z150, 0x0290, 0x00, 0x00, 0x00, Local0)
                             }
                             Else
                             {
                                 Local0 = Acquire (MT40, 0xFFFF)
                                 If (Local0)
                                 {
-                                    ERR (TS, Z150, 0x0294, 0x00, 0x00, 0x00, Local0)
+                                    ERR (__METHOD__, Z150, 0x0294, 0x00, 0x00, 0x00, Local0)
                                 }
                                 Else
                                 {
                                     Local0 = Acquire (MT50, 0xFFFF)
                                     If (Local0)
                                     {
-                                        ERR (TS, Z150, 0x0298, 0x00, 0x00, 0x00, Local0)
+                                        ERR (__METHOD__, Z150, 0x0298, 0x00, 0x00, 0x00, Local0)
                                     }
                                     Else
                                     {
                                         Local0 = Acquire (MT60, 0xFFFF)
                                         If (Local0)
                                         {
-                                            ERR (TS, Z150, 0x029C, 0x00, 0x00, 0x00, Local0)
+                                            ERR (__METHOD__, Z150, 0x029C, 0x00, 0x00, 0x00, Local0)
                                         }
                                         Else
                                         {
                                             Local0 = Acquire (MT70, 0xFFFF)
                                             If (Local0)
                                             {
-                                                ERR (TS, Z150, 0x02A0, 0x00, 0x00, 0x00, Local0)
+                                                ERR (__METHOD__, Z150, 0x02A0, 0x00, 0x00, 0x00, Local0)
                                             }
                                             Else
                                             {
                                                 Local0 = Acquire (MT80, 0xFFFF)
                                                 If (Local0)
                                                 {
-                                                    ERR (TS, Z150, 0x02A4, 0x00, 0x00, 0x00, Local0)
+                                                    ERR (__METHOD__, Z150, 0x02A4, 0x00, 0x00, 0x00, Local0)
                                                 }
                                                 Else
                                                 {
                                                     Local0 = Acquire (MT90, 0xFFFF)
                                                     If (Local0)
                                                     {
-                                                        ERR (TS, Z150, 0x02A8, 0x00, 0x00, 0x00, Local0)
+                                                        ERR (__METHOD__, Z150, 0x02A8, 0x00, 0x00, 0x00, Local0)
                                                     }
                                                     Else
                                                     {
                                                         Local0 = Acquire (MTA0, 0xFFFF)
                                                         If (Local0)
                                                         {
-                                                            ERR (TS, Z150, 0x02AC, 0x00, 0x00, 0x00, Local0)
+                                                            ERR (__METHOD__, Z150, 0x02AC, 0x00, 0x00, 0x00, Local0)
                                                         }
                                                         Else
                                                         {
                                                             Local0 = Acquire (MTB0, 0xFFFF)
                                                             If (Local0)
                                                             {
-                                                                ERR (TS, Z150, 0x02B0, 0x00, 0x00, 0x00, Local0)
+                                                                ERR (__METHOD__, Z150, 0x02B0, 0x00, 0x00, 0x00, Local0)
                                                             }
                                                             Else
                                                             {
                                                                 Local0 = Acquire (MTC0, 0xFFFF)
                                                                 If (Local0)
                                                                 {
-                                                                    ERR (TS, Z150, 0x02B4, 0x00, 0x00, 0x00, Local0)
+                                                                    ERR (__METHOD__, Z150, 0x02B4, 0x00, 0x00, 0x00, Local0)
                                                                 }
                                                                 Else
                                                                 {
                                                                     Local0 = Acquire (MTD0, 0xFFFF)
                                                                     If (Local0)
                                                                     {
-                                                                        ERR (TS, Z150, 0x02B8, 0x00, 0x00, 0x00, Local0)
+                                                                        ERR (__METHOD__, Z150, 0x02B8, 0x00, 0x00, 0x00, Local0)
                                                                     }
                                                                     Else
                                                                     {
                                                                         Local0 = Acquire (MTE0, 0xFFFF)
                                                                         If (Local0)
                                                                         {
-                                                                            ERR (TS, Z150, 0x02BC, 0x00, 0x00, 0x00, Local0)
+                                                                            ERR (__METHOD__, Z150, 0x02BC, 0x00, 0x00, 0x00, Local0)
                                                                         }
                                                                         Else
                                                                         {
                                                                             Local0 = Acquire (MTF0, 0xFFFF)
                                                                             If (Local0)
                                                                             {
-                                                                                ERR (TS, Z150, 0x02C0, 0x00, 0x00, 0x00, Local0)
+                                                                                ERR (__METHOD__, Z150, 0x02C0, 0x00, 0x00, 0x00, Local0)
                                                                             }
                                                                         }
                                                                     }
@@ -994,11 +990,11 @@
             Release (MT00)
         }
 
-        CH03 (TS, Z150, 0x12, 0x02E9, 0x00)
+        CH03 (__METHOD__, Z150, 0x12, 0x02E9, 0x00)
         M000 ()
-        CH03 (TS, Z150, 0x13, 0x02EB, 0x00)
+        CH03 (__METHOD__, Z150, 0x13, 0x02EB, 0x00)
         M001 ()
-        CH03 (TS, Z150, 0x14, 0x02ED, 0x00)
+        CH03 (__METHOD__, Z150, 0x14, 0x02ED, 0x00)
     }
 
     /*
@@ -1012,7 +1008,6 @@
      */
     Method (M36C, 0, Serialized)
     {
-        Name (TS, "m36c")
         Name (LPN0, 0x00)
         Name (LPC0, 0x00)
         /*
@@ -1025,9 +1020,9 @@
         {
             /* Acquire the first mutex */
 
-            CH03 (TS, Z150, 0x00, 0x0309, 0x00)
+            CH03 (__METHOD__, Z150, 0x00, 0x0309, 0x00)
             M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire N-level mutex */
-            CH03 (TS, Z150, 0x01, 0x030B, 0x00)
+            CH03 (__METHOD__, Z150, 0x01, 0x030B, 0x00)
             /*
              * Attempt to Acquire the second mutex (exception is expected).
              *
@@ -1051,9 +1046,9 @@
 
             }
 
-            CH04 (TS, 0x00, 0x40, Z150, 0x031E, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
+            CH04 (__METHOD__, 0x00, 0x40, Z150, 0x031E, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
             M388 (Arg0, 0x00, 0x00) /* Release */
-            CH03 (TS, Z150, 0x03, 0x0322, 0x00)
+            CH03 (__METHOD__, Z150, 0x03, 0x0322, 0x00)
         }
 
         /*
@@ -1103,25 +1098,24 @@
      */
     Method (M389, 0, Serialized)
     {
-        Name (TS, "m389")
         Name (LPN0, 0x00)
         Name (LPC0, 0x00)
         /* arg0 - level of mutex */
 
         Method (M000, 1, NotSerialized)
         {
-            CH03 (TS, Z150, 0x00, 0x0358, 0x00)
+            CH03 (__METHOD__, Z150, 0x00, 0x0358, 0x00)
             M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire */
             M388 (Arg0, 0x00, 0x00) /* Release */
-            CH03 (TS, Z150, 0x01, 0x035B, 0x00)
+            CH03 (__METHOD__, Z150, 0x01, 0x035B, 0x00)
             /* Attempt to Release free mutex */
 
             M388 (Arg0, 0x00, 0x00) /* Release */
-            CH04 (TS, 0x00, 0x41, Z150, 0x035F, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-            CH03 (TS, Z150, 0x03, 0x0361, 0x00)
+            CH04 (__METHOD__, 0x00, 0x41, Z150, 0x035F, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+            CH03 (__METHOD__, Z150, 0x03, 0x0361, 0x00)
             M36F (Arg0, 0x00, 0x00, 0x00) /* Acquire */
             M388 (Arg0, 0x00, 0x00) /* Release */
-            CH03 (TS, Z150, 0x04, 0x0364, 0x00)
+            CH03 (__METHOD__, Z150, 0x04, 0x0364, 0x00)
         }
 
         LPN0 = MAX0 /* \MAX0 */
@@ -1135,18 +1129,18 @@
 
         /* Separately for GL */
 
-        CH03 (TS, Z150, 0x05, 0x0371, 0x00)
+        CH03 (__METHOD__, Z150, 0x05, 0x0371, 0x00)
         M36F (GLLL, GLIX, 0x00, 0x00) /* Acquire */
         M388 (GLLL, GLIX, 0x00) /* Release */
-        CH03 (TS, Z150, 0x06, 0x0374, 0x00)
+        CH03 (__METHOD__, Z150, 0x06, 0x0374, 0x00)
         /* Attempt to Release free mutex */
 
         M388 (GLLL, GLIX, 0x00) /* Release */
-        CH04 (TS, 0x00, 0x41, Z150, 0x0378, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-        CH03 (TS, Z150, 0x08, 0x037A, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0378, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+        CH03 (__METHOD__, Z150, 0x08, 0x037A, 0x00)
         M36F (GLLL, GLIX, 0x00, 0x00) /* Acquire */
         M388 (GLLL, GLIX, 0x00) /* Release */
-        CH03 (TS, Z150, 0x09, 0x037D, 0x00)
+        CH03 (__METHOD__, Z150, 0x09, 0x037D, 0x00)
     }
 
     /*
@@ -1155,7 +1149,6 @@
      */
     Method (M07B, 0, Serialized)
     {
-        Name (TS, "m07b")
         Mutex (T000, 0x00)
         Mutex (T100, 0x01)
         Mutex (T200, 0x02)
@@ -1174,107 +1167,107 @@
         Mutex (TF00, 0x0F)
         /* First time */
 
-        CH03 (TS, Z150, 0x00, 0x039B, 0x00)
+        CH03 (__METHOD__, Z150, 0x00, 0x039B, 0x00)
         Release (T000)
-        CH04 (TS, 0x00, 0x41, Z150, 0x039D, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-        CH03 (TS, Z150, 0x02, 0x039F, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x039D, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+        CH03 (__METHOD__, Z150, 0x02, 0x039F, 0x00)
         Release (\_GL)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03A1, 0x00, 0x00)
-        CH03 (TS, Z150, 0x04, 0x03A3, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03A1, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x04, 0x03A3, 0x00)
         Release (T100)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03A5, 0x00, 0x00)
-        CH03 (TS, Z150, 0x06, 0x03A7, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03A5, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x06, 0x03A7, 0x00)
         Release (T200)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03A9, 0x00, 0x00)
-        CH03 (TS, Z150, 0x08, 0x03AB, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03A9, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x08, 0x03AB, 0x00)
         Release (T300)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03AD, 0x00, 0x00)
-        CH03 (TS, Z150, 0x0A, 0x03AF, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03AD, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x0A, 0x03AF, 0x00)
         Release (T400)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03B1, 0x00, 0x00)
-        CH03 (TS, Z150, 0x0C, 0x03B3, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03B1, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x0C, 0x03B3, 0x00)
         Release (T500)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03B5, 0x00, 0x00)
-        CH03 (TS, Z150, 0x0E, 0x03B7, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03B5, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x0E, 0x03B7, 0x00)
         Release (T600)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03B9, 0x00, 0x00)
-        CH03 (TS, Z150, 0x10, 0x03BB, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03B9, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x10, 0x03BB, 0x00)
         Release (T700)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03BD, 0x00, 0x00)
-        CH03 (TS, Z150, 0x12, 0x03BF, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03BD, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x12, 0x03BF, 0x00)
         Release (T800)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03C1, 0x00, 0x00)
-        CH03 (TS, Z150, 0x14, 0x03C3, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03C1, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x14, 0x03C3, 0x00)
         Release (T900)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03C5, 0x00, 0x00)
-        CH03 (TS, Z150, 0x16, 0x03C7, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03C5, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x16, 0x03C7, 0x00)
         Release (TA00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03C9, 0x00, 0x00)
-        CH03 (TS, Z150, 0x18, 0x03CB, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03C9, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x18, 0x03CB, 0x00)
         Release (TB00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03CD, 0x00, 0x00)
-        CH03 (TS, Z150, 0x1A, 0x03CF, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03CD, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x1A, 0x03CF, 0x00)
         Release (TC00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03D1, 0x00, 0x00)
-        CH03 (TS, Z150, 0x1C, 0x03D3, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03D1, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x1C, 0x03D3, 0x00)
         Release (TD00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03D5, 0x00, 0x00)
-        CH03 (TS, Z150, 0x1E, 0x03D7, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03D5, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x1E, 0x03D7, 0x00)
         Release (TE00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03D9, 0x00, 0x00)
-        CH03 (TS, Z150, 0x20, 0x03DB, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03D9, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x20, 0x03DB, 0x00)
         Release (TF00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03DD, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03DD, 0x00, 0x00)
         /* Second time */
 
-        CH03 (TS, Z150, 0x22, 0x03E2, 0x00)
+        CH03 (__METHOD__, Z150, 0x22, 0x03E2, 0x00)
         Release (T000)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03E4, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-        CH03 (TS, Z150, 0x24, 0x03E6, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03E4, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+        CH03 (__METHOD__, Z150, 0x24, 0x03E6, 0x00)
         Release (T100)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03E8, 0x00, 0x00)
-        CH03 (TS, Z150, 0x26, 0x03EA, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03E8, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x26, 0x03EA, 0x00)
         Release (T200)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03EC, 0x00, 0x00)
-        CH03 (TS, Z150, 0x28, 0x03EE, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03EC, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x28, 0x03EE, 0x00)
         Release (T300)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03F0, 0x00, 0x00)
-        CH03 (TS, Z150, 0x2A, 0x03F2, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03F0, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x2A, 0x03F2, 0x00)
         Release (T400)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03F4, 0x00, 0x00)
-        CH03 (TS, Z150, 0x2C, 0x03F6, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03F4, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x2C, 0x03F6, 0x00)
         Release (T500)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03F8, 0x00, 0x00)
-        CH03 (TS, Z150, 0x2E, 0x03FA, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03F8, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x2E, 0x03FA, 0x00)
         Release (T600)
-        CH04 (TS, 0x00, 0x41, Z150, 0x03FC, 0x00, 0x00)
-        CH03 (TS, Z150, 0x30, 0x03FE, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x03FC, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x30, 0x03FE, 0x00)
         Release (T700)
-        CH04 (TS, 0x00, 0x41, Z150, 0x0400, 0x00, 0x00)
-        CH03 (TS, Z150, 0x32, 0x0402, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0400, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x32, 0x0402, 0x00)
         Release (T800)
-        CH04 (TS, 0x00, 0x41, Z150, 0x0404, 0x00, 0x00)
-        CH03 (TS, Z150, 0x34, 0x0406, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0404, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x34, 0x0406, 0x00)
         Release (T900)
-        CH04 (TS, 0x00, 0x41, Z150, 0x0408, 0x00, 0x00)
-        CH03 (TS, Z150, 0x36, 0x040A, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0408, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x36, 0x040A, 0x00)
         Release (TA00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x040C, 0x00, 0x00)
-        CH03 (TS, Z150, 0x38, 0x040E, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x040C, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x38, 0x040E, 0x00)
         Release (TB00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x0410, 0x00, 0x00)
-        CH03 (TS, Z150, 0x3A, 0x0412, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0410, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x3A, 0x0412, 0x00)
         Release (TC00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x0414, 0x00, 0x00)
-        CH03 (TS, Z150, 0x3C, 0x0416, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0414, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x3C, 0x0416, 0x00)
         Release (TD00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x0418, 0x00, 0x00)
-        CH03 (TS, Z150, 0x3E, 0x041A, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0418, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x3E, 0x041A, 0x00)
         Release (TE00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x041C, 0x00, 0x00)
-        CH03 (TS, Z150, 0x40, 0x041E, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x041C, 0x00, 0x00)
+        CH03 (__METHOD__, Z150, 0x40, 0x041E, 0x00)
         Release (TF00)
-        CH04 (TS, 0x00, 0x41, Z150, 0x0420, 0x00, 0x00)
+        CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0420, 0x00, 0x00)
     }
 
     /*
@@ -1451,7 +1444,6 @@
      */
     Method (M079, 2, Serialized)
     {
-        Name (TS, "m079")
         Name (LPN0, 0x00)
         Name (LPC0, 0x00)
         Name (LPN1, 0x00)
@@ -1493,7 +1485,7 @@
 
         /* Release */
 
-        CH03 (TS, Z150, 0x00, 0x04FA, 0x00)
+        CH03 (__METHOD__, Z150, 0x00, 0x04FA, 0x00)
         LPN0 = MAX0 /* \MAX0 */
         LPC0 = (MAX0 - 0x01)
         While (LPN0)
@@ -1519,9 +1511,9 @@
         LPC0 = (MAX0 - 0x01)
         While (LPN0)
         {
-            CH03 (TS, Z150, 0x01, 0x0510, 0x00)
+            CH03 (__METHOD__, Z150, 0x01, 0x0510, 0x00)
             M388 (LPC0, IX00, 0x00)
-            CH04 (TS, 0x00, 0x41, Z150, 0x0512, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+            CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0512, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
             LPN0--
             LPC0--
         }
@@ -1550,7 +1542,6 @@
      */
     Method (M0B9, 0, Serialized)
     {
-        Name (TS, "m0b9")
         /* i101 - non-zero means that the test was run */
 
         If (!I101)
@@ -1558,7 +1549,7 @@
             Return (Zero)
         }
 
-        CH03 (TS, Z150, 0x00, 0x0537, 0x00)
+        CH03 (__METHOD__, Z150, 0x00, 0x0537, 0x00)
     }
 
     /*
@@ -1567,8 +1558,7 @@
      */
     Method (M0BB, 0, Serialized)
     {
-        Name (TS, "m0bb")
-        CH03 (TS, Z150, 0x00, 0x0543, 0x00)
+        CH03 (__METHOD__, Z150, 0x00, 0x0543, 0x00)
         Method (M137, 0, NotSerialized)
         {
             Debug = "m137 started"
@@ -1587,7 +1577,7 @@
             I103 = Acquire (T805, 0xFFFF)
             If (I103)
             {
-                ERR (TS, Z150, 0x0557, 0x00, 0x00, 0x00, I103)
+                ERR (__METHOD__, Z150, 0x0557, 0x00, 0x00, 0x00, I103)
             }
 
             Debug = "m13e completed"
@@ -1627,16 +1617,16 @@
         If (I102)
         {
             Debug = "Acquire(T804, 0xffff) failed"
-            ERR (TS, Z150, 0x0575, 0x00, 0x00, 0x00, I102)
+            ERR (__METHOD__, Z150, 0x0575, 0x00, 0x00, 0x00, I102)
         }
 
         If (I103)
         {
             Debug = "Acquire(T805, 0xffff) failed"
-            ERR (TS, Z150, 0x057A, 0x00, 0x00, 0x00, I103)
+            ERR (__METHOD__, Z150, 0x057A, 0x00, 0x00, 0x00, I103)
         }
 
-        CH03 (TS, Z150, 0x04, 0x057D, 0x00)
+        CH03 (__METHOD__, Z150, 0x04, 0x057D, 0x00)
     }
 
     /*
@@ -1649,117 +1639,116 @@
      */
     Method (M07C, 0, Serialized)
     {
-        Name (TS, "m07c")
         /* Acquire and Release operations are in the same method */
 
         Method (M000, 0, NotSerialized)
         {
-            CH03 (TS, Z150, 0x00, 0x058F, 0x00)
+            CH03 (__METHOD__, Z150, 0x00, 0x058F, 0x00)
             /* Acquire all */
 
             Local0 = Acquire (\_GL, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x0595, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x0595, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T000, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x059A, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x059A, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T100, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x059F, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x059F, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T200, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05A4, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05A4, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T300, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05A9, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05A9, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T400, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05AE, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05AE, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T500, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05B3, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05B3, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T600, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05B8, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05B8, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T700, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05BD, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05BD, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T800, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05C2, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05C2, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (T900, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05C7, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05C7, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (TA00, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05CC, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05CC, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (TB00, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05D1, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05D1, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (TC00, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05D6, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05D6, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (TD00, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05DB, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05DB, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (TE00, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05E0, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05E0, 0x00, 0x00, 0x00, Local0)
             }
 
             Local0 = Acquire (TF00, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z150, 0x05E5, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z150, 0x05E5, 0x00, 0x00, 0x00, Local0)
             }
 
-            CH03 (TS, Z150, 0x00, 0x05E8, 0x00)
+            CH03 (__METHOD__, Z150, 0x00, 0x05E8, 0x00)
             /* Release all */
 
             Release (TF00)
@@ -1779,7 +1768,7 @@
             Release (T100)
             Release (T000)
             Release (\_GL)
-            CH03 (TS, Z150, 0x00, 0x05FE, 0x00)
+            CH03 (__METHOD__, Z150, 0x00, 0x05FE, 0x00)
         }
 
         /* Acquire and Release operations are in different methods */
@@ -1788,115 +1777,115 @@
         {
             Method (MM00, 0, NotSerialized)
             {
-                CH03 (TS, Z150, 0x00, 0x0606, 0x00)
+                CH03 (__METHOD__, Z150, 0x00, 0x0606, 0x00)
                 Local0 = Acquire (\_GL, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x060A, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x060A, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T000, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x060F, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x060F, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T100, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0614, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0614, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T200, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0619, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0619, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T300, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x061E, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x061E, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T400, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0623, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0623, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T500, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0628, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0628, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T600, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x062D, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x062D, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T700, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0632, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0632, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T800, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0637, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0637, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (T900, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x063C, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x063C, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (TA00, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0641, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0641, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (TB00, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0646, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0646, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (TC00, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x064B, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x064B, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (TD00, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0650, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0650, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (TE00, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x0655, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x0655, 0x00, 0x00, 0x00, Local0)
                 }
 
                 Local0 = Acquire (TF00, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z150, 0x065A, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z150, 0x065A, 0x00, 0x00, 0x00, Local0)
                 }
 
-                CH03 (TS, Z150, 0x00, 0x065D, 0x00)
+                CH03 (__METHOD__, Z150, 0x00, 0x065D, 0x00)
             }
 
             Method (MM01, 0, NotSerialized)
             {
-                CH03 (TS, Z150, 0x00, 0x0662, 0x00)
+                CH03 (__METHOD__, Z150, 0x00, 0x0662, 0x00)
                 Release (TF00)
                 Release (TE00)
                 Release (TD00)
@@ -1914,62 +1903,62 @@
                 Release (T100)
                 Release (T000)
                 Release (\_GL)
-                CH03 (TS, Z150, 0x00, 0x0676, 0x00)
+                CH03 (__METHOD__, Z150, 0x00, 0x0676, 0x00)
             }
 
             Method (MM02, 0, NotSerialized)
             {
-                CH03 (TS, Z150, 0x00, 0x067B, 0x00)
+                CH03 (__METHOD__, Z150, 0x00, 0x067B, 0x00)
                 Release (TF00)
-                CH04 (TS, 0x00, 0x41, Z150, 0x067D, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x02, 0x067E, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x067D, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x02, 0x067E, 0x00)
                 Release (TE00)
-                CH04 (TS, 0x00, 0x41, Z150, 0x0680, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x04, 0x0681, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0680, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x04, 0x0681, 0x00)
                 Release (TD00)
-                CH04 (TS, 0x00, 0x41, Z150, 0x0683, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x06, 0x0684, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0683, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x06, 0x0684, 0x00)
                 Release (TC00)
-                CH04 (TS, 0x00, 0x41, Z150, 0x0686, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x08, 0x0687, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0686, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x08, 0x0687, 0x00)
                 Release (TB00)
-                CH04 (TS, 0x00, 0x41, Z150, 0x0689, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x0A, 0x068A, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0689, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x0A, 0x068A, 0x00)
                 Release (TA00)
-                CH04 (TS, 0x00, 0x41, Z150, 0x068C, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x0C, 0x068D, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x068C, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x0C, 0x068D, 0x00)
                 Release (T900)
-                CH04 (TS, 0x00, 0x41, Z150, 0x068F, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x0E, 0x0690, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x068F, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x0E, 0x0690, 0x00)
                 Release (T800)
-                CH04 (TS, 0x00, 0x41, Z150, 0x0692, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x10, 0x0693, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0692, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x10, 0x0693, 0x00)
                 Release (T700)
-                CH04 (TS, 0x00, 0x41, Z150, 0x0695, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x12, 0x0696, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0695, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x12, 0x0696, 0x00)
                 Release (T600)
-                CH04 (TS, 0x00, 0x41, Z150, 0x0698, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x14, 0x0699, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x0698, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x14, 0x0699, 0x00)
                 Release (T500)
-                CH04 (TS, 0x00, 0x41, Z150, 0x069B, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x16, 0x069C, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x069B, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x16, 0x069C, 0x00)
                 Release (T400)
-                CH04 (TS, 0x00, 0x41, Z150, 0x069E, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x18, 0x069F, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x069E, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x18, 0x069F, 0x00)
                 Release (T300)
-                CH04 (TS, 0x00, 0x41, Z150, 0x06A1, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x1A, 0x06A2, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06A1, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x1A, 0x06A2, 0x00)
                 Release (T200)
-                CH04 (TS, 0x00, 0x41, Z150, 0x06A4, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x1C, 0x06A5, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06A4, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x1C, 0x06A5, 0x00)
                 Release (T100)
-                CH04 (TS, 0x00, 0x41, Z150, 0x06A7, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x1E, 0x06A8, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06A7, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x1E, 0x06A8, 0x00)
                 Release (T000)
-                CH04 (TS, 0x00, 0x41, Z150, 0x06AA, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
-                CH03 (TS, Z150, 0x20, 0x06AB, 0x00)
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06AA, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH03 (__METHOD__, Z150, 0x20, 0x06AB, 0x00)
                 Release (\_GL)
-                CH04 (TS, 0x00, 0x41, Z150, 0x06AD, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
+                CH04 (__METHOD__, 0x00, 0x41, Z150, 0x06AD, 0x00, 0x00) /* AE_AML_MUTEX_NOT_ACQUIRED */
             }
 
             MM00 ()
@@ -1990,20 +1979,19 @@
      */
     Method (M0BA, 0, Serialized)
     {
-        Name (TS, "m0ba")
-        CH03 (TS, Z150, 0x00, 0x06C3, 0x00)
+        CH03 (__METHOD__, Z150, 0x00, 0x06C3, 0x00)
         /* Add */
 
         Local0 = (Acquire (\_GL, 0xFFFF) + 0x01)
         If ((Local0 != 0x01))
         {
-            ERR (TS, Z150, 0x06C9, 0x00, 0x00, 0x00, Local0)
+            ERR (__METHOD__, Z150, 0x06C9, 0x00, 0x00, 0x00, Local0)
         }
 
         Local0 = (Acquire (T500, 0xFFFF) + 0x01)
         If ((Local0 != 0x01))
         {
-            ERR (TS, Z150, 0x06CE, 0x00, 0x00, 0x00, Local0)
+            ERR (__METHOD__, Z150, 0x06CE, 0x00, 0x00, 0x00, Local0)
         }
 
         Release (T500)
@@ -2013,13 +2001,13 @@
         Local0 = (0x01 - Acquire (\_GL, 0xFFFF))
         If ((Local0 != 0x01))
         {
-            ERR (TS, Z150, 0x06D8, 0x00, 0x00, 0x00, Local0)
+            ERR (__METHOD__, Z150, 0x06D8, 0x00, 0x00, 0x00, Local0)
         }
 
         Local0 = (0x01 - Acquire (T500, 0xFFFF))
         If ((Local0 != 0x01))
         {
-            ERR (TS, Z150, 0x06DD, 0x00, 0x00, 0x00, Local0)
+            ERR (__METHOD__, Z150, 0x06DD, 0x00, 0x00, 0x00, Local0)
         }
 
         Release (T500)
@@ -2028,7 +2016,7 @@
 
         If ((Acquire (T500, 0xFFFF) != 0x00))
         {
-            ERR (TS, Z150, 0x06E6, 0x00, 0x00, 0x00, Local0)
+            ERR (__METHOD__, Z150, 0x06E6, 0x00, 0x00, 0x00, Local0)
         }
 
         Release (T500)
@@ -2039,7 +2027,7 @@
             M08A ()
         }
 
-        CH04 (TS, 0x01, 0x40, Z150, 0x01, 0x00, 0x00)
+        CH04 (__METHOD__, 0x01, 0x40, Z150, 0x01, 0x00, 0x00)
     }
 
     /*
diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl
index 21e663d54..3b7b23cc6 100644
--- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl
+++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex_proc.asl
@@ -44,7 +44,6 @@
      */
     Method (M36D, 1, Serialized)
     {
-        Name (TS, "m36d")
         If ((Arg0 == 0x00))
         {
             Return (Zero)
@@ -53,7 +52,7 @@
         Local0 = Acquire (T000, 0xFFFF)
         If (Local0)
         {
-            ERR (TS, Z151, 0x3A, 0x00, 0x00, 0x00, Local0)
+            ERR (__METHOD__, Z151, 0x3A, 0x00, 0x00, 0x00, Local0)
         }
         Else
         {
@@ -65,7 +64,7 @@
             Local0 = Acquire (\_GL, 0xFFFF)
             If (Local0)
             {
-                ERR (TS, Z151, 0x41, 0x00, 0x00, 0x00, Local0)
+                ERR (__METHOD__, Z151, 0x41, 0x00, 0x00, 0x00, Local0)
             }
             Else
             {
@@ -77,7 +76,7 @@
                 Local0 = Acquire (T100, 0xFFFF)
                 If (Local0)
                 {
-                    ERR (TS, Z151, 0x48, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z151, 0x48, 0x00, 0x00, 0x00, Local0)
                 }
                 Else
                 {
@@ -89,7 +88,7 @@
                     Local0 = Acquire (T200, 0xFFFF)
                     If (Local0)
                     {
-                        ERR (TS, Z151, 0x4F, 0x00, 0x00, 0x00, Local0)
+                        ERR (__METHOD__, Z151, 0x4F, 0x00, 0x00, 0x00, Local0)
                     }
                     Else
                     {
@@ -101,7 +100,7 @@
                         Local0 = Acquire (T300, 0xFFFF)
                         If (Local0)
                         {
-                            ERR (TS, Z151, 0x56, 0x00, 0x00, 0x00, Local0)
+                            ERR (__METHOD__, Z151, 0x56, 0x00, 0x00, 0x00, Local0)
                         }
                         Else
                         {
@@ -113,7 +112,7 @@
                             Local0 = Acquire (T400, 0xFFFF)
                             If (Local0)
                             {
-                                ERR (TS, Z151, 0x5D, 0x00, 0x00, 0x00, Local0)
+                                ERR (__METHOD__, Z151, 0x5D, 0x00, 0x00, 0x00, Local0)
                             }
                             Else
                             {
@@ -125,7 +124,7 @@
                                 Local0 = Acquire (T500, 0xFFFF)
                                 If (Local0)
                                 {
-                                    ERR (TS, Z151, 0x64, 0x00, 0x00, 0x00, Local0)
+                                    ERR (__METHOD__, Z151, 0x64, 0x00, 0x00, 0x00, Local0)
                                 }
                                 Else
                                 {
@@ -137,7 +136,7 @@
                                     Local0 = Acquire (T600, 0xFFFF)
                                     If (Local0)
                                     {
-                                        ERR (TS, Z151, 0x6B, 0x00, 0x00, 0x00, Local0)
+                                        ERR (__METHOD__, Z151, 0x6B, 0x00, 0x00, 0x00, Local0)
                                     }
                                     Else
                                     {
@@ -149,7 +148,7 @@
                                         Local0 = Acquire (T700, 0xFFFF)
                                         If (Local0)
                                         {
-                                            ERR (TS, Z151, 0x72, 0x00, 0x00, 0x00, Local0)
+                                            ERR (__METHOD__, Z151, 0x72, 0x00, 0x00, 0x00, Local0)
                                         }
                                         Else
                                         {
@@ -161,7 +160,7 @@
                                             Local0 = Acquire (T800, 0xFFFF)
                                             If (Local0)
                                             {
-                                                ERR (TS, Z151, 0x79, 0x00, 0x00, 0x00, Local0)
+                                                ERR (__METHOD__, Z151, 0x79, 0x00, 0x00, 0x00, Local0)
                                             }
                                             Else
                                             {
@@ -173,7 +172,7 @@
                                                 Local0 = Acquire (T900, 0xFFFF)
                                                 If (Local0)
                                                 {
-                                                    ERR (TS, Z151, 0x80, 0x00, 0x00, 0x00, Local0)
+                                                    ERR (__METHOD__, Z151, 0x80, 0x00, 0x00, 0x00, Local0)
                                                 }
                                                 Else
                                                 {
@@ -185,7 +184,7 @@
                                                     Local0 = Acquire (TA00, 0xFFFF)
                                                     If (Local0)
                                                     {
-                                                        ERR (TS, Z151, 0x87, 0x00, 0x00, 0x00, Local0)
+                                                        ERR (__METHOD__, Z151, 0x87, 0x00, 0x00, 0x00, Local0)
                                                     }
                                                     Else
                                                     {
@@ -197,7 +196,7 @@
                                                         Local0 = Acquire (TB00, 0xFFFF)
                                                         If (Local0)
                                                         {
-                                                            ERR (TS, Z151, 0x8E, 0x00, 0x00, 0x00, Local0)
+                                                            ERR (__METHOD__, Z151, 0x8E, 0x00, 0x00, 0x00, Local0)
                                                         }
                                                         Else
                                                         {
@@ -209,7 +208,7 @@
                                                             Local0 = Acquire (TC00, 0xFFFF)
                                                             If (Local0)
                                                             {
-                                                                ERR (TS, Z151, 0x95, 0x00, 0x00, 0x00, Local0)
+                                                                ERR (__METHOD__, Z151, 0x95, 0x00, 0x00, 0x00, Local0)
                                                             }
                                                             Else
                                                             {
@@ -221,7 +220,7 @@
                                                                 Local0 = Acquire (TD00, 0xFFFF)
                                                                 If (Local0)
                                                                 {
-                                                                    ERR (TS, Z151, 0x9C, 0x00, 0x00, 0x00, Local0)
+                                                                    ERR (__METHOD__, Z151, 0x9C, 0x00, 0x00, 0x00, Local0)
                                                                 }
                                                                 Else
                                                                 {
@@ -233,7 +232,7 @@
                                                                     Local0 = Acquire (TE00, 0xFFFF)
                                                                     If (Local0)
                                                                     {
-                                                                        ERR (TS, Z151, 0xA3, 0x00, 0x00, 0x00, Local0)
+                                                                        ERR (__METHOD__, Z151, 0xA3, 0x00, 0x00, 0x00, Local0)
                                                                     }
                                                                     Else
                                                                     {
@@ -245,7 +244,7 @@
                                                                         Local0 = Acquire (TF00, 0xFFFF)
                                                                         If (Local0)
                                                                         {
-                                                                            ERR (TS, Z151, 0xAA, 0x00, 0x00, 0x00, Local0)
+                                                                            ERR (__METHOD__, Z151, 0xAA, 0x00, 0x00, 0x00, Local0)
                                                                         }
                                                                         ElseIf ((Arg0 == 0x11))
                                                                         {
diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl
index dd159e8d6..ab6940f2f 100644
--- a/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl
+++ b/tests/aslts/src/runtime/collections/functional/synchronization/serialized.asl
@@ -34,7 +34,6 @@
      */
     Method (M3B0, 0, Serialized)
     {
-        Name (TS, "m3b0")
         Name (I000, 0x00)
         Method (M000, 0, Serialized)
         {
@@ -138,13 +137,13 @@
             Debug = "m016"
             If ((I000 != 0x11))
             {
-                ERR (TS, Z173, 0x3F, 0x00, 0x00, I000, 0x11)
+                ERR (__METHOD__, Z173, 0x3F, 0x00, 0x00, I000, 0x11)
             }
         }
 
-        CH03 (TS, Z173, 0x01, 0x43, 0x00)
+        CH03 (__METHOD__, Z173, 0x01, 0x43, 0x00)
         M000 ()
-        CH03 (TS, Z173, 0x02, 0x45, 0x00)
+        CH03 (__METHOD__, Z173, 0x02, 0x45, 0x00)
     }
 
     /*
@@ -153,7 +152,6 @@
      */
     Method (M3B1, 0, Serialized)
     {
-        Name (TS, "m3b1")
         Name (I000, 0x00)
         Method (M000, 0, Serialized)
         {
@@ -257,13 +255,13 @@
             Debug = "m016"
             If ((I000 != 0x11))
             {
-                ERR (TS, Z173, 0x65, 0x00, 0x00, I000, 0x11)
+                ERR (__METHOD__, Z173, 0x65, 0x00, 0x00, I000, 0x11)
             }
         }
 
-        CH03 (TS, Z173, 0x04, 0x69, 0x00)
+        CH03 (__METHOD__, Z173, 0x04, 0x69, 0x00)
         M000 ()
-        CH03 (TS, Z173, 0x05, 0x6B, 0x00)
+        CH03 (__METHOD__, Z173, 0x05, 0x6B, 0x00)
     }
 
     /*
@@ -272,7 +270,6 @@
      */
     Method (M3B2, 0, Serialized)
     {
-        Name (TS, "m3b2")
         Name (I000, 0x00)
         Name (I001, 0x00)
         Method (M000, 0, Serialized)
@@ -443,20 +440,20 @@
             Debug = "m016"
             If ((I000 != 0x1C))
             {
-                ERR (TS, Z173, 0xA6, 0x00, 0x00, I000, 0x1C)
+                ERR (__METHOD__, Z173, 0xA6, 0x00, 0x00, I000, 0x1C)
             }
 
             I001 = 0xABCD0000
         }
 
-        CH03 (TS, Z173, 0x07, 0xAB, 0x00)
+        CH03 (__METHOD__, Z173, 0x07, 0xAB, 0x00)
         M000 ()
         If ((I001 != 0xABCD0000))
         {
-            ERR (TS, Z173, 0xAF, 0x00, 0x00, I001, 0xABCD0000)
+            ERR (__METHOD__, Z173, 0xAF, 0x00, 0x00, I001, 0xABCD0000)
         }
 
-        CH03 (TS, Z173, 0x09, 0xB1, 0x00)
+        CH03 (__METHOD__, Z173, 0x09, 0xB1, 0x00)
     }
 
     /*
@@ -479,7 +476,6 @@
      */
     Method (M3B3, 3, Serialized)
     {
-        Name (TS, "m3b3")
         Name (I000, 0x00)
         Name (I001, 0x00)
         Name (I002, 0x00)
@@ -802,34 +798,33 @@
             }
         }
 
-        CH03 (TS, Z173, 0x0A, 0x012B, 0x00)
+        CH03 (__METHOD__, Z173, 0x0A, 0x012B, 0x00)
         I000 = Arg0
         I001 = Arg1
         I005 = Arg2
         MM00 (0x00, I000, I001)
         If ((Arg0 > Arg1))
         {
-            CH04 (TS, 0x00, 0x40, Z173, 0x0134, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
+            CH04 (__METHOD__, 0x00, 0x40, Z173, 0x0134, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
         }
         Else
         {
             If ((I003 != Arg0))
             {
-                ERR (TS, Z173, 0x0137, 0x00, 0x00, I003, Arg0)
+                ERR (__METHOD__, Z173, 0x0137, 0x00, 0x00, I003, Arg0)
             }
 
             If ((I004 != Arg1))
             {
-                ERR (TS, Z173, 0x013A, 0x00, 0x00, I004, Arg1)
+                ERR (__METHOD__, Z173, 0x013A, 0x00, 0x00, I004, Arg1)
             }
         }
 
-        CH03 (TS, Z173, 0x0E, 0x013E, 0x00)
+        CH03 (__METHOD__, Z173, 0x0E, 0x013E, 0x00)
     }
 
     Method (M3B4, 0, Serialized)
     {
-        Name (TS, "m3b4")
         Name (LPN0, 0x00)
         Name (LPC0, 0x00)
         Name (LPN1, 0x00)
@@ -860,7 +855,6 @@
      */
     Method (M3B5, 2, Serialized)
     {
-        Name (TS, "m3b5")
         Name (I000, 0x00)
         Name (I001, 0x00)
         Name (I002, 0x00)
@@ -1174,33 +1168,32 @@
             }
         }
 
-        CH03 (TS, Z173, 0x0F, 0x01B0, 0x00)
+        CH03 (__METHOD__, Z173, 0x0F, 0x01B0, 0x00)
         I000 = Arg0
         I001 = Arg1
         MM00 (0x00, I000, I001)
         If ((Arg0 > Arg1))
         {
-            CH04 (TS, 0x00, 0x40, Z173, 0x01B8, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
+            CH04 (__METHOD__, 0x00, 0x40, Z173, 0x01B8, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
         }
         Else
         {
             If ((I003 != Arg0))
             {
-                ERR (TS, Z173, 0x01BB, 0x00, 0x00, I003, Arg0)
+                ERR (__METHOD__, Z173, 0x01BB, 0x00, 0x00, I003, Arg0)
             }
 
             If ((I004 != Arg1))
             {
-                ERR (TS, Z173, 0x01BE, 0x00, 0x00, I004, Arg1)
+                ERR (__METHOD__, Z173, 0x01BE, 0x00, 0x00, I004, Arg1)
             }
         }
 
-        CH03 (TS, Z173, 0x13, 0x01C2, 0x00)
+        CH03 (__METHOD__, Z173, 0x13, 0x01C2, 0x00)
     }
 
     Method (M3B6, 0, Serialized)
     {
-        Name (TS, "m3b6")
         Name (LPN0, 0x00)
         Name (LPC0, 0x00)
         Name (LPN1, 0x00)
@@ -1233,7 +1226,6 @@
      */
     Method (M3B7, 3, Serialized)
     {
-        Name (TS, "m3b5")
         Name (I000, 0x00)
         Name (I001, 0x00)
         Name (I002, 0x00)
@@ -1585,34 +1577,33 @@
             }
         }
 
-        CH03 (TS, Z173, 0x14, 0x025C, 0x00)
+        CH03 (__METHOD__, Z173, 0x14, 0x025C, 0x00)
         I000 = Arg0
         I001 = Arg1
         I005 = Arg2
         MM00 (0x00, I000, I001)
         If ((Arg0 > Arg1))
         {
-            CH04 (TS, 0x00, 0x40, Z173, 0x0265, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
+            CH04 (__METHOD__, 0x00, 0x40, Z173, 0x0265, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
         }
         Else
         {
             If ((I003 != Arg0))
             {
-                ERR (TS, Z173, 0x0268, 0x00, 0x00, I003, Arg0)
+                ERR (__METHOD__, Z173, 0x0268, 0x00, 0x00, I003, Arg0)
             }
 
             If ((I004 != Arg1))
             {
-                ERR (TS, Z173, 0x026B, 0x00, 0x00, I004, Arg1)
+                ERR (__METHOD__, Z173, 0x026B, 0x00, 0x00, I004, Arg1)
             }
         }
 
-        CH03 (TS, Z173, 0x18, 0x026F, 0x00)
+        CH03 (__METHOD__, Z173, 0x18, 0x026F, 0x00)
     }
 
     Method (M3B8, 0, Serialized)
     {
-        Name (TS, "m3b6")
         Name (LPN0, 0x00)
         Name (LPC0, 0x00)
         Name (LPN1, 0x00)
@@ -1645,7 +1636,6 @@
      */
     Method (M3B9, 0, Serialized)
     {
-        Name (TS, "m3b9")
         Name (LPN0, 0x00)
         Name (LPC0, 0x00)
         Name (LPN1, 0x00)
@@ -1680,7 +1670,6 @@
      */
     Method (M3BA, 0, Serialized)
     {
-        Name (TS, "m3ba")
         Name (LPN0, 0x00)
         Name (LPC0, 0x00)
         Name (LPN1, 0x00)
@@ -1732,7 +1721,6 @@
      */
     Method (M3BB, 3, Serialized)
     {
-        Name (TS, "m3bb")
         Name (I000, 0x00)
         Name (I001, 0x00)
         Name (I002, 0x00)
@@ -1996,7 +1984,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x0327, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x0327, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2023,7 +2011,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x0338, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x0338, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2050,7 +2038,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x0349, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x0349, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2077,7 +2065,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x035A, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x035A, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2104,7 +2092,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x036B, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x036B, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2131,7 +2119,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x037C, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x037C, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2158,7 +2146,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x038D, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x038D, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2185,7 +2173,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x039E, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x039E, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2212,7 +2200,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x03AF, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x03AF, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2239,7 +2227,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x03C0, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x03C0, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2266,7 +2254,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x03D1, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x03D1, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2293,7 +2281,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x03E2, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x03E2, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2320,7 +2308,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x03F3, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x03F3, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2347,7 +2335,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x0404, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x0404, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2374,7 +2362,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x0415, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x0415, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2401,7 +2389,7 @@
             {
                 If (Local0)
                 {
-                    ERR (TS, Z173, 0x0426, 0x00, 0x00, 0x00, Local0)
+                    ERR (__METHOD__, Z173, 0x0426, 0x00, 0x00, 0x00, Local0)
                 }
             }
 
@@ -2606,7 +2594,7 @@
             }
         }
 
-        CH03 (TS, Z173, 0x0A, 0x04BE, 0x00)
+        CH03 (__METHOD__, Z173, 0x0A, 0x04BE, 0x00)
         I000 = Arg0
         I001 = Arg1
         I005 = Arg2
@@ -2640,27 +2628,26 @@
 
         If (!Local4)
         {
-            CH04 (TS, 0x01, 0x40, Z173, 0x04D7, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
+            CH04 (__METHOD__, 0x01, 0x40, Z173, 0x04D7, 0x00, 0x00) /* AE_AML_MUTEX_ORDER */
         }
         Else
         {
             If ((I003 != Arg0))
             {
-                ERR (TS, Z173, 0x04DA, 0x00, 0x00, I003, Arg0)
+                ERR (__METHOD__, Z173, 0x04DA, 0x00, 0x00, I003, Arg0)
             }
 
             If ((I004 != Arg1))
             {
-                ERR (TS, Z173, 0x04DD, 0x00, 0x00, I004, Arg1)
+                ERR (__METHOD__, Z173, 0x04DD, 0x00, 0x00, I004, Arg1)
             }
         }
 
-        CH03 (TS, Z173, 0x0E, 0x04E1, 0x00)
+        CH03 (__METHOD__, Z173, 0x0E, 0x04E1, 0x00)
     }
 
     Method (M3BC, 0, Serialized)
     {
-        Name (TS, "m3bc")
         Name (LPN0, 0x00)
         Name (LPC0, 0x00)
         Name (LPN1, 0x00)
diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl
index dbe7f625f..cfb378eee 100644
--- a/tests/aslts/src/runtime/collections/functional/table/load.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/load.asl
@@ -2436,111 +2436,109 @@ Local2 = Buffer (0x0A)
 
     Method (TLD0, 0, Serialized)
     {
-        Name (TS, "TLD0")
         /* Loading SSDT from a SystemMemory OpRegion, */
         /* different targets for DDBHandle */
-        CH03 (TS, Z174, 0x0200, 0x084F, 0x00)
+        CH03 (__METHOD__, Z174, 0x0200, 0x084F, 0x00)
         /* Named Objects */
 
         SRMT ("TLD0.tst0")
-        \DTM0.TST0 (TS)
-        CH03 (TS, Z174, 0x0201, 0x0855, 0x00)
+        \DTM0.TST0 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0201, 0x0855, 0x00)
         /* LocalX Object */
 
         SRMT ("TLD0.tst1")
-        \DTM0.TST1 (TS)
-        CH03 (TS, Z174, 0x0202, 0x085B, 0x00)
+        \DTM0.TST1 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0202, 0x085B, 0x00)
         /* Package element */
 
         SRMT ("TLD0.tst2")
-        \DTM0.TST2 (TS)
-        CH03 (TS, Z174, 0x0203, 0x0861, 0x00)
+        \DTM0.TST2 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0203, 0x0861, 0x00)
         /* By Reference in ArgX */
 
         SRMT ("TLD0.tst3")
-        \DTM0.TST3 (TS)
+        \DTM0.TST3 (__METHOD__)
         /* Loading SSDT from a Field of an OpRegion of any type, */
         /* different targets for DDBHandle */
-        CH03 (TS, Z174, 0x0204, 0x086A, 0x00)
+        CH03 (__METHOD__, Z174, 0x0204, 0x086A, 0x00)
         /* SystemMemory Region */
 
         SRMT ("TLD0.tst4")
-        \DTM0.TST4 (TS)
-        CH03 (TS, Z174, 0x0205, 0x0870, 0x00)
+        \DTM0.TST4 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0205, 0x0870, 0x00)
         /* SystemIO Region */
 
         SRMT ("TLD0.tst5")
-        \DTM0.TST5 (TS)
-        CH03 (TS, Z174, 0x0206, 0x0876, 0x00)
+        \DTM0.TST5 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0206, 0x0876, 0x00)
         /* EmbeddedControl Region */
 
         SRMT ("TLD0.tst6")
-        \DTM0.TST6 (TS)
-        CH03 (TS, Z174, 0x0207, 0x087C, 0x00)
+        \DTM0.TST6 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0207, 0x087C, 0x00)
         /* User defined Region */
 
         SRMT ("TLD0.tst7")
-        \DTM0.TST7 (TS)
-        CH03 (TS, Z174, 0x0208, 0x0882, 0x00)
+        \DTM0.TST7 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0208, 0x0882, 0x00)
         /* Check that "namespace location to load the Definition Block */
         /* is relative to the current namespace" scope, */
         SRMT ("TLD0.tst8")
-        \DTM0.TST8 (TS)
-        CH03 (TS, Z174, 0x0209, 0x0889, 0x00)
+        \DTM0.TST8 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x0209, 0x0889, 0x00)
         /* Check global and dynamic declarations of OpRegions */
         /* and the appropriate _REG Methods invocation for the */
         /* loaded SSDT */
         SRMT ("TLD0.tst9")
-        \DTM0.TST9 (TS)
-        CH03 (TS, Z174, 0x020A, 0x0891, 0x00)
+        \DTM0.TST9 (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x020A, 0x0891, 0x00)
         /* Object of any type can be used as the DDBHandle argument */
 
         SRMT ("TLD0.tstg")
-        \DTM0.TSTG (TS)
-        CH03 (TS, Z174, 0x020B, 0x0897, 0x00)
+        \DTM0.TSTG (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x020B, 0x0897, 0x00)
         /* Loading a number of different SSDTs */
 
         SRMT ("TLD0.tsta")
         If (Y261)
         {
-            \DTM0.TSTA (TS, 0xF0)
+            \DTM0.TSTA (__METHOD__, 0xF0)
         }
         Else
         {
             BLCK ()
         }
 
-        CH03 (TS, Z174, 0x020C, 0x08A1, 0x00)
+        CH03 (__METHOD__, Z174, 0x020C, 0x08A1, 0x00)
         /* Recursive Load in module level */
 
         SRMT ("TLD0.tstk")
-        \DTM0.TSTK (TS)
-        CH03 (TS, Z174, 0x020D, 0x08A7, 0x00)
+        \DTM0.TSTK (__METHOD__)
+        CH03 (__METHOD__, Z174, 0x020D, 0x08A7, 0x00)
     }
 
     /* Exceptional conditions */
 
     Method (TLD1, 0, Serialized)
     {
-        Name (TS, "TLD1")
         /* Exceptions when the Object argument does not refer to */
         /* an operation region field or an operation region */
         SRMT ("TLD1.tstb")
-        \DTM0.TSTB (TS)
+        \DTM0.TSTB (__METHOD__)
         /* Exceptions when the an OpRegion passed as the Object */
         /* parameter of Load is not of SystemMemory type */
         SRMT ("TLD1.tstc")
-        \DTM0.TSTC (TS)
+        \DTM0.TSTC (__METHOD__)
         /* Exceptions when the table contained in an OpRegion */
         /* (Field) is not an SSDT */
         SRMT ("TLD1.tstd")
-        \DTM0.TSTD (TS)
+        \DTM0.TSTD (__METHOD__)
         /* Exceptions when the length of the supplied SSDT is greater */
         /* than the length of the respective OpRegion or Region Field, */
         SRMT ("TLD1.tste.0")
         If (Y284)
         {
-            \DTM0.TSTE (TS, 0x00)
+            \DTM0.TSTE (__METHOD__, 0x00)
         }
         Else
         {
@@ -2550,17 +2548,17 @@ Local2 = Buffer (0x0A)
         /* Exceptions when the length of the supplied SSDT is */
         /* less than the length of the Table Header */
         SRMT ("TLD1.tste.1")
-        \DTM0.TSTE (TS, 0x01)
+        \DTM0.TSTE (__METHOD__, 0x01)
         /* Exceptions when the checksum of the supplied SSDT is invalid */
 
         SRMT ("TLD1.tstf")
-        \DTM0.TSTF (TS)
+        \DTM0.TSTF (__METHOD__)
         /* AE_OWNER_ID_LIMIT exception when too many Tables loaded */
 
         SRMT ("TLD1.tsth")
         If (Y294)
         {
-            \DTM0.TSTH (TS, 0x00)
+            \DTM0.TSTH (__METHOD__, 0x00)
         }
         Else
         {
@@ -2570,9 +2568,9 @@ Local2 = Buffer (0x0A)
         /* Exception when SSDT specified as the Object parameter */
         /* of the Load operator is already loaded */
         SRMT ("TLD1.tsti")
-        \DTM0.TSTI (TS)
+        \DTM0.TSTI (__METHOD__)
         /* Exception when there already is an previously created Object */
         /* referred by the namepath of the new Object in the Table loaded */
         SRMT ("TLD1.tstj")
-        \DTM0.TSTJ (TS)
+        \DTM0.TSTJ (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl
index a9a5ad013..5b17fc83c 100644
--- a/tests/aslts/src/runtime/collections/functional/table/loadtable.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/loadtable.asl
@@ -2402,105 +2402,103 @@
 
     Method (TLT0, 0, Serialized)
     {
-        Name (TS, "TLT0")
-        CH03 (TS, Z176, 0x0200, 0x0890, 0x00)
+        CH03 (__METHOD__, Z176, 0x0200, 0x0890, 0x00)
         /* Simple Loadtable test */
 
         SRMT ("TLT0.tst0")
-        \DTM2.TST0 (TS)
-        CH03 (TS, Z176, 0x0201, 0x0896, 0x00)
+        \DTM2.TST0 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0201, 0x0896, 0x00)
         /* All comparisons of Loadtable parameters are case sensitive, */
         /* if no table matches the specified parameters, then 0 is returned */
         SRMT ("TLT0.tst1")
-        \DTM2.TST1 (TS)
-        CH03 (TS, Z176, 0x0202, 0x089D, 0x00)
+        \DTM2.TST1 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0202, 0x089D, 0x00)
         /* Any of the RootPathString, ParameterPathString, and ParameterData */
         /* parameters in LoadTable expression can be omitted */
         SRMT ("TLT0.tst2")
-        \DTM2.TST2 (TS)
-        CH03 (TS, Z176, 0x0203, 0x08A4, 0x00)
+        \DTM2.TST2 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0203, 0x08A4, 0x00)
         /* Different sources of the String parameters: Named Objects, LocalX, */
         /* ArgX, elements of Packages, results of functions, any TermArg */
         SRMT ("TLT0.tst3")
-        \DTM2.TST3 (TS)
-        CH03 (TS, Z176, 0x0204, 0x08AB, 0x00)
+        \DTM2.TST3 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0204, 0x08AB, 0x00)
         /* Different sources of the optional parameters (RootPathString, */
         /* ParameterPathString, and ParameterData): Named Objects, LocalX, */
         /* ArgX, elements of Packages, results of functions, any TermArg */
         SRMT ("TLT0.tst4")
-        \DTM2.TST4 (TS)
-        CH03 (TS, Z176, 0x0205, 0x08B3, 0x00)
+        \DTM2.TST4 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0205, 0x08B3, 0x00)
         /* Namespace location to load the Definition Block is determined */
         /* by the RootPathString parameter of Loadtable */
         SRMT ("TLT0.tst5.0")
-        \DTM2.TST5 (TS, "\\DTM2.DEVR")
-        CH03 (TS, Z176, 0x0206, 0x08BA, 0x00)
+        \DTM2.TST5 (__METHOD__, "\\DTM2.DEVR")
+        CH03 (__METHOD__, Z176, 0x0206, 0x08BA, 0x00)
         /* The RootPathString value is evaluated using normal scoping rules, */
         /* assuming that the scope of the LoadTable operator is the current */
         /* scope */
         SRMT ("TLT0.tst5.1")
-        \DTM2.TST5 (TS, "^DEVR")
-        CH03 (TS, Z176, 0x0207, 0x08C2, 0x00)
+        \DTM2.TST5 (__METHOD__, "^DEVR")
+        CH03 (__METHOD__, Z176, 0x0207, 0x08C2, 0x00)
         /* "\" is assumed to be Namespace location to load the Definition */
         /* Block if RootPathString parameter is not specified */
         SRMT ("TLT0.tst6")
-        \DTM2.TST6 (TS)
-        CH03 (TS, Z176, 0x0208, 0x08C9, 0x00)
+        \DTM2.TST6 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0208, 0x08C9, 0x00)
         /* If the first character of ParameterPathString is a backslash */
         /* or caret character, then the path of the object set up on success */
         /* is ParameterPathString. It is RootPathString.ParameterPathString */
         /* in any case. */
         SRMT ("TLT0.tst7")
-        \DTM2.TST7 (TS)
-        CH03 (TS, Z176, 0x0209, 0x08D2, 0x00)
+        \DTM2.TST7 (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x0209, 0x08D2, 0x00)
         /* Implicit operand conversion of the parameters specified to be strings */
 
         SRMT ("TLT0.tste")
-        \DTM2.TSTE (TS)
-        CH03 (TS, Z176, 0x020A, 0x08D8, 0x00)
+        \DTM2.TSTE (__METHOD__)
+        CH03 (__METHOD__, Z176, 0x020A, 0x08D8, 0x00)
         /* LoadTable returns 0 if some SSDT matching the LoadTable */
         /* parameters is originally not listed in XSDT */
         /*SRMT("TLT0.tstf") */
         /*\DTM2.tstf(ts) */
-        CH03 (TS, Z176, 0x020B, 0x08DF, 0x00)
+        CH03 (__METHOD__, Z176, 0x020B, 0x08DF, 0x00)
     }
 
     /* Exceptional conditions */
 
     Method (TLT1, 0, Serialized)
     {
-        Name (TS, "TLT1")
         /* Exceptions when the SignatureString is greater than four characters, */
         /* the OEMIDString is greater than six characters, or the OEMTableID is */
         /* greater than eight characters */
         SRMT ("TLT1.tst8")
-        \DTM2.TST8 (TS)
+        \DTM2.TST8 (__METHOD__)
         /* Exceptions when some DSDT or SSDT matching the LoadTable parameters */
         /* is already loaded (actually on initial loading of tables listed in XSDT) */
         SRMT ("TLT1.tst9")
-        \DTM2.TST9 (TS)
+        \DTM2.TST9 (__METHOD__)
         /* Exceptions when the matched table is already loaded */
 
         SRMT ("TLT1.tsta")
-        \DTM2.TSTA (TS)
+        \DTM2.TSTA (__METHOD__)
         /* Exceptions when there already is an previously loaded Object */
         /* referred by the path in the Namespace */
         SRMT ("TLT1.tstb")
-        \DTM2.TSTB (TS)
+        \DTM2.TSTB (__METHOD__)
         /* Exceptions when the object specified by the ParameterPathString */
         /* does not exist */
         SRMT ("TLT1.tstc")
-        \DTM2.TSTC (TS)
+        \DTM2.TSTC (__METHOD__)
         /* Exceptions when storing of data of the ParameterData data type */
         /* to the specified object is not allowed. */
         SRMT ("TLT1.tstd")
-        \DTM2.TSTD (TS)
+        \DTM2.TSTD (__METHOD__)
         /* AE_OWNER_ID_LIMIT exception when too many Tables loaded */
 
         SRMT ("TLT1.tstg")
         If (Y294)
         {
-            \DTM2.TSTG (TS)
+            \DTM2.TSTG (__METHOD__)
         }
         Else
         {
@@ -2510,9 +2508,9 @@
         /* Exceptions when the parameter of the Loadtable operator */
         /* is of incorrect types */
         SRMT ("TLT1.tsth")
-        \DTM2.TSTH (TS)
+        \DTM2.TSTH (__METHOD__)
         /* Exceptions when the ParameterData parameter of the Loadtable operator */
         /* can not be saved into the Object referred by ParameterPathString */
         SRMT ("TLT1.tsti")
-        \DTM2.TSTI (TS)
+        \DTM2.TSTI (__METHOD__)
     }
diff --git a/tests/aslts/src/runtime/collections/functional/table/unload.asl b/tests/aslts/src/runtime/collections/functional/table/unload.asl
index b9076ba71..314e72739 100644
--- a/tests/aslts/src/runtime/collections/functional/table/unload.asl
+++ b/tests/aslts/src/runtime/collections/functional/table/unload.asl
@@ -770,42 +770,40 @@
 
     Method (TUL0, 0, Serialized)
     {
-        Name (TS, "TUL0")
-        CH03 (TS, Z175, 0x0200, 0x028B, 0x00)
+        CH03 (__METHOD__, Z175, 0x0200, 0x028B, 0x00)
         /* Different Sources to specify DDBHandle for UnLoad. */
         /* Most of them (Named Object, LocalX, ArgX, Derefof) */
         /* are checked in load.asl */
         /* DDBHandle returned by Method call */
         SRMT ("TUL0.tst0")
-        \DTM1.TST0 (TS)
-        CH03 (TS, Z175, 0x0201, 0x0294, 0x00)
+        \DTM1.TST0 (__METHOD__)
+        CH03 (__METHOD__, Z175, 0x0201, 0x0294, 0x00)
         /* All namespace objects created as a result of the corresponding */
         /* Load operation are absent in the namespace after UnLoad */
         SRMT ("TUL0.tst1")
-        \DTM1.TST1 (TS)
-        CH03 (TS, Z175, 0x0202, 0x029B, 0x00)
+        \DTM1.TST1 (__METHOD__)
+        CH03 (__METHOD__, Z175, 0x0202, 0x029B, 0x00)
         /* Load/UnLoad processing can be done with the same table many times */
 
         SRMT ("TUL0.tst2")
-        \DTM1.TST2 (TS)
-        CH03 (TS, Z175, 0x0203, 0x02A1, 0x00)
+        \DTM1.TST2 (__METHOD__)
+        CH03 (__METHOD__, Z175, 0x0203, 0x02A1, 0x00)
     }
 
     /* Exceptional conditions */
 
     Method (TUL1, 0, Serialized)
     {
-        Name (TS, "TUL1")
         /* Exceptions when the parameter of the UnLoad operator */
         /* is not of DDBHandle type */
         SRMT ("TUL1.tst3")
-        \DTM1.TST3 (TS)
+        \DTM1.TST3 (__METHOD__)
         /* Exceptions when UnLoad is executed with the same DDBHandle repeatedly */
 
         SRMT ("TUL1.tst4")
         If (Y292)
         {
-            \DTM1.TST4 (TS)
+            \DTM1.TST4 (__METHOD__)
         }
         Else
         {
@@ -815,5 +813,5 @@
         /* Exceptions when the operand of UnLoad operator is absent */
 
         SRMT ("TUL1.tst5")
-        \DTM1.TST5 (TS)
+        \DTM1.TST5 (__METHOD__)
     }