diff --git a/source/components/executer/exresolv.c b/source/components/executer/exresolv.c
index 5994b5160..b6ce916ae 100644
--- a/source/components/executer/exresolv.c
+++ b/source/components/executer/exresolv.c
@@ -166,7 +166,7 @@ AmlGetFieldUnitValue (
         DEBUG_PRINT (ACPI_ERROR, ("AmlGetFieldUnitValue: internal error - null container pointer\n"));
     }
 
-    else if (TYPE_Buffer != FieldDesc->FieldUnit.Container->Type)
+    else if (TYPE_Buffer != FieldDesc->FieldUnit.Container->Common.Type)
     {
         DEBUG_PRINT (ACPI_ERROR, ("AmlGetFieldUnitValue: internal error - container is not a Buffer\n"));
     }
@@ -279,7 +279,7 @@ AmlGetRvalue (
         return_ACPI_STATUS (AE_AML_ERROR);
     }
 
-    switch ((*StackPtr)->Type)
+    switch ((*StackPtr)->Common.Type)
     {
     case TYPE_Lvalue:
 
@@ -314,7 +314,7 @@ AmlGetRvalue (
                             MvIndex, Gbl_ExceptionNames[Status], StackPtr, *StackPtr,
                             *(UINT32 *)* StackPtr));
             
-            if (TYPE_Number == (*StackPtr)->Type)
+            if (TYPE_Number == (*StackPtr)->Common.Type)
             {
                 /* Value is a Number */
                 
@@ -340,7 +340,7 @@ AmlGetRvalue (
                             MvIndex, Gbl_ExceptionNames[Status], StackPtr, *StackPtr,
                             *(UINT32 *)* StackPtr));
 
-            if (TYPE_Number == (*StackPtr)->Type)
+            if (TYPE_Number == (*StackPtr)->Common.Type)
             {
                 /* Value is a Number */
                 
@@ -353,7 +353,7 @@ AmlGetRvalue (
 
         case AML_ZeroOp:
 
-            (*StackPtr)->Type = (UINT8) TYPE_Number;
+            (*StackPtr)->Common.Type = (UINT8) TYPE_Number;
             (*StackPtr)->Number.Value = 0;
             Status = AE_OK;
             break;
@@ -361,7 +361,7 @@ AmlGetRvalue (
 
         case AML_OneOp:
 
-            (*StackPtr)->Type = (UINT8) TYPE_Number;
+            (*StackPtr)->Common.Type = (UINT8) TYPE_Number;
             (*StackPtr)->Number.Value = 1;
             Status = AE_OK;
             break;
@@ -369,7 +369,7 @@ AmlGetRvalue (
 
         case AML_OnesOp:
 
-            (*StackPtr)->Type = (UINT8) TYPE_Number;
+            (*StackPtr)->Common.Type = (UINT8) TYPE_Number;
             (*StackPtr)->Number.Value = 0xFFFFFFFF;
             Status = AE_OK;
             break;
@@ -438,7 +438,7 @@ AmlGetRvalue (
 
         break;
 
-    }   /* switch ((*StackPtr)->Type) */
+    }   /* switch ((*StackPtr)->Common.Type) */
 
 
 
@@ -503,7 +503,7 @@ AmlGetRvalue (
                 }
             }
             
-            if (!ValDesc || (TYPE_Package != ValDesc->Type))
+            if (!ValDesc || (TYPE_Package != ValDesc->Common.Type))
             {
                 DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue:internal error - Bad package value\n"));
                 return_ACPI_STATUS (AE_AML_ERROR);
@@ -532,7 +532,7 @@ AmlGetRvalue (
 
             /* TBD: - Is there a problem here if the nte points to an AML definition? */
             
-            if (TYPE_String != ValDesc->Type)
+            if (TYPE_String != ValDesc->Common.Type)
             {
                 DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: internal error - Bad string value\n"));
                 return_ACPI_STATUS (AE_AML_ERROR);
@@ -597,7 +597,7 @@ AmlGetRvalue (
                 }
             }
             
-            if (!ValDesc || (TYPE_Buffer != ValDesc->Type))
+            if (!ValDesc || (TYPE_Buffer != ValDesc->Common.Type))
             {
                 DEBUG_PRINT (ACPI_ERROR, ("AmlGetRvalue: Bad buffer value\n"));
                 return_ACPI_STATUS (AE_AML_ERROR);
@@ -640,7 +640,7 @@ AmlGetRvalue (
                 return_ACPI_STATUS (AE_AML_ERROR);
             }
 
-            if (TYPE_Number == ValDesc->Type)
+            if (TYPE_Number == ValDesc->Common.Type)
             {
                 ObjDesc = CmAllocateObjectDesc ();
                 if (!ObjDesc)
@@ -770,11 +770,11 @@ BREAKPOINT3;
                 return_ACPI_STATUS (AE_AML_ERROR);
             }
 
-            if (TYPE_BankField != ValDesc->Type)
+            if (TYPE_BankField != ValDesc->Common.Type)
             {
                 DEBUG_PRINT (ACPI_ERROR, (
                         "AmlGetRvalue/BankField:internal error - Name %4.4s type %d does not match value-type %d at %p\n",
-                        *StackPtr, TYPE_BankField, ValDesc->Type, ValDesc));
+                        *StackPtr, TYPE_BankField, ValDesc->Common.Type, ValDesc));
                 
                 return_ACPI_STATUS (AE_AML_ERROR);
             }
@@ -828,11 +828,11 @@ BREAKPOINT3;
                 return_ACPI_STATUS (AE_AML_ERROR);
             }
 
-            if (TYPE_IndexField != ValDesc->Type)
+            if (TYPE_IndexField != ValDesc->Common.Type)
             {
                 DEBUG_PRINT (ACPI_ERROR, (
                         "AmlGetRvalue/IndexField: internal error - Name %4.4s type %d does not match value-type %d at %p\n",
-                        *StackPtr, TYPE_IndexField, ValDesc->Type, ValDesc));
+                        *StackPtr, TYPE_IndexField, ValDesc->Common.Type, ValDesc));
                 
                 return_ACPI_STATUS (AE_AML_ERROR);
             }
