diff --git a/source/components/tables/tbinstal.c b/source/components/tables/tbinstal.c
index 3c1c5c58c..21f02c006 100644
--- a/source/components/tables/tbinstal.c
+++ b/source/components/tables/tbinstal.c
@@ -126,7 +126,6 @@
         MODULE_NAME         ("tbinstal");
 
 
-
 /******************************************************************************
  *
  * FUNCTION:    AcpiTbInstallTable
@@ -261,7 +260,7 @@ AcpiTbRecognizeTable (
      * even the ones whose signature we don't recognize
      */
 
-    if (TableType != TABLE_FACS)
+    if (TableType != ACPI_TABLE_FACS)
     {
         /* But don't abort if the checksum is wrong */
         /* TBD: [Future] make this a configuration option? */
@@ -316,7 +315,6 @@ AcpiTbInitTableDescriptor (
     TableDesc   = ListHead;
 
 
-
     /*
      * Two major types of tables:  1) Only one instance is allowed.  This includes most
      * ACPI tables such as the DSDT.  2) Multiple instances of the table are allowed.  This
@@ -405,7 +403,6 @@ AcpiTbInitTableDescriptor (
 }
 
 
-
 /****************************************************************************
  *
  * FUNCTION:    AcpiTbDeleteAcpiTables
@@ -474,37 +471,37 @@ AcpiTbDeleteAcpiTable (
 
     switch (Type)
     {
-    case TABLE_RSDP:
+    case ACPI_TABLE_RSDP:
         AcpiGbl_RSDP = NULL;
         break;
 
-    case TABLE_APIC:
+    case ACPI_TABLE_APIC:
         AcpiGbl_APIC = NULL;
         break;
 
-    case TABLE_DSDT:
+    case ACPI_TABLE_DSDT:
         AcpiGbl_DSDT = NULL;
         break;
 
-    case TABLE_FACP:
+    case ACPI_TABLE_FACP:
         AcpiGbl_FACP = NULL;
         break;
 
-    case TABLE_FACS:
+    case ACPI_TABLE_FACS:
         AcpiGbl_FACS = NULL;
         break;
 
-    case TABLE_PSDT:
+    case ACPI_TABLE_PSDT:
         break;
 
-    case TABLE_RSDT:
+    case ACPI_TABLE_RSDT:
         AcpiGbl_RSDT = NULL;
         break;
 
-    case TABLE_SSDT:
+    case ACPI_TABLE_SSDT:
         break;
 
-    case TABLE_SBST:
+    case ACPI_TABLE_SBST:
         AcpiGbl_SBST = NULL;
 
     default:
@@ -591,7 +588,6 @@ AcpiTbDeleteSingleTable (
     /* Free the table descriptor (Don't delete the list head, tho) */
 
 
-
     if ((TableDesc->Prev) == (TableDesc->Next))
     {
 
@@ -618,8 +614,6 @@ AcpiTbDeleteSingleTable (
 }
 
 
-
-
 /****************************************************************************
  *
  * FUNCTION:    AcpiTbFreeAcpiTablesOfType
@@ -664,4 +658,3 @@ AcpiTbFreeAcpiTablesOfType (
 }
 
 
-
diff --git a/source/components/tables/tbutils.c b/source/components/tables/tbutils.c
index 0cabb39c0..dd0f6cb6d 100644
--- a/source/components/tables/tbutils.c
+++ b/source/components/tables/tbutils.c
@@ -211,9 +211,9 @@ AcpiTbSystemTablePointer (
 
     /* Check each of the loaded SSDTs (if any)*/
 
-    TableDesc = &AcpiGbl_AcpiTables[TABLE_SSDT];
+    TableDesc = &AcpiGbl_AcpiTables[ACPI_TABLE_SSDT];
 
-    for (i = 0; i < AcpiGbl_AcpiTables[TABLE_SSDT].Count; i++)
+    for (i = 0; i < AcpiGbl_AcpiTables[ACPI_TABLE_SSDT].Count; i++)
     {
         Table = TableDesc->Pointer;
 
@@ -228,9 +228,9 @@ AcpiTbSystemTablePointer (
 
     /* Check each of the loaded PSDTs (if any)*/
 
-    TableDesc = &AcpiGbl_AcpiTables[TABLE_PSDT];
+    TableDesc = &AcpiGbl_AcpiTables[ACPI_TABLE_PSDT];
 
-    for (i = 0; i < AcpiGbl_AcpiTables[TABLE_PSDT].Count; i++)
+    for (i = 0; i < AcpiGbl_AcpiTables[ACPI_TABLE_PSDT].Count; i++)
     {
         Table = TableDesc->Pointer;
 
@@ -243,14 +243,12 @@ AcpiTbSystemTablePointer (
     }
 
 
-
     /* Pointer does not point into any system table */
 
     return (FALSE);
 }
 
 
-
 /******************************************************************************
  *
  * FUNCTION:    AcpiTbValidateTableHeader
@@ -288,7 +286,7 @@ AcpiTbValidateTableHeader (
 
     /* Ensure that the signature is 4 ASCII characters */
 
-    STORE32 (&Signature, &TableHeader->Signature);
+    MOVE_UNALIGNED32_TO_32 (&Signature, &TableHeader->Signature);
     if (!AcpiCmValidAcpiName (Signature))
     {
         DEBUG_PRINT (ACPI_ERROR, ("Table signature at %p [%X] has invalid characters\n",
@@ -344,7 +342,6 @@ AcpiTbMapAcpiTable (
     ACPI_STATUS             Status = AE_OK;
 
 
-
     /* If size is zero, look at the table header to get the actual size */
 
     if ((*Size) == 0)
@@ -482,5 +479,3 @@ AcpiTbChecksum (
 }
 
 
-
-
diff --git a/source/components/tables/tbxface.c b/source/components/tables/tbxface.c
index 98ea16073..bf56ef50b 100644
--- a/source/components/tables/tbxface.c
+++ b/source/components/tables/tbxface.c
@@ -158,7 +158,6 @@ AcpiLoadFirmwareTables (void)
     }
 
 
-
     /* Now get the rest of the tables */
 
     Status = AcpiTbGetAllTables (NumberOfTables, NULL);
@@ -321,7 +320,7 @@ AcpiGetTableHeader (
     Status = AE_OK;
 
     if ((Instance == 0)                 ||
-        (TableType == TABLE_RSDP)       ||
+        (TableType == ACPI_TABLE_RSDP)  ||
         (!OutTableHeader))
     {
         return_ACPI_STATUS (AE_BAD_PARAMETER);
@@ -443,7 +442,7 @@ AcpiGetTable (
     /*
      * Got a table ptr, assume it's ok and copy it to the user's buffer
      */
-    if (TableType == TABLE_RSDP)
+    if (TableType == ACPI_TABLE_RSDP)
     {
         /*
          *  RSD PTR is the only "table" without a header
diff --git a/source/components/tables/tbxfroot.c b/source/components/tables/tbxfroot.c
index 775773a68..3f50d944f 100644
--- a/source/components/tables/tbxfroot.c
+++ b/source/components/tables/tbxfroot.c
@@ -125,7 +125,6 @@
         MODULE_NAME         ("tbtable");
 
 
-
 /******************************************************************************
  *
  * FUNCTION:    AcpiTbGetTableRsdt
@@ -161,7 +160,7 @@ AcpiTbGetTableRsdt (
 
     /* Save the table pointers and allocation info */
 
-    Status = AcpiTbInitTableDescriptor (TABLE_RSDP, &TableInfo);
+    Status = AcpiTbInitTableDescriptor (ACPI_TABLE_RSDP, &TableInfo);
     if (ACPI_FAILURE (Status))
     {
         return_ACPI_STATUS (Status);
@@ -197,7 +196,7 @@ AcpiTbGetTableRsdt (
 
     /* Always delete the RSDP mapping */
 
-    AcpiTbDeleteAcpiTable (TABLE_RSDP);
+    AcpiTbDeleteAcpiTable (ACPI_TABLE_RSDP);
     if (ACPI_FAILURE (Status))
     {
         return_ACPI_STATUS (Status);
@@ -205,7 +204,7 @@ AcpiTbGetTableRsdt (
 
     /* Save the table pointers and allocation info */
 
-    Status = AcpiTbInitTableDescriptor (TABLE_RSDT, &TableInfo);
+    Status = AcpiTbInitTableDescriptor (ACPI_TABLE_RSDT, &TableInfo);
     if (ACPI_FAILURE (Status))
     {
         return_ACPI_STATUS (Status);
@@ -251,7 +250,6 @@ AcpiTbScanMemoryForRsdp (
     char                    *MemRover;
 
 
-
     /* Search from given start addr for the requested length  */
 
     for (Offset = 0, MemRover = StartAddress;
@@ -422,7 +420,6 @@ AcpiTbFindRsdp (
 }
 
 
-
 /******************************************************************************
  *
  * FUNCTION:    AcpiTbGetTableFacs