diff --git a/stepmania/src/LocalizedString.cpp b/stepmania/src/LocalizedString.cpp
index 3695f3f139..85434d5d3c 100644
--- a/stepmania/src/LocalizedString.cpp
+++ b/stepmania/src/LocalizedString.cpp
@@ -17,7 +17,7 @@ void LocalizedString::RegisterLocalizer( RString (*pfnLocalizer)(const RString&,
 
 #include "SubscriptionManager.h"
 template<>
-SubscriptionHandler<LocalizedString> g_Subscribers;
+SubscriptionManager<LocalizedString> g_Subscribers;
 
 void LocalizedString::RefreshLocalizedStrings()
 {
diff --git a/stepmania/src/LuaReference.cpp b/stepmania/src/LuaReference.cpp
index 0f14dcb2e0..47c3b2db01 100644
--- a/stepmania/src/LuaReference.cpp
+++ b/stepmania/src/LuaReference.cpp
@@ -9,7 +9,7 @@
 
 REGISTER_CLASS_TRAITS( LuaReference, new LuaReference(*pCopy) )
 
-SubscriptionHandler<LuaReference> g_Subscribers;
+SubscriptionManager<LuaReference> g_Subscribers;
 
 LuaReference::LuaReference()
 {
diff --git a/stepmania/src/Preference.cpp b/stepmania/src/Preference.cpp
index 8afd31b339..17af10a183 100644
--- a/stepmania/src/Preference.cpp
+++ b/stepmania/src/Preference.cpp
@@ -7,7 +7,7 @@
 #include "MessageManager.h"
 #include "SubscriptionManager.h"
 
-static SubscriptionHandler<IPreference> m_Subscribers;
+static SubscriptionManager<IPreference> m_Subscribers;
 
 IPreference::IPreference( const CString& sName ):
 	m_sName( sName )
diff --git a/stepmania/src/SubscriptionManager.h b/stepmania/src/SubscriptionManager.h
index 96d25408d7..0324e1c7d1 100644
--- a/stepmania/src/SubscriptionManager.h
+++ b/stepmania/src/SubscriptionManager.h
@@ -8,7 +8,7 @@
 // Since this class has only POD types and no constructor, there's no 
 // initialize order problem.
 template<class T>
-class SubscriptionHandler
+class SubscriptionManager
 {
 public:
 	// TRICKY: If we make this a global instead of a global pointer,
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 1a3dba88ba..f7a7d35d55 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -50,7 +50,7 @@ static IniFile *g_pIniMetrics;
 // For self-registering metrics
 //
 #include "SubscriptionManager.h"
-static SubscriptionHandler<IThemeMetric> g_Subscribers;
+static SubscriptionManager<IThemeMetric> g_Subscribers;
 
 void ThemeManager::Subscribe( IThemeMetric *p )
 {