@@ -884,12 +884,12 @@ BREAKPOINT3;
                 return_ACPI_STATUS (AE_AML_ERROR);
             }
 
-            if (ValDesc->Type != (UINT8) NsGetType ((ACPI_HANDLE)* StackPtr))
+            if (ValDesc->Common.Type != (UINT8) NsGetType ((ACPI_HANDLE)* StackPtr))
             {
                 DEBUG_PRINT (ACPI_ERROR, (
                         "AmlGetRvalue/FieldUnit:internal error - Name %4.4s type %d does not match value-type %d at %p\n",
                           *StackPtr, NsGetType ((ACPI_HANDLE)* StackPtr),
-                          ValDesc->Type, ValDesc));
+                          ValDesc->Common.Type, ValDesc));
                 
                 return_ACPI_STATUS (AE_AML_ERROR);
                 break;
diff --git a/source/components/executer/exstore.c b/source/components/executer/exstore.c
index f9899c31f..65fe5c398 100644
--- a/source/components/executer/exstore.c
+++ b/source/components/executer/exstore.c
@@ -299,12 +299,12 @@ AmlExecStore (
 
     /* Destination object must be of type Lvalue */
 
-    if (DestDesc->Type != TYPE_Lvalue)
+    if (DestDesc->Common.Type != TYPE_Lvalue)
     {   
         /* Destination is not an Lvalue */
 
         DEBUG_PRINT (ACPI_ERROR, ("AmlExecStore: Destination is not an Lvalue [%s]\n",
-                        Gbl_NsTypeNames[DestDesc->Type]));
+                        Gbl_NsTypeNames[DestDesc->Common.Type]));
 
         DUMP_STACK_ENTRY (ValDesc);
         DUMP_STACK_ENTRY (DestDesc);
