]> git.proxmox.com Git - mirror_edk2.git/blobdiff - EdkNt32Pkg/Nt32.fpd
projects / mirror_edk2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
DebugLib:
[mirror_edk2.git] / EdkNt32Pkg / Nt32.fpd
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 448beb5b674de5f1cb339ba58db2794c42b9d84c..7dea2ca8841542f073a61f636602b3698c96a98e 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <PlatformSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
-  <PlatformHeader xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+  <PlatformHeader>\r
     <PlatformName>NT32</PlatformName>\r
     <GuidValue>eb216561-961f-47ee-9ef9-ca426ef547c2</GuidValue>\r
     <Version>0.3</Version>\r
     <Abstract>EFI/Framework Emulation Platform</Abstract>\r
-    <Description>The Emulation Platform can be used to debug individual modules, prior to creating
+    <Description>The Emulation Platform can be used to debug individual modules, prior to creating\r
       a real platform. This also provides an example for how an FPD is created.</Description>\r
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    <License>All rights reserved. This program and the accompanying materials\r
+      are licensed and made available under the terms and conditions of the BSD License\r
+      which accompanies this distribution.  The full text of the license may be found at\r
+      http://opensource.org/licenses/bsd-license.php\r
+\r
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>\r
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>\r
   </PlatformHeader>\r
-  <PlatformDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>\r
+  <PlatformDefinitions>\r
+    <SupportedArchitectures>IA32</SupportedArchitectures>\r
     <BuildTargets>DEBUG</BuildTargets>\r
     <IntermediateDirectories>UNIFIED</IntermediateDirectories>\r
     <OutputDirectory/>\r
   </PlatformDefinitions>\r
-  <Flash xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+  <Flash>\r
     <FlashDefinitionFile>FlashMap.fdf</FlashDefinitionFile>\r
     <!-- FlashDefinitionFile -->\r
     <FvImages>\r
@@ -129,7 +129,7 @@
       </FvImage>\r
     </FvImages>\r
   </Flash>\r
-  <FrameworkModules xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+  <FrameworkModules>\r
     <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="4b837b03-6587-4d19-b82b-edfad836c0a0">\r
       <Libraries>\r
         <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
@@ -143,7 +143,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -151,7 +151,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -159,7 +159,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -167,7 +167,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -175,7 +175,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -183,7 +183,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -191,7 +191,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -199,7 +199,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtCpuModel</C_Name>\r
           <Token>0x00001007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>48</MaxDatumSize>\r
           <Value>L"Intel(R) Processor Model"</Value>\r
@@ -207,7 +207,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
           <Token>0x00001009</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>52</MaxDatumSize>\r
           <Value>L"..\\..\\Fv\\Fv_Recovery.fd"</Value>\r
@@ -215,7 +215,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdWinNtBootMode</C_Name>\r
           <Token>0x00001006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1</Value>\r
@@ -223,7 +223,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -231,7 +231,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtMemorySize</C_Name>\r
           <Token>0x00001005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>10</MaxDatumSize>\r
           <Value>L"64!64"</Value>\r
@@ -239,7 +239,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
           <Token>0x00001005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>10</MaxDatumSize>\r
           <Value>L"64!64"</Value>\r
@@ -267,7 +267,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
           <Token>0x00000009</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
@@ -275,7 +275,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -283,7 +283,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -291,7 +291,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -299,7 +299,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -307,7 +307,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -315,7 +315,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -323,7 +323,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -331,7 +331,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -358,14 +358,14 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdKentTestDynamicUINT32</C_Name>\r
           <Token>0x0001000e</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
         </PcdData>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -373,7 +373,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -381,7 +381,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
           <Token>0x0001000f</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x8</Value>\r
@@ -389,7 +389,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdVpdBaseAddress</C_Name>\r
           <Token>0x00010010</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x0</Value>\r
