diff --git a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/ConfigKnobShimStandaloneMmLib.c b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/ConfigKnobShimMmLib.c
similarity index 96%
rename from SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/ConfigKnobShimStandaloneMmLib.c
rename to SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/ConfigKnobShimMmLib.c
index 84db9859..ee8a157f 100644
--- a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/ConfigKnobShimStandaloneMmLib.c
+++ b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/ConfigKnobShimMmLib.c
@@ -1,4 +1,4 @@
-/** @file ConfigKnobShimStandaloneMmLib.c
+/** @file ConfigKnobShimMmLib.c
   Library interface for an OEM config policy creator to call into to fetch overrides for config values.
 
   Copyright (c) Microsoft Corporation.
diff --git a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/ConfigKnobShimStandaloneMmLib.inf b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/ConfigKnobShimMmLib.inf
similarity index 80%
rename from SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/ConfigKnobShimStandaloneMmLib.inf
rename to SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/ConfigKnobShimMmLib.inf
index f435358c..36470706 100644
--- a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/ConfigKnobShimStandaloneMmLib.inf
+++ b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/ConfigKnobShimMmLib.inf
@@ -8,11 +8,11 @@
 
 [Defines]
   INF_VERSION               = 0x00010017
-  BASE_NAME                 = ConfigKnobShimStandaloneMmLib
+  BASE_NAME                 = ConfigKnobShimMmLib
   FILE_GUID                 = 675EE92E-8771-413A-8BBE-B87152B910E2
   VERSION_STRING            = 1.0
-  MODULE_TYPE               = MM_STANDALONE
-  LIBRARY_CLASS             = ConfigKnobShimLib
+  MODULE_TYPE               = BASE
+  LIBRARY_CLASS             = ConfigKnobShimLib | MM_STANDALONE DXE_SMM_DRIVER
   PI_SPECIFICATION_VERSION  = 0x00010032
 
 #
@@ -23,7 +23,7 @@
 #
 
 [Sources]
-  ConfigKnobShimStandaloneMmLib.c
+  ConfigKnobShimMmLib.c
   ../ConfigKnobShimLibCommon.c
   ../ConfigKnobShimLibCommon.h
 
diff --git a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/UnitTest/ConfigKnobShimStandaloneMmLibUnitTest.inf b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/UnitTest/ConfigKnobShimMmLibUnitTest.inf
similarity index 75%
rename from SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/UnitTest/ConfigKnobShimStandaloneMmLibUnitTest.inf
rename to SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/UnitTest/ConfigKnobShimMmLibUnitTest.inf
index d8d51c6a..12cb4421 100644
--- a/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/UnitTest/ConfigKnobShimStandaloneMmLibUnitTest.inf
+++ b/SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/UnitTest/ConfigKnobShimMmLibUnitTest.inf
@@ -1,5 +1,5 @@
 ## @file
-# Unit tests of the ConfigKnobShimExampleStandaloneMmLib instance.
+# Unit tests of the ConfigKnobShimMmLib instance.
 #
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -7,7 +7,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010017
-  BASE_NAME                      = ConfigKnobShimStandaloneMmUnitTest
+  BASE_NAME                      = ConfigKnobShimMmUnitTest
   FILE_GUID                      = EA4B9417-78FC-474E-AC35-44AFF09E9099
   MODULE_TYPE                    = HOST_APPLICATION
   VERSION_STRING                 = 1.0
@@ -15,12 +15,12 @@
 #
 # The following information is for reference only and not required by the build tools.
 #
-#  VALID_ARCHITECTURES           = IA32 X64 AARCH64
+#  VALID_ARCHITECTURES           = IA32 X64
 #
 
 [Sources]
   ../../UnitTest/ConfigKnobShimLibUnitTestCommon.c
-  ../ConfigKnobShimStandaloneMmLib.c
+  ../ConfigKnobShimMmLib.c
   ../../ConfigKnobShimLibCommon.c
 
 [Packages]
diff --git a/SetupDataPkg/SetupDataPkg.dsc b/SetupDataPkg/SetupDataPkg.dsc
index 8bda3ca9..561b1b41 100644
--- a/SetupDataPkg/SetupDataPkg.dsc
+++ b/SetupDataPkg/SetupDataPkg.dsc
@@ -89,7 +89,7 @@
 [Components]
   SetupDataPkg/Library/ConfigVariableListLib/ConfigVariableListLib.inf
   SetupDataPkg/Library/ConfigSystemModeLibNull/ConfigSystemModeLibNull.inf
-  SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/ConfigKnobShimStandaloneMmLib.inf
+  SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/ConfigKnobShimMmLib.inf
   SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimPeiLib/ConfigKnobShimPeiLib.inf
   SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimDxeLib/ConfigKnobShimDxeLib.inf
   SetupDataPkg/Library/SvdXmlSettingSchemaSupportLib/SvdXmlSettingSchemaSupportLib.inf
diff --git a/SetupDataPkg/Test/SetupDataPkgHostTest.dsc b/SetupDataPkg/Test/SetupDataPkgHostTest.dsc
index 08fa5cfb..b9bb7114 100644
--- a/SetupDataPkg/Test/SetupDataPkgHostTest.dsc
+++ b/SetupDataPkg/Test/SetupDataPkgHostTest.dsc
@@ -54,9 +54,9 @@
       PeiServicesLib|SetupDataPkg/Test/MockLibrary/MockPeiServicesLib/MockPeiServicesLib.inf
   }
 
-  SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/UnitTest/ConfigKnobShimStandaloneMmLibUnitTest.inf {
+  SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/UnitTest/ConfigKnobShimMmLibUnitTest.inf {
     <LibraryClasses>
-      ConfigKnobShimLib|SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimStandaloneMmLib/ConfigKnobShimStandaloneMmLib.inf
+      ConfigKnobShimLib|SetupDataPkg/Library/ConfigKnobShimLib/ConfigKnobShimMmLib/ConfigKnobShimMmLib.inf
       MmServicesTableLib|SetupDataPkg/Test/MockLibrary/MockMmServicesTableLib/MockMmServicesTableLib.inf
   }