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>

25 files changed, 1028 insertions, 1091 deletions

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 */