diff --git a/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
index 65ea51dfcf..6861a9faac 100644
--- a/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
+++ b/MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.msa
@@ -6,8 +6,10 @@
     <GuidValue>f4731d79-537e-4505-bd52-c03f9b1f6b89</GuidValue>
     <Version>1.0</Version>
     <Abstract>Timer library NULL template implementaton</Abstract>
-    <Description>This NULL Timer library provides one template API of TimerLib library,
-      this library do not impletement functionality completely.</Description>
+    <Description>A non-functional instance of the Timer Library that can be used as a template
+      for the implementation of a functional timer library instance. This library instance can
+      also be used to test build DXE, Runtime, DXE SAL, and DXE SMM modules that require timer
+      services as well as EBC modules that require timer services</Description>
     <Copyright>Copyright (c) 2007, Intel Corporation.</Copyright>
     <License>All rights reserved. This program and the accompanying materials
       are licensed and made available under the terms and conditions of the BSD License
diff --git a/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c b/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c
index 33a9736a24..0d76072776 100644
--- a/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c
+++ b/MdePkg/Library/BaseTimerLibNullTemplate/TimerLibNull.c
@@ -1,5 +1,5 @@
 /** @file
-  Timer Library functions for runtime drivers.
+  A non-functional instance of the Timer Library.
 
   Copyright (c) 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
@@ -10,7 +10,7 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  Module Name:  RuntimeTimerLib.c
+  Module Name:  TimerLibNull.c
 
 **/
 
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
index 9049fef997..8f7651519e 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/IpfTimerLib.c
@@ -1,5 +1,5 @@
 /** @file
-  Timer Library functions built upon ITC on IA32/x64.
+  Timer Library functions built upon ITC on IPF.
 
   Copyright (c) 2006 - 2007, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
index 4c152caae6..2655293af1 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.msa
@@ -5,7 +5,7 @@
     <ModuleType>BASE</ModuleType>
     <GuidValue>b5a05743-9b71-489b-a0ed-a0eb3950d23b</GuidValue>
     <Version>1.0</Version>
-    <Abstract>Timer Library implementation for boot time drivers.</Abstract>
+    <Abstract>Timer Library implementation for Boot Timer moudles that require timer services.</Abstract>
     <Description>Timer Library that uses CPU resources to provide calibrated
       delays on IA-32 and x64, and uses ITC on IPF. Note: Because CpuLocalApci
       and ITC could be programmed by OS, it cannot be used by SMM drivers
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
index 7467bc5e4d..dd105de7fb 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/x86TimerLib.c
@@ -1,10 +1,6 @@
 /** @file
   Timer Library functions built upon local APIC on IA32/x64.
 
-  @bug Should use PCD to retrieve all the constants including index of
-  the IA32_APIC_BASE MSR, the offsets of InitialCount, CorrentCount
-  and DivideConfiguration.
-
   Copyright (c) 2006 - 2007, 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