diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
index 4c4cdb8c26..afe425ca21 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_default_deadline_server.py
@@ -25,7 +25,7 @@ class CollectDefaultDeadlineServer(pyblish.api.ContextPlugin):
 
     def process(self, context):
         try:
-            deadline_module = context.data["ayonAddonsManger"]["deadline"]
+            deadline_module = context.data["ayonAddonsManager"]["deadline"]
         except AttributeError:
             self.log.error("Cannot get OpenPype Deadline module.")
             raise AssertionError("OpenPype Deadline module not found.")
diff --git a/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py b/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py
index 46046d73ab..51f707ecf6 100644
--- a/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py
+++ b/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py
@@ -1,7 +1,7 @@
 """
 Requires:
     context -> system_settings
-    context -> ayonAddonsManger
+    context -> ayonAddonsManager
 """
 
 import pyblish.api
@@ -13,7 +13,7 @@ class StartTimer(pyblish.api.ContextPlugin):
     hosts = ["*"]
 
     def process(self, context):
-        timers_manager = context.data["ayonAddonsManger"]["timers_manager"]
+        timers_manager = context.data["ayonAddonsManager"]["timers_manager"]
         if not timers_manager.enabled:
             self.log.debug("TimersManager is disabled")
             return
diff --git a/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py b/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py
index 755dccbff6..9d7cb33ba9 100644
--- a/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py
+++ b/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py
@@ -1,7 +1,7 @@
 """
 Requires:
     context -> system_settings
-    context -> ayonAddonsManger
+    context -> ayonAddonsManager
 """
 
 
@@ -14,7 +14,7 @@ class StopTimer(pyblish.api.ContextPlugin):
     hosts = ["*"]
 
     def process(self, context):
-        timers_manager = context.data["ayonAddonsManger"]["timers_manager"]
+        timers_manager = context.data["ayonAddonsManager"]["timers_manager"]
         if not timers_manager.enabled:
             self.log.debug("TimersManager is disabled")
             return
diff --git a/client/ayon_core/plugins/publish/collect_modules.py b/client/ayon_core/plugins/publish/collect_addons.py
similarity index 74%
rename from client/ayon_core/plugins/publish/collect_modules.py
rename to client/ayon_core/plugins/publish/collect_addons.py
index 6ed1ffefb3..9bba9978ab 100644
--- a/client/ayon_core/plugins/publish/collect_modules.py
+++ b/client/ayon_core/plugins/publish/collect_addons.py
@@ -2,10 +2,10 @@
 """Collect AYON addons."""
 import pyblish.api
 
-from ayon_core.modules import AddonsManager
+from ayon_core.addon import AddonsManager
 
 
-class CollectModules(pyblish.api.ContextPlugin):
+class CollectAddons(pyblish.api.ContextPlugin):
     """Collect AYON addons."""
 
     order = pyblish.api.CollectorOrder - 0.5
@@ -13,7 +13,7 @@ class CollectModules(pyblish.api.ContextPlugin):
 
     def process(self, context):
         manager = AddonsManager()
-        context.data["ayonAddonsManger"] = manager
+        context.data["ayonAddonsManager"] = manager
         context.data["ayonAddons"] = manager.addons_by_name
         # Backwards compatibility - remove
         context.data["openPypeModules"] = manager.addons_by_name
diff --git a/client/ayon_core/plugins/publish/collect_farm_target.py b/client/ayon_core/plugins/publish/collect_farm_target.py
index d169b3275a..2d68687183 100644
--- a/client/ayon_core/plugins/publish/collect_farm_target.py
+++ b/client/ayon_core/plugins/publish/collect_farm_target.py
@@ -17,7 +17,7 @@ class CollectFarmTarget(pyblish.api.InstancePlugin):
         context = instance.context
 
         farm_name = ""
-        addons_manager = context.data.get("ayonAddonsManger")
+        addons_manager = context.data.get("ayonAddonsManager")
 
         for farm_renderer in ["deadline", "royalrender"]:
             addon = addons_manager.get(farm_renderer, False)
diff --git a/client/ayon_core/plugins/publish/integrate.py b/client/ayon_core/plugins/publish/integrate.py
index 88fa533da6..a67c837daf 100644
--- a/client/ayon_core/plugins/publish/integrate.py
+++ b/client/ayon_core/plugins/publish/integrate.py
@@ -322,7 +322,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
         self.log.debug("Retrieving Representation Site Sync information ...")
 
         # Get the accessible sites for Site Sync
-        addons_manager = instance.context.data["ayonAddonsManger"]
+        addons_manager = instance.context.data["ayonAddonsManager"]
         sync_server_addon = addons_manager.get("sync_server")
         if sync_server_addon is None:
             sites = [{