@@ -397,7 +397,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -405,7 +405,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -413,7 +413,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -421,7 +421,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -429,7 +429,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -437,7 +437,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -464,7 +464,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -472,7 +472,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -480,7 +480,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -488,7 +488,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -496,7 +496,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -504,7 +504,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -512,7 +512,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -520,7 +520,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -545,7 +545,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -553,7 +553,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -561,7 +561,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -569,7 +569,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -577,7 +577,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -585,7 +585,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -593,7 +593,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -601,7 +601,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -627,7 +627,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -635,7 +635,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -643,7 +643,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -651,7 +651,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -659,7 +659,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -667,7 +667,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -675,7 +675,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -683,7 +683,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -708,7 +708,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -716,7 +716,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -724,7 +724,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -732,7 +732,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -740,7 +740,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -748,7 +748,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -756,7 +756,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -764,7 +764,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -790,7 +790,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -798,7 +798,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -806,7 +806,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -814,7 +814,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -822,7 +822,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -830,7 +830,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -838,7 +838,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -846,7 +846,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -872,7 +872,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -880,7 +880,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -888,7 +888,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -896,7 +896,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -904,7 +904,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -912,7 +912,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -920,7 +920,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -928,7 +928,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -954,7 +954,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -962,7 +962,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -970,7 +970,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -978,7 +978,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -986,7 +986,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -994,7 +994,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1002,7 +1002,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1010,7 +1010,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1036,7 +1036,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1044,7 +1044,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1052,7 +1052,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1060,7 +1060,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1068,7 +1068,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1076,7 +1076,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1084,7 +1084,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1092,7 +1092,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1124,7 +1124,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1132,7 +1132,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1140,7 +1140,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1148,7 +1148,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1156,7 +1156,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1164,7 +1164,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1172,7 +1172,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1180,7 +1180,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1211,7 +1211,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
           <Token>0x00000009</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
@@ -1219,7 +1219,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1227,7 +1227,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1235,7 +1235,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1243,7 +1243,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1251,7 +1251,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1259,7 +1259,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1267,7 +1267,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1275,7 +1275,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1312,7 +1312,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1320,7 +1320,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1328,7 +1328,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
           <Token>0x0001000f</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x8</Value>\r
@@ -1336,7 +1336,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdVpdBaseAddress</C_Name>\r
           <Token>0x00010010</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x0</Value>\r
@@ -1344,7 +1344,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1352,7 +1352,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1360,7 +1360,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1368,7 +1368,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1376,7 +1376,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1384,7 +1384,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1410,7 +1410,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1418,7 +1418,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1426,7 +1426,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1434,7 +1434,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1442,7 +1442,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1450,7 +1450,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1458,7 +1458,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1466,7 +1466,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1493,7 +1493,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1501,7 +1501,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1509,7 +1509,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1517,7 +1517,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1525,7 +1525,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1533,7 +1533,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1541,7 +1541,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1549,7 +1549,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1585,7 +1585,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1593,7 +1593,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1601,7 +1601,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1609,7 +1609,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1617,7 +1617,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1625,7 +1625,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1633,7 +1633,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1641,7 +1641,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1670,7 +1670,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1678,7 +1678,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1686,7 +1686,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1694,7 +1694,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1702,7 +1702,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1710,7 +1710,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1718,7 +1718,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1726,7 +1726,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1754,7 +1754,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1762,7 +1762,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1770,7 +1770,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1778,7 +1778,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1786,7 +1786,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1794,7 +1794,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1802,7 +1802,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1810,7 +1810,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1838,7 +1838,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1846,7 +1846,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1854,7 +1854,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1862,7 +1862,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1870,7 +1870,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1878,7 +1878,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1886,7 +1886,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1894,7 +1894,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -1930,7 +1930,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
           <Token>0x00000009</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
