diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index c3c2069c66..59a6a56dd1 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -314,7 +314,7 @@
   MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
 
-  MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf
+  MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
   MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
   MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
   MdeModulePkg/Universal/PCD/Pei/Pcd.inf
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
index 76289087bc..7762933e59 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 Module Name:
 
-  WatchDogTimer.c
+  WatchdogTimer.c
 
 Abstract:
 
@@ -21,7 +21,7 @@ Revision History
 
 --*/
 
-#include "WatchDogTimer.h"
+#include "WatchdogTimer.h"
 
 //
 // Handle for the Watchdog Timer Architectural Protocol instance produced by this driver
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
index 412ab887c1..ec6deec47a 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 Module Name:
 
-  WatchDogTimer.h
+  WatchdogTimer.h
 
 Abstract:
 
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
index 30d30f8e45..f03d50de35 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
@@ -1,5 +1,5 @@
 #/** @file
-# Component description file for WatchDogTimer module.
+# Component description file for WatchdogTimer module.
 #
 # Generic watchdog timer implemenetation using EFI APIs.
 # Copyright (c) 2006 - 2007, Intel Corporation
@@ -16,7 +16,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = WatchDogTimer
+  BASE_NAME                      = WatchdogTimer
   FILE_GUID                      = F099D67F-71AE-4c36-B2A3-DCEB0EB2B7D8
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -35,8 +35,8 @@
   MdePkg/MdePkg.dec
 
 [Sources.common]
-  WatchDogTimer.h
-  WatchDogTimer.c
+  WatchdogTimer.h
+  WatchdogTimer.c
 
 [LibraryClasses]
   UefiRuntimeServicesTableLib
diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.msa b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.msa
index 9231ae543d..0f3c6b0a10 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.msa
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.msa
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <MsaHeader>
-    <ModuleName>WatchDogTimer</ModuleName>
+    <ModuleName>WatchdogTimer</ModuleName>
     <ModuleType>DXE_DRIVER</ModuleType>
     <GuidValue>F099D67F-71AE-4c36-B2A3-DCEB0EB2B7D8</GuidValue>
     <Version>1.0</Version>
-    <Abstract>Component description file for WatchDogTimer module.</Abstract>
+    <Abstract>Component description file for WatchdogTimer module.</Abstract>
     <Description>Generic watchdog timer implemenetation using EFI APIs.</Description>
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>
     <License>All rights reserved. This program and the accompanying materials
@@ -19,7 +19,7 @@
   <ModuleDefinitions>
     <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>
     <BinaryModule>false</BinaryModule>
-    <OutputFileBasename>WatchDogTimer</OutputFileBasename>
+    <OutputFileBasename>WatchdogTimer</OutputFileBasename>
   </ModuleDefinitions>
   <LibraryClassDefinitions>
     <LibraryClass Usage="ALWAYS_CONSUMED">
@@ -39,9 +39,9 @@
     </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
-    <Filename>WatchDogTimer.c</Filename>
-    <Filename>WatchDogTimer.h</Filename>
-    <Filename>WatchDogTimer.dxs</Filename>
+    <Filename>WatchdogTimer.c</Filename>
+    <Filename>WatchdogTimer.h</Filename>
+    <Filename>WatchdogTimer.dxs</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>