diff --git a/src/extensions/init/initext_functions.cpp b/src/extensions/init/initext_functions.cpp
index eb5009014..29db5a3f0 100644
--- a/src/extensions/init/initext_functions.cpp
+++ b/src/extensions/init/initext_functions.cpp
@@ -501,7 +501,7 @@ bool Vinifera_Init_Secondary_Mixfiles()
         DEBUG_INFO(" MULTI.MIX\n", buffer);
     }
 
-    if (Addon_407120(ADDON_FIRESTORM)) {
+    if (Addon_Installed(ADDON_FIRESTORM)) {
         if (CCFileClass("SOUNDS01.MIX").Is_Available()) {
             FSSoundsMix = new MFCC("SOUNDS01.MIX", &FastKey);
             ASSERT(FSSoundsMix);
diff --git a/src/extensions/newmenu/newmenuext_hooks.cpp b/src/extensions/newmenu/newmenuext_hooks.cpp
index 1bdadf366..18f612149 100644
--- a/src/extensions/newmenu/newmenuext_hooks.cpp
+++ b/src/extensions/newmenu/newmenuext_hooks.cpp
@@ -68,10 +68,10 @@ static void Draw_Title_Screen(bool firestorm)
  */
 static void Set_Addon_Mode(bool firestorm)
 {
-    Addon_4071C0(-1);
+    Addon_4071C0(ADDON_ANY);
 
     if (firestorm) {
-         Addon_407190(1);
+         Addon_407190(ADDON_FIRESTORM);
     }
 
     Set_Required_Addon(firestorm ? ADDON_FIRESTORM : ADDON_NONE);
diff --git a/src/extensions/rules/rulesext_hooks.cpp b/src/extensions/rules/rulesext_hooks.cpp
index 19834b2d1..ba581f189 100644
--- a/src/extensions/rules/rulesext_hooks.cpp
+++ b/src/extensions/rules/rulesext_hooks.cpp
@@ -252,7 +252,7 @@ DECLARE_PATCH(_Init_Rules_Extended_Class_Patch)
      * 
      *  @author: CCHyper
      */
-    if (Addon_407120(ADDON_FIRESTORM)) {
+    if (Addon_Enabled(ADDON_FIRESTORM)) {
         Rule->Colors(FSRuleINI);
         Rule->AudioVisual(FSRuleINI);
         Rule->MPlayer(FSRuleINI);