@@ -1938,7 +1938,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1946,7 +1946,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1954,7 +1954,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -1962,7 +1962,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -1970,7 +1970,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -1978,7 +1978,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -1986,7 +1986,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -1994,7 +1994,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2021,7 +2021,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2029,7 +2029,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2037,7 +2037,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2045,7 +2045,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2053,7 +2053,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2061,7 +2061,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2069,7 +2069,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2077,7 +2077,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2103,7 +2103,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2111,7 +2111,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2119,7 +2119,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2127,7 +2127,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2135,7 +2135,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2143,7 +2143,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2151,7 +2151,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2159,7 +2159,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2187,7 +2187,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2195,7 +2195,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2203,7 +2203,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2211,7 +2211,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2219,7 +2219,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2227,7 +2227,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2235,7 +2235,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2243,7 +2243,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2277,7 +2277,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2285,7 +2285,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2293,7 +2293,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2301,7 +2301,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2309,7 +2309,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2317,7 +2317,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2325,7 +2325,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2333,7 +2333,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2363,7 +2363,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2371,7 +2371,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2379,7 +2379,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2387,7 +2387,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2395,7 +2395,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2403,7 +2403,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2411,7 +2411,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2419,7 +2419,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2447,7 +2447,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2455,7 +2455,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2463,7 +2463,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2471,7 +2471,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2479,7 +2479,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2487,7 +2487,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2495,7 +2495,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2503,7 +2503,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2533,7 +2533,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2541,7 +2541,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2549,7 +2549,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2557,7 +2557,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2565,7 +2565,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2573,7 +2573,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2581,7 +2581,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2589,7 +2589,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2615,7 +2615,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2623,7 +2623,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2631,7 +2631,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2639,7 +2639,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2647,7 +2647,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2655,7 +2655,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2663,7 +2663,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2671,7 +2671,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2700,7 +2700,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2708,7 +2708,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2716,7 +2716,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2724,7 +2724,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2732,7 +2732,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2740,7 +2740,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2748,7 +2748,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2756,7 +2756,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2781,7 +2781,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2789,7 +2789,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2797,7 +2797,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2805,7 +2805,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2813,7 +2813,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2821,7 +2821,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2829,7 +2829,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2837,7 +2837,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2867,7 +2867,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2875,7 +2875,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2883,7 +2883,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2891,7 +2891,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2899,7 +2899,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2907,7 +2907,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2915,7 +2915,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2923,7 +2923,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -2950,7 +2950,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2958,7 +2958,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -2966,7 +2966,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -2974,7 +2974,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -2982,7 +2982,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -2990,7 +2990,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -2998,7 +2998,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3006,7 +3006,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3034,7 +3034,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3042,7 +3042,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3050,7 +3050,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3058,7 +3058,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3066,7 +3066,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3074,7 +3074,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3082,7 +3082,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3090,7 +3090,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3120,7 +3120,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3128,7 +3128,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3136,7 +3136,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3144,7 +3144,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3152,7 +3152,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3160,7 +3160,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3168,7 +3168,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3176,7 +3176,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3203,7 +3203,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3211,7 +3211,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3219,7 +3219,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3227,7 +3227,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3235,7 +3235,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3243,7 +3243,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3251,7 +3251,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3259,7 +3259,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3283,7 +3283,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3291,7 +3291,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3299,7 +3299,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3307,7 +3307,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3315,7 +3315,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3323,7 +3323,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3331,7 +3331,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3339,7 +3339,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3366,7 +3366,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3374,7 +3374,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3382,7 +3382,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3390,7 +3390,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3398,7 +3398,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3406,7 +3406,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3414,7 +3414,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3422,7 +3422,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3449,7 +3449,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3457,7 +3457,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3465,7 +3465,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3473,7 +3473,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3481,7 +3481,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3489,7 +3489,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3497,7 +3497,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3505,7 +3505,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3532,7 +3532,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3540,7 +3540,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3548,7 +3548,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3556,7 +3556,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3564,7 +3564,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3572,7 +3572,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3580,7 +3580,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3588,7 +3588,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3615,7 +3615,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3623,7 +3623,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3631,7 +3631,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3639,7 +3639,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3647,7 +3647,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3655,7 +3655,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3663,7 +3663,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3671,7 +3671,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3699,7 +3699,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3707,7 +3707,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3715,7 +3715,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3723,7 +3723,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3731,7 +3731,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3739,7 +3739,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3747,7 +3747,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3755,7 +3755,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3790,7 +3790,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3798,7 +3798,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3806,7 +3806,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3814,7 +3814,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3822,7 +3822,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3830,7 +3830,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3838,7 +3838,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3846,7 +3846,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3875,7 +3875,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3883,7 +3883,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3891,7 +3891,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3899,7 +3899,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3907,7 +3907,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -3915,7 +3915,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -3923,7 +3923,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3931,7 +3931,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -3962,7 +3962,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3970,7 +3970,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -3978,7 +3978,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -3986,7 +3986,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -3994,7 +3994,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4002,7 +4002,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4010,7 +4010,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4018,7 +4018,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4042,7 +4042,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4050,7 +4050,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4058,7 +4058,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4066,7 +4066,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4074,7 +4074,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4082,7 +4082,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4090,7 +4090,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4098,7 +4098,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4126,7 +4126,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4134,7 +4134,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4142,7 +4142,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4150,7 +4150,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4158,7 +4158,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4166,7 +4166,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4174,7 +4174,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4182,7 +4182,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4210,7 +4210,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4218,7 +4218,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4226,7 +4226,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4234,7 +4234,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4242,7 +4242,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4250,7 +4250,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4258,7 +4258,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4266,7 +4266,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4297,7 +4297,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
           <Token>0x00000009</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0</Value>\r
