diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
index cb5c6d4b73..9e47772303 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
@@ -30,7 +30,6 @@
   @param  Delay Number of ticks to delay.
 
 **/
-STATIC
 VOID
 InternalIpfDelay (
   IN      INT64                     Delay
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
index 377d269a8f..059fff16d6 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
@@ -34,10 +34,10 @@
 #
 
 [Sources.Ia32]
-  x86TimerLib.c
+  X86TimerLib.c
 
 [Sources.X64]
-  x86TimerLib.c
+  X86TimerLib.c
 
 [Sources.IPF]
   IpfTimerLib.c
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/X86TimerLib.c
similarity index 95%
rename from MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
rename to MdePkg/Library/SecPeiDxeTimerLibCpu/X86TimerLib.c
index 263ce9a2ec..99b75d5251 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/X86TimerLib.c
@@ -1,7 +1,7 @@
 /** @file
   Timer Library functions built upon local APIC on IA32/x64.
 
-  Copyright (c) 2006 - 2007, Intel Corporation<BR>
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>
   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
@@ -40,7 +40,6 @@ CONST UINT8                           mTimerLibLocalApicDivisor[] = {
   @return The base address of local APIC
 
 **/
-STATIC
 UINTN
 InternalX86GetApicBase (
   VOID
@@ -59,7 +58,6 @@ InternalX86GetApicBase (
   @return The frequency of the timer in Hz.
 
 **/
-STATIC
 UINT32
 InternalX86GetTimerFrequency (
   IN      UINTN                     ApicBase
@@ -80,7 +78,6 @@ InternalX86GetTimerFrequency (
   @return The tick counter read.
 
 **/
-STATIC
 INT32
 InternalX86GetTimerTick (
   IN      UINTN                     ApicBase
@@ -99,7 +96,6 @@ InternalX86GetTimerTick (
   @param  Delay     A period of time to delay in ticks.
 
 **/
-STATIC
 VOID
 InternalX86Delay (
   IN      UINTN                     ApicBase,