diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 02b94c8591..52cd1e204d 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -891,7 +891,7 @@
           <Value>0</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -5288,7 +5288,7 @@
           <Value>0x06</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -5465,7 +5465,7 @@
           <Value>0x06</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -5642,7 +5642,7 @@
           <Value>0x06</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -6517,7 +6517,7 @@
           <Value>0</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -10932,7 +10932,7 @@
           <Value>0</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -15351,7 +15351,7 @@
           <Value>0</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -19523,7 +19523,7 @@
           <Value>10000000</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index cad8a21b59..3d4496f730 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -579,7 +579,7 @@
           <Value>TRUE</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -2538,7 +2538,7 @@
           <Value>FALSE</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
diff --git a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa b/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
index 2b34af396b..c0affb8a29 100644
--- a/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
+++ b/MdePkg/Library/BaseTimerLibLocalApic/BaseTimerLibLocalApic.msa
@@ -54,7 +54,7 @@
   </Externs>
   <PcdCoded>
     <PcdEntry PcdItemType="FIXED_AT_BUILD" Usage="ALWAYS_CONSUMED">
-      <C_Name>PcdPlatformBusSpeed</C_Name>
+      <C_Name>PcdFSBClock</C_Name>
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
       <HelpText>Bus speed on the platform, its unit is Hz.  its default value is 200000000, that means bus speed is 200Mhz.</HelpText>
     </PcdEntry>
diff --git a/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c b/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c
index d2935cf83a..b2adc3e140 100644
--- a/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c
+++ b/MdePkg/Library/BaseTimerLibLocalApic/x86TimerLib.c
@@ -64,7 +64,7 @@ InternalX86GetTimerFrequency (
   )
 {
   return
-    PcdGet32(PcdPlatformBusSpeed) /
+    PcdGet32(PcdFSBClock) /
     mTimerLibLocalApicDivisor[MmioBitFieldRead32 (ApicBase + 0x3e0, 0, 3)];
 }
 
@@ -246,5 +246,5 @@ GetPerformanceCounterProperties (
     *EndValue = 0;
   }
 
-  return PcdGet32(PcdPlatformBusSpeed);
+  return PcdGet32(PcdFSBClock);
 }
diff --git a/MdePkg/MdePkg.fpd b/MdePkg/MdePkg.fpd
index b79d9faa61..19681c25f0 100644
--- a/MdePkg/MdePkg.fpd
+++ b/MdePkg/MdePkg.fpd
@@ -108,7 +108,7 @@
     <ModuleSA SupArchList="IA32" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -666,7 +666,7 @@
     <ModuleSA SupArchList="IPF" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -1236,7 +1236,7 @@
     <ModuleSA SupArchList="X64" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>
@@ -1794,7 +1794,7 @@
     <ModuleSA SupArchList="EBC" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" ModuleGuid="b5a05743-9b71-489b-a0ed-a0eb3950d23b">
       <PcdBuildDefinition>
         <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdGenericPlatformBusSpeed</C_Name>
+          <C_Name>PcdFSBClock</C_Name>
           <Token>0x0000000c</Token>
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>UINT32</DatumType>