@@ -4305,7 +4305,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4313,7 +4313,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4321,7 +4321,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4329,7 +4329,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4337,7 +4337,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4345,7 +4345,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4353,7 +4353,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4361,7 +4361,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4389,7 +4389,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4397,7 +4397,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4405,7 +4405,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4413,7 +4413,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4421,7 +4421,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4429,7 +4429,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4437,7 +4437,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4445,7 +4445,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4475,7 +4475,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4483,7 +4483,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4491,7 +4491,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4499,7 +4499,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4507,7 +4507,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4515,7 +4515,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4523,7 +4523,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4531,7 +4531,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4560,7 +4560,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4568,7 +4568,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4576,7 +4576,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4584,7 +4584,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4592,7 +4592,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4600,7 +4600,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4608,7 +4608,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4616,7 +4616,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4645,7 +4645,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4653,7 +4653,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4661,7 +4661,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4669,7 +4669,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4677,7 +4677,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4685,7 +4685,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4693,7 +4693,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4701,7 +4701,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4731,7 +4731,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4739,7 +4739,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4747,7 +4747,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4755,7 +4755,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4763,7 +4763,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4771,7 +4771,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4779,7 +4779,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4787,7 +4787,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4816,7 +4816,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4824,7 +4824,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4832,7 +4832,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4840,7 +4840,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4848,7 +4848,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4856,7 +4856,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4864,7 +4864,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4872,7 +4872,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4901,7 +4901,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4909,7 +4909,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4917,7 +4917,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -4925,7 +4925,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -4933,7 +4933,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -4941,7 +4941,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -4949,7 +4949,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4957,7 +4957,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -4987,7 +4987,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -4995,7 +4995,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5003,7 +5003,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5011,7 +5011,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5019,7 +5019,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5027,7 +5027,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5035,7 +5035,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5043,7 +5043,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5072,7 +5072,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5080,7 +5080,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5088,7 +5088,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5096,7 +5096,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5104,7 +5104,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5112,7 +5112,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5120,7 +5120,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5128,7 +5128,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5157,7 +5157,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5165,7 +5165,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5173,7 +5173,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5181,7 +5181,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5189,7 +5189,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5197,7 +5197,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5205,7 +5205,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5213,7 +5213,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5241,7 +5241,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5249,7 +5249,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5257,7 +5257,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5265,7 +5265,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5273,7 +5273,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5281,7 +5281,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5289,7 +5289,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5297,7 +5297,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5324,7 +5324,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5332,7 +5332,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5340,7 +5340,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5348,7 +5348,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5356,7 +5356,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5364,7 +5364,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5372,7 +5372,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5380,7 +5380,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5407,7 +5407,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5415,7 +5415,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5423,7 +5423,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5431,7 +5431,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5439,7 +5439,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5447,7 +5447,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5455,7 +5455,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5463,7 +5463,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5491,7 +5491,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5499,7 +5499,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5507,7 +5507,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5515,7 +5515,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5523,7 +5523,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5531,7 +5531,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5539,7 +5539,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5547,7 +5547,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5576,7 +5576,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5584,7 +5584,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5592,7 +5592,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5600,7 +5600,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5608,7 +5608,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5616,7 +5616,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5624,7 +5624,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5632,7 +5632,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5640,7 +5640,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtMemorySize</C_Name>\r
           <Token>0x00001005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>10</MaxDatumSize>\r
           <Value>L"64!64"</Value>\r
@@ -5648,7 +5648,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
           <Token>0x00001000</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>24</MaxDatumSize>\r
           <Value>L"FW;40960;512"</Value>\r
@@ -5656,7 +5656,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtVirtualDisk</C_Name>\r
           <Token>0x00001001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>24</MaxDatumSize>\r
           <Value>L"FW;40960;512"</Value>\r
@@ -5664,7 +5664,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtSerialPort</C_Name>\r
           <Token>0x00001002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>18</MaxDatumSize>\r
           <Value>L"COM1!COM2"</Value>\r
