diff --git a/MsCorePkg/Test/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.cpp b/MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.cpp
similarity index 100%
rename from MsCorePkg/Test/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.cpp
rename to MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.cpp
diff --git a/MsCorePkg/Test/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf b/MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
similarity index 100%
rename from MsCorePkg/Test/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
rename to MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
diff --git a/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc b/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc
index c8ee239090..ba231623df 100644
--- a/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc
+++ b/MsCorePkg/UnitTests/MsCorePkgHostTest.dsc
@@ -46,7 +46,7 @@
 [Components]
     MsCorePkg/MacAddressEmulationDxe/Test/MacAddressEmulationDxeHostTest.inf
 
-    MsCorePkg/Test/Mock/Library/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
+    MsCorePkg/Test/Mock/Library/GoogleTest/MockDeviceBootManagerLib/MockDeviceBootManagerLib.inf
 
 [BuildOptions]
   *_*_*_CC_FLAGS            = -D DISABLE_NEW_DEPRECATED_INTERFACES