@@ -345,17 +345,17 @@ AmlExecStore (
              * If value is not a Number, try to resolve it to one.
              */
 
-            if ((ValDesc->Type != TYPE_Number) &&
+            if ((ValDesc->Common.Type != TYPE_Number) &&
                ((Status = AmlGetRvalue (&ValDesc)) != AE_OK))
             {
                 DeleteDestDesc = DestDesc;
             }
 
-            else if (ValDesc->Type != TYPE_Number)
+            else if (ValDesc->Common.Type != TYPE_Number)
             {
                 DEBUG_PRINT (ACPI_ERROR, (
                         "AmlExecStore: Value assigned to BankField must be Number, not %d\n",
-                        ValDesc->Type));
+                        ValDesc->Common.Type));
 
                 DeleteDestDesc = DestDesc;
                 Status = AE_AML_ERROR;
@@ -380,11 +380,11 @@ AmlExecStore (
 
 
             if ((AE_OK == Status) && 
-                (TYPE_BankField != DestDesc->Type))
+                (TYPE_BankField != DestDesc->Common.Type))
             {
                 DEBUG_PRINT (ACPI_ERROR, (
                         "AmlExecStore/BankField: Internal error - Name %4.4s type %d does not match value-type %d at %p\n",
-                        TempHandle, NsGetType (TempHandle), DestDesc->Type, DestDesc));
+                        TempHandle, NsGetType (TempHandle), DestDesc->Common.Type, DestDesc));
 
                 Status = AE_AML_ERROR;
             }
@@ -426,17 +426,17 @@ AmlExecStore (
              * If value is not a Number, try to resolve it to one.
              */
 
-            if ((ValDesc->Type != TYPE_Number) && 
+            if ((ValDesc->Common.Type != TYPE_Number) && 
                ((Status = AmlGetRvalue (&ValDesc)) != AE_OK))
             {
                 DeleteDestDesc = DestDesc;
             }
 
-            else if (ValDesc->Type != TYPE_Number)
+            else if (ValDesc->Common.Type != TYPE_Number)
             {
                 DEBUG_PRINT (ACPI_ERROR, 
                         ("AmlExecStore/DefField: Value assigned to Field must be Number, not %d\n",
-                        ValDesc->Type));
+                        ValDesc->Common.Type));
 
                 DeleteDestDesc = DestDesc;
                 Status = AE_AML_ERROR;
@@ -460,11 +460,11 @@ AmlExecStore (
             }
 
             if ((AE_OK == Status) && 
-                (TYPE_DefField != DestDesc->Type))
+                (TYPE_DefField != DestDesc->Common.Type))
             {
                 DEBUG_PRINT (ACPI_ERROR, (
                         "AmlExecStore/DefField: Internal error - Name %4.4s type %d does not match value-type %d at %p\n",
-                        TempHandle, NsGetType (TempHandle), DestDesc->Type, DestDesc));
+                        TempHandle, NsGetType (TempHandle), DestDesc->Common.Type, DestDesc));
 
                 Status = AE_AML_ERROR;
             }
@@ -490,17 +490,17 @@ AmlExecStore (
              * If value is not a Number, try to resolve it to one.
              */
             
-            if ((ValDesc->Type != TYPE_Number) &&
+            if ((ValDesc->Common.Type != TYPE_Number) &&
                ((Status = AmlGetRvalue (&ValDesc)) != AE_OK))
             {
                 DeleteDestDesc = DestDesc;
             }
 
-            else if (ValDesc->Type != TYPE_Number)
+            else if (ValDesc->Common.Type != TYPE_Number)
             {
                 DEBUG_PRINT (ACPI_ERROR, (
                         "AmlExecStore: Value assigned to IndexField must be Number, not %d\n",
-                        ValDesc->Type));
+                        ValDesc->Common.Type));
 
                 DeleteDestDesc = DestDesc;
                 Status = AE_AML_ERROR;
@@ -525,11 +525,11 @@ AmlExecStore (
             }
 
             if ((AE_OK == Status) &&
-                (TYPE_IndexField != DestDesc->Type))
+                (TYPE_IndexField != DestDesc->Common.Type))
             {
                 DEBUG_PRINT (ACPI_ERROR, 
                         ("AmlExecStore/IndexField: Internal error - Name %4.4s type %d does not match value-type %d at %p\n",
-                        TempHandle, NsGetType (TempHandle), DestDesc->Type, DestDesc));
+                        TempHandle, NsGetType (TempHandle), DestDesc->Common.Type, DestDesc));
 
                 Status = AE_AML_ERROR;
             }
