diff --git a/kiauh/core/menus/install_menu.py b/kiauh/core/menus/install_menu.py
index 45ecccb..52e6592 100644
--- a/kiauh/core/menus/install_menu.py
+++ b/kiauh/core/menus/install_menu.py
@@ -70,7 +70,7 @@ class InstallMenu(BaseMenu):
         moonraker_setup.install_moonraker()
 
     def install_mainsail(self):
-        mainsail_setup.run_mainsail_installation()
+        mainsail_setup.install_mainsail()
 
     def install_fluidd(self):
         print("install_fluidd")
diff --git a/kiauh/modules/mainsail/mainsail_setup.py b/kiauh/modules/mainsail/mainsail_setup.py
index 70f7dc4..437c19b 100644
--- a/kiauh/modules/mainsail/mainsail_setup.py
+++ b/kiauh/modules/mainsail/mainsail_setup.py
@@ -58,7 +58,7 @@ from kiauh.utils.system_utils import (
 )
 
 
-def run_mainsail_installation() -> None:
+def install_mainsail() -> None:
     mr_im = InstanceManager(Moonraker)
     mr_instances: List[Moonraker] = mr_im.instances
 
diff --git a/kiauh/modules/moonraker/moonraker_setup.py b/kiauh/modules/moonraker/moonraker_setup.py
index 0b08a54..e47b7eb 100644
--- a/kiauh/modules/moonraker/moonraker_setup.py
+++ b/kiauh/modules/moonraker/moonraker_setup.py
@@ -52,27 +52,6 @@ from kiauh.utils.system_utils import (
 )
 
 
-def check_moonraker_install_requirements() -> bool:
-    if not (sys.version_info.major >= 3 and sys.version_info.minor >= 7):
-        Logger.print_error("Versioncheck failed!")
-        Logger.print_error("Python 3.7 or newer required to run Moonraker.")
-        return False
-
-    kl_instance_count = len(InstanceManager(Klipper).instances)
-    if kl_instance_count < 1:
-        Logger.print_warn("Klipper not installed!")
-        Logger.print_warn("Moonraker cannot be installed! Install Klipper first.")
-        return False
-
-    mr_instance_count = len(InstanceManager(Moonraker).instances)
-    if mr_instance_count >= kl_instance_count:
-        Logger.print_warn("Unable to install more Moonraker instances!")
-        Logger.print_warn("More Klipper instances required.")
-        return False
-
-    return True
-
-
 def install_moonraker() -> None:
     if not check_moonraker_install_requirements():
         return
@@ -134,6 +113,25 @@ def install_moonraker() -> None:
     if MAINSAIL_DIR.exists() and len(mr_im.instances) > 1:
         enable_mainsail_remotemode()
 
+def check_moonraker_install_requirements() -> bool:
+    if not (sys.version_info.major >= 3 and sys.version_info.minor >= 7):
+        Logger.print_error("Versioncheck failed!")
+        Logger.print_error("Python 3.7 or newer required to run Moonraker.")
+        return False
+
+    kl_instance_count = len(InstanceManager(Klipper).instances)
+    if kl_instance_count < 1:
+        Logger.print_warn("Klipper not installed!")
+        Logger.print_warn("Moonraker cannot be installed! Install Klipper first.")
+        return False
+
+    mr_instance_count = len(InstanceManager(Moonraker).instances)
+    if mr_instance_count >= kl_instance_count:
+        Logger.print_warn("Unable to install more Moonraker instances!")
+        Logger.print_warn("More Klipper instances required.")
+        return False
+
+    return True
 
 def setup_moonraker_prerequesites() -> None:
     cm = ConfigManager(cfg_file=KIAUH_CFG)