-STATIC CONST CHAR16 strNameEfiReservedMemoryType[] = L"Reserved";\r
-STATIC CONST CHAR16 strNameEfiLoaderCode[] = L"LoadCode";\r
-STATIC CONST CHAR16 strNameEfiLoaderData[] = L"LoadData";\r
-STATIC CONST CHAR16 strNameEfiBootServicesCode[] = L"BSCode";\r
-STATIC CONST CHAR16 strNameEfiBootServicesData[] = L"BSData";\r
-STATIC CONST CHAR16 strNameEfiRuntimeServicesCode[] = L"RTCode";\r
-STATIC CONST CHAR16 strNameEfiRuntimeServicesData[] = L"RTData";\r
-STATIC CONST CHAR16 strNameEfiConventionalMemory[] = L"Conv";\r
-STATIC CONST CHAR16 strNameEfiUnusableMemory[] = L"Unusable";\r
-STATIC CONST CHAR16 strNameEfiACPIReclaimMemory[] = L"ACPIRec";\r
-STATIC CONST CHAR16 strNameEfiACPIMemoryNVS[] = L"ACPI_NVS";\r
-STATIC CONST CHAR16 strNameEfiMemoryMappedIO[] = L"MMIO";\r
-STATIC CONST CHAR16 strNameEfiMemoryMappedIOPortSpace[] = L"MMIOPort";\r
-STATIC CONST CHAR16 strNameEfiPalCode[] = L"PalCode";\r
+//\r
+// Need full names for Standard-Format Output\r
+//\r
+STATIC CONST CHAR16 NameEfiReservedMemoryType[] = L"Reserved";\r
+STATIC CONST CHAR16 NameEfiLoaderCode[] = L"LoaderCode";\r
+STATIC CONST CHAR16 NameEfiLoaderData[] = L"LoaderData";\r
+STATIC CONST CHAR16 NameEfiBootServicesCode[] = L"BootServiceCode";\r
+STATIC CONST CHAR16 NameEfiBootServicesData[] = L"BootServiceData";\r
+STATIC CONST CHAR16 NameEfiRuntimeServicesCode[] = L"RuntimeCode";\r
+STATIC CONST CHAR16 NameEfiRuntimeServicesData[] = L"RuntimeData";\r
+STATIC CONST CHAR16 NameEfiConventionalMemory[] = L"Available";\r
+STATIC CONST CHAR16 NameEfiPersistentMemory[] = L"Persistent";\r
+STATIC CONST CHAR16 NameEfiUnusableMemory[] = L"UnusableMemory";\r
+STATIC CONST CHAR16 NameEfiACPIReclaimMemory[] = L"ACPIReclaimMemory";\r
+STATIC CONST CHAR16 NameEfiACPIMemoryNVS[] = L"ACPIMemoryNVS";\r
+STATIC CONST CHAR16 NameEfiMemoryMappedIO[] = L"MemoryMappedIO";\r
+STATIC CONST CHAR16 NameEfiMemoryMappedIOPortSpace[] = L"MemoryMappedIOPortSpace";\r
+STATIC CONST CHAR16 NameEfiPalCode[] = L"PalCode";\r
+\r
+//\r
+// Need short names for some memory types\r
+//\r
+STATIC CONST CHAR16 NameEfiBootServicesCodeShort[] = L"BS_Code";\r
+STATIC CONST CHAR16 NameEfiBootServicesDataShort[] = L"BS_Data";\r
+STATIC CONST CHAR16 NameEfiRuntimeServicesCodeShort[] = L"RT_Code";\r
+STATIC CONST CHAR16 NameEfiRuntimeServicesDataShort[] = L"RT_Data";\r
+STATIC CONST CHAR16 NameEfiUnusableMemoryShort[] = L"Unusable";\r
+STATIC CONST CHAR16 NameEfiACPIReclaimMemoryShort[] = L"ACPI_Recl";\r
+STATIC CONST CHAR16 NameEfiACPIMemoryNVSShort[] = L"ACPI_NVS";\r
+STATIC CONST CHAR16 NameEfiMemoryMappedIOShort[] = L"MMIO";\r
+STATIC CONST CHAR16 NameEfiMemoryMappedIOPortSpaceShort[] = L"MMIO_Port";\r