diff --git a/Debug/GdbSyms/GdbSyms.inf b/Debug/GdbSyms/GdbSyms.inf
index d5f8ed65..6fde8c94 100644
--- a/Debug/GdbSyms/GdbSyms.inf
+++ b/Debug/GdbSyms/GdbSyms.inf
@@ -49,7 +49,7 @@
   UefiDriverEntryPoint
   UefiLib
   OcGuardLib
-  OcTimerLib
+  TimerLib
 
 [Guids]
 
diff --git a/Library/OcBootManagementLib/OcBootManagementLib.inf b/Library/OcBootManagementLib/OcBootManagementLib.inf
index ef3466a1..f2ae65d6 100644
--- a/Library/OcBootManagementLib/OcBootManagementLib.inf
+++ b/Library/OcBootManagementLib/OcBootManagementLib.inf
@@ -108,5 +108,5 @@
   OcFileLib
   OcRtcLib
   OcXmlLib
-  OcTimerLib
+  TimerLib
   FileHandleLib
diff --git a/Library/OcTimerLib/OcTimerLib.inf b/Library/OcTimerLib/OcTimerLib.inf
index 0c08a58b..17569ad7 100755
--- a/Library/OcTimerLib/OcTimerLib.inf
+++ b/Library/OcTimerLib/OcTimerLib.inf
@@ -22,7 +22,7 @@
   FILE_GUID                      = 8BF2026F-C0BB-4A5D-A7DB-395DAB5A73E7
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = OcTimerLib
+  LIBRARY_CLASS                  = TimerLib
   CONSTRUCTOR                    = OcTimerLibConstructor
 
 #
diff --git a/OpenCorePkg.dec b/OpenCorePkg.dec
index 1e833537..8ad9f04b 100755
--- a/OpenCorePkg.dec
+++ b/OpenCorePkg.dec
@@ -845,7 +845,7 @@
   OcTemplateLib|Include/Acidanthera/Library/OcTemplateLib.h
 
   ##  @libraryclass
-  OcTimerLib|Include/Acidanthera/Library/OcTimerLib.h
+  TimerLib|Include/Acidanthera/Library/OcTimerLib.h
 
   ##  @libraryclass
   OcUnicodeCollationEngGenericLib|Include/Acidanthera/Library/OcUnicodeCollationEngGenericLib.h
diff --git a/OpenCorePkg.dsc b/OpenCorePkg.dsc
index 49c1d457..4448ed87 100755
--- a/OpenCorePkg.dsc
+++ b/OpenCorePkg.dsc
@@ -97,7 +97,7 @@
   OcStorageLib|OpenCorePkg/Library/OcStorageLib/OcStorageLib.inf
   OcStringLib|OpenCorePkg/Library/OcStringLib/OcStringLib.inf
   OcTemplateLib|OpenCorePkg/Library/OcTemplateLib/OcTemplateLib.inf
-  OcTimerLib|OpenCorePkg/Library/OcTimerLib/OcTimerLib.inf
+  TimerLib|OpenCorePkg/Library/OcTimerLib/OcTimerLib.inf
   OcUnicodeCollationEngGenericLib|OpenCorePkg/Library/OcUnicodeCollationEngLib/OcUnicodeCollationEngGenericLib.inf
   OcUnicodeCollationEngLocalLib|OpenCorePkg/Library/OcUnicodeCollationEngLib/OcUnicodeCollationEngLocalLib.inf
   OcVirtualFsLib|OpenCorePkg/Library/OcVirtualFsLib/OcVirtualFsLib.inf
@@ -140,10 +140,7 @@
       !endif
   }
   MdeModulePkg/Bus/Isa/Ps2MouseDxe/Ps2MouseDxe.inf
-  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf {
-    <LibraryClasses>
-      TimerLib|OpenCorePkg/Library/OcTimerLib/OcTimerLib.inf
-  }
+  MdeModulePkg/Bus/Isa/Ps2KeyboardDxe/Ps2KeyboardDxe.inf
   MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
   OpenCorePkg/Application/BootKicker/BootKicker.inf
@@ -222,10 +219,7 @@
   OpenCorePkg/Platform/OpenCore/OpenCore.inf
   OpenCorePkg/Platform/OpenRuntime/OpenRuntime.inf
   OpenCorePkg/Platform/OpenUsbKbDxe/UsbKbDxe.inf
-  OpenCorePkg/Staging/AudioDxe/AudioDxe.inf {
-    <LibraryClasses>
-      TimerLib|OpenCorePkg/Library/OcTimerLib/OcTimerLib.inf
-  }
+  OpenCorePkg/Staging/AudioDxe/AudioDxe.inf
   OpenCorePkg/Staging/VBoxHfs/VBoxHfs.inf
   OpenCorePkg/Tests/AcpiTest/AcpiTest.inf
   OpenCorePkg/Tests/AcpiTest/AcpiTestApp.inf