@@ -5672,7 +5672,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtUga</C_Name>\r
           <Token>0x00001003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>50</MaxDatumSize>\r
           <Value>L"UGA Window 1!UGA Window 2"</Value>\r
@@ -5680,7 +5680,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtCpuModel</C_Name>\r
           <Token>0x00001007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>48</MaxDatumSize>\r
           <Value>L"Intel(R) Processor Model"</Value>\r
@@ -5688,7 +5688,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtFileSystem</C_Name>\r
           <Token>0x00001004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>120</MaxDatumSize>\r
           <Value>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</Value>\r
@@ -5696,7 +5696,7 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtConsole</C_Name>\r
           <Token>0x0000100a</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>50</MaxDatumSize>\r
           <Value>L"Bus Driver Console Window"</Value>\r
@@ -5704,35 +5704,11 @@
         <PcdData ItemType="DYNAMIC">\r
           <C_Name>PcdWinNtCpuSpeed</C_Name>\r
           <Token>0x00001008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>VOID*</DatumType>\r
           <MaxDatumSize>8</MaxDatumSize>\r
           <Value>L"3000"</Value>\r
         </PcdData>\r
-        <PcdData ItemType="FEATURE_FLAG">\r
-          <C_Name>PcdWinNtFeatureFlag1</C_Name>\r
-          <Token>0x0001000d</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
-          <DatumType>BOOLEAN</DatumType>\r
-          <MaxDatumSize>1</MaxDatumSize>\r
-          <Value>TRUE</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-          <C_Name>PcdWinNtBinaryPatch1</C_Name>\r
-          <Token>0x0001000b</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>0x1234</Value>\r
-        </PcdData>\r
-        <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-          <C_Name>PcdWinNtBinaryPatch2</C_Name>\r
-          <Token>0x0001000c</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
-          <DatumType>UINT32</DatumType>\r
-          <MaxDatumSize>4</MaxDatumSize>\r
-          <Value>0x5678</Value>\r
-        </PcdData>\r
       </PcdBuildDefinition>\r
       <ModuleSaBuildOptions>\r
         <FvBinding>FV_RECOVERY</FvBinding>\r
@@ -5755,7 +5731,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5763,7 +5739,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5771,7 +5747,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5779,7 +5755,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5787,7 +5763,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5795,7 +5771,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5803,7 +5779,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5811,7 +5787,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5838,7 +5814,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5846,7 +5822,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5854,7 +5830,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5862,7 +5838,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5870,7 +5846,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5878,7 +5854,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5886,7 +5862,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5894,7 +5870,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -5922,7 +5898,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5930,7 +5906,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5938,7 +5914,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -5946,7 +5922,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -5954,7 +5930,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -5962,7 +5938,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -5970,7 +5946,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -5978,7 +5954,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -6005,7 +5981,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6013,7 +5989,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6021,7 +5997,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -6029,7 +6005,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -6037,7 +6013,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -6045,7 +6021,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -6053,7 +6029,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6061,7 +6037,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -6088,7 +6064,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6096,7 +6072,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6104,7 +6080,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -6112,7 +6088,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -6120,7 +6096,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -6128,7 +6104,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -6136,7 +6112,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6144,7 +6120,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -6172,7 +6148,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6180,7 +6156,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6188,7 +6164,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -6196,7 +6172,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -6204,7 +6180,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -6212,7 +6188,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -6220,7 +6196,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6228,7 +6204,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -6263,7 +6239,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6271,7 +6247,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6279,7 +6255,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -6287,7 +6263,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -6295,7 +6271,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -6303,7 +6279,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -6311,7 +6287,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6319,7 +6295,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -6339,12 +6315,13 @@
         <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
         <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
       </Libraries>\r
       <PcdBuildDefinition>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
           <Token>0x00000001</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6352,7 +6329,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
           <Token>0x00000002</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6360,7 +6337,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugPropertyMask</C_Name>\r
           <Token>0x00000005</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x1f</Value>\r
@@ -6368,7 +6345,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdSpinLockTimeout</C_Name>\r
           <Token>0x00000004</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>10000000</Value>\r
@@ -6376,7 +6353,7 @@
         <PcdData ItemType="PATCHABLE_IN_MODULE">\r
           <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <Token>0x00000006</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>0x80000000</Value>\r
@@ -6384,7 +6361,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
           <Token>0x00000007</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0x07</Value>\r