@@ -568,17 +568,17 @@ AmlExecStore (
              * Storing into a FieldUnit (defined in a Buffer).
              * If value is not a Number, try to resolve it to one.
              */
-            if ((ValDesc->Type != TYPE_Number) &&
+            if ((ValDesc->Common.Type != TYPE_Number) &&
                ((Status = AmlGetRvalue (&ValDesc)) != AE_OK))
             {
                 DeleteDestDesc = DestDesc;
             }
 
-            else if (ValDesc->Type != TYPE_Number)
+            else if (ValDesc->Common.Type != TYPE_Number)
             {
                 DEBUG_PRINT (ACPI_ERROR, (
                         "AmlExecStore/FieldUnit: Value assigned to Field must be Number, not %d\n",
-                          ValDesc->Type));
+                          ValDesc->Common.Type));
 
                 DeleteDestDesc = DestDesc;
                 Status = AE_AML_ERROR;
@@ -604,24 +604,24 @@ AmlExecStore (
                 else
                 {
                     DEBUG_PRINT (ACPI_INFO,
-                        ("AmlExecStore: FieldUnit: Name's value DestDesc=%p, DestDesc->Type=%02Xh\n",
-                        DestDesc, DestDesc->Type));
+                        ("AmlExecStore: FieldUnit: Name's value DestDesc=%p, DestDesc->Common.Type=%02Xh\n",
+                        DestDesc, DestDesc->Common.Type));
                 }
             }
 
             if ((AE_OK == Status) &&
-                (DestDesc->Type != (UINT8) NsGetType (TempHandle)))
+                (DestDesc->Common.Type != (UINT8) NsGetType (TempHandle)))
             {
                 DEBUG_PRINT (ACPI_ERROR, (
                         "AmlExecStore/FieldUnit: Internal error - Name %4.4s type %d does not match value-type %d at %p\n",
-                          TempHandle, NsGetType(TempHandle), DestDesc->Type, DestDesc));
+                          TempHandle, NsGetType(TempHandle), DestDesc->Common.Type, DestDesc));
 
                 Status = AE_AML_ERROR;
             }
 
             if ((AE_OK == Status) &&
                (!DestDesc->FieldUnit.Container ||
-                TYPE_Buffer != DestDesc->FieldUnit.Container->Type ||
+                TYPE_Buffer != DestDesc->FieldUnit.Container->Common.Type ||
                 DestDesc->FieldUnit.Sequence
                     != DestDesc->FieldUnit.Container->Buffer.Sequence))
             {
@@ -633,7 +633,7 @@ AmlExecStore (
                 if (DestDesc->FieldUnit.Container)
                 {
                     DEBUG_PRINT_RAW (ACPI_ERROR, (" Type %d, FuSeq %x BufSeq %x",
-                        DestDesc->FieldUnit.Container->Type,
+                        DestDesc->FieldUnit.Container->Common.Type,
                         DestDesc->FieldUnit.Sequence,
                         DestDesc->FieldUnit.Container->Buffer.Sequence));
                 }
@@ -709,7 +709,7 @@ AmlExecStore (
                 return_ACPI_STATUS (Status);
             }
             
-            if (TYPE_Buffer == DestDesc->Type)
+            if (TYPE_Buffer == DestDesc->Common.Type)
             {
                 /* Assign a new sequence number */
 
@@ -717,7 +717,7 @@ AmlExecStore (
             }
 
 
-            NsAttachObject (TempHandle, DestDesc, DestDesc->Type);
+            NsAttachObject (TempHandle, DestDesc, DestDesc->Common.Type);
             break;
         }