diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 96a66dbf..d231d589 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -11,6 +11,12 @@ Change Log
 
 .. There should always be an "Unreleased" section for changes pending release.
 
+[1.2.1] - 2020-12-17
+~~~~~~~~~~~~~~~~~~~~
+
+* Improve monitoring of legacy Waffle class imports. We should watch for "edx_toggles.toggles.internal.waffle.legacy.WaffleSwitch" custom attributes.
+
+
 [1.2.0] - 2020-11-05
 ~~~~~~~~~~~~~~~~~~~~
 
diff --git a/edx_toggles/__init__.py b/edx_toggles/__init__.py
index 0ad056e5..c954b7da 100644
--- a/edx_toggles/__init__.py
+++ b/edx_toggles/__init__.py
@@ -2,6 +2,6 @@
 Library and utilities for feature toggles.
 """
 
-__version__ = '1.2.0'
+__version__ = '1.2.1'
 
 default_app_config = 'edx_toggles.apps.TogglesConfig'  # pylint: disable=invalid-name
diff --git a/edx_toggles/toggles/__init__.py b/edx_toggles/toggles/__init__.py
index 520ad7ce..b84807f9 100644
--- a/edx_toggles/toggles/__init__.py
+++ b/edx_toggles/toggles/__init__.py
@@ -4,8 +4,21 @@
 from .internal.setting_toggle import SettingDictToggle, SettingToggle
 from .internal.waffle.legacy import WaffleFlag, WaffleFlagNamespace, WaffleSwitch, WaffleSwitchNamespace
 
+
 # Create waffle aliases for forward compatibility
-LegacyWaffleFlag = WaffleFlag
-LegacyWaffleFlagNamespace = WaffleFlagNamespace
-LegacyWaffleSwitch = WaffleSwitch
-LegacyWaffleSwitchNamespace = WaffleSwitchNamespace
+# We create new classes instead of using `LegacyClass = Class` statements
+# for better monitoring of legacy class usage.
+class LegacyWaffleFlag(WaffleFlag):
+    pass
+
+
+class LegacyWaffleFlagNamespace(WaffleFlagNamespace):
+    pass
+
+
+class LegacyWaffleSwitch(WaffleSwitch):
+    pass
+
+
+class LegacyWaffleSwitchNamespace(WaffleSwitchNamespace):
+    pass