@@ -6392,7 +6369,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdMaximumLinkedListLength</C_Name>\r
           <Token>0x00000003</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT32</DatumType>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
@@ -6400,7 +6377,7 @@
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdDebugClearMemoryValue</C_Name>\r
           <Token>0x00000008</Token>\r
-          <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r\r
           <DatumType>UINT8</DatumType>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
@@ -6412,11 +6389,11 @@
       </ModuleSaBuildOptions>\r
     </ModuleSA>\r
   </FrameworkModules>\r
-  <DynamicPcdBuildDefinitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
+  <DynamicPcdBuildDefinitions>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtMemorySize</C_Name>\r
       <Token>0x00001005</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <MaxDatumSize>10</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6427,7 +6404,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuModel</C_Name>\r
       <Token>0x00001007</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <MaxDatumSize>48</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6438,7 +6415,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
       <Token>0x00001000</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <MaxDatumSize>24</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6449,7 +6426,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtVirtualDisk</C_Name>\r
       <Token>0x00001001</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <MaxDatumSize>24</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6460,7 +6437,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtFileSystem</C_Name>\r
       <Token>0x00001004</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <MaxDatumSize>120</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6471,7 +6448,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtSerialPort</C_Name>\r
       <Token>0x00001002</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <MaxDatumSize>18</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6482,7 +6459,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtConsole</C_Name>\r
       <Token>0x0000100a</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <MaxDatumSize>50</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6493,7 +6470,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtUga</C_Name>\r
       <Token>0x00001003</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <MaxDatumSize>50</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6504,7 +6481,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint8</C_Name>\r
       <Token>0x00011000</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT8</DatumType>\r
       <MaxDatumSize>1</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6515,7 +6492,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint16</C_Name>\r
       <Token>0x00011001</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT16</DatumType>\r
       <MaxDatumSize>2</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6526,7 +6503,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint32</C_Name>\r
       <Token>0x00011002</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
       <MaxDatumSize>4</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6537,7 +6514,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicUint64</C_Name>\r
       <Token>0x00011003</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT64</DatumType>\r
       <MaxDatumSize>8</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6548,7 +6525,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdTestDynamicBoolean</C_Name>\r
       <Token>0x00011004</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>BOOLEAN</DatumType>\r
       <MaxDatumSize>1</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6559,7 +6536,7 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuSpeed</C_Name>\r
       <Token>0x00001008</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <MaxDatumSize>8</MaxDatumSize>\r
       <SkuInfo>\r
@@ -6570,12 +6547,12 @@
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdKentTestDynamicUINT32</C_Name>\r
       <Token>0x0001000e</Token>\r
-      <TokenSpaceGuidCName>Fix_Me</TokenSpaceGuidCName>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
       <MaxDatumSize>4</MaxDatumSize>\r
       <SkuInfo>\r
         <SkuId>0</SkuId>\r
-       <Value>0x2</Value>\r
+             <Value>0x2</Value>\r
       </SkuInfo>\r
     </PcdBuildData>\r
   </DynamicPcdBuildDefinitions>\r
@@ -6593,7 +6570,7 @@
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>\r
+      <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r
       <Option BuildTargets="RELEASE" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
       \r
       <!-- MSFT tool chain options definition : IA32 -->\r
@@ -6608,7 +6585,7 @@
         "/nologo", "/W3", "/WX", "/c", "/coff", "/DEFI32", "/DDEBUG", "/Cx", "/Zd", "/Zi", "/DEFI_NT_EMULATOR", "/Fl${DEST_DIR_OUTPUT}/${FILE_PATH}/${FILE_BASENAME}.lst"\r
       </Option>\r
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASMLINK"/>\r
-      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/P", "/TC" </Option>\r
+      <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="PP"> "/nologo", "/P", "/TC", "/FI${DEST_DIR_DEBUG}/AutoGen.h" </Option>\r
       <Option BuildTargets="DEBUG" ToolChainFamily="MSFT" SupArchList="IA32" ToolCode="ASL"> "/nologo" </Option>\r
     </Options>\r
 \r
@@ -6870,4 +6847,4 @@
       <fileset dir="${FV_DIR}" includes="*.fv" />\r
     </copy>\r
   </UserExtensions-->\r
-</PlatformSurfaceArea>
\ No newline at end of file
+</PlatformSurfaceArea>\r
EFI Development Kit II mirror for PVE