From ee8645d6a8e89d463697a773881f0b317fedb3c1 Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3@ahs3.net>
Date: Oct 04 2016 22:39:43 +0000
Subject: Merge tag 'upstream/20160930'


Upstream version 20160930

---

diff --git a/changes.txt b/changes.txt
index 3e87f12..49c88a4 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,83 @@
 ----------------------------------------
+30 September 2016. Summary of changes for version 20160930:
+
+
+1) ACPICA kernel-resident subsystem:
+
+Fixed a regression in the internal AcpiTbFindTable function where a non 
+AE_OK exception could inadvertently be returned even if the function did 
+not fail. This problem affects the following operators:
+    DataTableRegion
+    LoadTable
+
+Fixed a regression in the LoadTable operator where a load to any 
+namespace location other than the root no longer worked properly.
+
+Increased the maximum loop count value that will result in the 
+AE_AML_INFINITE_LOOP exception. This is a mechanism that is intended to 
+prevent infinite loops within the AML interpreter and thus the host OS 
+kernel. The value is increased from 0xFFFF to 0xFFFFF loops (65,535 to 
+1,048,575).
+
+Moved the AcpiGbl_MaxLoopIterations configuration variable to the public 
+acpixf.h file. This allows hosts to easily configure the maximum loop 
+count at runtime.
+
+Removed an illegal character in the strtoul64.c file. This character 
+caused errors with some C compilers.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 9.0 32-bit compiler. The 
+debug version of the code includes the debug output trace mechanism and 
+has a much larger code and data size.
+
+  Current Release:
+    Non-Debug Version: 140.4K Code, 58.1K Data, 198.5K Total
+    Debug Version:     200.7K Code, 82.1K Data, 282.8K Total
+  Previous Release:
+    Non-Debug Version: 140.0K Code, 58.1K Data, 198.1K Total
+    Debug Version:     200.3K Code, 82.1K Data, 282.4K Total
+
+
+2) iASL Compiler/Disassembler and Tools:
+
+Disassembler: Fixed a problem with the conversion of Else{If{ blocks into 
+the simpler ASL ElseIf keyword. During the conversion, a trailing If 
+block could be lost and missing from the disassembled output.
+
+iASL: Fixed a missing parser rule for the ObjectType operator. For ASL+, 
+the missing rule caused a parse error when using the Index operator as an 
+operand to ObjectType. This construct now compiles properly. Example:
+    ObjectType(PKG1[4]).
+
+iASL: Correctly handle unresolved symbols in the hardware map file (-lm 
+option). Previously, unresolved symbols could cause a protection fault. 
+Such symbols are now marked as unresolved in the map file.
+
+iASL: Implemented support to allow control method invocations as an 
+operand to the ASL DeRefOf operator. Example:
+    DeRefOf(MTH1(Local0))
+
+Disassembler: Improved support for the ToPLD ASL macro. Detection of a 
+possible _PLD buffer now includes examination of both the normal buffer 
+length (16 or 20) as well as the surrounding AML package length.
+
+Disassembler: Fixed a problem with the decoding of complex expressions 
+within the Divide operator for ASL+. For the case where both the quotient 
+and remainder targets are specified, the entire statement cannot be 
+disassembled. Previously, the output incorrectly contained a mix of ASL- 
+and ASL+ operators. This mixed statement causes a syntax error when 
+compiled. Example:
+    Divide (Add (INT1, 6), 128, RSLT, QUOT)  // was incorrectly 
+disassembled to:
+    Divide (INT1 + 6, 128, RSLT, QUOT)
+
+iASL/Tools: Added support to process AML and non-AML ACPI tables 
+consistently. For the disassembler and AcpiExec, allow all types of ACPI 
+tables (AML and data tables). For the iASL -e option, allow only AML 
+tables (DSDT/SSDT).
+
+----------------------------------------
 31 August 2016. Summary of changes for version 20160831:
 
 
diff --git a/source/common/acfileio.c b/source/common/acfileio.c
index c2ae855..409e16f 100644
--- a/source/common/acfileio.c
+++ b/source/common/acfileio.c
@@ -262,12 +262,14 @@ AcGetOneTableFromFile (
         return (Status);
     }
 
+
     if (GetOnlyAmlTables)
     {
-        /* Table must be an AML table (DSDT/SSDT) or FADT */
-
-        if (!ACPI_COMPARE_NAME (TableHeader.Signature, ACPI_SIG_FADT) &&
-            !AcpiUtIsAmlTable (&TableHeader))
+        /*
+         * Table must be an AML table (DSDT/SSDT).
+         * Used for iASL -e option only.
+         */
+        if (!AcpiUtIsAmlTable (&TableHeader))
         {
             fprintf (stderr,
                 "    %s: Table [%4.4s] is not an AML table - ignoring\n",
diff --git a/source/compiler/aslmaputils.c b/source/compiler/aslmaputils.c
index ebdab7d..1ba7040 100644
--- a/source/compiler/aslmaputils.c
+++ b/source/compiler/aslmaputils.c
@@ -80,6 +80,12 @@ MpGetHidFromParseTree (
 
 
     Op = HidNode->Op;
+    if (!Op)
+    {
+        /* Object is not resolved, probably an External */
+
+        return ("Unresolved Symbol - referenced but not defined in this table");
+    }
 
     switch (Op->Asl.ParseOpcode)
     {
diff --git a/source/compiler/asloperands.c b/source/compiler/asloperands.c
index 3f84114..1b8eb87 100644
--- a/source/compiler/asloperands.c
+++ b/source/compiler/asloperands.c
@@ -351,6 +351,20 @@ OpnDoFieldCommon (
             NewBitOffset = (UINT32) PkgLengthNode->Asl.Value.Integer;
             CurrentBitOffset += NewBitOffset;
 
+            if ((NewBitOffset == 0) &&
+                (Next->Asl.ParseOpcode == PARSEOP_RESERVED_BYTES))
+            {
+                /*
+                 * Unnamed field with a bit length of zero. We can
+                 * safely just ignore this. However, we will not ignore
+                 * a named field of zero length, we don't want to just
+                 * toss out a name.
+                 */
+                Next->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG;
+                PkgLengthNode->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG;
+                break;
+            }
+
             /* Save the current AccessAs value for error checking later */
 
             switch (AccessType)
diff --git a/source/compiler/asloptions.c b/source/compiler/asloptions.c
index b9d4e3c..4f12945 100644
--- a/source/compiler/asloptions.c
+++ b/source/compiler/asloptions.c
@@ -561,6 +561,13 @@ AslDoOptions (
             Gbl_CompileTimesFlag = TRUE;
             break;
 
+        case 'd':
+
+            /* Disable disassembler code optimizations */
+
+            AcpiGbl_DoDisassemblerOptimizations = FALSE;
+            break;
+
         case 'e':
 
             /* iASL: Disable External opcode generation */
diff --git a/source/compiler/aslrules.y b/source/compiler/aslrules.y
index a7a41e2..2cb972f 100644
--- a/source/compiler/aslrules.y
+++ b/source/compiler/aslrules.y
@@ -530,7 +530,7 @@ ObjectTypeName
     | RefOfTerm                     {}
     | DerefOfTerm                   {}
     | IndexTerm                     {}
-
+    | IndexExpTerm                  {}
 /*    | MethodInvocationTerm          {} */  /* Caused reduce/reduce with Type6Opcode->MethodInvocationTerm */
     ;
 
diff --git a/source/compiler/aslxref.c b/source/compiler/aslxref.c
index a2cb6b3..b8c7835 100644
--- a/source/compiler/aslxref.c
+++ b/source/compiler/aslxref.c
@@ -826,16 +826,18 @@ XfNamespaceLocateBegin (
         /*
          * A reference to a method within one of these opcodes is not an
          * invocation of the method, it is simply a reference to the method.
+         *
+         * September 2016: Removed DeRefOf from this list
          */
         if ((Op->Asl.Parent) &&
-           ((Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_REFOF)      ||
-            (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_DEREFOF)    ||
+            ((Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_REFOF)     ||
             (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_PACKAGE)    ||
             (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_VAR_PACKAGE)||
             (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_OBJECTTYPE)))
         {
             return_ACPI_STATUS (AE_OK);
         }
+
         /*
          * There are two types of method invocation:
          * 1) Invocation with arguments -- the parser recognizes this
diff --git a/source/components/disassembler/dmbuffer.c b/source/components/disassembler/dmbuffer.c
index 79c37e2..4292050 100644
--- a/source/components/disassembler/dmbuffer.c
+++ b/source/components/disassembler/dmbuffer.c
@@ -529,7 +529,8 @@ AcpiDmIsStringBuffer (
  *
  * PARAMETERS:  Op                  - Buffer Object to be examined
  *
- * RETURN:      TRUE if buffer contains a ASCII string, FALSE otherwise
+ * RETURN:      TRUE if buffer appears to contain data produced via the
+ *              ToPLD macro, FALSE otherwise
  *
  * DESCRIPTION: Determine if a buffer Op contains a _PLD structure
  *
@@ -541,12 +542,60 @@ AcpiDmIsPldBuffer (
 {
     ACPI_NAMESPACE_NODE     *Node;
     ACPI_PARSE_OBJECT       *SizeOp;
+    ACPI_PARSE_OBJECT       *ByteListOp;
     ACPI_PARSE_OBJECT       *ParentOp;
+    UINT64                  BufferSize;
+    UINT64                  InitializerSize;
 
 
-    /* Buffer size is the buffer argument */
-
+    /*
+     * Get the BufferSize argument - Buffer(BufferSize)
+     * If the buffer was generated by the ToPld macro, it must
+     * be a BYTE constant.
+     */
     SizeOp = Op->Common.Value.Arg;
+    if (SizeOp->Common.AmlOpcode != AML_BYTE_OP)
+    {
+        return (FALSE);
+    }
+
+    /* Check the declared BufferSize, two possibilities */
+
+    BufferSize = SizeOp->Common.Value.Integer;
+    if ((BufferSize != ACPI_PLD_REV1_BUFFER_SIZE) &&
+        (BufferSize != ACPI_PLD_REV2_BUFFER_SIZE))
+    {
+        return (FALSE);
+    }
+
+    /*
+     * Check the initializer list length. This is the actual
+     * number of bytes in the buffer as counted by the AML parser.
+     * The declared BufferSize can be larger than the actual length.
+     * However, for the ToPLD macro, the BufferSize will be the same
+     * as the initializer list length.
+     */
+    ByteListOp = SizeOp->Common.Next;
+    if (!ByteListOp)
+    {
+        return (FALSE); /* Zero-length buffer case */
+    }
+
+    InitializerSize = ByteListOp->Common.Value.Integer;
+    if ((InitializerSize != ACPI_PLD_REV1_BUFFER_SIZE) &&
+        (InitializerSize != ACPI_PLD_REV2_BUFFER_SIZE))
+    {
+        return (FALSE);
+    }
+
+    /* Final size check */
+
+    if (BufferSize != InitializerSize)
+    {
+        return (FALSE);
+    }
+
+    /* Now examine the buffer parent */
 
     ParentOp = Op->Common.Parent;
     if (!ParentOp)
@@ -571,8 +620,17 @@ AcpiDmIsPldBuffer (
         return (FALSE);
     }
 
-    /* Check for proper form: Name(_PLD, Package() {Buffer() {}}) */
-
+    /*
+     * Check for proper form: Name(_PLD, Package() {ToPLD()})
+     *
+     * Note: All other forms such as
+     *      Return (Package() {ToPLD()})
+     *      Local0 = ToPLD()
+     * etc. are not converted back to the ToPLD macro, because
+     * there is really no deterministic way to disassemble the buffer
+     * back to the ToPLD macro, other than trying to find the "_PLD"
+     * name
+     */
     if (ParentOp->Common.AmlOpcode == AML_PACKAGE_OP)
     {
         ParentOp = ParentOp->Common.Parent;
diff --git a/source/components/disassembler/dmcstyle.c b/source/components/disassembler/dmcstyle.c
index 2f61dea..939168f 100644
--- a/source/components/disassembler/dmcstyle.c
+++ b/source/components/disassembler/dmcstyle.c
@@ -98,6 +98,9 @@ AcpiDmCheckForSymbolicOpcode (
     ACPI_PARSE_OBJECT       *Child1;
     ACPI_PARSE_OBJECT       *Child2;
     ACPI_PARSE_OBJECT       *Target;
+    ACPI_PARSE_OBJECT       *GrandChild1;
+    ACPI_PARSE_OBJECT       *GrandChild2;
+    ACPI_PARSE_OBJECT       *GrandTarget = NULL;
 
 
     /* Exit immediately if ASL+ not enabled */
@@ -107,6 +110,14 @@ AcpiDmCheckForSymbolicOpcode (
         return (FALSE);
     }
 
+    /* Check for a non-ASL+ statement, propagate the flag */
+
+    if (Op->Common.Parent->Common.DisasmFlags & ACPI_PARSEOP_LEGACY_ASL_ONLY)
+    {
+        Op->Common.DisasmFlags |= ACPI_PARSEOP_LEGACY_ASL_ONLY;
+        return (FALSE);
+    }
+
     /* Get the first operand */
 
     Child1 = AcpiPsGetArg (Op, 0);
@@ -323,6 +334,7 @@ AcpiDmCheckForSymbolicOpcode (
             if (AcpiDmIsValidTarget (Target))
             {
                 Child1->Common.OperatorSymbol = NULL;
+                Op->Common.DisasmFlags |= ACPI_PARSEOP_LEGACY_ASL_ONLY;
                 return (FALSE);
             }
 
@@ -339,6 +351,13 @@ AcpiDmCheckForSymbolicOpcode (
 
         if (!AcpiDmIsValidTarget (Target))
         {
+            if (Op->Common.Parent->Common.AmlOpcode == AML_STORE_OP)
+            {
+                Op->Common.DisasmFlags = 0;
+                Child1->Common.OperatorSymbol = NULL;
+                return (FALSE);
+            }
+
             /* Not a valid target (placeholder only, from parser) */
             break;
         }
@@ -478,6 +497,69 @@ AcpiDmCheckForSymbolicOpcode (
         /*
          * Target is the 2nd operand.
          * We know the target is valid, it is not optional.
+         *
+         * The following block implements "Ignore conversion if a store
+         * is followed by a math/bit operator that has no target". Used
+         * only for the ASL test suite.
+         */
+        if (!AcpiGbl_DoDisassemblerOptimizations)
+        {
+            switch (Child1->Common.AmlOpcode)
+            {
+            /* This operator has two operands and two targets */
+
+            case AML_DIVIDE_OP:
+
+                GrandChild1 = Child1->Common.Value.Arg;
+                GrandChild2 = GrandChild1->Common.Next;
+                GrandTarget = GrandChild2->Common.Next;
+
+                if (GrandTarget && !AcpiDmIsValidTarget (GrandTarget))
+                {
+                    Op->Common.DisasmFlags |= ACPI_PARSEOP_LEGACY_ASL_ONLY;
+                    return (FALSE);
+                }
+                GrandTarget = GrandTarget->Common.Next;
+                break;
+
+            case AML_ADD_OP:
+            case AML_SUBTRACT_OP:
+            case AML_MULTIPLY_OP:
+            case AML_MOD_OP:
+            case AML_SHIFT_LEFT_OP:
+            case AML_SHIFT_RIGHT_OP:
+            case AML_BIT_AND_OP:
+            case AML_BIT_OR_OP:
+            case AML_BIT_XOR_OP:
+            case AML_INDEX_OP:
+
+                /* These operators have two operands and a target */
+
+                GrandChild1 = Child1->Common.Value.Arg;
+                GrandChild2 = GrandChild1->Common.Next;
+                GrandTarget = GrandChild2->Common.Next;
+                break;
+
+            case AML_BIT_NOT_OP:
+
+                /* This operator has one operand and a target */
+
+                GrandChild1 = Child1->Common.Value.Arg;
+                GrandTarget = GrandChild1->Common.Next;
+                break;
+
+            default:
+                break;
+            }
+
+            if (GrandTarget && !AcpiDmIsValidTarget (GrandTarget))
+            {
+                Op->Common.DisasmFlags |= ACPI_PARSEOP_LEGACY_ASL_ONLY;
+                return (FALSE);
+            }
+        }
+
+        /*
          * In the parse tree, simply swap the target with the
          * source so that the target is processed first.
          */
@@ -563,6 +645,7 @@ AcpiDmCloseOperator (
 {
     BOOLEAN                 IsCStyleOp = FALSE;
 
+
     /* Always emit paren if ASL+ disassembly disabled */
 
     if (!AcpiGbl_CstyleDisassembly)
@@ -571,6 +654,14 @@ AcpiDmCloseOperator (
         return;
     }
 
+    /* Check for a non-ASL+ statement */
+
+    if (Op->Common.DisasmFlags & ACPI_PARSEOP_LEGACY_ASL_ONLY)
+    {
+        AcpiOsPrintf (")");
+        return;
+    }
+
     /* Check if we need to add an additional closing paren */
 
     switch (Op->Common.AmlOpcode)
diff --git a/source/components/disassembler/dmopcode.c b/source/components/disassembler/dmopcode.c
index 7ca171c..35fa594 100644
--- a/source/components/disassembler/dmopcode.c
+++ b/source/components/disassembler/dmopcode.c
@@ -64,6 +64,10 @@ static void
 AcpiDmConvertToElseIf (
     ACPI_PARSE_OBJECT       *Op);
 
+static void
+AcpiDmPromoteSubtree (
+    ACPI_PARSE_OBJECT       *StartOp);
+
 
 /*******************************************************************************
  *
@@ -1067,12 +1071,22 @@ AcpiDmConvertToElseIf (
      *    be the only blocks under the original Else.
      */
     IfOp = OriginalElseOp->Common.Value.Arg;
+
     if (!IfOp ||
         (IfOp->Common.AmlOpcode != AML_IF_OP) ||
         (IfOp->Asl.Next && (IfOp->Asl.Next->Common.AmlOpcode != AML_ELSE_OP)))
     {
-        /* Not an Else..If sequence, cannot convert to ElseIf */
+        /* Not a proper Else..If sequence, cannot convert to ElseIf */
+
+        AcpiOsPrintf ("%s", "Else");
+        return;
+    }
+
+    /* Cannot have anything following the If...Else block */
 
+    ElseOp = IfOp->Common.Next;
+    if (ElseOp && ElseOp->Common.Next)
+    {
         AcpiOsPrintf ("%s", "Else");
         return;
     }
@@ -1100,7 +1114,10 @@ AcpiDmConvertToElseIf (
         /* If an ELSE matches the IF, promote it also */
 
         ElseOp->Common.Parent = OriginalElseOp->Common.Parent;
-        ElseOp->Common.Next = OriginalElseOp->Common.Next;
+
+        /* Promote the entire block under the ElseIf (All Next OPs) */
+
+        AcpiDmPromoteSubtree (OriginalElseOp);
     }
     else
     {
@@ -1122,3 +1139,48 @@ AcpiDmConvertToElseIf (
 
     OriginalElseOp->Common.Next = IfOp;
 }
+
+
+/*******************************************************************************
+ *
+ * FUNCTION:    AcpiDmPromoteSubtree
+ *
+ * PARAMETERS:  StartOpOp           - Original parent of the entire subtree
+ *
+ * RETURN:      None
+ *
+ * DESCRIPTION: Promote an entire parse subtree up one level.
+ *
+ ******************************************************************************/
+
+static void
+AcpiDmPromoteSubtree (
+    ACPI_PARSE_OBJECT       *StartOp)
+{
+    ACPI_PARSE_OBJECT       *Op;
+    ACPI_PARSE_OBJECT       *ParentOp;
+
+
+    /* New parent for subtree elements */
+
+    ParentOp = StartOp->Common.Parent;
+
+    /* First child starts the subtree */
+
+    Op = StartOp->Common.Value.Arg;
+
+    /* Walk the top-level elements of the subtree */
+
+    while (Op)
+    {
+        Op->Common.Parent = ParentOp;
+        if (!Op->Common.Next)
+        {
+            /* Last Op in list, update its next field */
+
+            Op->Common.Next = StartOp->Common.Next;
+            break;
+        }
+        Op = Op->Common.Next;
+    }
+}
diff --git a/source/components/disassembler/dmresrcl.c b/source/components/disassembler/dmresrcl.c
index 52fd335..b845a72 100644
--- a/source/components/disassembler/dmresrcl.c
+++ b/source/components/disassembler/dmresrcl.c
@@ -443,16 +443,17 @@ AcpiDmIoFlags2 (
         UINT8               SpecificFlags)
 {
 
+    /* _TTP */
+
     AcpiOsPrintf (", %s",
         AcpiGbl_TtpDecode [ACPI_EXTRACT_1BIT_FLAG (SpecificFlags, 4)]);
 
-    /* TRS is only used if TTP is TypeTranslation */
-
-    if (SpecificFlags & 0x10)
-    {
-        AcpiOsPrintf (", %s",
-            AcpiGbl_TrsDecode [ACPI_EXTRACT_1BIT_FLAG (SpecificFlags, 5)]);
-    }
+    /*
+     * TRS is only used if TTP is TypeTranslation. However, the disassembler
+     * always emits exactly what is in the AML.
+     */
+    AcpiOsPrintf (", %s",
+        AcpiGbl_TrsDecode [ACPI_EXTRACT_1BIT_FLAG (SpecificFlags, 5)]);
 }
 
 
diff --git a/source/components/executer/exconfig.c b/source/components/executer/exconfig.c
index 7e2f699..c17beab 100644
--- a/source/components/executer/exconfig.c
+++ b/source/components/executer/exconfig.c
@@ -581,11 +581,18 @@ AcpiExUnloadTable (
 
     TableIndex = TableDesc->Reference.Value;
 
+    /*
+     * Release the interpreter lock so that the table lock won't have
+     * strict order requirement against it.
+     */
+    AcpiExExitInterpreter ();
+
     /* Ensure the table is still loaded */
 
     if (!AcpiTbIsTableLoaded (TableIndex))
     {
-        return_ACPI_STATUS (AE_NOT_EXIST);
+        Status = AE_NOT_EXIST;
+        goto LockAndExit;
     }
 
     /* Invoke table handler if present */
@@ -605,16 +612,25 @@ AcpiExUnloadTable (
     Status = AcpiTbDeleteNamespaceByOwner (TableIndex);
     if (ACPI_FAILURE (Status))
     {
-        return_ACPI_STATUS (Status);
+        goto LockAndExit;
     }
 
     (void) AcpiTbReleaseOwnerId (TableIndex);
     AcpiTbSetTableLoadedFlag (TableIndex, FALSE);
 
+LockAndExit:
+
+    /* Re-acquire the interpreter lock */
+
+    AcpiExEnterInterpreter ();
+
     /*
      * Invalidate the handle. We do this because the handle may be stored
      * in a named object and may not be actually deleted until much later.
      */
-    DdbHandle->Common.Flags &= ~AOPOBJ_DATA_VALID;
-    return_ACPI_STATUS (AE_OK);
+    if (ACPI_SUCCESS (Status))
+    {
+        DdbHandle->Common.Flags &= ~AOPOBJ_DATA_VALID;
+    }
+    return_ACPI_STATUS (Status);
 }
diff --git a/source/components/parser/psxface.c b/source/components/parser/psxface.c
index c85f0e9..58c1ce8 100644
--- a/source/components/parser/psxface.c
+++ b/source/components/parser/psxface.c
@@ -334,6 +334,18 @@ AcpiPsExecuteTable (
         WalkState->ParseFlags |= ACPI_PARSE_MODULE_LEVEL;
     }
 
+    /* Info->Node is the default location to load the table  */
+
+    if (Info->Node && Info->Node != AcpiGbl_RootNode)
+    {
+        Status = AcpiDsScopeStackPush (
+            Info->Node, ACPI_TYPE_METHOD, WalkState);
+        if (ACPI_FAILURE (Status))
+        {
+            goto Cleanup;
+        }
+    }
+
     /*
      * Parse the AML, WalkState will be deleted by ParseAml
      */
diff --git a/source/components/tables/tbdata.c b/source/components/tables/tbdata.c
index 11164e2..81b3abc 100644
--- a/source/components/tables/tbdata.c
+++ b/source/components/tables/tbdata.c
@@ -681,18 +681,13 @@ AcpiTbDeleteNamespaceByOwner (
      * lock may block, and also since the execution of a namespace walk
      * must be allowed to use the interpreter.
      */
-    (void) AcpiUtReleaseMutex (ACPI_MTX_INTERPRETER);
     Status = AcpiUtAcquireWriteLock (&AcpiGbl_NamespaceRwLock);
-
-    AcpiNsDeleteNamespaceByOwner (OwnerId);
     if (ACPI_FAILURE (Status))
     {
         return_ACPI_STATUS (Status);
     }
-
+    AcpiNsDeleteNamespaceByOwner (OwnerId);
     AcpiUtReleaseWriteLock (&AcpiGbl_NamespaceRwLock);
-
-    Status = AcpiUtAcquireMutex (ACPI_MTX_INTERPRETER);
     return_ACPI_STATUS (Status);
 }
 
diff --git a/source/components/tables/tbfind.c b/source/components/tables/tbfind.c
index 663e852..563358c 100644
--- a/source/components/tables/tbfind.c
+++ b/source/components/tables/tbfind.c
@@ -156,5 +156,5 @@ AcpiTbFindTable (
 
 UnlockAndExit:
     (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
-    return_ACPI_STATUS (AE_NOT_FOUND);
+    return_ACPI_STATUS (Status);
 }
diff --git a/source/components/tables/tbxfload.c b/source/components/tables/tbxfload.c
index bebfc11..43fe397 100644
--- a/source/components/tables/tbxfload.c
+++ b/source/components/tables/tbxfload.c
@@ -262,7 +262,7 @@ AcpiTbLoadNamespace (
     if (!TablesFailed)
     {
         ACPI_INFO ((
-            "%u ACPI AML tables successfully acquired and loaded\n",
+            "%u ACPI AML tables successfully acquired and loaded",
             TablesLoaded));
     }
     else
@@ -276,6 +276,11 @@ AcpiTbLoadNamespace (
         Status = AE_CTRL_TERMINATE;
     }
 
+#ifdef ACPI_APPLICATION
+    ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "\n"));
+#endif
+
+
 UnlockAndExit:
     (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
     return_ACPI_STATUS (Status);
@@ -423,9 +428,9 @@ AcpiUnloadParentTable (
         return_ACPI_STATUS (AE_TYPE);
     }
 
-    /* Must acquire the interpreter lock during this operation */
+    /* Must acquire the table lock during this operation */
 
-    Status = AcpiUtAcquireMutex (ACPI_MTX_INTERPRETER);
+    Status = AcpiUtAcquireMutex (ACPI_MTX_TABLES);
     if (ACPI_FAILURE (Status))
     {
         return_ACPI_STATUS (Status);
@@ -456,9 +461,11 @@ AcpiUnloadParentTable (
 
         /* Ensure the table is actually loaded */
 
+        (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
         if (!AcpiTbIsTableLoaded (i))
         {
             Status = AE_NOT_EXIST;
+            (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
             break;
         }
 
@@ -485,10 +492,11 @@ AcpiUnloadParentTable (
 
         Status = AcpiTbReleaseOwnerId (i);
         AcpiTbSetTableLoadedFlag (i, FALSE);
+        (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
         break;
     }
 
-    (void) AcpiUtReleaseMutex (ACPI_MTX_INTERPRETER);
+    (void) AcpiUtReleaseMutex (ACPI_MTX_TABLES);
     return_ACPI_STATUS (Status);
 }
 
diff --git a/source/components/utilities/utstrtoul64.c b/source/components/utilities/utstrtoul64.c
index 96cf112..f755877 100644
--- a/source/components/utilities/utstrtoul64.c
+++ b/source/components/utilities/utstrtoul64.c
@@ -85,7 +85,7 @@ AcpiUtStrtoulBase16 (
  * The integer is initialized to the value zero.
  * The ASCII string is interpreted as a hexadecimal constant.
  *
- *  1)  A �0x� prefix is not allowed. However, ACPICA allows this for
+ *  1)  A "0x" prefix is not allowed. However, ACPICA allows this for
  *      compatibility with previous ACPICA. (NO ERROR)
  *
  *  2)  Terminates when the size of an integer is reached (32 or 64 bits).
diff --git a/source/include/acconfig.h b/source/include/acconfig.h
index fb97271..d632491 100644
--- a/source/include/acconfig.h
+++ b/source/include/acconfig.h
@@ -148,7 +148,7 @@
 
 /* Maximum number of While() loops before abort */
 
-#define ACPI_MAX_LOOP_COUNT             0xFFFF
+#define ACPI_MAX_LOOP_COUNT             0x000FFFFF
 
 
 /******************************************************************************
diff --git a/source/include/acglobal.h b/source/include/acglobal.h
index fc7a7a2..1d5c17e 100644
--- a/source/include/acglobal.h
+++ b/source/include/acglobal.h
@@ -245,10 +245,6 @@ ACPI_INIT_GLOBAL (UINT32,               AcpiGbl_NestingLevel, 0);
 
 ACPI_GLOBAL (ACPI_THREAD_STATE *,       AcpiGbl_CurrentWalkList);
 
-/* Maximum number of While() loop iterations before forced abort */
-
-ACPI_GLOBAL (UINT16,                    AcpiGbl_MaxLoopIterations);
-
 /* Control method single step flag */
 
 ACPI_GLOBAL (UINT8,                     AcpiGbl_CmSingleStep);
@@ -322,6 +318,7 @@ ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_CstyleDisassembly, TRUE);
 ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_ForceAmlDisassembly, FALSE);
 ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_DmOpt_Verbose, TRUE);
 ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_DmEmitExternalOpcodes, FALSE);
+ACPI_INIT_GLOBAL (BOOLEAN,              AcpiGbl_DoDisassemblerOptimizations, TRUE);
 
 ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DmOpt_Disasm);
 ACPI_GLOBAL (BOOLEAN,                   AcpiGbl_DmOpt_Listing);
diff --git a/source/include/aclocal.h b/source/include/aclocal.h
index 9820a89..f411609 100644
--- a/source/include/aclocal.h
+++ b/source/include/aclocal.h
@@ -917,7 +917,7 @@ typedef union acpi_parse_value
     ACPI_PARSE_VALUE                Value;          /* Value or args associated with the opcode */\
     UINT8                           ArgListLength;  /* Number of elements in the arg list */\
     ACPI_DISASM_ONLY_MEMBERS (\
-    UINT8                           DisasmFlags;    /* Used during AML disassembly */\
+    UINT16                          DisasmFlags;    /* Used during AML disassembly */\
     UINT8                           DisasmOpcode;   /* Subtype used for disassembly */\
     char                            *OperatorSymbol;/* Used for C-style operator name strings */\
     char                            AmlOpName[16])  /* Op name (debug only) */
@@ -1037,14 +1037,15 @@ typedef struct acpi_parse_state
 
 /* Parse object DisasmFlags */
 
-#define ACPI_PARSEOP_IGNORE                 0x01
-#define ACPI_PARSEOP_PARAMETER_LIST         0x02
-#define ACPI_PARSEOP_EMPTY_TERMLIST         0x04
-#define ACPI_PARSEOP_PREDEFINED_CHECKED     0x08
-#define ACPI_PARSEOP_CLOSING_PAREN          0x10
-#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT    0x20
-#define ACPI_PARSEOP_ASSIGNMENT             0x40
-#define ACPI_PARSEOP_ELSEIF                 0x80
+#define ACPI_PARSEOP_IGNORE                 0x0001
+#define ACPI_PARSEOP_PARAMETER_LIST         0x0002
+#define ACPI_PARSEOP_EMPTY_TERMLIST         0x0004
+#define ACPI_PARSEOP_PREDEFINED_CHECKED     0x0008
+#define ACPI_PARSEOP_CLOSING_PAREN          0x0010
+#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT    0x0020
+#define ACPI_PARSEOP_ASSIGNMENT             0x0040
+#define ACPI_PARSEOP_ELSEIF                 0x0080
+#define ACPI_PARSEOP_LEGACY_ASL_ONLY        0x0100
 
 
 /*****************************************************************************
diff --git a/source/include/acpixf.h b/source/include/acpixf.h
index 17bab19..b2655e9 100644
--- a/source/include/acpixf.h
+++ b/source/include/acpixf.h
@@ -46,7 +46,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20160831
+#define ACPI_CA_VERSION                 0x20160930
 
 #include "acconfig.h"
 #include "actypes.h"
@@ -261,6 +261,13 @@ ACPI_INIT_GLOBAL (UINT8,            AcpiGbl_OsiData, 0);
 ACPI_INIT_GLOBAL (BOOLEAN,          AcpiGbl_ReducedHardware, FALSE);
 
 /*
+ * Maximum number of While() loop iterations before forced method abort.
+ * This mechanism is intended to prevent infinite loops during interpreter
+ * execution within a host kernel.
+ */
+ACPI_INIT_GLOBAL (UINT32,           AcpiGbl_MaxLoopIterations, ACPI_MAX_LOOP_COUNT);
+
+/*
  * This mechanism is used to trace a specified AML method. The method is
  * traced each time it is executed.
  */
diff --git a/source/include/platform/acmacosx.h b/source/include/platform/acmacosx.h
index 5d2ba41..a16262a 100644
--- a/source/include/platform/acmacosx.h
+++ b/source/include/platform/acmacosx.h
@@ -47,7 +47,6 @@
 #include "aclinux.h"
 
 #ifdef __APPLE__
-#define sem_destroy         sem_close
 #define ACPI_USE_ALTERNATE_TIMEOUT
 #endif /* __APPLE__ */
 
diff --git a/source/os_specific/service_layers/osunixxf.c b/source/os_specific/service_layers/osunixxf.c
index 643b02e..3837b8e 100644
--- a/source/os_specific/service_layers/osunixxf.c
+++ b/source/os_specific/service_layers/osunixxf.c
@@ -754,8 +754,12 @@ AcpiOsCreateSemaphore (
 
 #ifdef __APPLE__
     {
-        char            *SemaphoreName = tmpnam (NULL);
+        static int      SemaphoreCount = 0;
+        char            SemaphoreName[32];
 
+        snprintf (SemaphoreName, sizeof (SemaphoreName), "acpi_sem_%d",
+            SemaphoreCount++);
+        printf ("%s\n", SemaphoreName);
         Sem = sem_open (SemaphoreName, O_EXCL|O_CREAT, 0755, InitialUnits);
         if (!Sem)
         {
@@ -807,10 +811,17 @@ AcpiOsDeleteSemaphore (
         return (AE_BAD_PARAMETER);
     }
 
+#ifdef __APPLE__
+    if (sem_close (Sem) == -1)
+    {
+        return (AE_BAD_PARAMETER);
+    }
+#else
     if (sem_destroy (Sem) == -1)
     {
         return (AE_BAD_PARAMETER);
     }
+#endif
 
     return (AE_OK);
 }
diff --git a/source/tools/acpibin/abcompare.c b/source/tools/acpibin/abcompare.c
index b997a5c..e21e29d 100644
--- a/source/tools/acpibin/abcompare.c
+++ b/source/tools/acpibin/abcompare.c
@@ -433,7 +433,7 @@ AbCompareAmlFiles (
     {
         if (Char1 != Char2)
         {
-            printf ("Error - Byte mismatch at offset %8.8X: 0x%2.2X 0x%2.2X\n",
+            printf ("Error - Byte mismatch at offset %8.4X: 0x%2.2X 0x%2.2X\n",
                 Offset, Char1, Char2);
             Mismatches++;
             if (Mismatches > 100)
@@ -471,7 +471,10 @@ AbCompareAmlFiles (
     }
 
     printf ("%u Mismatches found\n", Mismatches);
-    Status = 0;
+    if (Mismatches == 0)
+    {
+        Status = 0;
+    }
 
 Exit2:
     fclose (File2);
diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c
index d4bf335..826d60d 100644
--- a/source/tools/acpiexec/aemain.c
+++ b/source/tools/acpiexec/aemain.c
@@ -542,7 +542,7 @@ main (
         /* Get all ACPI AML tables in this file */
 
         Status = AcGetAllTablesFromFile (argv[AcpiGbl_Optind],
-            ACPI_GET_ONLY_AML_TABLES, &ListHead);
+            ACPI_GET_ALL_TABLES, &ListHead);
         if (ACPI_FAILURE (Status))
         {
             ExitCode = -1;
diff --git a/source/tools/acpinames/anmain.c b/source/tools/acpinames/anmain.c
index 6e48bfd..46a69ac 100644
--- a/source/tools/acpinames/anmain.c
+++ b/source/tools/acpinames/anmain.c
@@ -176,7 +176,7 @@ main (
         /* Get all ACPI AML tables in this file */
 
         Status = AcGetAllTablesFromFile (argv[AcpiGbl_Optind],
-            ACPI_GET_ONLY_AML_TABLES, &ListHead);
+            ACPI_GET_ALL_TABLES, &ListHead);
         if (ACPI_FAILURE (Status))
         {
             return (-1);
diff --git a/source/tools/acpisrc/asfile.c b/source/tools/acpisrc/asfile.c
index b8f0501..570b27c 100644
--- a/source/tools/acpisrc/asfile.c
+++ b/source/tools/acpisrc/asfile.c
@@ -321,7 +321,7 @@ AsConvertFile (
         ConditionalTable    = ConversionTable->SourceConditionalTable;
         StructTable         = ConversionTable->SourceStructTable;
         SpecialMacroTable   = ConversionTable->SourceSpecialMacroTable;
-       break;
+        break;
 
     case FILE_TYPE_HEADER:
 
diff --git a/tests/aslts/bin/asltsrun b/tests/aslts/bin/asltsrun
index 7063400..021895e 100755
--- a/tests/aslts/bin/asltsrun
+++ b/tests/aslts/bin/asltsrun
@@ -171,7 +171,7 @@ run_test_case()
 		AML_DONT_EXIST=$[ $AML_DONT_EXIST + 1 ]
 		TEST_RET=1
 	else
-		options="-ep"
+		options="-ep -el"
 		if [ $SLMODE == "norm" ]; then
 			method=MN00
 			options="$options"
diff --git a/tests/aslts/src/runtime/cntl/common.asl b/tests/aslts/src/runtime/cntl/common.asl
index bb06218..88b1e7c 100644
--- a/tests/aslts/src/runtime/cntl/common.asl
+++ b/tests/aslts/src/runtime/cntl/common.asl
@@ -40,8 +40,8 @@
 
 Name(z062, 62)
 
-Name(ff32, 0xffffffff)         // -1, 32-bit
-Name(ff64, 0xffffffffffffffff) // -1, 64-bit
+Name(ff32, 0xffffffff)          // -1, 32-bit
+Name(ff64, Ones)                // -1, 64-bit
 
 // Test execution trace
 
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 78ae2fa..efa0952 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
@@ -15951,10 +15951,10 @@ Method(m617,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(arg2, Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(arg2, Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(arg2, Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(arg2, Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -15995,10 +15995,10 @@ Method(m617,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(arg2, Derefof(m601(1, 21, 1)), Local0)
+			Mod(arg2, Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(arg2, Derefof(m601(1, 22, 1)), Local0)
+			Mod(arg2, Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -16041,10 +16041,10 @@ Method(m617,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), arg2), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), arg2), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), arg2), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), arg2), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -16085,10 +16085,10 @@ Method(m617,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), arg2, Local0)
+			Mod(Derefof(m602(1, 21, 1)), arg2, Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), arg2, Local0)
+			Mod(Derefof(m602(1, 22, 1)), arg2, Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -22107,10 +22107,10 @@ Method(m617,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), arg1), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), arg1), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), arg1), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), arg1), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), arg1), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -22171,10 +22171,10 @@ Method(m617,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), arg1), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), arg1), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), arg1), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), arg1), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), arg1), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -22235,10 +22235,10 @@ Method(m617,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), arg1), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), arg1), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), arg1), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), arg1), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), arg1), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -22299,10 +22299,10 @@ Method(m617,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), arg1), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), arg1), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), arg1), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), arg1), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), arg1), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -22363,10 +22363,10 @@ Method(m617,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), arg1), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), arg1), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), arg1), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), arg1), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), arg1), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -22427,10 +22427,10 @@ Method(m617,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), arg1), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), arg1), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), arg1), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), arg1), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), arg1), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
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 c6ca045..021570f 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
@@ -16918,10 +16918,10 @@ Method(m610,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -16962,10 +16962,10 @@ Method(m610,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Derefof(m601(1, 21, 1)), Local0)
+			Mod(Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Derefof(m601(1, 22, 1)), Local0)
+			Mod(Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -17008,10 +17008,10 @@ Method(m610,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -17052,10 +17052,10 @@ Method(m610,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Local0)
+			Mod(Derefof(m602(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Local0)
+			Mod(Derefof(m602(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}, Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -23035,10 +23035,10 @@ Method(m610,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -23099,10 +23099,10 @@ Method(m610,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -23163,10 +23163,10 @@ Method(m610,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -23227,10 +23227,10 @@ Method(m610,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -23291,10 +23291,10 @@ Method(m610,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -23355,10 +23355,10 @@ Method(m610,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
@@ -25402,7 +25402,7 @@ Method(m610,, Serialized)
 
 		if (y500) {
 			Store(0, i000)
-			Switch (Derefof(m601(1, 21, 1))) {
+			Switch (Derefof(m602(1, 21, 1))) {
 				Case (Buffer(9){0x84, 0xA2, 0x50, 0xD6, 0x91, 0xB3, 0x7C, 0xFE, 0xa5}) {Store(1, i000)}
 				Default {Store(2, i000)}
 			}
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 8a37a9f..5a81a18 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
@@ -16241,10 +16241,10 @@ Method(m618,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Local2, Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(Local2, Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(Local2, Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(Local2, Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -16285,10 +16285,10 @@ Method(m618,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Local2, Derefof(m601(1, 21, 1)), Local0)
+			Mod(Local2, Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(Local2, Derefof(m601(1, 22, 1)), Local0)
+			Mod(Local2, Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -16331,10 +16331,10 @@ Method(m618,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), Local2), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), Local2), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), Local2), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), Local2), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -16375,10 +16375,10 @@ Method(m618,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), Local2, Local0)
+			Mod(Derefof(m602(1, 21, 1)), Local2, Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), Local2, Local0)
+			Mod(Derefof(m602(1, 22, 1)), Local2, Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -22448,10 +22448,10 @@ Method(m618,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), Local1), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), Local1), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), Local1), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), Local1), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), Local1), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -22512,10 +22512,10 @@ Method(m618,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), Local1), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), Local1), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), Local1), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), Local1), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), Local1), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -22576,10 +22576,10 @@ Method(m618,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), Local1), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), Local1), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), Local1), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), Local1), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), Local1), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -22640,10 +22640,10 @@ Method(m618,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), Local1), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), Local1), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), Local1), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), Local1), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), Local1), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -22704,10 +22704,10 @@ Method(m618,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), Local1), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), Local1), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), Local1), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), Local1), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), Local1), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -22768,10 +22768,10 @@ Method(m618,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), Local1), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), Local1), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), Local1), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), Local1), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), Local1), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
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 a245e01..1f48b58 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
@@ -15956,10 +15956,10 @@ Method(m611,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(b60a, Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(b60a, Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(b60a, Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(b60a, Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -16000,10 +16000,10 @@ Method(m611,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(b60a, Derefof(m601(1, 21, 1)), Local0)
+			Mod(b60a, Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(b60a, Derefof(m601(1, 22, 1)), Local0)
+			Mod(b60a, Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -16046,10 +16046,10 @@ Method(m611,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -16090,10 +16090,10 @@ Method(m611,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), b60a, Local0)
+			Mod(Derefof(m602(1, 21, 1)), b60a, Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), b60a, Local0)
+			Mod(Derefof(m602(1, 22, 1)), b60a, Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -22074,10 +22074,10 @@ Method(m611,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -22138,10 +22138,10 @@ Method(m611,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -22202,10 +22202,10 @@ Method(m611,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -22266,10 +22266,10 @@ Method(m611,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -22330,10 +22330,10 @@ Method(m611,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -22394,10 +22394,10 @@ Method(m611,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
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 2fa0af9..cbe1251 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
@@ -3788,10 +3788,10 @@ Method(m612,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(bf65, Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(bf65, Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(bf65, Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(bf65, Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -3832,10 +3832,10 @@ Method(m612,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(bf65, Derefof(m601(1, 21, 1)), Local0)
+			Mod(bf65, Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(bf65, Derefof(m601(1, 22, 1)), Local0)
+			Mod(bf65, Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -3878,10 +3878,10 @@ Method(m612,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -3922,10 +3922,10 @@ Method(m612,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), bf65, Local0)
+			Mod(Derefof(m602(1, 21, 1)), bf65, Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), bf65, Local0)
+			Mod(Derefof(m602(1, 22, 1)), bf65, Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -9906,10 +9906,10 @@ Method(m612,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -9970,10 +9970,10 @@ Method(m612,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -10034,10 +10034,10 @@ Method(m612,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -10098,10 +10098,10 @@ Method(m612,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -10162,10 +10162,10 @@ Method(m612,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -10226,10 +10226,10 @@ Method(m612,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
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 2ba8d1c..a06fbcf 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
@@ -16239,10 +16239,10 @@ Method(m613,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(b60a, Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(b60a, Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(b60a, Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(b60a, Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -16283,10 +16283,10 @@ Method(m613,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(b60a, Derefof(m601(1, 21, 1)), Local0)
+			Mod(b60a, Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(b60a, Derefof(m601(1, 22, 1)), Local0)
+			Mod(b60a, Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -16329,10 +16329,10 @@ Method(m613,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -16373,10 +16373,10 @@ Method(m613,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), b60a, Local0)
+			Mod(Derefof(m602(1, 21, 1)), b60a, Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), b60a, Local0)
+			Mod(Derefof(m602(1, 22, 1)), b60a, Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -22447,10 +22447,10 @@ Method(m613,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -22511,10 +22511,10 @@ Method(m613,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -22575,10 +22575,10 @@ Method(m613,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -22639,10 +22639,10 @@ Method(m613,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -22703,10 +22703,10 @@ Method(m613,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -22767,10 +22767,10 @@ Method(m613,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), b60a), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), b60a), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), b60a), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), b60a), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), b60a), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
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 a24550a..e3ee848 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
@@ -3953,10 +3953,10 @@ Method(m614,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(bf65, Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(bf65, Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(bf65, Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(bf65, Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -3997,10 +3997,10 @@ Method(m614,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(bf65, Derefof(m601(1, 21, 1)), Local0)
+			Mod(bf65, Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(bf65, Derefof(m601(1, 22, 1)), Local0)
+			Mod(bf65, Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -4043,10 +4043,10 @@ Method(m614,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -4087,10 +4087,10 @@ Method(m614,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), bf65, Local0)
+			Mod(Derefof(m602(1, 21, 1)), bf65, Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), bf65, Local0)
+			Mod(Derefof(m602(1, 22, 1)), bf65, Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -10253,10 +10253,10 @@ Method(m614,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -10317,10 +10317,10 @@ Method(m614,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -10381,10 +10381,10 @@ Method(m614,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -10445,10 +10445,10 @@ Method(m614,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -10509,10 +10509,10 @@ Method(m614,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -10573,10 +10573,10 @@ Method(m614,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), bf65), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), bf65), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), bf65), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), bf65), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), bf65), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
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 0c49c36..0d13608 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
@@ -15956,10 +15956,10 @@ Method(m615,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(Index(pb60, 10)), Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(Derefof(Index(pb60, 10)), Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(Derefof(Index(pb60, 10)), Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(Derefof(Index(pb60, 10)), Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -16000,10 +16000,10 @@ Method(m615,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(Index(pb60, 10)), Derefof(m601(1, 21, 1)), Local0)
+			Mod(Derefof(Index(pb60, 10)), Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(Derefof(Index(pb60, 10)), Derefof(m601(1, 22, 1)), Local0)
+			Mod(Derefof(Index(pb60, 10)), Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -16046,10 +16046,10 @@ Method(m615,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -16090,10 +16090,10 @@ Method(m615,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), Derefof(Index(pb60, 10)), Local0)
+			Mod(Derefof(m602(1, 21, 1)), Derefof(Index(pb60, 10)), Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), Derefof(Index(pb60, 10)), Local0)
+			Mod(Derefof(m602(1, 22, 1)), Derefof(Index(pb60, 10)), Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -22074,10 +22074,10 @@ Method(m615,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -22138,10 +22138,10 @@ Method(m615,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -22202,10 +22202,10 @@ Method(m615,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -22266,10 +22266,10 @@ Method(m615,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -22330,10 +22330,10 @@ Method(m615,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -22394,10 +22394,10 @@ Method(m615,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), Derefof(Index(pb60, 10))), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
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 7374880..d0aae1f 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
@@ -15956,10 +15956,10 @@ Method(m616,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(Refof(b60a)), Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(Derefof(Refof(b60a)), Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(Derefof(Refof(b60a)), Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(Derefof(Refof(b60a)), Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -16000,10 +16000,10 @@ Method(m616,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(Refof(b60a)), Derefof(m601(1, 21, 1)), Local0)
+			Mod(Derefof(Refof(b60a)), Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(Derefof(Refof(b60a)), Derefof(m601(1, 22, 1)), Local0)
+			Mod(Derefof(Refof(b60a)), Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -16046,10 +16046,10 @@ Method(m616,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), Derefof(Refof(b60a))), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), Derefof(Refof(b60a))), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -16090,10 +16090,10 @@ Method(m616,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), Derefof(Refof(b60a)), Local0)
+			Mod(Derefof(m602(1, 21, 1)), Derefof(Refof(b60a)), Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), Derefof(Refof(b60a)), Local0)
+			Mod(Derefof(m602(1, 22, 1)), Derefof(Refof(b60a)), Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -22074,10 +22074,10 @@ Method(m616,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -22138,10 +22138,10 @@ Method(m616,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -22202,10 +22202,10 @@ Method(m616,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -22266,10 +22266,10 @@ Method(m616,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -22330,10 +22330,10 @@ Method(m616,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -22394,10 +22394,10 @@ Method(m616,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), Derefof(Refof(b60a))), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), Derefof(Refof(b60a))), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
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 7fcf24c..9c86ac2 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
@@ -3774,10 +3774,10 @@ Method(m61b,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(Refof(bf65)), Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(Derefof(Refof(bf65)), Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(Derefof(Refof(bf65)), Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(Derefof(Refof(bf65)), Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -3818,10 +3818,10 @@ Method(m61b,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(Refof(bf65)), Derefof(m601(1, 21, 1)), Local0)
+			Mod(Derefof(Refof(bf65)), Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(Derefof(Refof(bf65)), Derefof(m601(1, 22, 1)), Local0)
+			Mod(Derefof(Refof(bf65)), Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -3864,10 +3864,10 @@ Method(m61b,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), Derefof(Refof(bf65))), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), Derefof(Refof(bf65))), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -3908,10 +3908,10 @@ Method(m61b,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), Derefof(Refof(bf65)), Local0)
+			Mod(Derefof(m602(1, 21, 1)), Derefof(Refof(bf65)), Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), Derefof(Refof(bf65)), Local0)
+			Mod(Derefof(m602(1, 22, 1)), Derefof(Refof(bf65)), Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -9892,10 +9892,10 @@ Method(m61b,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -9956,10 +9956,10 @@ Method(m61b,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -10020,10 +10020,10 @@ Method(m61b,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -10084,10 +10084,10 @@ Method(m61b,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -10148,10 +10148,10 @@ Method(m61b,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -10212,10 +10212,10 @@ Method(m61b,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), Derefof(Refof(bf65))), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), Derefof(Refof(bf65))), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/MAIN.asl b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/MAIN.asl
index ed5e48e..1f62e0a 100644
--- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/MAIN.asl
+++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/MAIN.asl
@@ -42,6 +42,7 @@ DefinitionBlock(
 
 	Method(MAIN) {
 
+Y500 = Ones
 		// Initialization
 		STRT(0)
 
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 e16f446..2c88613 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
@@ -15958,10 +15958,10 @@ Method(m61a,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m604(2, 3, 10, 1)), Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(Derefof(m604(2, 3, 10, 1)), Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(Derefof(m604(2, 3, 10, 1)), Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(Derefof(m604(2, 3, 10, 1)), Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -16002,10 +16002,10 @@ Method(m61a,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m604(2, 3, 10, 1)), Derefof(m601(1, 21, 1)), Local0)
+			Mod(Derefof(m604(2, 3, 10, 1)), Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(Derefof(m604(2, 3, 10, 1)), Derefof(m601(1, 22, 1)), Local0)
+			Mod(Derefof(m604(2, 3, 10, 1)), Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -16048,10 +16048,10 @@ Method(m61a,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -16092,10 +16092,10 @@ Method(m61a,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), Derefof(m604(2, 3, 10, 1)), Local0)
+			Mod(Derefof(m602(1, 21, 1)), Derefof(m604(2, 3, 10, 1)), Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), Derefof(m604(2, 3, 10, 1)), Local0)
+			Mod(Derefof(m602(1, 22, 1)), Derefof(m604(2, 3, 10, 1)), Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -22076,10 +22076,10 @@ Method(m61a,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -22140,10 +22140,10 @@ Method(m61a,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -22204,10 +22204,10 @@ Method(m61a,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -22268,10 +22268,10 @@ Method(m61a,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -22332,10 +22332,10 @@ Method(m61a,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -22396,10 +22396,10 @@ Method(m61a,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), Derefof(m604(2, 3, 10, 1))), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
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 ce2b9d7..1158be6 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
@@ -15957,10 +15957,10 @@ Method(m619,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(m604(0, 3, 10, 0), Derefof(m601(1, 21, 1))), Local0)
+			Store(Mod(m604(0, 3, 10, 0), Derefof(m602(1, 21, 1))), Local0)
 			m600(arg0, 10, Local0, 0xd650a284)
 
-			Store(Mod(m604(0, 3, 10, 0), Derefof(m601(1, 22, 1))), Local0)
+			Store(Mod(m604(0, 3, 10, 0), Derefof(m602(1, 22, 1))), Local0)
 			m600(arg0, 11, Local0, 1)
 		}
 
@@ -16001,10 +16001,10 @@ Method(m619,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(m604(0, 3, 10, 0), Derefof(m601(1, 21, 1)), Local0)
+			Mod(m604(0, 3, 10, 0), Derefof(m602(1, 21, 1)), Local0)
 			m600(arg0, 22, Local0, 0xd650a284)
 
-			Mod(m604(0, 3, 10, 0), Derefof(m601(1, 22, 1)), Local0)
+			Mod(m604(0, 3, 10, 0), Derefof(m602(1, 22, 1)), Local0)
 			m600(arg0, 23, Local0, 1)
 		}
 
@@ -16047,10 +16047,10 @@ Method(m619,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Store(Mod(Derefof(m601(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(Mod(Derefof(m602(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 34, Local0, 1)
 
-			Store(Mod(Derefof(m601(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(Mod(Derefof(m602(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 35, Local0, 0xd650a283)
 		}
 
@@ -16091,10 +16091,10 @@ Method(m619,, Serialized)
 		// Method returns Reference to Integer
 
 		if (y500) {
-			Mod(Derefof(m601(1, 21, 1)), m604(0, 3, 10, 0), Local0)
+			Mod(Derefof(m602(1, 21, 1)), m604(0, 3, 10, 0), Local0)
 			m600(arg0, 46, Local0, 1)
 
-			Mod(Derefof(m601(1, 22, 1)), m604(0, 3, 10, 0), Local0)
+			Mod(Derefof(m602(1, 22, 1)), m604(0, 3, 10, 0), Local0)
 			m600(arg0, 47, Local0, 0xd650a283)
 		}
 
@@ -22074,10 +22074,10 @@ Method(m619,, Serialized)
 			Store(LEqual(Derefof(m602(1, 20, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 15, Local0, Ones)
 
-			Store(LEqual(Derefof(m601(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LEqual(Derefof(m602(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 16, Local0, Zero)
 
-			Store(LEqual(Derefof(m601(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LEqual(Derefof(m602(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 17, Local0, Zero)
 		}
 
@@ -22138,10 +22138,10 @@ Method(m619,, Serialized)
 			Store(LGreater(Derefof(m602(1, 20, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 33, Local0, Zero)
 
-			Store(LGreater(Derefof(m601(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LGreater(Derefof(m602(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 34, Local0, Ones)
 
-			Store(LGreater(Derefof(m601(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LGreater(Derefof(m602(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 35, Local0, Zero)
 		}
 
@@ -22202,10 +22202,10 @@ Method(m619,, Serialized)
 			Store(LGreaterEqual(Derefof(m602(1, 20, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 51, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 52, Local0, Ones)
 
-			Store(LGreaterEqual(Derefof(m601(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LGreaterEqual(Derefof(m602(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 53, Local0, Zero)
 		}
 
@@ -22266,10 +22266,10 @@ Method(m619,, Serialized)
 			Store(LLess(Derefof(m602(1, 20, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 69, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LLess(Derefof(m602(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 70, Local0, Zero)
 
-			Store(LLess(Derefof(m601(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LLess(Derefof(m602(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 71, Local0, Ones)
 		}
 
@@ -22330,10 +22330,10 @@ Method(m619,, Serialized)
 			Store(LLessEqual(Derefof(m602(1, 20, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 87, Local0, Ones)
 
-			Store(LLessEqual(Derefof(m601(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LLessEqual(Derefof(m602(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 88, Local0, Zero)
 
-			Store(LLessEqual(Derefof(m601(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LLessEqual(Derefof(m602(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 89, Local0, Ones)
 		}
 
@@ -22394,10 +22394,10 @@ Method(m619,, Serialized)
 			Store(LNotEqual(Derefof(m602(1, 20, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 105, Local0, Zero)
 
-			Store(LNotEqual(Derefof(m601(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LNotEqual(Derefof(m602(1, 21, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 106, Local0, Ones)
 
-			Store(LNotEqual(Derefof(m601(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
+			Store(LNotEqual(Derefof(m602(1, 22, 1)), m604(0, 3, 10, 0)), Local0)
 			m600(arg0, 107, Local0, Ones)
 		}
 	}
diff --git a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl
index cb4c3b3..724eff2 100644
--- a/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl
+++ b/tests/aslts/src/runtime/collections/functional/control/ImplicitReturn/add.asl
@@ -541,7 +541,7 @@ Method(mff0,, Serialized)
 		{
 			Store(0, Local0)
 
-			Store(Add(0xabcd000e, Local0, Local0), Local1)
+			Store(Add(Local0, 0xabcd000e, Local0), Local1)
 			m001(Local0)
 		}
 
diff --git a/tests/aslts/src/runtime/collections/functional/control/while.asl b/tests/aslts/src/runtime/collections/functional/control/while.asl
index 68ac880..74bc6e2 100644
--- a/tests/aslts/src/runtime/collections/functional/control/while.asl
+++ b/tests/aslts/src/runtime/collections/functional/control/while.asl
@@ -134,19 +134,19 @@ Method(m0f5, 3)
 	Store(0, Local0)
 
 	if (m0f4(arg0, CHL0, arg2)) {
-		Or(0x01, Local0, Local0)
+		Or(Local0, 0x01, Local0)
 	}
 
 	Store(m0f4(arg0, CNT0, arg2), Local1)
 	Store(m0f4(arg1, CNT0, arg2), Local2)
 	if (LGreaterEqual(Local1, Local2)) {
-		Or(0x02, Local0, Local0)
+		Or(Local0, 0x02, Local0)
 	}
 
 	Store(m0f4(arg0, BRK0, arg2), Local1)
 	Store(m0f4(arg1, BRK0, arg2), Local2)
 	if (LGreaterEqual(Local1, Local2)) {
-		Or(0x04, Local0, Local0)
+		Or(Local0, 0x04, Local0)
 	}
 
 	return (Local0)
@@ -242,13 +242,13 @@ Method(m0f9, 4)
 	Store(0, Local0)
 
 	if (arg0) {
-		Or(0x01, Local0, Local0)
+		Or(Local0, 0x01, Local0)
 	}
 	if (arg1) {
-		Or(0x02, Local0, Local0)
+		Or(Local0, 0x02, Local0)
 	}
 	if (arg2) {
-		Or(0x04, Local0, Local0)
+		Or(Local0, 0x04, Local0)
 	}
 
 	Mod(arg3, 3, Local1)
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl
index 3831568..6069481 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/i2cserialbus.asl
@@ -35,104 +35,104 @@ Device (I2C) {}
 
 Name (p456, Package() {
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode7Bit, "\\I2C",
-            0xEE, ResourceConsumer, ,
+            0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\I2C",
-            0xEE, ResourceConsumer, ,
+            0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, ControllerInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, ControllerInitiated, 0x88775544,
             AddressingMode7Bit, "\\I2C",
-            0xEE, ResourceConsumer, ,
+            0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, ControllerInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, ControllerInitiated, 0x88775544,
             AddressingMode10Bit, "\\I2C",
-            0xEE, ResourceConsumer, ,
+            0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode7Bit, "\\I2C",
-            0xEE, ResourceProducer, ,
+            0xEE, ResourceProducer, , Shared,
             RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\I2C",
-            0xEE, ResourceProducer, ,
+            0xEE, ResourceProducer, , Shared,
             RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, ControllerInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, ControllerInitiated, 0x88775544,
             AddressingMode7Bit, "\\I2C",
-            0xEE, ResourceProducer, ,
+            0xEE, ResourceProducer, , Shared,
             RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, ControllerInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, ControllerInitiated, 0x88775544,
             AddressingMode10Bit, "\\I2C",
-            0xEE, ResourceProducer, ,
+            0xEE, ResourceProducer, , Shared,
             RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode7Bit, "\\I2C",
-            0xEE, ResourceConsumer, ,)
+            0xEE, ResourceConsumer, , Shared,)
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\I2C",
             0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, ControllerInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, ControllerInitiated, 0x88775544,
             AddressingMode7Bit, "\\I2C",
             0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, ControllerInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, ControllerInitiated, 0x88775544,
             AddressingMode10Bit, "\\I2C",
             0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode7Bit, "\\I2C",
-            0xEE, ResourceProducer, ,)
+            0xEE, ResourceProducer, , Shared,)
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\I2C",
             0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, ControllerInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, ControllerInitiated, 0x88775544,
             AddressingMode7Bit, "\\I2C",
             0xEE, ResourceProducer)
     },
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, ControllerInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, ControllerInitiated, 0x88775544,
             AddressingMode10Bit, "\\I2C",
-            0xEE, ResourceProducer, ,)
+            0xEE, ResourceProducer, , Shared,)
     },
 
 
     // Minimal invocation
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, , 0x88775544, , "\\I2C", , , ,)
+        I2cSerialBusV2 (0x1234, , 0x88775544, , "\\I2C", , , ,)
     },
 
 	ResourceTemplate () {
-        I2cSerialBus (0x1234, ControllerInitiated, 0x88775544,
+        I2cSerialBusV2 (0x1234, ControllerInitiated, 0x88775544,
             AddressingMode10Bit, "\\I2C",
-            0xEE, ResourceProducer, ,
+            0xEE, ResourceProducer, , Shared,
             RawDataBuffer () {
                 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8,
                 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, 0xB7, 0xB8,
@@ -188,7 +188,7 @@ Name (p456, Package() {
 Name (p457, Package() {
     Buffer (0x1D)
     {
-        /* 0000 */    0x8E, 0x18, 0x00, 0x01, 0xEE, 0x01, 0x03, 0x00,
+        /* 0000 */    0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x03, 0x00,
         /* 0008 */    0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49,
         /* 0018 */    0x32, 0x43, 0x00, 0x79, 0x00
@@ -196,7 +196,7 @@ Name (p457, Package() {
 
     Buffer (0x1D)
     {
-        /* 0000 */    0x8E, 0x18, 0x00, 0x01, 0xEE, 0x01, 0x03, 0x01,
+        /* 0000 */    0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x03, 0x01,
         /* 0008 */    0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49,
         /* 0018 */    0x32, 0x43, 0x00, 0x79, 0x00
@@ -204,7 +204,7 @@ Name (p457, Package() {
 
     Buffer (0x1D)
     {
-        /* 0000 */    0x8E, 0x18, 0x00, 0x01, 0xEE, 0x01, 0x02, 0x00,
+        /* 0000 */    0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x02, 0x00,
         /* 0008 */    0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49,
         /* 0018 */    0x32, 0x43, 0x00, 0x79, 0x00
@@ -212,7 +212,7 @@ Name (p457, Package() {
 
     Buffer (0x1D)
     {
-        /* 0000 */    0x8E, 0x18, 0x00, 0x01, 0xEE, 0x01, 0x02, 0x01,
+        /* 0000 */    0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x02, 0x01,
         /* 0008 */    0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49,
         /* 0018 */    0x32, 0x43, 0x00, 0x79, 0x00
@@ -220,7 +220,7 @@ Name (p457, Package() {
 
     Buffer (0x1D)
     {
-        /* 0000 */    0x8E, 0x18, 0x00, 0x01, 0xEE, 0x01, 0x01, 0x00,
+        /* 0000 */    0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x01, 0x00,
         /* 0008 */    0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49,
         /* 0018 */    0x32, 0x43, 0x00, 0x79, 0x00
@@ -228,7 +228,7 @@ Name (p457, Package() {
 
     Buffer (0x1D)
     {
-        /* 0000 */    0x8E, 0x18, 0x00, 0x01, 0xEE, 0x01, 0x01, 0x01,
+        /* 0000 */    0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x01, 0x01,
         /* 0008 */    0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49,
         /* 0018 */    0x32, 0x43, 0x00, 0x79, 0x00
@@ -236,7 +236,7 @@ Name (p457, Package() {
 
     Buffer (0x1D)
     {
-        /* 0000 */    0x8E, 0x18, 0x00, 0x01, 0xEE, 0x01, 0x00, 0x00,
+        /* 0000 */    0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x00, 0x00,
         /* 0008 */    0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49,
         /* 0018 */    0x32, 0x43, 0x00, 0x79, 0x00
@@ -244,7 +244,7 @@ Name (p457, Package() {
 
     Buffer (0x1D)
     {
-        /* 0000 */    0x8E, 0x18, 0x00, 0x01, 0xEE, 0x01, 0x00, 0x01,
+        /* 0000 */    0x8E, 0x18, 0x00, 0x02, 0xEE, 0x01, 0x00, 0x01,
         /* 0008 */    0x00, 0x01, 0x0A, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0x5C, 0x49,
         /* 0018 */    0x32, 0x43, 0x00, 0x79, 0x00
@@ -252,7 +252,7 @@ Name (p457, Package() {
 
     Buffer (0x19)
     {
-        /* 0000 */    0x8E, 0x14, 0x00, 0x01, 0xEE, 0x01, 0x03, 0x00,
+        /* 0000 */    0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x03, 0x00,
         /* 0008 */    0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79,
         /* 0018 */    0x00
@@ -260,7 +260,7 @@ Name (p457, Package() {
 
     Buffer (0x19)
     {
-        /* 0000 */    0x8E, 0x14, 0x00, 0x01, 0xEE, 0x01, 0x03, 0x01,
+        /* 0000 */    0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x03, 0x01,
         /* 0008 */    0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79,
         /* 0018 */    0x00
@@ -268,7 +268,7 @@ Name (p457, Package() {
 
     Buffer (0x19)
     {
-        /* 0000 */    0x8E, 0x14, 0x00, 0x01, 0xEE, 0x01, 0x02, 0x00,
+        /* 0000 */    0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x02, 0x00,
         /* 0008 */    0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79,
         /* 0018 */    0x00
@@ -276,7 +276,7 @@ Name (p457, Package() {
 
     Buffer (0x19)
     {
-        /* 0000 */    0x8E, 0x14, 0x00, 0x01, 0xEE, 0x01, 0x02, 0x01,
+        /* 0000 */    0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x02, 0x01,
         /* 0008 */    0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79,
         /* 0018 */    0x00
@@ -284,7 +284,7 @@ Name (p457, Package() {
 
     Buffer (0x19)
     {
-        /* 0000 */    0x8E, 0x14, 0x00, 0x01, 0xEE, 0x01, 0x01, 0x00,
+        /* 0000 */    0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x01, 0x00,
         /* 0008 */    0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79,
         /* 0018 */    0x00
@@ -292,7 +292,7 @@ Name (p457, Package() {
 
     Buffer (0x19)
     {
-        /* 0000 */    0x8E, 0x14, 0x00, 0x01, 0xEE, 0x01, 0x01, 0x01,
+        /* 0000 */    0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x01, 0x01,
         /* 0008 */    0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79,
         /* 0018 */    0x00
@@ -300,7 +300,7 @@ Name (p457, Package() {
 
     Buffer (0x19)
     {
-        /* 0000 */    0x8E, 0x14, 0x00, 0x01, 0xEE, 0x01, 0x00, 0x00,
+        /* 0000 */    0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x00, 0x00,
         /* 0008 */    0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79,
         /* 0018 */    0x00
@@ -308,7 +308,7 @@ Name (p457, Package() {
 
     Buffer (0x19)
     {
-        /* 0000 */    0x8E, 0x14, 0x00, 0x01, 0xEE, 0x01, 0x00, 0x01,
+        /* 0000 */    0x8E, 0x14, 0x00, 0x02, 0xEE, 0x01, 0x00, 0x01,
         /* 0008 */    0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79,
         /* 0018 */    0x00
@@ -316,7 +316,7 @@ Name (p457, Package() {
 
     Buffer (0x19)
     {
-        /* 0000 */    0x8E, 0x14, 0x00, 0x01, 0x00, 0x01, 0x02, 0x00,
+        /* 0000 */    0x8E, 0x14, 0x00, 0x02, 0x00, 0x01, 0x02, 0x00,
         /* 0008 */    0x00, 0x01, 0x06, 0x00, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0x5C, 0x49, 0x32, 0x43, 0x00, 0x79,
         /* 0018 */    0x00
@@ -324,7 +324,7 @@ Name (p457, Package() {
 
     Buffer (0x0181)
     {
-        /* 0000 */    0x8E, 0x7C, 0x01, 0x01, 0xEE, 0x01, 0x00, 0x01,
+        /* 0000 */    0x8E, 0x7C, 0x01, 0x02, 0xEE, 0x01, 0x00, 0x01,
         /* 0008 */    0x00, 0x01, 0x6E, 0x01, 0x44, 0x55, 0x77, 0x88,
         /* 0010 */    0x34, 0x12, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6,
         /* 0018 */    0xB7, 0xB8, 0xB1, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6,
@@ -400,13 +400,13 @@ Method(RT23,, Serialized)
 
 	Store (
 		ResourceTemplate () {
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
                 AddressingMode10Bit, "\\I2C",
-                0xEE, ResourceConsumer, I2C0,
+                0xEE, ResourceConsumer, I2C0, Exclusive,
                 RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
                 AddressingMode10Bit, "\\I2C",
-                0xEE, ResourceConsumer, I2C1,
+                0xEE, ResourceConsumer, I2C1, Exclusive,
                 RawDataBuffer (4) {0xB1, 0xB2, 0xB3, 0xB4})
 		}, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl
index d194e57..518c5d4 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/spiserialbus.asl
@@ -35,714 +35,714 @@ Device (SPI) {}
 
 Name (p458, Package() {
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,)
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,)
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,)
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,)
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,)
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,)
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, ,
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceConsumer, , Shared,
             RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, ,)
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceConsumer, , Shared,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,)
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,)
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,)
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,)
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,)
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,)
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, ,)
+            ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer, , Exclusive,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
-            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, ,)
+            ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer, , Exclusive,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityHigh, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityHigh, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, FourWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, FourWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer,)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             DeviceInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x07,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x07,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseFirst, "\\SPI", 0xEE, ResourceProducer)
     },
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, PolarityLow, ThreeWireMode, 0x08,
+        SpiSerialBusV2 (0x6789, PolarityLow, ThreeWireMode, 0x08,
             ControllerInitiated, 0xAABBCCDD, ClockPolarityHigh,
             ClockPhaseSecond, "\\SPI", 0xEE, ResourceProducer)
     },
 
     // Minimal invocation
 	ResourceTemplate () {
-        SpiSerialBus (0x6789, , , 0x07, , 0xAABBCCDD, ClockPolarityLow,
+        SpiSerialBusV2 (0x6789, , , 0x07, , 0xAABBCCDD, ClockPolarityLow,
             ClockPhaseSecond, "\\SPI", , , ,)
 	}
 })
@@ -751,7 +751,7 @@ Name (p458, Package() {
 Name (p459, Package() {
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -759,7 +759,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -767,7 +767,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -775,7 +775,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -783,7 +783,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -791,7 +791,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -799,7 +799,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -807,7 +807,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -815,7 +815,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -823,7 +823,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -831,7 +831,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -839,7 +839,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -847,7 +847,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -855,7 +855,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -863,7 +863,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -871,7 +871,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -879,7 +879,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -887,7 +887,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -895,7 +895,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -903,7 +903,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -911,7 +911,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -919,7 +919,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -927,7 +927,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -935,7 +935,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -943,7 +943,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -951,7 +951,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -959,7 +959,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -967,7 +967,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -975,7 +975,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -983,7 +983,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -991,7 +991,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -999,7 +999,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1007,7 +1007,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1015,7 +1015,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1023,7 +1023,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1031,7 +1031,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1039,7 +1039,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1047,7 +1047,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1055,7 +1055,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1063,7 +1063,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x02,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x02,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1071,7 +1071,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1079,7 +1079,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1087,7 +1087,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1095,7 +1095,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1103,7 +1103,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1111,7 +1111,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1119,7 +1119,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1127,7 +1127,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x03,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x03,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1135,7 +1135,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1143,7 +1143,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1151,7 +1151,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1159,7 +1159,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1167,7 +1167,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1175,7 +1175,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1183,7 +1183,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1191,7 +1191,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x00,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x00,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1199,7 +1199,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1207,7 +1207,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1215,7 +1215,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1223,7 +1223,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1231,7 +1231,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1239,7 +1239,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1247,7 +1247,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1255,7 +1255,7 @@ Name (p459, Package() {
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1263,217 +1263,217 @@ Name (p459, Package() {
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x03, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x03, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x21)
     {
-        /* 0000 */   0x8E, 0x1C, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x01,
+        /* 0000 */   0x8E, 0x1C, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01,
         /* 0008 */   0x00, 0x01, 0x0E, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0xF0, 0xF1, 0xF2,
         /* 0018 */   0xF3, 0xF4, 0x5C, 0x53, 0x50, 0x49, 0x00, 0x79,
@@ -1481,238 +1481,238 @@ Name (p459, Package() {
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x02, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x02, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x02,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x02,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x03,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x03,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x01, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x01, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x00, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x00, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0xEE, 0x02, 0x00, 0x01,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0xEE, 0x02, 0x00, 0x01,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x08, 0x01, 0x01, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
     },
     Buffer (0x1C)
     {
-        /* 0000 */   0x8E, 0x17, 0x00, 0x01, 0x00, 0x02, 0x02, 0x00,
+        /* 0000 */   0x8E, 0x17, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00,
         /* 0008 */   0x00, 0x01, 0x09, 0x00, 0xDD, 0xCC, 0xBB, 0xAA,
         /* 0010 */   0x07, 0x01, 0x00, 0x89, 0x67, 0x5C, 0x53, 0x50,
         /* 0018 */   0x49, 0x00, 0x79, 0x00
@@ -1744,15 +1744,15 @@ Method(RT24,, Serialized)
 
 	Store (
 		ResourceTemplate () {
-            SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+            SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
                 DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
                 ClockPhaseSecond, "\\SPI",
-                0xEE, ResourceConsumer, SPI0,
+                0xEE, ResourceConsumer, SPI0, Shared,
                 RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
-            SpiSerialBus (0x6789, PolarityHigh, FourWireMode, 0x07,
+            SpiSerialBusV2 (0x6789, PolarityHigh, FourWireMode, 0x07,
                 DeviceInitiated, 0xAABBCCDD, ClockPolarityLow,
                 ClockPhaseSecond, "\\SPI",
-                0xEE, ResourceConsumer, SPI1,
+                0xEE, ResourceConsumer, SPI1, Exclusive,
                 RawDataBuffer (0x05) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4})
 		}, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl
index 5a2c822..7a2e1ea 100644
--- a/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl
+++ b/tests/aslts/src/runtime/collections/functional/descriptor/uartserialbus.asl
@@ -35,240 +35,240 @@ Device (UART) {}
 
 Name (p45A, Package() {
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeEven, FlowControlNone,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeEven, FlowControlXon,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeEven, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeNone, FlowControlNone,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeNone, FlowControlXon,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeNone, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeSpace, FlowControlNone,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeSpace, FlowControlXon,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeSpace, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeMark, FlowControlNone,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeMark, FlowControlXon,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeMark, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeOdd, FlowControlNone,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeOdd, FlowControlXon,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 
 // StopBits
 
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsZero,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsZero,
             0xA5, BigEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsOne,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsOne,
             0xA5, BigEndian, ParityTypeOdd, FlowControlNone,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsOnePlusHalf,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsOnePlusHalf,
             0xA5, BigEndian, ParityTypeOdd, FlowControlXon,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 
 // DataBits
 
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsFive, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsFive, StopBitsTwo,
             0xA5, BigEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsSix, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsSix, StopBitsTwo,
             0xA5, BigEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsSeven, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsSeven, StopBitsTwo,
             0xA5, BigEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, BigEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsNine, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsNine, StopBitsTwo,
             0xA5, BigEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 
 // Endian
 
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsZero,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsZero,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsOne,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsOne,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlNone,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsOnePlusHalf,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsOnePlusHalf,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlXon,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsFive, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsFive, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsSix, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsSix, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsSeven, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsSeven, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsNine, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsNine, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, ,
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceConsumer, , Exclusive,
             RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
     },
 
 // ResourceProducer
 
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsZero,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsZero,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer, ,)
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer, , Shared,)
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsOne,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsOne,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlNone,
-            0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer, ,)
+            0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer, , Shared,)
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsOnePlusHalf,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsOnePlusHalf,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlXon,
             0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer,)
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsFive, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsFive, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
             0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer,)
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsSix, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsSix, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
             0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer,)
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsSeven, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsSeven, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
             0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer)
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
             0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer)
     },
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, DataBitsNine, StopBitsTwo,
+        UartSerialBusV2 (0xFFEEDDCC, DataBitsNine, StopBitsTwo,
             0xA5, LittleEndian, ParityTypeOdd, FlowControlHardware,
             0x3377, 0x4488, "\\UART", 0x8C, ResourceProducer)
     },
@@ -276,7 +276,7 @@ Name (p45A, Package() {
     // Minimal invocation
 
 	ResourceTemplate () {
-        UartSerialBus (0xFFEEDDCC, , , 0xA5, , , ,
+        UartSerialBusV2 (0xFFEEDDCC, , , 0xA5, , , ,
             0x3300, 0x4400, "\\UART", , , ,)
     }
 })
@@ -285,7 +285,7 @@ Name (p45A, Package() {
 Name (p45B, Package() {
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBC,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBC,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x01, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -293,7 +293,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBE,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBE,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x01, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -301,7 +301,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBD,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBD,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x01, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -309,7 +309,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBC,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBC,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x00, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -317,7 +317,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBE,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBE,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x00, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -325,7 +325,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBD,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBD,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x00, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -333,7 +333,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBC,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBC,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x04, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -341,7 +341,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBE,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBE,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x04, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -349,7 +349,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBD,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBD,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x04, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -357,7 +357,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBC,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBC,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x03, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -365,7 +365,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBE,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBE,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x03, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -373,7 +373,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBD,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBD,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x03, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -381,7 +381,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBC,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBC,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -389,7 +389,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBE,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBE,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -397,7 +397,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBD,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBD,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -405,7 +405,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xB1,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xB1,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -413,7 +413,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xB4,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xB4,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -421,7 +421,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBA,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBA,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -429,7 +429,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x8D,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x8D,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -437,7 +437,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x9D,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x9D,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -445,7 +445,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xAD,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xAD,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -453,7 +453,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xBD,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xBD,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -461,7 +461,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0xCD,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0xCD,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -469,7 +469,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x31,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x31,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -477,7 +477,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x34,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x34,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -485,7 +485,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x3A,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x3A,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -493,7 +493,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x0D,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x0D,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -501,7 +501,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x1D,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x1D,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -509,7 +509,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x2D,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x2D,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -517,7 +517,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x3D,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x3D,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -525,7 +525,7 @@ Name (p45B, Package() {
     },
     Buffer (0x25)
     {
-        /* 0000 */   0x8E, 0x20, 0x00, 0x01, 0x8C, 0x03, 0x02, 0x4D,
+        /* 0000 */   0x8E, 0x20, 0x00, 0x02, 0x8C, 0x03, 0x02, 0x4D,
         /* 0008 */   0x00, 0x01, 0x11, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0xF0, 0xF1,
         /* 0018 */   0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0x5C, 0x55, 0x41,
@@ -533,63 +533,63 @@ Name (p45B, Package() {
     },
     Buffer (0x1E)
     {
-        /* 0000 */   0x8E, 0x19, 0x00, 0x01, 0x8C, 0x03, 0x00, 0x31,
+        /* 0000 */   0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x31,
         /* 0008 */   0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55,
         /* 0018 */   0x41, 0x52, 0x54, 0x00, 0x79, 0x00
     },
     Buffer (0x1E)
     {
-        /* 0000 */   0x8E, 0x19, 0x00, 0x01, 0x8C, 0x03, 0x00, 0x34,
+        /* 0000 */   0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x34,
         /* 0008 */   0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55,
         /* 0018 */   0x41, 0x52, 0x54, 0x00, 0x79, 0x00
     },
     Buffer (0x1E)
     {
-        /* 0000 */   0x8E, 0x19, 0x00, 0x01, 0x8C, 0x03, 0x00, 0x3A,
+        /* 0000 */   0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x3A,
         /* 0008 */   0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55,
         /* 0018 */   0x41, 0x52, 0x54, 0x00, 0x79, 0x00
     },
     Buffer (0x1E)
     {
-        /* 0000 */   0x8E, 0x19, 0x00, 0x01, 0x8C, 0x03, 0x00, 0x0D,
+        /* 0000 */   0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x0D,
         /* 0008 */   0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55,
         /* 0018 */   0x41, 0x52, 0x54, 0x00, 0x79, 0x00
     },
     Buffer (0x1E)
     {
-        /* 0000 */   0x8E, 0x19, 0x00, 0x01, 0x8C, 0x03, 0x00, 0x1D,
+        /* 0000 */   0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x1D,
         /* 0008 */   0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55,
         /* 0018 */   0x41, 0x52, 0x54, 0x00, 0x79, 0x00
     },
     Buffer (0x1E)
     {
-        /* 0000 */   0x8E, 0x19, 0x00, 0x01, 0x8C, 0x03, 0x00, 0x2D,
+        /* 0000 */   0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x2D,
         /* 0008 */   0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55,
         /* 0018 */   0x41, 0x52, 0x54, 0x00, 0x79, 0x00
     },
     Buffer (0x1E)
     {
-        /* 0000 */   0x8E, 0x19, 0x00, 0x01, 0x8C, 0x03, 0x00, 0x3D,
+        /* 0000 */   0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x3D,
         /* 0008 */   0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55,
         /* 0018 */   0x41, 0x52, 0x54, 0x00, 0x79, 0x00
     },
     Buffer (0x1E)
     {
-        /* 0000 */   0x8E, 0x19, 0x00, 0x01, 0x8C, 0x03, 0x00, 0x4D,
+        /* 0000 */   0x8E, 0x19, 0x00, 0x02, 0x8C, 0x03, 0x00, 0x4D,
         /* 0008 */   0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x77, 0x33, 0x88, 0x44, 0x02, 0xA5, 0x5C, 0x55,
         /* 0018 */   0x41, 0x52, 0x54, 0x00, 0x79, 0x00
     },
     Buffer (0x1E)
     {
-        /* 0000 */   0x8E, 0x19, 0x00, 0x01, 0x00, 0x03, 0x02, 0x34,
+        /* 0000 */   0x8E, 0x19, 0x00, 0x02, 0x00, 0x03, 0x02, 0x34,
         /* 0008 */   0x00, 0x01, 0x0A, 0x00, 0xCC, 0xDD, 0xEE, 0xFF,
         /* 0010 */   0x00, 0x33, 0x00, 0x44, 0x00, 0xA5, 0x5C, 0x55,
         /* 0018 */   0x41, 0x52, 0x54, 0x00, 0x79, 0x00
@@ -620,15 +620,15 @@ Method(RT25,, Serialized)
 
 	Store (
 		ResourceTemplate () {
-            UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+            UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
                 0xA5, BigEndian, ParityTypeEven, FlowControlNone,
                 0x3300, 0x4400, "\\UART",
-                0xEE, ResourceProducer, UAR0,
+                0xEE, ResourceProducer, UAR0, Shared,
                 RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
-            UartSerialBus (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
+            UartSerialBusV2 (0xFFEEDDCC, DataBitsEight, StopBitsTwo,
                 0xA5, BigEndian, ParityTypeEven, FlowControlNone,
                 0x3300, 0x4400, "\\UART",
-                0xEE, ResourceConsumer, UAR1,
+                0xEE, ResourceConsumer, UAR1, Exclusive,
                 RawDataBuffer (0x07) {0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6})
 		}, Local0)
 
diff --git a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl
index 9a99f00..b4026ca 100644
--- a/tests/aslts/src/runtime/collections/functional/region/dtregions.asl
+++ b/tests/aslts/src/runtime/collections/functional/region/dtregions.asl
@@ -98,7 +98,7 @@ Device(DTR0) {
 		}
 
 		if (LLess(arg1, NFLG)) {
-			Store(Index(VFLG, arg1), Local1)
+			Index(VFLG, arg1, Local1)
 			Store(Refof(Local1), Local2)
 			Add(Derefof(Local1), 1, Derefof(Local2))
 		} else {
@@ -164,7 +164,7 @@ Method(m7f1, 1, Serialized)
 		}
 
 		if (LLess(arg1, NFLG)) {
-			Store(Index(VFLG, arg1), Local1)
+			Index(VFLG, arg1, Local1)
 			Store(Refof(Local1), Local2)
 			Add(Derefof(Local1), 1, Derefof(Local2))
 		} else {
diff --git a/tests/aslts/src/runtime/collections/functional/region/opregions.asl b/tests/aslts/src/runtime/collections/functional/region/opregions.asl
index b000bd4..fbf97ea 100644
--- a/tests/aslts/src/runtime/collections/functional/region/opregions.asl
+++ b/tests/aslts/src/runtime/collections/functional/region/opregions.asl
@@ -129,7 +129,7 @@ Method(_REG, 2, Serialized)
 	}
 
 	if (LLess(Local0, NRSK)) {
-		Store(Index(VRSK, Local0), Local1)
+		Index(VRSK, Local0, Local1)
 		Store(Refof(Local1), Local2)
 		Add(Derefof(Local1), 1, Derefof(Local2))
 	} else {
@@ -137,7 +137,7 @@ Method(_REG, 2, Serialized)
 	}
 
 	if (LLess(arg1, NFLG)) {
-		Store(Index(VFLG, arg1), Local1)
+		Index(VFLG, arg1, Local1)
 		Store(Refof(Local1), Local2)
 		Add(Derefof(Local1), 1, Derefof(Local2))
 	} else {
@@ -259,7 +259,7 @@ Device(DOR0) {
 		}
 
 		if (LLess(Local0, NRSK)) {
-			Store(Index(VRSK, Local0), Local1)
+			Index(VRSK, Local0, Local1)
 			Store(Refof(Local1), Local2)
 			Add(Derefof(Local1), 1, Derefof(Local2))
 		} else {
@@ -267,7 +267,7 @@ Device(DOR0) {
 		}
 
 		if (LLess(arg1, NFLG)) {
-			Store(Index(VFLG, arg1), Local1)
+			Index(VFLG, arg1, Local1)
 			Store(Refof(Local1), Local2)
 			Add(Derefof(Local1), 1, Derefof(Local2))
 		} else {
@@ -345,7 +345,7 @@ Device(DOR1) {
 			}
 
 			if (LLess(Local0, NRSK)) {
-				Store(Index(VRSK, Local0), Local1)
+				Index(VRSK, Local0, Local1)
 				Store(Refof(Local1), Local2)
 				Add(Derefof(Local1), 1, Derefof(Local2))
 			} else {
@@ -353,7 +353,7 @@ Device(DOR1) {
 			}
 
 			if (LLess(arg1, NFLG)) {
-				Store(Index(VFLG, arg1), Local1)
+				Index(VFLG, arg1, Local1)
 				Store(Refof(Local1), Local2)
 				Add(Derefof(Local1), 1, Derefof(Local2))
 			} else {
@@ -493,7 +493,7 @@ Method(m702, 1)
 	Concatenate(arg0, "-m702", arg0)
 
 	Store(Sizeof(p702), Local0)
-	Store(Divide(Local0, 3), Local0)
+	Divide(Local0, 3, , Local0)
 	Store(0, Local1)
 
 	Store(2, Local1)
@@ -641,7 +641,7 @@ Method(m70e, 5, Serialized)
 
 	while (Local0) {
 		Decrement(Local0)
-		Store(Index(arg2, Local0), Local1)
+		Index(arg2, Local0, Local1)
 		Store(Refof(Local1), Local2)
 
 		switch(ToInteger (arg1)) {
@@ -649,7 +649,7 @@ Method(m70e, 5, Serialized)
 				Store (0, Derefof(Local2))
 			}
 			case (1) {
-				Store(Index(arg3, Local0), Local3)
+				Index(arg3, Local0, Local3)
 				if (LNotEqual(DeRefof(Local1), DeRefof(Local3))) {
 					err(arg0, z141, arg4, z141, Local0, DeRefof(Local1), DeRefof(Local3))
 				}
diff --git a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl
index a356d8d..97ca39d 100644
--- a/tests/aslts/src/runtime/collections/functional/region/regionfield.asl
+++ b/tests/aslts/src/runtime/collections/functional/region/regionfield.asl
@@ -899,7 +899,7 @@ Method(m758, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -968,7 +968,7 @@ Method(m759, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -1038,7 +1038,7 @@ Method(m75a, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -1110,7 +1110,7 @@ Method(m75b, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -1182,7 +1182,7 @@ Method(m75c, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -1261,7 +1261,7 @@ Method(m75d, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -1320,7 +1320,7 @@ Method(m75e, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -1389,7 +1389,7 @@ Method(m75f, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -1460,7 +1460,7 @@ Method(m760, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -1531,7 +1531,7 @@ Method(m761, 1, Serialized)
 
         // A Connection is required
         Connection (
-            I2cSerialBus (0x1234, DeviceInitiated, 0x88775544,
+            I2cSerialBusV2 (0x1234, DeviceInitiated, 0x88775544,
             AddressingMode10Bit, "\\GPI1", 0xEE,
             ResourceConsumer)),
 
@@ -2396,7 +2396,7 @@ Method(m72f, 4, Serialized)
 
 				if (LGreater(Local7, 8)) {
 					// Buffer source, shorter than field
-					Store(Divide(Subtract(Local7, 1), 8), Local4)
+					Divide(Subtract(Local7, 1), 8, , Local4)
 					m72e(Concatenate(arg0, "-BShort"), arg2, Local6,
 						Local7, Local2, Local4)
 				}
@@ -24813,7 +24813,7 @@ Method(m743, 1, Serialized)
 			if (Local7) {
 				Increment(i000)
 			}
-			Add(Derefof(Index(Local4, 0)), i000, i000)
+			Add(i000, Derefof(Index(Local4, 0)), i000)
 
 			Divide(i000, Local5, Local7)