diff --git a/client/ayon_core/cli_commands.py b/client/ayon_core/cli_commands.py
index c07b72afdf..7e652950eb 100644
--- a/client/ayon_core/cli_commands.py
+++ b/client/ayon_core/cli_commands.py
@@ -73,6 +73,20 @@ class Commands:
         import pyblish.api
         import pyblish.util
 
+        # Fix older jobs
+        for src_key, dst_key in (
+            ("AVALON_PROJECT", "AYON_PROJECT_NAME"),
+            ("AVALON_ASSET", "AYON_FOLDER_PATH"),
+            ("AVALON_TASK", "AYON_TASK_NAME"),
+            ("AVALON_WORKDIR", "AYON_WORKDIR"),
+            ("AVALON_APP_NAME", "AYON_APP_NAME"),
+            ("AVALON_APP", "AYON_HOST_NAME"),
+        ):
+            if src_key in os.environ and dst_key not in os.environ:
+                os.environ[dst_key] = os.environ[src_key]
+            # Remove old keys, so we're sure they're not used
+            os.environ.pop(src_key, None)
+
         log = Logger.get_logger("CLI-publish")
 
         install_ayon_plugins()
@@ -87,7 +101,7 @@ class Commands:
         if not any(paths):
             raise RuntimeError("No publish paths specified")
 
-        app_full_name = os.getenv("AVALON_APP_NAME")
+        app_full_name = os.getenv("AYON_APP_NAME")
         if app_full_name:
             context = get_global_context()
             env = get_app_environments_for_context(
diff --git a/client/ayon_core/hooks/pre_create_extra_workdir_folders.py b/client/ayon_core/hooks/pre_create_extra_workdir_folders.py
index 6116d5fbd3..72c6bf2f68 100644
--- a/client/ayon_core/hooks/pre_create_extra_workdir_folders.py
+++ b/client/ayon_core/hooks/pre_create_extra_workdir_folders.py
@@ -21,7 +21,7 @@ class CreateWorkdirExtraFolders(PreLaunchHook):
             return
 
         env = self.data.get("env") or {}
-        workdir = env.get("AVALON_WORKDIR")
+        workdir = env.get("AYON_WORKDIR")
         if not workdir or not os.path.exists(workdir):
             return
 
diff --git a/client/ayon_core/host/dirmap.py b/client/ayon_core/host/dirmap.py
index 9756657386..effafb6261 100644
--- a/client/ayon_core/host/dirmap.py
+++ b/client/ayon_core/host/dirmap.py
@@ -181,6 +181,10 @@ class HostDirmap(object):
                 exclude_locals=False,
                 cached=False)
 
+            # TODO implement
+            # Dirmap is dependent on 'get_site_local_overrides' which
+            #   is not implemented in AYON. The mapping should be received
+            #   from sitesync addon.
             active_overrides = get_site_local_overrides(
                 project_name, active_site)
             remote_overrides = get_site_local_overrides(
diff --git a/client/ayon_core/host/host.py b/client/ayon_core/host/host.py
index 2dd98c8126..51dff9d558 100644
--- a/client/ayon_core/host/host.py
+++ b/client/ayon_core/host/host.py
@@ -106,7 +106,7 @@ class HostBase(object):
             Union[str, None]: Current project name.
         """
 
-        return os.environ.get("AVALON_PROJECT")
+        return os.environ.get("AYON_PROJECT_NAME")
 
     def get_current_asset_name(self):
         """
@@ -114,7 +114,7 @@ class HostBase(object):
             Union[str, None]: Current asset name.
         """
 
-        return os.environ.get("AVALON_ASSET")
+        return os.environ.get("AYON_FOLDER_PATH")
 
     def get_current_task_name(self):
         """
@@ -122,7 +122,7 @@ class HostBase(object):
             Union[str, None]: Current task name.
         """
 
-        return os.environ.get("AVALON_TASK")
+        return os.environ.get("AYON_TASK_NAME")
 
     def get_current_context(self):
         """Get current context information.
diff --git a/client/ayon_core/host/interfaces.py b/client/ayon_core/host/interfaces.py
index 7c6057acf0..7157ad6f7e 100644
--- a/client/ayon_core/host/interfaces.py
+++ b/client/ayon_core/host/interfaces.py
@@ -234,7 +234,7 @@ class IWorkfileHost:
             str: Path to new workdir.
         """
 
-        return session["AVALON_WORKDIR"]
+        return session["AYON_WORKDIR"]
 
     # --- Deprecated method names ---
     def file_extensions(self):
diff --git a/client/ayon_core/hosts/aftereffects/api/launch_logic.py b/client/ayon_core/hosts/aftereffects/api/launch_logic.py
index 4ffed8cecf..0d1a6cf585 100644
--- a/client/ayon_core/hosts/aftereffects/api/launch_logic.py
+++ b/client/ayon_core/hosts/aftereffects/api/launch_logic.py
@@ -297,11 +297,11 @@ class AfterEffectsRoute(WebSocketRoute):
         log.info("Setting context change")
         log.info("project {} asset {} ".format(project, asset))
         if project:
-            os.environ["AVALON_PROJECT"] = project
+            os.environ["AYON_PROJECT_NAME"] = project
         if asset:
-            os.environ["AVALON_ASSET"] = asset
+            os.environ["AYON_FOLDER_PATH"] = asset
         if task:
-            os.environ["AVALON_TASK"] = task
+            os.environ["AYON_TASK_NAME"] = task
 
     async def read(self):
         log.debug("aftereffects.read client calls server server calls "
diff --git a/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py b/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py
index 78aa49a562..bd005f5d4f 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py
@@ -194,13 +194,13 @@ class RenderCreator(Creator):
         name into created subset name.
 
         Position of composition name could be set in
-        `project_settings/global/tools/creator/subset_name_profiles` with some
-        form of '{composition}' placeholder.
+        `project_settings/global/tools/creator/product_name_profiles` with
+        some form of '{composition}' placeholder.
 
         Composition name will be used implicitly if multiple composition should
         be handled at same time.
 
-        If {composition} placeholder is not us 'subset_name_profiles'
+        If {composition} placeholder is not us 'product_name_profiles'
         composition name will be capitalized and set at the end of subset name
         if necessary.
 
diff --git a/client/ayon_core/hosts/blender/api/pipeline.py b/client/ayon_core/hosts/blender/api/pipeline.py
index 77731a0fd3..a49afeea6b 100644
--- a/client/ayon_core/hosts/blender/api/pipeline.py
+++ b/client/ayon_core/hosts/blender/api/pipeline.py
@@ -272,7 +272,7 @@ def set_resolution(data):
 
 
 def on_new():
-    project = os.environ.get("AVALON_PROJECT")
+    project = os.environ.get("AYON_PROJECT_NAME")
     settings = get_project_settings(project).get("blender")
 
     set_resolution_startup = settings.get("set_resolution_startup")
@@ -293,7 +293,7 @@ def on_new():
 
 
 def on_open():
-    project = os.environ.get("AVALON_PROJECT")
+    project = os.environ.get("AYON_PROJECT_NAME")
     settings = get_project_settings(project).get("blender")
 
     set_resolution_startup = settings.get("set_resolution_startup")
@@ -379,7 +379,7 @@ def _on_task_changed():
     # `directory` attribute, so it opens in that directory (does it?).
     # https://docs.blender.org/api/blender2.8/bpy.types.Operator.html#calling-a-file-selector
     # https://docs.blender.org/api/blender2.8/bpy.types.WindowManager.html#bpy.types.WindowManager.fileselect_add
-    workdir = os.getenv("AVALON_WORKDIR")
+    workdir = os.getenv("AYON_WORKDIR")
     log.debug("New working directory: %s", workdir)
 
 
diff --git a/client/ayon_core/hosts/blender/api/workio.py b/client/ayon_core/hosts/blender/api/workio.py
index a8f6193abc..e0f333843a 100644
--- a/client/ayon_core/hosts/blender/api/workio.py
+++ b/client/ayon_core/hosts/blender/api/workio.py
@@ -82,7 +82,7 @@ def file_extensions() -> List[str]:
 def work_root(session: dict) -> str:
     """Return the default root to browse for work files."""
 
-    work_dir = session["AVALON_WORKDIR"]
+    work_dir = session["AYON_WORKDIR"]
     scene_dir = session.get("AVALON_SCENEDIR")
     if scene_dir:
         return str(Path(work_dir, scene_dir))
diff --git a/client/ayon_core/hosts/flame/api/workio.py b/client/ayon_core/hosts/flame/api/workio.py
index 0e3cb7f5fd..eef10a4847 100644
--- a/client/ayon_core/hosts/flame/api/workio.py
+++ b/client/ayon_core/hosts/flame/api/workio.py
@@ -34,4 +34,4 @@ def current_file():
 
 
 def work_root(session):
-    return os.path.normpath(session["AVALON_WORKDIR"]).replace("\\", "/")
+    return os.path.normpath(session["AYON_WORKDIR"]).replace("\\", "/")
diff --git a/client/ayon_core/hosts/flame/plugins/load/load_clip.py b/client/ayon_core/hosts/flame/plugins/load/load_clip.py
index 6f35196932..47d0331255 100644
--- a/client/ayon_core/hosts/flame/plugins/load/load_clip.py
+++ b/client/ayon_core/hosts/flame/plugins/load/load_clip.py
@@ -70,7 +70,7 @@ class LoadClip(opfapi.ClipLoader):
         self.log.info("Loading with colorspace: `{}`".format(colorspace))
 
         # create workfile path
-        workfile_dir = os.environ["AVALON_WORKDIR"]
+        workfile_dir = os.environ["AYON_WORKDIR"]
         openclip_dir = os.path.join(
             workfile_dir, clip_name
         )
diff --git a/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py b/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py
index 57797e5a44..cdf96bd459 100644
--- a/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py
+++ b/client/ayon_core/hosts/flame/plugins/load/load_clip_batch.py
@@ -80,7 +80,7 @@ class LoadClipBatch(opfapi.ClipLoader):
         self.log.info("Loading with colorspace: `{}`".format(colorspace))
 
         # create workfile path
-        workfile_dir = options.get("workdir") or os.environ["AVALON_WORKDIR"]
+        workfile_dir = options.get("workdir") or os.environ["AYON_WORKDIR"]
         openclip_dir = os.path.join(
             workfile_dir, clip_name
         )
diff --git a/client/ayon_core/hosts/fusion/addon.py b/client/ayon_core/hosts/fusion/addon.py
index 391ee770c4..54e48ea7bf 100644
--- a/client/ayon_core/hosts/fusion/addon.py
+++ b/client/ayon_core/hosts/fusion/addon.py
@@ -22,7 +22,7 @@ def get_fusion_version(app_name):
     The function is triggered by the prelaunch hooks to get the fusion version.
 
     `app_name` is obtained by prelaunch hooks from the
-    `launch_context.env.get("AVALON_APP_NAME")`.
+    `launch_context.env.get("AYON_APP_NAME")`.
 
     To get a correct Fusion version, a version number should be present
     in the `applications/fusion/variants` key
diff --git a/client/ayon_core/hosts/fusion/api/pipeline.py b/client/ayon_core/hosts/fusion/api/pipeline.py
index 7c480704a5..0e9e0724c7 100644
--- a/client/ayon_core/hosts/fusion/api/pipeline.py
+++ b/client/ayon_core/hosts/fusion/api/pipeline.py
@@ -135,7 +135,7 @@ class FusionHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         return current_filepath
 
     def work_root(self, session):
-        work_dir = session["AVALON_WORKDIR"]
+        work_dir = session["AYON_WORKDIR"]
         scene_dir = session.get("AVALON_SCENEDIR")
         if scene_dir:
             return os.path.join(work_dir, scene_dir)
diff --git a/client/ayon_core/hosts/fusion/api/plugin.py b/client/ayon_core/hosts/fusion/api/plugin.py
index 807bed59f7..70392c2f5b 100644
--- a/client/ayon_core/hosts/fusion/api/plugin.py
+++ b/client/ayon_core/hosts/fusion/api/plugin.py
@@ -135,7 +135,7 @@ class GenericCreateSaver(Creator):
         ext = data["creator_attributes"]["image_format"]
 
         # Subset change detected
-        workdir = os.path.normpath(os.getenv("AVALON_WORKDIR"))
+        workdir = os.path.normpath(os.getenv("AYON_WORKDIR"))
         formatting_data.update({
             "workdir": workdir,
             "frame": "0" * frame_padding,
diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py b/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py
index f63aaa1eb4..5aa2783129 100644
--- a/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py
+++ b/client/ayon_core/hosts/fusion/hooks/pre_fusion_profile_hook.py
@@ -131,7 +131,7 @@ class FusionCopyPrefsPrelaunch(PreLaunchHook):
         ) = self.get_copy_fusion_prefs_settings()
 
         # Get launched application context and return correct app version
-        app_name = self.launch_context.env.get("AVALON_APP_NAME")
+        app_name = self.launch_context.env.get("AYON_APP_NAME")
         app_version = get_fusion_version(app_name)
         if app_version is None:
             version_names = ", ".join(str(x) for x in FUSION_VERSIONS_DICT)
diff --git a/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py b/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py
index 7cfa9d0a26..7eaf2ddc02 100644
--- a/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py
+++ b/client/ayon_core/hosts/fusion/hooks/pre_fusion_setup.py
@@ -28,7 +28,7 @@ class FusionPrelaunch(PreLaunchHook):
     def execute(self):
         # making sure python 3 is installed at provided path
         # Py 3.3-3.10 for Fusion 18+ or Py 3.6 for Fu 16-17
-        app_data = self.launch_context.env.get("AVALON_APP_NAME")
+        app_data = self.launch_context.env.get("AYON_APP_NAME")
         app_version = get_fusion_version(app_data)
         if not app_version:
             raise ApplicationLaunchFailed(
diff --git a/client/ayon_core/hosts/harmony/api/workio.py b/client/ayon_core/hosts/harmony/api/workio.py
index 8df5ede917..1f95148e75 100644
--- a/client/ayon_core/hosts/harmony/api/workio.py
+++ b/client/ayon_core/hosts/harmony/api/workio.py
@@ -74,4 +74,4 @@ def current_file():
 
 
 def work_root(session):
-    return os.path.normpath(session["AVALON_WORKDIR"]).replace("\\", "/")
+    return os.path.normpath(session["AYON_WORKDIR"]).replace("\\", "/")
diff --git a/client/ayon_core/hosts/harmony/plugins/publish/validate_scene_settings.py b/client/ayon_core/hosts/harmony/plugins/publish/validate_scene_settings.py
index 0cf96e70b0..6d46fbcd33 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/validate_scene_settings.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/validate_scene_settings.py
@@ -77,7 +77,7 @@ class ValidateSceneSettings(pyblish.api.InstancePlugin):
             expected_settings.pop("resolutionWidth")
             expected_settings.pop("resolutionHeight")
 
-        if (any(re.search(pattern, os.getenv('AVALON_TASK'))
+        if (any(re.search(pattern, os.getenv('AYON_TASK_NAME'))
                 for pattern in self.skip_timelines_check)):
             self.log.info("Skipping frames check because of "
                           "task name and pattern {}".format(
diff --git a/client/ayon_core/hosts/hiero/api/workio.py b/client/ayon_core/hosts/hiero/api/workio.py
index 14d9439344..4c2416ca38 100644
--- a/client/ayon_core/hosts/hiero/api/workio.py
+++ b/client/ayon_core/hosts/hiero/api/workio.py
@@ -70,4 +70,4 @@ def current_file():
 
 
 def work_root(session):
-    return os.path.normpath(session["AVALON_WORKDIR"]).replace("\\", "/")
+    return os.path.normpath(session["AYON_WORKDIR"]).replace("\\", "/")
diff --git a/client/ayon_core/hosts/houdini/hooks/set_paths.py b/client/ayon_core/hosts/houdini/hooks/set_paths.py
index 1f24a8dd7d..7eb346cc74 100644
--- a/client/ayon_core/hosts/houdini/hooks/set_paths.py
+++ b/client/ayon_core/hosts/houdini/hooks/set_paths.py
@@ -10,7 +10,7 @@ class SetPath(PreLaunchHook):
     launch_types = {LaunchTypes.local}
 
     def execute(self):
-        workdir = self.launch_context.env.get("AVALON_WORKDIR", "")
+        workdir = self.launch_context.env.get("AYON_WORKDIR", "")
         if not workdir:
             self.log.warning("BUG: Workdir is not filled.")
             return
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py
index 800d6fb883..ee259fb70d 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances_usd_layered.py
@@ -2,7 +2,7 @@ import hou
 import pyblish.api
 from ayon_core.hosts.houdini.api import lib
 import ayon_core.hosts.houdini.api.usd as hou_usdlib
-import ayon_core.lib.usdlib as usdlib
+from ayon_core.pipeline import usdlib
 
 
 class CollectInstancesUsdLayered(pyblish.api.ContextPlugin):
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py
index ed54ad8bc1..7342c8f621 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_bootstrap.py
@@ -5,7 +5,7 @@ from ayon_core.client import (
     get_asset_by_name,
     get_asset_name_identifier,
 )
-import ayon_core.lib.usdlib as usdlib
+from ayon_core.pipeline import usdlib
 
 
 class CollectUsdBootstrap(pyblish.api.InstancePlugin):
diff --git a/client/ayon_core/hosts/max/hooks/set_paths.py b/client/ayon_core/hosts/max/hooks/set_paths.py
index c18fd29295..0ee1b0dab7 100644
--- a/client/ayon_core/hosts/max/hooks/set_paths.py
+++ b/client/ayon_core/hosts/max/hooks/set_paths.py
@@ -10,7 +10,7 @@ class SetPath(PreLaunchHook):
     launch_types = {LaunchTypes.local}
 
     def execute(self):
-        workdir = self.launch_context.env.get("AVALON_WORKDIR", "")
+        workdir = self.launch_context.env.get("AYON_WORKDIR", "")
         if not workdir:
             self.log.warning("BUG: Workdir is not filled.")
             return
diff --git a/client/ayon_core/hosts/maya/api/commands.py b/client/ayon_core/hosts/maya/api/commands.py
index b52d5e6c2d..f69dca97a8 100644
--- a/client/ayon_core/hosts/maya/api/commands.py
+++ b/client/ayon_core/hosts/maya/api/commands.py
@@ -38,25 +38,6 @@ class ToolWindows:
         cls._windows[tool] = window
 
 
-def edit_shader_definitions():
-    from qtpy import QtWidgets
-    from ayon_core.hosts.maya.api.shader_definition_editor import (
-        ShaderDefinitionsEditor
-    )
-    from ayon_core.tools.utils import qt_app_context
-
-    top_level_widgets = QtWidgets.QApplication.topLevelWidgets()
-    main_window = next(widget for widget in top_level_widgets
-                       if widget.objectName() == "MayaWindow")
-
-    with qt_app_context():
-        window = ToolWindows.get_window("shader_definition_editor")
-        if not window:
-            window = ShaderDefinitionsEditor(parent=main_window)
-            ToolWindows.set_window("shader_definition_editor", window)
-        window.show()
-
-
 def _resolution_from_document(doc):
     if not doc or "data" not in doc:
         print("Entered document is not valid. \"{}\"".format(str(doc)))
diff --git a/client/ayon_core/hosts/maya/api/pipeline.py b/client/ayon_core/hosts/maya/api/pipeline.py
index dc6353618a..e58316030e 100644
--- a/client/ayon_core/hosts/maya/api/pipeline.py
+++ b/client/ayon_core/hosts/maya/api/pipeline.py
@@ -246,7 +246,7 @@ def _set_project():
         None
 
     """
-    workdir = os.getenv("AVALON_WORKDIR")
+    workdir = os.getenv("AYON_WORKDIR")
 
     try:
         os.makedirs(workdir)
@@ -628,7 +628,7 @@ def on_task_changed():
     # Run
     menu.update_menu_task_label()
 
-    workdir = os.getenv("AVALON_WORKDIR")
+    workdir = os.getenv("AYON_WORKDIR")
     if os.path.exists(workdir):
         log.info("Updating Maya workspace for task change to %s", workdir)
         _set_project()
@@ -677,7 +677,7 @@ def workfile_save_before_xgen(event):
 
     import xgenm
 
-    current_work_dir = os.getenv("AVALON_WORKDIR").replace("\\", "/")
+    current_work_dir = os.getenv("AYON_WORKDIR").replace("\\", "/")
     expected_work_dir = event.data["workdir_path"].replace("\\", "/")
     if current_work_dir == expected_work_dir:
         return
diff --git a/client/ayon_core/hosts/maya/api/plugin.py b/client/ayon_core/hosts/maya/api/plugin.py
index aba5fd8903..42c0c7051e 100644
--- a/client/ayon_core/hosts/maya/api/plugin.py
+++ b/client/ayon_core/hosts/maya/api/plugin.py
@@ -612,7 +612,7 @@ def get_load_color_for_family(family, settings=None):
     else:
         raise ValueError("Invalid color definition {}".format(str(color)))
 
-    if type(red, int):
+    if isinstance(red, int):
         red = red / 255.0
         green = green / 255.0
         blue = blue / 255.0
diff --git a/client/ayon_core/hosts/maya/api/shader_definition_editor.py b/client/ayon_core/hosts/maya/api/shader_definition_editor.py
deleted file mode 100644
index 04e8dded6f..0000000000
--- a/client/ayon_core/hosts/maya/api/shader_definition_editor.py
+++ /dev/null
@@ -1,176 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Editor for shader definitions.
-
-Shader names are stored as simple text file over GridFS in mongodb.
-
-"""
-import os
-from qtpy import QtWidgets, QtCore, QtGui
-from ayon_core.client.mongo import OpenPypeMongoConnection
-from ayon_core import resources
-import gridfs
-
-
-DEFINITION_FILENAME = "{}/maya/shader_definition.txt".format(
-    os.getenv("AVALON_PROJECT"))
-
-
-class ShaderDefinitionsEditor(QtWidgets.QWidget):
-    """Widget serving as simple editor for shader name definitions."""
-
-    # name of the file used to store definitions
-
-    def __init__(self, parent=None):
-        super(ShaderDefinitionsEditor, self).__init__(parent)
-        self._mongo = OpenPypeMongoConnection.get_mongo_client()
-        self._gridfs = gridfs.GridFS(
-            self._mongo[os.getenv("OPENPYPE_DATABASE_NAME")])
-        self._editor = None
-
-        self._original_content = self._read_definition_file()
-
-        self.setObjectName("shaderDefinitionEditor")
-        self.setWindowTitle("OpenPype shader name definition editor")
-        icon = QtGui.QIcon(resources.get_ayon_icon_filepath())
-        self.setWindowIcon(icon)
-        self.setWindowFlags(QtCore.Qt.Window)
-        self.setParent(parent)
-        self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
-        self.resize(750, 500)
-
-        self._setup_ui()
-        self._reload()
-
-    def _setup_ui(self):
-        """Setup UI of Widget."""
-        layout = QtWidgets.QVBoxLayout(self)
-        label = QtWidgets.QLabel()
-        label.setText("Put shader names here - one name per line:")
-        layout.addWidget(label)
-        self._editor = QtWidgets.QPlainTextEdit()
-        self._editor.setStyleSheet("border: none;")
-        layout.addWidget(self._editor)
-
-        btn_layout = QtWidgets.QHBoxLayout()
-        save_btn = QtWidgets.QPushButton("Save")
-        save_btn.clicked.connect(self._save)
-
-        reload_btn = QtWidgets.QPushButton("Reload")
-        reload_btn.clicked.connect(self._reload)
-
-        exit_btn = QtWidgets.QPushButton("Exit")
-        exit_btn.clicked.connect(self._close)
-
-        btn_layout.addWidget(reload_btn)
-        btn_layout.addWidget(save_btn)
-        btn_layout.addWidget(exit_btn)
-
-        layout.addLayout(btn_layout)
-
-    def _read_definition_file(self, file=None):
-        """Read definition file from database.
-
-        Args:
-            file (gridfs.grid_file.GridOut, Optional): File to read. If not
-                set, new query will be issued to find it.
-
-        Returns:
-            str: Content of the file or empty string if file doesn't exist.
-
-        """
-        content = ""
-        if not file:
-            file = self._gridfs.find_one(
-                {"filename": DEFINITION_FILENAME})
-        if not file:
-            print(">>> [SNDE]: nothing in database yet")
-            return content
-        content = file.read()
-        file.close()
-        return content
-
-    def _write_definition_file(self, content, force=False):
-        """Write content as definition to file in database.
-
-        Before file is written, check is made if its content has not
-        changed. If is changed, warning is issued to user if he wants
-        it to overwrite. Note: GridFs doesn't allow changing file content.
-        You need to delete existing file and create new one.
-
-        Args:
-            content (str): Content to write.
-
-        Raises:
-            ContentException: If file is changed in database while
-                editor is running.
-        """
-        file = self._gridfs.find_one(
-            {"filename": DEFINITION_FILENAME})
-        if file:
-            content_check = self._read_definition_file(file)
-            if content == content_check:
-                print(">>> [SNDE]: content not changed")
-                return
-            if self._original_content != content_check:
-                if not force:
-                    raise ContentException("Content changed")
-            print(">>> [SNDE]: overwriting data")
-            file.close()
-            self._gridfs.delete(file._id)
-
-        file = self._gridfs.new_file(
-            filename=DEFINITION_FILENAME,
-            content_type='text/plain',
-            encoding='utf-8')
-        file.write(content)
-        file.close()
-        QtCore.QTimer.singleShot(200, self._reset_style)
-        self._editor.setStyleSheet("border: 1px solid #33AF65;")
-        self._original_content = content
-
-    def _reset_style(self):
-        """Reset editor style back.
-
-        Used to visually indicate save.
-
-        """
-        self._editor.setStyleSheet("border: none;")
-
-    def _close(self):
-        self.hide()
-
-    def closeEvent(self, event):
-        event.ignore()
-        self.hide()
-
-    def _reload(self):
-        print(">>> [SNDE]: reloading")
-        self._set_content(self._read_definition_file())
-
-    def _save(self):
-        try:
-            self._write_definition_file(content=self._editor.toPlainText())
-        except ContentException:
-            # content has changed meanwhile
-            print(">>> [SNDE]: content has changed")
-            self._show_overwrite_warning()
-
-    def _set_content(self, content):
-        self._editor.setPlainText(content)
-
-    def _show_overwrite_warning(self):
-        reply = QtWidgets.QMessageBox.question(
-            self,
-            "Warning",
-            ("Content you are editing was changed meanwhile in database.\n"
-             "Please, reload and solve the conflict."),
-            QtWidgets.QMessageBox.OK)
-
-        if reply == QtWidgets.QMessageBox.OK:
-            # do nothing
-            pass
-
-
-class ContentException(Exception):
-    """This is risen during save if file is changed in database."""
-    pass
diff --git a/client/ayon_core/hosts/maya/api/workio.py b/client/ayon_core/hosts/maya/api/workio.py
index 8c31974c73..ff6c11eb4f 100644
--- a/client/ayon_core/hosts/maya/api/workio.py
+++ b/client/ayon_core/hosts/maya/api/workio.py
@@ -35,7 +35,7 @@ def current_file():
 
 
 def work_root(session):
-    work_dir = session["AVALON_WORKDIR"]
+    work_dir = session["AYON_WORKDIR"]
     scene_dir = None
 
     # Query scene file rule from workspace.mel if it exists in WORKDIR
diff --git a/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py b/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py
index 7198f98131..03ca8661bd 100644
--- a/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py
+++ b/client/ayon_core/hosts/maya/hooks/pre_copy_mel.py
@@ -12,7 +12,7 @@ class PreCopyMel(PreLaunchHook):
 
     def execute(self):
         project_doc = self.data["project_doc"]
-        workdir = self.launch_context.env.get("AVALON_WORKDIR")
+        workdir = self.launch_context.env.get("AYON_WORKDIR")
         if not workdir:
             self.log.warning("BUG: Workdir is not filled.")
             return
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_render.py b/client/ayon_core/hosts/maya/plugins/publish/collect_render.py
index e4221a091c..4ea91ccb0d 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_render.py
@@ -8,13 +8,12 @@ publishing on farm.
 Requires:
     instance    -> families
     instance    -> setMembers
+    instance    -> asset
 
     context     -> currentFile
     context     -> workspaceDir
     context     -> user
 
-    session     -> AVALON_ASSET
-
 Optional:
 
 Provides:
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_model_name.py b/client/ayon_core/hosts/maya/plugins/publish/validate_model_name.py
deleted file mode 100644
index cf2bbcd77c..0000000000
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_model_name.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Validate model nodes names."""
-import os
-import platform
-import re
-
-import gridfs
-import pyblish.api
-from maya import cmds
-
-import ayon_core.hosts.maya.api.action
-from ayon_core.client.mongo import OpenPypeMongoConnection
-from ayon_core.hosts.maya.api.shader_definition_editor import (
-    DEFINITION_FILENAME)
-from ayon_core.pipeline.publish import (
-    OptionalPyblishPluginMixin, PublishValidationError, ValidateContentsOrder)
-
-
-class ValidateModelName(pyblish.api.InstancePlugin,
-                        OptionalPyblishPluginMixin):
-    """Validate name of model
-
-    starts with (somename)_###_(materialID)_GEO
-    materialID must be present in list
-    padding number doesn't have limit
-
-    """
-    optional = True
-    order = ValidateContentsOrder
-    hosts = ["maya"]
-    families = ["model"]
-    label = "Model Name"
-    actions = [ayon_core.hosts.maya.api.action.SelectInvalidAction]
-    material_file = None
-    database_file = DEFINITION_FILENAME
-
-    @classmethod
-    def get_invalid(cls, instance):
-        """Get invalid nodes."""
-        use_db = cls.database
-
-        def is_group(group_name):
-            """Find out if supplied transform is group or not."""
-            try:
-                children = cmds.listRelatives(group_name, children=True)
-                for child in children:
-                    if not cmds.ls(child, transforms=True):
-                        return False
-                return True
-            except Exception:
-                return False
-
-        invalid = []
-        content_instance = instance.data.get("setMembers", None)
-        if not content_instance:
-            cls.log.error("Instance has no nodes!")
-            return True
-        pass
-
-        # validate top level group name
-        assemblies = cmds.ls(content_instance, assemblies=True, long=True)
-        if len(assemblies) != 1:
-            cls.log.error("Must have exactly one top group")
-            return assemblies or True
-        top_group = assemblies[0]
-        regex = cls.top_level_regex
-        r = re.compile(regex)
-        m = r.match(top_group)
-        project_name = instance.context.data["projectName"]
-        current_asset_name = instance.context.data["asset"]
-        if m is None:
-            cls.log.error("invalid name on: {}".format(top_group))
-            cls.log.error("name doesn't match regex {}".format(regex))
-            invalid.append(top_group)
-        else:
-            if "asset" in r.groupindex:
-                if m.group("asset") != current_asset_name:
-                    cls.log.error("Invalid asset name in top level group.")
-                    return top_group
-            if "subset" in r.groupindex:
-                if m.group("subset") != instance.data.get("subset"):
-                    cls.log.error("Invalid subset name in top level group.")
-                    return top_group
-            if "project" in r.groupindex:
-                if m.group("project") != project_name:
-                    cls.log.error("Invalid project name in top level group.")
-                    return top_group
-
-        descendants = cmds.listRelatives(content_instance,
-                                         allDescendents=True,
-                                         fullPath=True) or []
-
-        descendants = cmds.ls(descendants, noIntermediate=True, long=True)
-        trns = cmds.ls(descendants, long=False, type='transform')
-
-        # filter out groups
-        filtered = [node for node in trns if not is_group(node)]
-
-        # load shader list file as utf-8
-        shaders = []
-        if not use_db:
-            material_file = cls.material_file[platform.system().lower()]
-            if material_file:
-                if os.path.isfile(material_file):
-                    shader_file = open(material_file, "r")
-                    shaders = shader_file.readlines()
-                    shader_file.close()
-            else:
-                cls.log.error("Missing shader name definition file.")
-                return True
-        else:
-            client = OpenPypeMongoConnection.get_mongo_client()
-            fs = gridfs.GridFS(client[os.getenv("OPENPYPE_DATABASE_NAME")])
-            shader_file = fs.find_one({"filename": cls.database_file})
-            if not shader_file:
-                cls.log.error("Missing shader name definition in database.")
-                return True
-            shaders = shader_file.read().splitlines()
-            shader_file.close()
-
-        # strip line endings from list
-        shaders = [s.rstrip() for s in shaders if s.rstrip()]
-
-        # compile regex for testing names
-        regex = cls.regex
-        r = re.compile(regex)
-
-        for obj in filtered:
-            cls.log.debug("testing: {}".format(obj))
-            m = r.match(obj)
-            if m is None:
-                cls.log.error("invalid name on: {}".format(obj))
-                invalid.append(obj)
-            else:
-                # if we have shader files and shader named group is in
-                # regex, test this group against names in shader file
-                if "shader" in r.groupindex and shaders:
-                    try:
-                        if not m.group('shader') in shaders:
-                            cls.log.error(
-                                "invalid materialID on: {0} ({1})".format(
-                                    obj, m.group('shader')))
-                            invalid.append(obj)
-                    except IndexError:
-                        # shader named group doesn't match
-                        cls.log.error(
-                            "shader group doesn't match: {}".format(obj))
-                        invalid.append(obj)
-
-        return invalid
-
-    def process(self, instance):
-        """Plugin entry point."""
-        if not self.is_active(instance.data):
-            return
-
-        invalid = self.get_invalid(instance)
-
-        if invalid:
-            raise PublishValidationError(
-                "Model naming is invalid. See the log.")
diff --git a/client/ayon_core/hosts/maya/startup/userSetup.py b/client/ayon_core/hosts/maya/startup/userSetup.py
index a652e4d7de..adbbfe4f44 100644
--- a/client/ayon_core/hosts/maya/startup/userSetup.py
+++ b/client/ayon_core/hosts/maya/startup/userSetup.py
@@ -38,7 +38,7 @@ if explicit_plugins_loading["enabled"]:
 key = "AYON_OPEN_WORKFILE_POST_INITIALIZATION"
 if bool(int(os.environ.get(key, "0"))):
     def _log_and_open():
-        path = os.environ["AVALON_LAST_WORKFILE"]
+        path = os.environ["AYON_LAST_WORKFILE"]
         print("Opening \"{}\"".format(path))
         cmds.file(path, open=True, force=True)
     cmds.evalDeferred(
diff --git a/client/ayon_core/hosts/nuke/api/lib.py b/client/ayon_core/hosts/nuke/api/lib.py
index 2ac33de68e..c320df9361 100644
--- a/client/ayon_core/hosts/nuke/api/lib.py
+++ b/client/ayon_core/hosts/nuke/api/lib.py
@@ -120,7 +120,7 @@ def deprecated(new_destination):
 class Context:
     main_window = None
     context_action_item = None
-    project_name = os.getenv("AVALON_PROJECT")
+    project_name = os.getenv("AYON_PROJECT_NAME")
     # Workfile related code
     workfiles_launched = False
     workfiles_tool_timer = None
@@ -2605,7 +2605,7 @@ Reopening Nuke should synchronize these paths and resolve any discrepancies.
     def set_favorites(self):
         from .utils import set_context_favorites
 
-        work_dir = os.getenv("AVALON_WORKDIR")
+        work_dir = os.getenv("AYON_WORKDIR")
         asset = get_current_asset_name()
         favorite_items = OrderedDict()
 
@@ -2953,7 +2953,7 @@ def process_workfile_builder():
     create_fv_on = workfile_builder.get("create_first_version") or None
     builder_on = workfile_builder.get("builder_on_start") or None
 
-    last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE")
+    last_workfile_path = os.environ.get("AYON_LAST_WORKFILE")
 
     # generate first version in file not existing and feature is enabled
     if create_fv_on and not os.path.exists(last_workfile_path):
@@ -3203,7 +3203,7 @@ class DirmapCache:
     @classmethod
     def project_name(cls):
         if cls._project_name is None:
-            cls._project_name = os.getenv("AVALON_PROJECT")
+            cls._project_name = os.getenv("AYON_PROJECT_NAME")
         return cls._project_name
 
     @classmethod
diff --git a/client/ayon_core/hosts/nuke/api/plugin.py b/client/ayon_core/hosts/nuke/api/plugin.py
index 4b8ddac167..dc14515f2a 100644
--- a/client/ayon_core/hosts/nuke/api/plugin.py
+++ b/client/ayon_core/hosts/nuke/api/plugin.py
@@ -493,7 +493,7 @@ def get_colorspace_from_node(node):
 def get_review_presets_config():
     settings = get_current_project_settings()
     review_profiles = (
-        settings["global"]
+        settings["core"]
         ["publish"]
         ["ExtractReview"]
         ["profiles"]
@@ -1348,7 +1348,9 @@ def _remove_old_knobs(node):
 
 
 def exposed_write_knobs(settings, plugin_name, instance_node):
-    exposed_knobs = settings["nuke"]["create"][plugin_name]["exposed_knobs"]
+    exposed_knobs = settings["nuke"]["create"][plugin_name].get(
+        "exposed_knobs", []
+    )
     if exposed_knobs:
         instance_node.addKnob(nuke.Text_Knob('', 'Write Knobs'))
     write_node = nuke.allNodes(group=instance_node, filter="Write")[0]
diff --git a/client/ayon_core/hosts/nuke/api/workio.py b/client/ayon_core/hosts/nuke/api/workio.py
index 98e59eff71..b2445fd3d2 100644
--- a/client/ayon_core/hosts/nuke/api/workio.py
+++ b/client/ayon_core/hosts/nuke/api/workio.py
@@ -68,7 +68,7 @@ def current_file():
 
 def work_root(session):
 
-    work_dir = session["AVALON_WORKDIR"]
+    work_dir = session["AYON_WORKDIR"]
     scene_dir = session.get("AVALON_SCENEDIR")
     if scene_dir:
         path = os.path.join(work_dir, scene_dir)
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py
index 9111bcdc2c..c047347481 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_exposed_knobs.py
@@ -65,7 +65,7 @@ class ValidateExposedKnobs(
         group_node = instance.data["transientData"]["node"]
         nuke_settings = instance.context.data["project_settings"]["nuke"]
         create_settings = nuke_settings["create"][plugin]
-        exposed_knobs = create_settings["exposed_knobs"]
+        exposed_knobs = create_settings.get("exposed_knobs", [])
         unexposed_knobs = []
         for knob in exposed_knobs:
             if knob not in group_node.knobs():
diff --git a/client/ayon_core/hosts/nuke/startup/custom_write_node.py b/client/ayon_core/hosts/nuke/startup/custom_write_node.py
index 01e255d0c0..89dfde297c 100644
--- a/client/ayon_core/hosts/nuke/startup/custom_write_node.py
+++ b/client/ayon_core/hosts/nuke/startup/custom_write_node.py
@@ -112,7 +112,7 @@ class WriteNodeKnobSettingPanel(nukescripts.PythonPanel):
         for write_node in write_selected_nodes:
             # data for mapping the path
             data = {
-                "work": os.getenv("AVALON_WORKDIR"),
+                "work": os.getenv("AYON_WORKDIR"),
                 "subset": write_node["name"].value(),
                 "frame": "#" * frame_padding,
                 "ext": ext
diff --git a/client/ayon_core/hosts/photoshop/api/pipeline.py b/client/ayon_core/hosts/photoshop/api/pipeline.py
index 046ec8e6ee..ebde175053 100644
--- a/client/ayon_core/hosts/photoshop/api/pipeline.py
+++ b/client/ayon_core/hosts/photoshop/api/pipeline.py
@@ -62,7 +62,7 @@ class PhotoshopHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         return None
 
     def work_root(self, session):
-        return os.path.normpath(session["AVALON_WORKDIR"]).replace("\\", "/")
+        return os.path.normpath(session["AYON_WORKDIR"]).replace("\\", "/")
 
     def open_workfile(self, filepath):
         lib.stub().open(filepath)
diff --git a/client/ayon_core/hosts/photoshop/plugins/create/create_image.py b/client/ayon_core/hosts/photoshop/plugins/create/create_image.py
index a28872bba1..2ef746fc94 100644
--- a/client/ayon_core/hosts/photoshop/plugins/create/create_image.py
+++ b/client/ayon_core/hosts/photoshop/plugins/create/create_image.py
@@ -209,8 +209,8 @@ class ImageCreator(Creator):
 
         'Use layer name in subset' will explicitly add layer name into subset
         name. Position of this name is configurable in
-        `project_settings/global/tools/creator/subset_name_profiles`.
-        If layer placeholder ({layer}) is not used in `subset_name_profiles`
+        `project_settings/global/tools/creator/product_name_profiles`.
+        If layer placeholder ({layer}) is not used in `product_name_profiles`
         but layer name should be used (set explicitly in UI or implicitly if
         multiple images should be created), it is added in capitalized form
         as a suffix to subset name.
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py
index 2912dbf23d..464b6e3999 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_batch_data.py
@@ -52,10 +52,10 @@ class CollectBatchData(pyblish.api.ContextPlugin):
         assert os.path.exists(batch_dir), \
             "Folder {} doesn't exist".format(batch_dir)
 
-        project_name = os.environ.get("AVALON_PROJECT")
+        project_name = os.environ.get("AYON_PROJECT_NAME")
         if project_name is None:
             raise AssertionError(
-                "Environment `AVALON_PROJECT` was not found."
+                "Environment `AYON_PROJECT_NAME` was not found."
                 "Could not set project `root` which may cause issues."
             )
 
@@ -68,8 +68,8 @@ class CollectBatchData(pyblish.api.ContextPlugin):
             batch_data["context"]
         )
 
-        os.environ["AVALON_ASSET"] = asset_name
-        os.environ["AVALON_TASK"] = task_name
+        os.environ["AYON_FOLDER_PATH"] = asset_name
+        os.environ["AYON_TASK_NAME"] = task_name
 
         context.data["asset"] = asset_name
         context.data["task"] = task_name
diff --git a/client/ayon_core/hosts/resolve/api/workio.py b/client/ayon_core/hosts/resolve/api/workio.py
index 5e4865ddc5..b6c2f63432 100644
--- a/client/ayon_core/hosts/resolve/api/workio.py
+++ b/client/ayon_core/hosts/resolve/api/workio.py
@@ -79,7 +79,7 @@ def open_file(filepath):
 def current_file():
     pm = get_project_manager()
     file_ext = file_extensions()[0]
-    workdir_path = os.getenv("AVALON_WORKDIR")
+    workdir_path = os.getenv("AYON_WORKDIR")
     project = pm.GetCurrentProject()
     project_name = project.GetName()
     file_name = project_name + file_ext
@@ -93,4 +93,4 @@ def current_file():
 
 
 def work_root(session):
-    return os.path.normpath(session["AVALON_WORKDIR"]).replace("\\", "/")
+    return os.path.normpath(session["AYON_WORKDIR"]).replace("\\", "/")
diff --git a/client/ayon_core/hosts/traypublisher/api/pipeline.py b/client/ayon_core/hosts/traypublisher/api/pipeline.py
index 88fa3239a5..f4526ddf4b 100644
--- a/client/ayon_core/hosts/traypublisher/api/pipeline.py
+++ b/client/ayon_core/hosts/traypublisher/api/pipeline.py
@@ -22,7 +22,7 @@ class TrayPublisherHost(HostBase, IPublishHost):
     name = "traypublisher"
 
     def install(self):
-        os.environ["AVALON_APP"] = self.name
+        os.environ["AYON_HOST_NAME"] = self.name
 
         pyblish.api.register_host("traypublisher")
         pyblish.api.register_plugin_path(PUBLISH_PATH)
@@ -40,7 +40,7 @@ class TrayPublisherHost(HostBase, IPublishHost):
     def set_project_name(self, project_name):
         # TODO Deregister project specific plugins and register new project
         #   plugins
-        os.environ["AVALON_PROJECT"] = project_name
+        os.environ["AYON_PROJECT_NAME"] = project_name
         HostContext.set_project_name(project_name)
 
 
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py
index 20f8dd792a..cc1429901d 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_from_settings.py
@@ -8,7 +8,7 @@ log = Logger.get_logger(__name__)
 def initialize():
     from ayon_core.hosts.traypublisher.api.plugin import SettingsCreator
 
-    project_name = os.environ["AVALON_PROJECT"]
+    project_name = os.environ["AYON_PROJECT_NAME"]
     project_settings = get_project_settings(project_name)
 
     simple_creators = project_settings["traypublisher"]["simple_creators"]
diff --git a/client/ayon_core/hosts/tvpaint/api/pipeline.py b/client/ayon_core/hosts/tvpaint/api/pipeline.py
index d636e68cfa..78a0c5270d 100644
--- a/client/ayon_core/hosts/tvpaint/api/pipeline.py
+++ b/client/ayon_core/hosts/tvpaint/api/pipeline.py
@@ -68,7 +68,7 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         log.info("AYON - Installing TVPaint integration")
 
         # Create workdir folder if does not exist yet
-        workdir = os.getenv("AVALON_WORKDIR")
+        workdir = os.getenv("AYON_WORKDIR")
         if not os.path.exists(workdir):
             os.makedirs(workdir)
 
@@ -155,7 +155,7 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         return execute_george(george_script)
 
     def work_root(self, session):
-        return session["AVALON_WORKDIR"]
+        return session["AYON_WORKDIR"]
 
     def get_current_workfile(self):
         return execute_george("tv_GetProjectName")
@@ -174,7 +174,7 @@ class TVPaintHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         # Setup project settings if its the template that's launched.
         # TODO also check for template creation when it's possible to define
         #   templates
-        last_workfile = os.environ.get("AVALON_LAST_WORKFILE")
+        last_workfile = os.environ.get("AYON_LAST_WORKFILE")
         if not last_workfile or os.path.exists(last_workfile):
             return
 
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py
index 05ceb143e9..a6b6f05dc9 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile_data.py
@@ -85,8 +85,8 @@ class CollectWorkfileData(pyblish.api.ContextPlugin):
         if workfile_context:
             # Change current context with context from workfile
             key_map = (
-                ("AVALON_ASSET", "asset_name"),
-                ("AVALON_TASK", "task_name")
+                ("AYON_FOLDER_PATH", "asset_name"),
+                ("AYON_TASK_NAME", "task_name")
             )
             for env_key, key in key_map:
                 os.environ[env_key] = workfile_context[key]
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py b/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py
index 6d54d8ec32..0ab9fbd038 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py
@@ -31,7 +31,7 @@ class ExtractSequence(pyblish.api.Extractor):
     families = ["review", "render"]
 
     # Modifiable with settings
-    review_bg = [255, 255, 255, 255]
+    review_bg = [255, 255, 255, 1.0]
 
     def process(self, instance):
         self.log.info(
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py
index be3259bfd8..5b42842717 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_workfile_project_name.py
@@ -6,7 +6,7 @@ class ValidateWorkfileProjectName(pyblish.api.ContextPlugin):
     """Validate project name stored in workfile metadata.
 
     It is not possible to publish from different project than is set in
-    environment variable "AVALON_PROJECT".
+    environment variable "AYON_PROJECT_NAME".
     """
 
     label = "Validate Workfile Project Name"
diff --git a/client/ayon_core/hosts/unreal/api/rendering.py b/client/ayon_core/hosts/unreal/api/rendering.py
index 8717788732..4a15ceb89a 100644
--- a/client/ayon_core/hosts/unreal/api/rendering.py
+++ b/client/ayon_core/hosts/unreal/api/rendering.py
@@ -60,7 +60,7 @@ def start_rendering():
             inst_data.append(data)
 
     try:
-        project = os.environ.get("AVALON_PROJECT")
+        project = os.environ.get("AYON_PROJECT_NAME")
         anatomy = Anatomy(project)
         root = anatomy.roots['renders']
     except Exception as e:
diff --git a/client/ayon_core/hosts/unreal/hooks/pre_workfile_preparation.py b/client/ayon_core/hosts/unreal/hooks/pre_workfile_preparation.py
index 4317844ca5..0eaa1adb84 100644
--- a/client/ayon_core/hosts/unreal/hooks/pre_workfile_preparation.py
+++ b/client/ayon_core/hosts/unreal/hooks/pre_workfile_preparation.py
@@ -146,7 +146,7 @@ class UnrealPrelaunchHook(PreLaunchHook):
 
     def execute(self):
         """Hook entry method."""
-        workdir = self.launch_context.env["AVALON_WORKDIR"]
+        workdir = self.launch_context.env["AYON_WORKDIR"]
         executable = str(self.launch_context.executable)
         engine_version = self.app_name.split("/")[-1].replace("-", ".")
         try:
diff --git a/client/ayon_core/lib/applications.py b/client/ayon_core/lib/applications.py
index 2b0b855c81..373b82d82f 100644
--- a/client/ayon_core/lib/applications.py
+++ b/client/ayon_core/lib/applications.py
@@ -16,7 +16,6 @@ from ayon_core.client import get_asset_name_identifier
 from ayon_core.settings import (
     get_system_settings,
     get_project_settings,
-    get_local_settings
 )
 from ayon_core.settings.constants import (
     METADATA_KEYS,
@@ -1528,16 +1527,17 @@ def prepare_app_environments(
 
     # Use environments from local settings
     filtered_local_envs = {}
-    system_settings = data["system_settings"]
-    whitelist_envs = system_settings["general"].get("local_env_white_list")
-    if whitelist_envs:
-        local_settings = get_local_settings()
-        local_envs = local_settings.get("environments") or {}
-        filtered_local_envs = {
-            key: value
-            for key, value in local_envs.items()
-            if key in whitelist_envs
-        }
+    # NOTE Overrides for environment variables are not implemented in AYON.
+    # system_settings = data["system_settings"]
+    # whitelist_envs = system_settings["general"].get("local_env_white_list")
+    # if whitelist_envs:
+    #     local_settings = get_local_settings()
+    #     local_envs = local_settings.get("environments") or {}
+    #     filtered_local_envs = {
+    #         key: value
+    #         for key, value in local_envs.items()
+    #         if key in whitelist_envs
+    #     }
 
     # Apply local environment variables for already existing values
     for key, value in filtered_local_envs.items():
@@ -1656,8 +1656,9 @@ def apply_project_environments_value(
     if project_settings is None:
         project_settings = get_project_settings(project_name)
 
-    env_value = project_settings["global"]["project_environments"]
+    env_value = project_settings["core"]["project_environments"]
     if env_value:
+        env_value = json.loads(env_value)
         parsed_value = parse_environments(env_value, env_group)
         env.update(acre.compute(
             _merge_env(parsed_value, env),
@@ -1698,15 +1699,15 @@ def prepare_context_environments(data, env_group=None, addons_manager=None):
 
     app = data["app"]
     context_env = {
-        "AVALON_PROJECT": project_doc["name"],
-        "AVALON_APP_NAME": app.full_name
+        "AYON_PROJECT_NAME": project_doc["name"],
+        "AYON_APP_NAME": app.full_name
     }
     if asset_doc:
         asset_name = get_asset_name_identifier(asset_doc)
-        context_env["AVALON_ASSET"] = asset_name
+        context_env["AYON_FOLDER_PATH"] = asset_name
 
         if task_name:
-            context_env["AVALON_TASK"] = task_name
+            context_env["AYON_TASK_NAME"] = task_name
 
     log.debug(
         "Context environments set:\n{}".format(
@@ -1724,7 +1725,7 @@ def prepare_context_environments(data, env_group=None, addons_manager=None):
     if not app.is_host:
         return
 
-    data["env"]["AVALON_APP"] = app.host_name
+    data["env"]["AYON_HOST_NAME"] = app.host_name
 
     if not asset_doc or not task_name:
         # QUESTION replace with log.info and skip workfile discovery?
@@ -1770,7 +1771,7 @@ def prepare_context_environments(data, env_group=None, addons_manager=None):
                 "Couldn't create workdir because: {}".format(str(exc))
             )
 
-    data["env"]["AVALON_WORKDIR"] = workdir
+    data["env"]["AYON_WORKDIR"] = workdir
 
     _prepare_last_workfile(data, workdir, addons_manager)
 
@@ -1887,7 +1888,7 @@ def _prepare_last_workfile(data, workdir, addons_manager):
         "Setting last workfile path: {}".format(last_workfile_path)
     )
 
-    data["env"]["AVALON_LAST_WORKFILE"] = last_workfile_path
+    data["env"]["AYON_LAST_WORKFILE"] = last_workfile_path
     data["last_workfile_path"] = last_workfile_path
 
 
@@ -1916,7 +1917,7 @@ def should_start_last_workfile(
     project_settings = get_project_settings(project_name)
     profiles = (
         project_settings
-        ["global"]
+        ["core"]
         ["tools"]
         ["Workfiles"]
         ["last_workfile_on_startup"]
@@ -1966,7 +1967,7 @@ def should_workfile_tool_start(
     project_settings = get_project_settings(project_name)
     profiles = (
         project_settings
-        ["global"]
+        ["core"]
         ["tools"]
         ["Workfiles"]
         ["open_workfile_tool_on_startup"]
diff --git a/client/ayon_core/lib/ayon_info.py b/client/ayon_core/lib/ayon_info.py
index 97a35adcc6..ec37d735d8 100644
--- a/client/ayon_core/lib/ayon_info.py
+++ b/client/ayon_core/lib/ayon_info.py
@@ -5,7 +5,6 @@ import platform
 import getpass
 import socket
 
-from ayon_core.settings.lib import get_local_settings
 from .execute import get_ayon_launcher_args
 from .local_settings import get_local_site_id
 
@@ -96,7 +95,6 @@ def get_all_current_info():
     return {
         "workstation": get_workstation_info(),
         "env": os.environ.copy(),
-        "local_settings": get_local_settings(),
         "ayon": get_ayon_info(),
     }
 
diff --git a/client/ayon_core/lib/log.py b/client/ayon_core/lib/log.py
index cbb1e41bae..36c39f9d84 100644
--- a/client/ayon_core/lib/log.py
+++ b/client/ayon_core/lib/log.py
@@ -257,7 +257,7 @@ class Logger:
             return cls._process_name
 
         # Get process name
-        process_name = os.environ.get("AVALON_APP_NAME")
+        process_name = os.environ.get("AYON_APP_NAME")
         if not process_name:
             try:
                 import psutil
diff --git a/client/ayon_core/lib/transcoding.py b/client/ayon_core/lib/transcoding.py
index 6c6837dcf9..08e0bc9237 100644
--- a/client/ayon_core/lib/transcoding.py
+++ b/client/ayon_core/lib/transcoding.py
@@ -1385,23 +1385,26 @@ def _get_image_dimensions(application, input_path, log):
 
 def convert_color_values(application, color_value):
     """Get color mapping for ffmpeg and oiiotool.
+
     Args:
         application (str): Application for which command should be created.
-        color_value (list[int]): List of 8bit int values for RGBA.
+        color_value (tuple[int, int, int, float]): List of 8bit int values
+            for RGBA.
+
     Returns:
         str: ffmpeg returns hex string, oiiotool is string with floats.
+
     """
     red, green, blue, alpha = color_value
 
     if application == "ffmpeg":
         return "{0:0>2X}{1:0>2X}{2:0>2X}@{3}".format(
-            red, green, blue, (alpha / 255.0)
+            red, green, blue, alpha
         )
     elif application == "oiiotool":
         red = float(red / 255)
         green = float(green / 255)
         blue = float(blue / 255)
-        alpha = float(alpha / 255)
 
         return "{0:.3f},{1:.3f},{2:.3f},{3:.3f}".format(
             red, green, blue, alpha)
diff --git a/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py b/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py
index 19aa2ef195..f7dd1772b0 100644
--- a/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py
+++ b/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py
@@ -12,7 +12,7 @@ class ClockifyStart(LauncherAction):
 
     def is_compatible(self, session):
         """Return whether the action is compatible with the session"""
-        if "AVALON_TASK" in session:
+        if "AYON_TASK_NAME" in session:
             return True
         return False
 
@@ -20,9 +20,9 @@ class ClockifyStart(LauncherAction):
         self.clockify_api.set_api()
         user_id = self.clockify_api.user_id
         workspace_id = self.clockify_api.workspace_id
-        project_name = session["AVALON_PROJECT"]
-        asset_name = session["AVALON_ASSET"]
-        task_name = session["AVALON_TASK"]
+        project_name = session["AYON_PROJECT_NAME"]
+        asset_name = session["AYON_FOLDER_PATH"]
+        task_name = session["AYON_TASK_NAME"]
         description = asset_name
 
         # fetch asset docs
diff --git a/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py b/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py
index 30f5ae698f..5ef9033ffe 100644
--- a/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py
+++ b/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py
@@ -36,7 +36,7 @@ class ClockifySync(LauncherAction):
             raise ClockifyPermissionsCheckFailed(
                 "Current CLockify user is missing permissions for this action!"
             )
-        project_name = session.get("AVALON_PROJECT") or ""
+        project_name = session.get("AYON_PROJECT_NAME") or ""
 
         projects_to_sync = []
         if project_name.strip():
diff --git a/client/ayon_core/modules/deadline/deadline_module.py b/client/ayon_core/modules/deadline/deadline_module.py
index c98d04759e..97d346c287 100644
--- a/client/ayon_core/modules/deadline/deadline_module.py
+++ b/client/ayon_core/modules/deadline/deadline_module.py
@@ -4,7 +4,7 @@ import six
 import sys
 
 from ayon_core.lib import requests_get, Logger
-from ayon_core.modules import OpenPypeModule, IPluginPaths
+from ayon_core.modules import AYONAddon, IPluginPaths
 
 
 class DeadlineWebserviceError(Exception):
@@ -13,28 +13,28 @@ class DeadlineWebserviceError(Exception):
     """
 
 
-class DeadlineModule(OpenPypeModule, IPluginPaths):
+class DeadlineModule(AYONAddon, IPluginPaths):
     name = "deadline"
 
-    def __init__(self, manager, settings):
-        self.deadline_urls = {}
-        super(DeadlineModule, self).__init__(manager, settings)
-
-    def initialize(self, modules_settings):
+    def initialize(self, studio_settings):
         # This module is always enabled
-        deadline_settings = modules_settings[self.name]
-        self.enabled = deadline_settings["enabled"]
-        deadline_url = deadline_settings.get("DEADLINE_REST_URL")
-        if deadline_url:
-            self.deadline_urls = {"default": deadline_url}
-        else:
-            self.deadline_urls = deadline_settings.get("deadline_urls")  # noqa: E501
+        deadline_urls = {}
+        enabled = self.name in studio_settings
+        if enabled:
+            deadline_settings = studio_settings[self.name]
+            deadline_urls = {
+                url_item["name"]: url_item["value"]
+                for url_item in deadline_settings["deadline_urls"]
+            }
 
-        if not self.deadline_urls:
-            self.enabled = False
-            self.log.warning(("default Deadline Webservice URL "
-                              "not specified. Disabling module."))
-            return
+        if enabled and not deadline_urls:
+            enabled = False
+            self.log.warning((
+                "Deadline Webservice URLs are not specified. Disabling addon."
+            ))
+
+        self.enabled = enabled
+        self.deadline_urls = deadline_urls
 
     def get_plugin_paths(self):
         """Deadline plugin paths."""
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
index 0cfe7c9b39..445971f2b0 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_deadline_server_from_instance.py
@@ -47,11 +47,11 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
         deadline_settings = (
             render_instance.context.data
             ["system_settings"]
-            ["modules"]
             ["deadline"]
         )
 
         default_server = render_instance.context.data["defaultDeadline"]
+        # QUESTION How and where is this is set? Should be removed?
         instance_server = render_instance.data.get("deadlineServers")
         if not instance_server:
             self.log.debug("Using default server.")
@@ -64,7 +64,10 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
                 asString=True
             )
 
-        default_servers = deadline_settings["deadline_urls"]
+        default_servers = {
+            url_item["name"]: url_item["value"]
+            for url_item in deadline_settings["deadline_urls"]
+        }
         project_servers = (
             render_instance.context.data
             ["project_settings"]
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_publishable_instances.py b/client/ayon_core/modules/deadline/plugins/publish/collect_publishable_instances.py
deleted file mode 100644
index 347da86360..0000000000
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_publishable_instances.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Collect instances that should be processed and published on DL.
-
-"""
-import os
-
-import pyblish.api
-from ayon_core.pipeline import PublishValidationError
-
-
-class CollectDeadlinePublishableInstances(pyblish.api.InstancePlugin):
-    """Collect instances that should be processed and published on DL.
-
-    Some long running publishes (not just renders) could be offloaded to DL,
-    this plugin compares theirs name against env variable, marks only
-    publishable by farm.
-
-    Triggered only when running only in headless mode, eg on a farm.
-    """
-
-    order = pyblish.api.CollectorOrder + 0.499
-    label = "Collect Deadline Publishable Instance"
-    targets = ["remote"]
-
-    def process(self, instance):
-        self.log.debug("CollectDeadlinePublishableInstances")
-        publish_inst = os.environ.get("OPENPYPE_PUBLISH_SUBSET", '')
-        if not publish_inst:
-            raise PublishValidationError("OPENPYPE_PUBLISH_SUBSET env var "
-                                         "required for remote publishing")
-
-        subset_name = instance.data["subset"]
-        if subset_name == publish_inst:
-            self.log.debug("Publish {}".format(subset_name))
-            instance.data["publish"] = True
-            instance.data["farm"] = False
-        else:
-            self.log.debug("Skipping {}".format(subset_name))
-            instance.data["publish"] = False
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py
index fb75f3a917..3537c3099d 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_aftereffects_deadline.py
@@ -80,11 +80,11 @@ class AfterEffectsSubmitDeadline(
             "FTRACK_API_KEY",
             "FTRACK_API_USER",
             "FTRACK_SERVER",
-            "AVALON_PROJECT",
-            "AVALON_ASSET",
-            "AVALON_TASK",
-            "AVALON_WORKDIR",
-            "AVALON_APP_NAME",
+            "AYON_PROJECT_NAME",
+            "AYON_FOLDER_PATH",
+            "AYON_TASK_NAME",
+            "AYON_WORKDIR",
+            "AYON_APP_NAME",
             "AYON_LOG_NO_COLORS",
             "IS_TEST"
         ]
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
index 07b9f6e819..ae19e63a37 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_blender_deadline.py
@@ -102,11 +102,11 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             "FTRACK_API_USER",
             "FTRACK_SERVER",
             "OPENPYPE_SG_USER",
-            "AVALON_PROJECT",
-            "AVALON_ASSET",
-            "AVALON_TASK",
-            "AVALON_WORKDIR",
-            "AVALON_APP_NAME",
+            "AYON_PROJECT_NAME",
+            "AYON_FOLDER_PATH",
+            "AYON_TASK_NAME",
+            "AYON_WORKDIR",
+            "AYON_APP_NAME",
             "IS_TEST"
         ]
 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py
index 7aa8546bb6..9c125db174 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_fusion_deadline.py
@@ -220,11 +220,11 @@ class FusionSubmitDeadline(
             "FTRACK_API_KEY",
             "FTRACK_API_USER",
             "FTRACK_SERVER",
-            "AVALON_PROJECT",
-            "AVALON_ASSET",
-            "AVALON_TASK",
-            "AVALON_WORKDIR",
-            "AVALON_APP_NAME",
+            "AYON_PROJECT_NAME",
+            "AYON_FOLDER_PATH",
+            "AYON_TASK_NAME",
+            "AYON_WORKDIR",
+            "AYON_APP_NAME",
             "AYON_LOG_NO_COLORS",
             "IS_TEST",
             "AYON_BUNDLE_NAME",
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py
index c7047edd67..beb8afc3a3 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_harmony_deadline.py
@@ -273,11 +273,11 @@ class HarmonySubmitDeadline(
             "FTRACK_API_KEY",
             "FTRACK_API_USER",
             "FTRACK_SERVER",
-            "AVALON_PROJECT",
-            "AVALON_ASSET",
-            "AVALON_TASK",
-            "AVALON_WORKDIR",
-            "AVALON_APP_NAME",
+            "AYON_PROJECT_NAME",
+            "AYON_FOLDER_PATH",
+            "AYON_TASK_NAME",
+            "AYON_WORKDIR",
+            "AYON_APP_NAME",
             "AYON_LOG_NO_COLORS"
             "IS_TEST"
         ]
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py
index a864e15c76..94e0947952 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_cache_deadline.py
@@ -98,11 +98,11 @@ class HoudiniCacheSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline
             "FTRACK_API_USER",
             "FTRACK_SERVER",
             "OPENPYPE_SG_USER",
-            "AVALON_PROJECT",
-            "AVALON_ASSET",
-            "AVALON_TASK",
-            "AVALON_WORKDIR",
-            "AVALON_APP_NAME",
+            "AYON_PROJECT_NAME",
+            "AYON_FOLDER_PATH",
+            "AYON_TASK_NAME",
+            "AYON_WORKDIR",
+            "AYON_APP_NAME",
             "AYON_LOG_NO_COLORS",
         ]
 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
index 393d85e785..45c252dd56 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_houdini_render_deadline.py
@@ -207,11 +207,11 @@ class HoudiniSubmitDeadline(
             "FTRACK_API_USER",
             "FTRACK_SERVER",
             "OPENPYPE_SG_USER",
-            "AVALON_PROJECT",
-            "AVALON_ASSET",
-            "AVALON_TASK",
-            "AVALON_WORKDIR",
-            "AVALON_APP_NAME",
+            "AYON_PROJECT_NAME",
+            "AYON_FOLDER_PATH",
+            "AYON_TASK_NAME",
+            "AYON_WORKDIR",
+            "AYON_APP_NAME",
             "AYON_LOG_NO_COLORS",
         ]
 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py
index 8908283164..4eaaedac34 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_max_deadline.py
@@ -106,11 +106,11 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             "FTRACK_API_USER",
             "FTRACK_SERVER",
             "OPENPYPE_SG_USER",
-            "AVALON_PROJECT",
-            "AVALON_ASSET",
-            "AVALON_TASK",
-            "AVALON_WORKDIR",
-            "AVALON_APP_NAME",
+            "AYON_PROJECT_NAME",
+            "AYON_FOLDER_PATH",
+            "AYON_TASK_NAME",
+            "AYON_WORKDIR",
+            "AYON_APP_NAME",
             "IS_TEST"
         ]
 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
index a4a5391ce1..afa3a3dd14 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -207,11 +207,11 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
             "FTRACK_API_USER",
             "FTRACK_SERVER",
             "OPENPYPE_SG_USER",
-            "AVALON_PROJECT",
-            "AVALON_ASSET",
-            "AVALON_TASK",
-            "AVALON_WORKDIR",
-            "AVALON_APP_NAME",
+            "AYON_PROJECT_NAME",
+            "AYON_FOLDER_PATH",
+            "AYON_TASK_NAME",
+            "AYON_WORKDIR",
+            "AYON_APP_NAME",
             "IS_TEST"
         ]
 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py
deleted file mode 100644
index c4a7a43ce0..0000000000
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py
+++ /dev/null
@@ -1,131 +0,0 @@
-import os
-import attr
-from datetime import datetime
-
-from ayon_core.pipeline import PublishXmlValidationError
-from ayon_core.lib import is_in_tests
-from openpype_modules.deadline import abstract_submit_deadline
-from openpype_modules.deadline.abstract_submit_deadline import DeadlineJobInfo
-
-import pyblish.api
-
-
-@attr.s
-class MayaPluginInfo(object):
-    Build = attr.ib(default=None)  # Don't force build
-    StrictErrorChecking = attr.ib(default=True)
-
-    SceneFile = attr.ib(default=None)  # Input scene
-    Version = attr.ib(default=None)  # Mandatory for Deadline
-    ProjectPath = attr.ib(default=None)
-
-    ScriptJob = attr.ib(default=True)
-    ScriptFilename = attr.ib(default=None)
-
-
-class MayaSubmitRemotePublishDeadline(
-        abstract_submit_deadline.AbstractSubmitDeadline):
-    """Submit Maya scene to perform a local publish in Deadline.
-
-    Publishing in Deadline can be helpful for scenes that publish very slow.
-    This way it can process in the background on another machine without the
-    Artist having to wait for the publish to finish on their local machine.
-
-    Submission is done through the Deadline Web Service. DL then triggers
-    `openpype/scripts/remote_publish.py`.
-
-    Each publishable instance creates its own full publish job.
-
-    Different from `ProcessSubmittedJobOnFarm` which creates publish job
-    depending on metadata json containing context and instance data of
-    rendered files.
-    """
-
-    label = "Submit Scene to Deadline"
-    order = pyblish.api.IntegratorOrder
-    hosts = ["maya"]
-    families = ["publish.farm"]
-    targets = ["local"]
-
-    def process(self, instance):
-
-        # Ensure no errors so far
-        if not (all(result["success"]
-                for result in instance.context.data["results"])):
-            raise PublishXmlValidationError("Publish process has errors")
-
-        if not instance.data["publish"]:
-            self.log.warning("No active instances found. "
-                             "Skipping submission..")
-            return
-
-        super(MayaSubmitRemotePublishDeadline, self).process(instance)
-
-    def get_job_info(self):
-        instance = self._instance
-        context = instance.context
-
-        project_name = instance.context.data["projectName"]
-        scene = instance.context.data["currentFile"]
-        scenename = os.path.basename(scene)
-
-        job_name = "{scene} [PUBLISH]".format(scene=scenename)
-        batch_name = "{code} - {scene}".format(code=project_name,
-                                               scene=scenename)
-
-        if is_in_tests():
-            batch_name += datetime.now().strftime("%d%m%Y%H%M%S")
-
-        job_info = DeadlineJobInfo(Plugin="MayaBatch")
-        job_info.BatchName = batch_name
-        job_info.Name = job_name
-        job_info.UserName = context.data.get("user")
-        job_info.Comment = context.data.get("comment", "")
-
-        # use setting for publish job on farm, no reason to have it separately
-        project_settings = context.data["project_settings"]
-        deadline_publish_job_sett = project_settings["deadline"]["publish"]["ProcessSubmittedJobOnFarm"]  # noqa
-        job_info.Department = deadline_publish_job_sett["deadline_department"]
-        job_info.ChunkSize = deadline_publish_job_sett["deadline_chunk_size"]
-        job_info.Priority = deadline_publish_job_sett["deadline_priority"]
-        job_info.Group = deadline_publish_job_sett["deadline_group"]
-        job_info.Pool = deadline_publish_job_sett["deadline_pool"]
-
-        # Include critical environment variables with submission + Session
-        keys = [
-            "FTRACK_API_USER",
-            "FTRACK_API_KEY",
-            "FTRACK_SERVER"
-        ]
-
-        environment = {
-            key: os.environ[key]
-            for key in keys
-            if key in os.environ
-        }
-
-        environment["AVALON_PROJECT"] = project_name
-        environment["AVALON_ASSET"] = instance.context.data["asset"]
-        environment["AVALON_TASK"] = instance.context.data["task"]
-        environment["AVALON_APP_NAME"] = os.environ.get("AVALON_APP_NAME")
-        environment["OPENPYPE_PUBLISH_SUBSET"] = instance.data["subset"]
-        environment["AYON_LOG_NO_COLORS"] = "1"
-        environment["AYON_USERNAME"] = instance.context.data["user"]
-        environment["AYON_REMOTE_PUBLISH"] = "1"
-
-        for key, value in environment.items():
-            job_info.EnvironmentKeyValue[key] = value
-
-    def get_plugin_info(self):
-        # Not all hosts can import this module.
-        from maya import cmds
-        scene = self._instance.context.data["currentFile"]
-
-        plugin_info = MayaPluginInfo()
-        plugin_info.SceneFile = scene
-        plugin_info.ScriptFilename = "{OPENPYPE_REPOS_ROOT}/openpype/scripts/remote_publish.py"  # noqa
-        plugin_info.Version = cmds.about(version=True)
-        plugin_info.ProjectPath = cmds.workspace(query=True,
-                                                 rootDirectory=True)
-
-        return attr.asdict(plugin_info)
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
index 0887c23165..b314232a42 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_nuke_deadline.py
@@ -373,10 +373,10 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         keys = [
             "PYTHONPATH",
             "PATH",
-            "AVALON_PROJECT",
-            "AVALON_ASSET",
-            "AVALON_TASK",
-            "AVALON_APP_NAME",
+            "AYON_PROJECT_NAME",
+            "AYON_FOLDER_PATH",
+            "AYON_TASK_NAME",
+            "AYON_APP_NAME",
             "FTRACK_API_KEY",
             "FTRACK_API_USER",
             "FTRACK_SERVER",
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
index e6b49d4e58..54d4fb47fc 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_cache_job.py
@@ -67,7 +67,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
         "FTRACK_API_USER",
         "FTRACK_API_KEY",
         "FTRACK_SERVER",
-        "AVALON_APP_NAME",
+        "AYON_APP_NAME",
         "AYON_USERNAME",
         "OPENPYPE_SG_USER",
         "KITSU_LOGIN",
@@ -125,9 +125,9 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
             create_metadata_path(instance, anatomy)
 
         environment = {
-            "AVALON_PROJECT": instance.context.data["projectName"],
-            "AVALON_ASSET": instance.context.data["asset"],
-            "AVALON_TASK": instance.context.data["task"],
+            "AYON_PROJECT_NAME": instance.context.data["projectName"],
+            "AYON_FOLDER_PATH": instance.context.data["asset"],
+            "AYON_TASK_NAME": instance.context.data["task"],
             "AYON_USERNAME": instance.context.data["user"],
             "AYON_LOG_NO_COLORS": "1",
             "IS_TEST": str(int(is_in_tests())),
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
index 3b34974576..4023846817 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_publish_job.py
@@ -130,7 +130,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         "FTRACK_API_USER",
         "FTRACK_API_KEY",
         "FTRACK_SERVER",
-        "AVALON_APP_NAME",
+        "AYON_APP_NAME",
         "AYON_USERNAME",
         "OPENPYPE_SG_USER",
         "KITSU_LOGIN",
@@ -202,9 +202,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             create_metadata_path(instance, anatomy)
 
         environment = {
-            "AVALON_PROJECT": instance.context.data["projectName"],
-            "AVALON_ASSET": instance.context.data["asset"],
-            "AVALON_TASK": instance.context.data["task"],
+            "AYON_PROJECT_NAME": instance.context.data["projectName"],
+            "AYON_FOLDER_PATH": instance.context.data["asset"],
+            "AYON_TASK_NAME": instance.context.data["task"],
             "AYON_USERNAME": instance.context.data["user"],
             "AYON_LOG_NO_COLORS": "1",
             "IS_TEST": str(int(is_in_tests())),
@@ -330,151 +330,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             self.log.debug("Skipping local instance.")
             return
 
-        data = instance.data.copy()
-        context = instance.context
-        self.context = context
-        self.anatomy = instance.context.data["anatomy"]
-
-        asset = data.get("asset") or context.data["asset"]
-        subset = data.get("subset")
-
-        start = instance.data.get("frameStart")
-        if start is None:
-            start = context.data["frameStart"]
-
-        end = instance.data.get("frameEnd")
-        if end is None:
-            end = context.data["frameEnd"]
-
-        handle_start = instance.data.get("handleStart")
-        if handle_start is None:
-            handle_start = context.data["handleStart"]
-
-        handle_end = instance.data.get("handleEnd")
-        if handle_end is None:
-            handle_end = context.data["handleEnd"]
-
-        fps = instance.data.get("fps")
-        if fps is None:
-            fps = context.data["fps"]
-
-        if data.get("extendFrames", False):
-            start, end = self._extend_frames(
-                asset,
-                subset,
-                start,
-                end,
-                data["overrideExistingFrame"])
-
-        try:
-            source = data["source"]
-        except KeyError:
-            source = context.data["currentFile"]
-
-        success, rootless_path = (
-            self.anatomy.find_root_template_from_path(source)
-        )
-        if success:
-            source = rootless_path
-
-        else:
-            # `rootless_path` is not set to `source` if none of roots match
-            self.log.warning((
-                "Could not find root path for remapping \"{}\"."
-                " This may cause issues."
-            ).format(source))
-
-        family = "render"
-        if ("prerender" in instance.data["families"] or
-                "prerender.farm" in instance.data["families"]):
-            family = "prerender"
-        families = [family]
-
-        # pass review to families if marked as review
-        do_not_add_review = False
-        if data.get("review"):
-            families.append("review")
-        elif data.get("review") is False:
-            self.log.debug("Instance has review explicitly disabled.")
-            do_not_add_review = True
-
-        instance_skeleton_data = {
-            "family": family,
-            "subset": subset,
-            "families": families,
-            "asset": asset,
-            "frameStart": start,
-            "frameEnd": end,
-            "handleStart": handle_start,
-            "handleEnd": handle_end,
-            "frameStartHandle": start - handle_start,
-            "frameEndHandle": end + handle_end,
-            "comment": instance.data["comment"],
-            "fps": fps,
-            "source": source,
-            "extendFrames": data.get("extendFrames"),
-            "overrideExistingFrame": data.get("overrideExistingFrame"),
-            "pixelAspect": data.get("pixelAspect", 1),
-            "resolutionWidth": data.get("resolutionWidth", 1920),
-            "resolutionHeight": data.get("resolutionHeight", 1080),
-            "multipartExr": data.get("multipartExr", False),
-            "jobBatchName": data.get("jobBatchName", ""),
-            "useSequenceForReview": data.get("useSequenceForReview", True),
-            # map inputVersions `ObjectId` -> `str` so json supports it
-            "inputVersions": list(map(str, data.get("inputVersions", []))),
-            "colorspace": instance.data.get("colorspace"),
-            "stagingDir_persistent": instance.data.get(
-                "stagingDir_persistent", False
-            )
-        }
-
-        # skip locking version if we are creating v01
-        instance_version = instance.data.get("version")  # take this if exists
-        if instance_version != 1:
-            instance_skeleton_data["version"] = instance_version
-
-        # transfer specific families from original instance to new render
-        for item in self.families_transfer:
-            if item in instance.data.get("families", []):
-                instance_skeleton_data["families"] += [item]
-
-        # transfer specific properties from original instance based on
-        # mapping dictionary `instance_transfer`
-        for key, values in self.instance_transfer.items():
-            if key in instance.data.get("families", []):
-                for v in values:
-                    instance_skeleton_data[v] = instance.data.get(v)
-
-        # look into instance data if representations are not having any
-        # which are having tag `publish_on_farm` and include them
-        for repre in instance.data.get("representations", []):
-            staging_dir = repre.get("stagingDir")
-            if staging_dir:
-                success, rootless_staging_dir = (
-                    self.anatomy.find_root_template_from_path(
-                        staging_dir
-                    )
-                )
-                if success:
-                    repre["stagingDir"] = rootless_staging_dir
-                else:
-                    self.log.warning((
-                        "Could not find root path for remapping \"{}\"."
-                        " This may cause issues on farm."
-                    ).format(staging_dir))
-                    repre["stagingDir"] = staging_dir
-
-            if "publish_on_farm" in repre.get("tags"):
-                # create representations attribute of not there
-                if "representations" not in instance_skeleton_data.keys():
-                    instance_skeleton_data["representations"] = []
-
-                instance_skeleton_data["representations"].append(repre)
-
-        instances = None
-        assert data.get("expectedFiles"), ("Submission from old Pype version"
-                                           " - missing expectedFiles")
-
         anatomy = instance.context.data["anatomy"]
 
         instance_skeleton_data = create_skeleton_instance(
diff --git a/client/ayon_core/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py b/client/ayon_core/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
index 459153c957..1565b2c496 100644
--- a/client/ayon_core/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
+++ b/client/ayon_core/modules/deadline/repository/custom/plugins/GlobalJobPreLoad.py
@@ -14,7 +14,7 @@ from Deadline.Scripting import (
     DirectoryUtils,
     ProcessUtils,
 )
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 VERSION_REGEX = re.compile(
     r"(?P<major>0|[1-9]\d*)"
     r"\.(?P<minor>0|[1-9]\d*)"
@@ -471,12 +471,21 @@ def inject_ayon_environment(deadlinePlugin):
         ]
 
         add_kwargs = {
-            "project": job.GetJobEnvironmentKeyValue("AVALON_PROJECT"),
-            "asset": job.GetJobEnvironmentKeyValue("AVALON_ASSET"),
-            "task": job.GetJobEnvironmentKeyValue("AVALON_TASK"),
-            "app": job.GetJobEnvironmentKeyValue("AVALON_APP_NAME"),
             "envgroup": "farm",
         }
+        # Support backwards compatible keys
+        for key, env_keys in (
+            ("project", ["AYON_PROJECT_NAME", "AVALON_PROJECT"]),
+            ("asset", ["AYON_FOLDER_PATH", "AVALON_ASSET"]),
+            ("task", ["AYON_TASK_NAME", "AVALON_TASK"]),
+            ("app", ["AYON_APP_NAME", "AVALON_APP_NAME"]),
+        ):
+            value = ""
+            for env_key in env_keys:
+                value = job.GetJobEnvironmentKeyValue(env_key)
+                if value:
+                    break
+            add_kwargs[key] = value
 
         if job.GetJobEnvironmentKeyValue("IS_TEST"):
             args.append("--automatic-tests")
@@ -486,8 +495,8 @@ def inject_ayon_environment(deadlinePlugin):
                 args.extend(["--{}".format(key), value])
         else:
             raise RuntimeError((
-                "Missing required env vars: AVALON_PROJECT, AVALON_ASSET,"
-                " AVALON_TASK, AVALON_APP_NAME"
+                "Missing required env vars: AYON_PROJECT_NAME,"
+                " AYON_FOLDER_PATH, AYON_TASK_NAME, AYON_APP_NAME"
             ))
 
         environment = {
diff --git a/client/ayon_core/modules/royalrender/lib.py b/client/ayon_core/modules/royalrender/lib.py
index b53c5e6186..5343a5f06f 100644
--- a/client/ayon_core/modules/royalrender/lib.py
+++ b/client/ayon_core/modules/royalrender/lib.py
@@ -361,8 +361,8 @@ class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin,
 
         if not all(add_kwargs.values()):
             raise RuntimeError((
-                "Missing required env vars: AVALON_PROJECT, AVALON_ASSET,"
-                " AVALON_TASK, AVALON_APP_NAME"
+                "Missing required env vars: AYON_PROJECT_NAME, AYON_FOLDER_PATH,"
+                " AYON_TASK_NAME, AYON_APP_NAME"
             ))
 
         for key, value in add_kwargs.items():
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py b/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
index abc8d7dccd..910abfcb15 100644
--- a/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
+++ b/client/ayon_core/modules/royalrender/plugins/publish/create_publish_royalrender_job.py
@@ -63,7 +63,7 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
         "FTRACK_API_USER",
         "FTRACK_API_KEY",
         "FTRACK_SERVER",
-        "AVALON_APP_NAME",
+        "AYON_APP_NAME",
         "AYON_USERNAME",
         "OPENPYPE_SG_USER",
     ]
@@ -179,9 +179,9 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
         anatomy_data = instance.context.data["anatomyData"]
 
         environment = RREnvList({
-            "AVALON_PROJECT": anatomy_data["project"]["name"],
-            "AVALON_ASSET": instance.context.data["asset"],
-            "AVALON_TASK": anatomy_data["task"]["name"],
+            "AYON_PROJECT_NAME": anatomy_data["project"]["name"],
+            "AYON_FOLDER_PATH": instance.context.data["asset"],
+            "AYON_TASK_NAME": anatomy_data["task"]["name"],
             "AYON_USERNAME": anatomy_data["user"]
         })
 
diff --git a/client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py b/client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py
index 7118c5ebef..778052778f 100644
--- a/client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py
+++ b/client/ayon_core/modules/royalrender/rr_root/plugins/control_job/perjob/m50__openpype_publish_render.py
@@ -136,10 +136,10 @@ class OpenPypeContextSelector:
 
     def run_publish(self):
         """Run publish process."""
-        env = {"AVALON_PROJECT": str(self.context.get("project")),
-               "AVALON_ASSET": str(self.context.get("asset")),
-               "AVALON_TASK": str(self.context.get("task")),
-               # "AVALON_APP_NAME": str(self.context.get("app_name"))
+        env = {"AYON_PROJECT_NAME": str(self.context.get("project")),
+               "AYON_FOLDER_PATH": str(self.context.get("asset")),
+               "AYON_TASK_NAME": str(self.context.get("task")),
+               # "AYON_APP_NAME": str(self.context.get("app_name"))
                }
 
         print(">>> setting environment:")
@@ -182,10 +182,18 @@ print("running selector")
 selector = OpenPypeContextSelector()
 
 # try to set context from environment
-selector.context["project"] = os.getenv("AVALON_PROJECT")
-selector.context["asset"] = os.getenv("AVALON_ASSET")
-selector.context["task"] = os.getenv("AVALON_TASK")
-# selector.context["app_name"] = os.getenv("AVALON_APP_NAME")
+for key, env_keys in (
+    ("project", ["AYON_PROJECT_NAME", "AVALON_PROJECT"]),
+    ("asset", ["AYON_FOLDER_PATH", "AVALON_ASSET"]),
+    ("task", ["AYON_TASK_NAME", "AVALON_TASK"]),
+    # ("app_name", ["AYON_APP_NAME", "AVALON_APP_NAME"])
+):
+    value = ""
+    for env_key in env_keys:
+        value = os.getenv(env_key)
+        if value:
+            break
+    selector.context[key] = value
 
 # if anything inside is None, scratch the whole thing and
 # ask user for context.
diff --git a/client/ayon_core/pipeline/actions.py b/client/ayon_core/pipeline/actions.py
index 1701498d10..8e0ce7e583 100644
--- a/client/ayon_core/pipeline/actions.py
+++ b/client/ayon_core/pipeline/actions.py
@@ -26,7 +26,7 @@ class LauncherAction(object):
 
         Args:
             session (dict[str, Union[str, None]]): Session data with
-                AVALON_PROJECT, AVALON_ASSET and AVALON_TASK.
+                AYON_PROJECT_NAME, AYON_FOLDER_PATH and AYON_TASK_NAME.
         """
 
         return True
diff --git a/client/ayon_core/pipeline/anatomy.py b/client/ayon_core/pipeline/anatomy.py
index 86b7d92309..e7833a9a15 100644
--- a/client/ayon_core/pipeline/anatomy.py
+++ b/client/ayon_core/pipeline/anatomy.py
@@ -8,9 +8,6 @@ import numbers
 import six
 import time
 
-from ayon_core.settings.lib import (
-    get_local_settings,
-)
 from ayon_core.client import get_project, get_ayon_server_api_connection
 from ayon_core.lib import Logger, get_local_site_id
 from ayon_core.lib.path_templates import (
@@ -423,7 +420,7 @@ class Anatomy(BaseAnatomy):
 
     def __init__(self, project_name=None, site_name=None):
         if not project_name:
-            project_name = os.environ.get("AVALON_PROJECT")
+            project_name = os.environ.get("AYON_PROJECT_NAME")
 
         if not project_name:
             raise ProjectNotSet((
@@ -453,7 +450,7 @@ class Anatomy(BaseAnatomy):
         return cls._sync_server_addon_cache.data
 
     @classmethod
-    def _get_studio_roots_overrides(cls, project_name, local_settings=None):
+    def _get_studio_roots_overrides(cls, project_name):
         """This would return 'studio' site override by local settings.
 
         Notes:
@@ -465,7 +462,6 @@ class Anatomy(BaseAnatomy):
 
         Args:
             project_name (str): Name of project.
-            local_settings (Optional[dict[str, Any]]): Prepared local settings.
 
         Returns:
             Union[Dict[str, str], None]): Local root overrides.
@@ -488,11 +484,6 @@ class Anatomy(BaseAnatomy):
                 should be returned.
         """
 
-        # Local settings may be used more than once or may not be used at all
-        # - to avoid slowdowns 'get_local_settings' is not called until it's
-        #   really needed
-        local_settings = None
-
         # First check if sync server is available and enabled
         sync_server = cls.get_sync_server_addon()
         if sync_server is None or not sync_server.enabled:
@@ -503,11 +494,8 @@ class Anatomy(BaseAnatomy):
             # Use sync server to receive active site name
             project_cache = cls._default_site_id_cache[project_name]
             if project_cache.is_outdated:
-                local_settings = get_local_settings()
                 project_cache.update_data(
-                    sync_server.get_active_site_type(
-                        project_name, local_settings
-                    )
+                    sync_server.get_active_site_type(project_name)
                 )
             site_name = project_cache.data
 
@@ -517,12 +505,12 @@ class Anatomy(BaseAnatomy):
                 # Handle studio root overrides without sync server
                 # - studio root overrides can be done even without sync server
                 roots_overrides = cls._get_studio_roots_overrides(
-                    project_name, local_settings
+                    project_name
                 )
             else:
                 # Ask sync server to get roots overrides
                 roots_overrides = sync_server.get_site_root_overrides(
-                    project_name, site_name, local_settings
+                    project_name, site_name
                 )
             site_cache.update_data(roots_overrides)
         return site_cache.data
diff --git a/client/ayon_core/pipeline/colorspace.py b/client/ayon_core/pipeline/colorspace.py
index 1b795e1c39..7100984217 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -1018,7 +1018,7 @@ def _get_imageio_settings(project_settings, host_name):
         tuple[dict, dict]: image io settings for global and host
     """
     # get image io from global and host_name
-    imageio_global = project_settings["global"]["imageio"]
+    imageio_global = project_settings["core"]["imageio"]
     # host is optional, some might not have any settings
     imageio_host = project_settings.get(host_name, {}).get("imageio", {})
 
diff --git a/client/ayon_core/pipeline/context_tools.py b/client/ayon_core/pipeline/context_tools.py
index 445e27604d..7c0db0be27 100644
--- a/client/ayon_core/pipeline/context_tools.py
+++ b/client/ayon_core/pipeline/context_tools.py
@@ -117,12 +117,12 @@ def install_host(host):
 
     addons_manager = _get_addons_manager()
 
-    project_name = os.getenv("AVALON_PROJECT")
+    project_name = os.getenv("AYON_PROJECT_NAME")
     # WARNING: This might be an issue
     #   - commented out because 'traypublisher' does not have set project
     # if not project_name:
     #     raise ValueError(
-    #         "AVALON_PROJECT is missing in environment variables."
+    #         "AYON_PROJECT_NAME is missing in environment variables."
     #     )
 
     log.info("Activating {}..".format(project_name))
@@ -152,7 +152,7 @@ def install_host(host):
         print("Registering pyblish target: automated")
         pyblish.api.register_target("automated")
 
-    host_name = os.environ.get("AVALON_APP")
+    host_name = os.environ.get("AYON_HOST_NAME")
 
     # Give option to handle host installation
     for addon in addons_manager.get_enabled_addons():
@@ -172,7 +172,7 @@ def install_ayon_plugins(project_name=None, host_name=None):
     register_inventory_action_path(INVENTORY_PATH)
 
     if host_name is None:
-        host_name = os.environ.get("AVALON_APP")
+        host_name = os.environ.get("AYON_HOST_NAME")
 
     addons_manager = _get_addons_manager()
     publish_plugin_dirs = addons_manager.collect_publish_plugin_paths(
@@ -196,7 +196,7 @@ def install_ayon_plugins(project_name=None, host_name=None):
         register_inventory_action_path(path)
 
     if project_name is None:
-        project_name = os.environ.get("AVALON_PROJECT")
+        project_name = os.environ.get("AYON_PROJECT_NAME")
 
     # Register studio specific plugins
     if project_name:
@@ -208,8 +208,8 @@ def install_ayon_plugins(project_name=None, host_name=None):
         platform_name = platform.system().lower()
         project_plugins = (
             project_settings
-            .get("global", {})
-            .get("project_plugins", {})
+            ["core"]
+            ["project_plugins"]
             .get(platform_name)
         ) or []
         for path in project_plugins:
@@ -331,7 +331,7 @@ def get_current_host_name():
     """Current host name.
 
     Function is based on currently registered host integration or environment
-    variable 'AVALON_APP'.
+    variable 'AYON_HOST_NAME'.
 
     Returns:
         Union[str, None]: Name of host integration in current process or None.
@@ -340,7 +340,7 @@ def get_current_host_name():
     host = registered_host()
     if isinstance(host, HostBase):
         return host.name
-    return os.environ.get("AVALON_APP")
+    return os.environ.get("AYON_HOST_NAME")
 
 
 def get_global_context():
@@ -365,9 +365,9 @@ def get_global_context():
     """
 
     return {
-        "project_name": os.environ.get("AVALON_PROJECT"),
-        "asset_name": os.environ.get("AVALON_ASSET"),
-        "task_name": os.environ.get("AVALON_TASK"),
+        "project_name": os.environ.get("AYON_PROJECT_NAME"),
+        "asset_name": os.environ.get("AYON_FOLDER_PATH"),
+        "task_name": os.environ.get("AYON_TASK_NAME"),
     }
 
 
@@ -474,10 +474,10 @@ def get_template_data_from_session(session=None, system_settings=None):
     """
 
     if session is not None:
-        project_name = session["AVALON_PROJECT"]
-        asset_name = session["AVALON_ASSET"]
-        task_name = session["AVALON_TASK"]
-        host_name = session["AVALON_APP"]
+        project_name = session["AYON_PROJECT_NAME"]
+        asset_name = session["AYON_FOLDER_PATH"]
+        task_name = session["AYON_TASK_NAME"]
+        host_name = session["AYON_HOST_NAME"]
     else:
         context = get_current_context()
         project_name = context["project_name"]
@@ -525,8 +525,8 @@ def get_workdir_from_session(session=None, template_key=None):
     """
 
     if session is not None:
-        project_name = session["AVALON_PROJECT"]
-        host_name = session["AVALON_APP"]
+        project_name = session["AYON_PROJECT_NAME"]
+        host_name = session["AYON_HOST_NAME"]
     else:
         project_name = get_current_project_name()
         host_name = get_current_host_name()
@@ -566,10 +566,10 @@ def get_custom_workfile_template_from_session(
     """
 
     if session is not None:
-        project_name = session["AVALON_PROJECT"]
-        asset_name = session["AVALON_ASSET"]
-        task_name = session["AVALON_TASK"]
-        host_name = session["AVALON_APP"]
+        project_name = session["AYON_PROJECT_NAME"]
+        asset_name = session["AYON_FOLDER_PATH"]
+        task_name = session["AYON_TASK_NAME"]
+        host_name = session["AYON_HOST_NAME"]
     else:
         context = get_current_context()
         project_name = context["project_name"]
@@ -616,10 +616,10 @@ def change_current_context(asset_doc, task_name, template_key=None):
 
     folder_path = get_asset_name_identifier(asset_doc)
     envs = {
-        "AVALON_PROJECT": project_name,
-        "AVALON_ASSET": folder_path,
-        "AVALON_TASK": task_name,
-        "AVALON_WORKDIR": workdir,
+        "AYON_PROJECT_NAME": project_name,
+        "AYON_FOLDER_PATH": folder_path,
+        "AYON_TASK_NAME": task_name,
+        "AYON_WORKDIR": workdir,
     }
 
     # Update the Session and environments. Pop from environments all keys with
diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py
index be685ea2cc..b973c45097 100644
--- a/client/ayon_core/pipeline/create/context.py
+++ b/client/ayon_core/pipeline/create/context.py
@@ -1536,7 +1536,7 @@ class CreateContext:
     def host_name(self):
         if hasattr(self.host, "name"):
             return self.host.name
-        return os.environ["AVALON_APP"]
+        return os.environ["AYON_HOST_NAME"]
 
     def get_current_project_name(self):
         """Project name which was used as current context on context reset.
diff --git a/client/ayon_core/pipeline/create/legacy_create.py b/client/ayon_core/pipeline/create/legacy_create.py
index 08be32eed4..2ab8b8e3e5 100644
--- a/client/ayon_core/pipeline/create/legacy_create.py
+++ b/client/ayon_core/pipeline/create/legacy_create.py
@@ -45,7 +45,7 @@ class LegacyCreator(object):
     def apply_settings(cls, project_settings, system_settings):
         """Apply OpenPype settings to a plugin class."""
 
-        host_name = os.environ.get("AVALON_APP")
+        host_name = os.environ.get("AYON_HOST_NAME")
         plugin_type = "create"
         plugin_type_settings = (
             project_settings
@@ -54,7 +54,7 @@ class LegacyCreator(object):
         )
         global_type_settings = (
             project_settings
-            .get("global", {})
+            .get("core", {})
             .get(plugin_type, {})
         )
         if not global_type_settings and not plugin_type_settings:
diff --git a/client/ayon_core/pipeline/create/subset_name.py b/client/ayon_core/pipeline/create/subset_name.py
index 2973b1e54e..5925ec0f2b 100644
--- a/client/ayon_core/pipeline/create/subset_name.py
+++ b/client/ayon_core/pipeline/create/subset_name.py
@@ -47,10 +47,10 @@ def get_subset_name_template(
 
     if project_settings is None:
         project_settings = get_project_settings(project_name)
-    tools_settings = project_settings["global"]["tools"]
-    profiles = tools_settings["creator"]["subset_name_profiles"]
+    tools_settings = project_settings["core"]["tools"]
+    profiles = tools_settings["creator"]["product_name_profiles"]
     filtering_criteria = {
-        "families": family,
+        "product_types": family,
         "hosts": host_name,
         "tasks": task_name,
         "task_types": task_type
@@ -59,7 +59,19 @@ def get_subset_name_template(
     matching_profile = filter_profiles(profiles, filtering_criteria)
     template = None
     if matching_profile:
-        template = matching_profile["template"]
+        # TODO remove formatting keys replacement
+        template = (
+            matching_profile["template"]
+            .replace("{task[name]}", "{task}")
+            .replace("{Task[name]}", "{Task}")
+            .replace("{TASK[NAME]}", "{TASK}")
+            .replace("{product[type]}", "{family}")
+            .replace("{Product[type]}", "{Family}")
+            .replace("{PRODUCT[TYPE]}", "{FAMILY}")
+            .replace("{folder[name]}", "{asset}")
+            .replace("{Folder[name]}", "{Asset}")
+            .replace("{FOLDER[NAME]}", "{ASSET}")
+        )
 
     # Make sure template is set (matching may have empty string)
     if not template:
@@ -82,9 +94,9 @@ def get_subset_name(
     """Calculate subset name based on passed context and OpenPype settings.
 
     Subst name templates are defined in `project_settings/global/tools/creator
-    /subset_name_profiles` where are profiles with host name, family, task name
-    and task type filters. If context does not match any profile then
-    `DEFAULT_SUBSET_TEMPLATE` is used as default template.
+    /product_name_profiles` where are profiles with host name, family,
+    task name and task type filters. If context does not match any profile
+    then `DEFAULT_SUBSET_TEMPLATE` is used as default template.
 
     That's main reason why so many arguments are required to calculate subset
     name.
@@ -128,13 +140,13 @@ def get_subset_name(
         return ""
 
     if not host_name:
-        host_name = os.environ.get("AVALON_APP")
+        host_name = os.environ.get("AYON_HOST_NAME")
 
     # Use only last part of class family value split by dot (`.`)
     family = family.rsplit(".", 1)[-1]
 
     if project_name is None:
-        project_name = os.environ.get("AVALON_PROJECT")
+        project_name = os.environ.get("AYON_PROJECT_NAME")
 
     asset_tasks = asset_doc.get("data", {}).get("tasks") or {}
     task_info = asset_tasks.get(task_name) or {}
diff --git a/client/ayon_core/pipeline/farm/pyblish_functions.py b/client/ayon_core/pipeline/farm/pyblish_functions.py
index 9423d8501c..389d3d27ed 100644
--- a/client/ayon_core/pipeline/farm/pyblish_functions.py
+++ b/client/ayon_core/pipeline/farm/pyblish_functions.py
@@ -321,7 +321,7 @@ def prepare_representations(skeleton_data, exp_files, anatomy, aov_filter,
 
     """
     representations = []
-    host_name = os.environ.get("AVALON_APP", "")
+    host_name = os.environ.get("AYON_HOST_NAME", "")
     collections, remainders = clique.assemble(exp_files)
 
     log = Logger.get_logger("farm_publishing")
@@ -541,7 +541,7 @@ def _create_instances_for_aov(instance, skeleton, aov_filter, additional_data,
 
     """
     # TODO: this needs to be taking the task from context or instance
-    task = os.environ["AVALON_TASK"]
+    task = os.environ["AYON_TASK_NAME"]
 
     anatomy = instance.context.data["anatomy"]
     subset = skeleton["subset"]
@@ -611,7 +611,7 @@ def _create_instances_for_aov(instance, skeleton, aov_filter, additional_data,
 
         log.info("Creating data for: {}".format(subset_name))
 
-        app = os.environ.get("AVALON_APP", "")
+        app = os.environ.get("AYON_HOST_NAME", "")
 
         if isinstance(col, list):
             render_file_name = os.path.basename(col[0])
diff --git a/client/ayon_core/pipeline/load/plugins.py b/client/ayon_core/pipeline/load/plugins.py
index fc64edf2ae..962417c6f2 100644
--- a/client/ayon_core/pipeline/load/plugins.py
+++ b/client/ayon_core/pipeline/load/plugins.py
@@ -38,7 +38,7 @@ class LoaderPlugin(list):
 
     @classmethod
     def apply_settings(cls, project_settings, system_settings):
-        host_name = os.environ.get("AVALON_APP")
+        host_name = os.environ.get("AYON_HOST_NAME")
         plugin_type = "load"
         plugin_type_settings = (
             project_settings
@@ -47,7 +47,7 @@ class LoaderPlugin(list):
         )
         global_type_settings = (
             project_settings
-            .get("global", {})
+            .get("core", {})
             .get(plugin_type, {})
         )
         if not global_type_settings and not plugin_type_settings:
diff --git a/client/ayon_core/pipeline/project_folders.py b/client/ayon_core/pipeline/project_folders.py
index ad205522a6..811a98ce4b 100644
--- a/client/ayon_core/pipeline/project_folders.py
+++ b/client/ayon_core/pipeline/project_folders.py
@@ -104,7 +104,7 @@ def _list_path_items(folder_structure):
 def get_project_basic_paths(project_name):
     project_settings = get_project_settings(project_name)
     folder_structure = (
-        project_settings["global"]["project_folder_structure"]
+        project_settings["core"]["project_folder_structure"]
     )
     if not folder_structure:
         return []
diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py
index 47f4be9e69..7d980b4bbe 100644
--- a/client/ayon_core/pipeline/publish/lib.py
+++ b/client/ayon_core/pipeline/publish/lib.py
@@ -60,7 +60,7 @@ def get_template_name_profiles(
 
     return copy.deepcopy(
         project_settings
-        ["global"]
+        ["core"]
         ["tools"]
         ["publish"]
         ["template_name_profiles"]
@@ -95,7 +95,7 @@ def get_hero_template_name_profiles(
 
     return copy.deepcopy(
         project_settings
-        ["global"]
+        ["core"]
         ["tools"]
         ["publish"]
         ["hero_template_name_profiles"]
@@ -138,7 +138,7 @@ def get_publish_template_name(
     template = None
     filter_criteria = {
         "hosts": host_name,
-        "families": family,
+        "product_types": family,
         "task_names": task_name,
         "task_types": task_type,
     }
@@ -383,7 +383,7 @@ def get_plugin_settings(plugin, project_settings, log, category=None):
 
     # TODO: change after all plugins are moved one level up
     if category_from_file in ("ayon_core", "openpype"):
-        category_from_file = "global"
+        category_from_file = "core"
 
     try:
         return (
@@ -437,7 +437,7 @@ def filter_pyblish_plugins(plugins):
     #   - kept becau on farm is probably used host 'shell' which propably
     #       affect how settings are applied there
     host_name = pyblish.api.current_host()
-    project_name = os.environ.get("AVALON_PROJECT")
+    project_name = os.environ.get("AYON_PROJECT_NAME")
 
     project_settings = get_project_settings(project_name)
     system_settings = get_system_settings()
@@ -485,26 +485,6 @@ def filter_pyblish_plugins(plugins):
             plugins.remove(plugin)
 
 
-def remote_publish(log):
-    """Loops through all plugins, logs to console. Used for tests.
-
-    Args:
-        log (Logger)
-    """
-
-    # Error exit as soon as any error occurs.
-    error_format = "Failed {plugin.__name__}: {error}\n{error.traceback}"
-
-    for result in pyblish.util.publish_iter():
-        if not result["error"]:
-            continue
-
-        error_message = error_format.format(**result)
-        log.error(error_message)
-        # 'Fatal Error: ' is because of Deadline
-        raise RuntimeError("Fatal Error: {}".format(error_message))
-
-
 def get_errored_instances_from_context(context, plugin=None):
     """Collect failed instances from pyblish context.
 
@@ -744,7 +724,7 @@ def get_custom_staging_dir_info(project_name, host_name, family, task_name,
         ValueError - if misconfigured template should be used
     """
     settings = project_settings or get_project_settings(project_name)
-    custom_staging_dir_profiles = (settings["global"]
+    custom_staging_dir_profiles = (settings["core"]
                                            ["tools"]
                                            ["publish"]
                                            ["custom_staging_dir_profiles"])
diff --git a/client/ayon_core/lib/usdlib.py b/client/ayon_core/pipeline/usdlib.py
similarity index 100%
rename from client/ayon_core/lib/usdlib.py
rename to client/ayon_core/pipeline/usdlib.py
diff --git a/client/ayon_core/pipeline/version_start.py b/client/ayon_core/pipeline/version_start.py
index bd7d800335..4813910bf3 100644
--- a/client/ayon_core/pipeline/version_start.py
+++ b/client/ayon_core/pipeline/version_start.py
@@ -16,7 +16,7 @@ def get_versioning_start(
         project_settings = get_project_settings(project_name)
 
     version_start = 1
-    settings = project_settings["global"]
+    settings = project_settings["core"]
     profiles = settings.get("version_start_category", {}).get("profiles", [])
 
     if not profiles:
diff --git a/client/ayon_core/pipeline/workfile/build_workfile.py b/client/ayon_core/pipeline/workfile/build_workfile.py
index 8df3830d6e..3a0d9ba95e 100644
--- a/client/ayon_core/pipeline/workfile/build_workfile.py
+++ b/client/ayon_core/pipeline/workfile/build_workfile.py
@@ -229,8 +229,8 @@ class BuildWorkfile:
     def get_build_presets(self, task_name, asset_doc):
         """ Returns presets to build workfile for task name.
 
-        Presets are loaded for current project set in
-        io.Session["AVALON_PROJECT"], filtered by registered host
+        Presets are loaded for current project received by
+        'get_current_project_name', filtered by registered host
         and entered task name.
 
         Args:
diff --git a/client/ayon_core/pipeline/workfile/lock_workfile.py b/client/ayon_core/pipeline/workfile/lock_workfile.py
index a6d4348966..7eab3f36dc 100644
--- a/client/ayon_core/pipeline/workfile/lock_workfile.py
+++ b/client/ayon_core/pipeline/workfile/lock_workfile.py
@@ -64,7 +64,7 @@ def is_workfile_lock_enabled(host_name, project_name, project_setting=None):
         project_setting = get_project_settings(project_name)
     workfile_lock_profiles = (
         project_setting
-        ["global"]
+        ["core"]
         ["tools"]
         ["Workfiles"]
         ["workfile_lock_profiles"])
diff --git a/client/ayon_core/pipeline/workfile/path_resolving.py b/client/ayon_core/pipeline/workfile/path_resolving.py
index 95a0a03c60..168e775475 100644
--- a/client/ayon_core/pipeline/workfile/path_resolving.py
+++ b/client/ayon_core/pipeline/workfile/path_resolving.py
@@ -72,7 +72,7 @@ def get_workfile_template_key(
     try:
         profiles = (
             project_settings
-            ["global"]
+            ["core"]
             ["tools"]
             ["Workfiles"]
             ["workfile_template_profiles"]
@@ -157,7 +157,7 @@ def get_workdir(
         task_name (str): Task name for which are workdir data preapred.
         host_name (str): Host which is used to workdir. This is required
             because workdir template may contain `{app}` key. In `Session`
-            is stored under `AVALON_APP` key.
+            is stored under `AYON_HOST_NAME` key.
         anatomy (Anatomy): Optional argument. Anatomy object is created using
             project name from `project_doc`. It is preferred to pass this
             argument as initialization of a new Anatomy object may be time
@@ -507,7 +507,7 @@ def create_workdir_extra_folders(
 
     # Load extra folders profiles
     extra_folders_profiles = (
-        project_settings["global"]["tools"]["Workfiles"]["extra_folders"]
+        project_settings["core"]["tools"]["Workfiles"]["extra_folders"]
     )
     # Skip if are empty
     if not extra_folders_profiles:
diff --git a/client/ayon_core/pipeline/workfile/workfile_template_builder.py b/client/ayon_core/pipeline/workfile/workfile_template_builder.py
index 3b42b6ec0a..3004e55861 100644
--- a/client/ayon_core/pipeline/workfile/workfile_template_builder.py
+++ b/client/ayon_core/pipeline/workfile/workfile_template_builder.py
@@ -103,7 +103,7 @@ class AbstractTemplateBuilder(object):
         if isinstance(host, HostBase):
             host_name = host.name
         else:
-            host_name = os.environ.get("AVALON_APP")
+            host_name = os.environ.get("AYON_HOST_NAME")
 
         self._host = host
         self._host_name = host_name
@@ -129,19 +129,19 @@ class AbstractTemplateBuilder(object):
     def project_name(self):
         if isinstance(self._host, HostBase):
             return self._host.get_current_project_name()
-        return os.getenv("AVALON_PROJECT")
+        return os.getenv("AYON_PROJECT_NAME")
 
     @property
     def current_asset_name(self):
         if isinstance(self._host, HostBase):
             return self._host.get_current_asset_name()
-        return os.getenv("AVALON_ASSET")
+        return os.getenv("AYON_FOLDER_PATH")
 
     @property
     def current_task_name(self):
         if isinstance(self._host, HostBase):
             return self._host.get_current_task_name()
-        return os.getenv("AVALON_TASK")
+        return os.getenv("AYON_TASK_NAME")
 
     def get_current_context(self):
         if isinstance(self._host, HostBase):
@@ -585,7 +585,7 @@ class AbstractTemplateBuilder(object):
             template_path (str): Fullpath for current task and
                 host's template file.
         """
-        last_workfile_path = os.environ.get("AVALON_LAST_WORKFILE")
+        last_workfile_path = os.environ.get("AYON_LAST_WORKFILE")
         self.log.info("__ last_workfile_path: {}".format(last_workfile_path))
         if os.path.exists(last_workfile_path):
             # ignore in case workfile existence
diff --git a/client/ayon_core/plugins/actions/open_file_explorer.py b/client/ayon_core/plugins/actions/open_file_explorer.py
index b29ed30258..fba3c231a5 100644
--- a/client/ayon_core/plugins/actions/open_file_explorer.py
+++ b/client/ayon_core/plugins/actions/open_file_explorer.py
@@ -22,14 +22,14 @@ class OpenTaskPath(LauncherAction):
 
     def is_compatible(self, session):
         """Return whether the action is compatible with the session"""
-        return bool(session.get("AVALON_ASSET"))
+        return bool(session.get("AYON_FOLDER_PATH"))
 
     def process(self, session, **kwargs):
         from qtpy import QtCore, QtWidgets
 
-        project_name = session["AVALON_PROJECT"]
-        asset_name = session["AVALON_ASSET"]
-        task_name = session.get("AVALON_TASK", None)
+        project_name = session["AYON_PROJECT_NAME"]
+        asset_name = session["AYON_FOLDER_PATH"]
+        task_name = session.get("AYON_TASK_NAME", None)
 
         path = self._get_workdir(project_name, asset_name, task_name)
         if not path:
diff --git a/client/ayon_core/plugins/load/delete_old_versions.py b/client/ayon_core/plugins/load/delete_old_versions.py
index 6b3263e2b6..956b232e2b 100644
--- a/client/ayon_core/plugins/load/delete_old_versions.py
+++ b/client/ayon_core/plugins/load/delete_old_versions.py
@@ -359,7 +359,7 @@
 #
 #         if mongo_changes_bulk:
 #             dbcon = AvalonMongoDB()
-#             dbcon.Session["AVALON_PROJECT"] = project_name
+#             dbcon.Session["AYON_PROJECT_NAME"] = project_name
 #             dbcon.install()
 #             dbcon.bulk_write(mongo_changes_bulk)
 #             dbcon.uninstall()
diff --git a/client/ayon_core/plugins/publish/cleanup.py b/client/ayon_core/plugins/publish/cleanup.py
index df68af7e57..db73d28e7a 100644
--- a/client/ayon_core/plugins/publish/cleanup.py
+++ b/client/ayon_core/plugins/publish/cleanup.py
@@ -40,7 +40,7 @@ class CleanUp(pyblish.api.InstancePlugin):
     active = True
 
     # Presets
-    paterns = None  # list of regex paterns
+    patterns = None  # list of regex patterns
     remove_temp_renders = True
 
     def process(self, instance):
@@ -115,10 +115,10 @@ class CleanUp(pyblish.api.InstancePlugin):
             src = os.path.normpath(src)
             dest = os.path.normpath(dest)
 
-            # add src dir into clearing dir paths (regex paterns)
+            # add src dir into clearing dir paths (regex patterns)
             transfers_dirs.append(os.path.dirname(src))
 
-            # add dest dir into clearing dir paths (regex paterns)
+            # add dest dir into clearing dir paths (regex patterns)
             transfers_dirs.append(os.path.dirname(dest))
 
             if src in skip_cleanup_filepaths:
@@ -141,13 +141,13 @@ class CleanUp(pyblish.api.InstancePlugin):
                     # add dir for cleanup
                     dirnames.append(os.path.dirname(src))
 
-        # clean by regex paterns
+        # clean by regex patterns
         # make unique set
         transfers_dirs = set(transfers_dirs)
 
         self.log.debug("__ transfers_dirs: `{}`".format(transfers_dirs))
-        self.log.debug("__ self.paterns: `{}`".format(self.paterns))
-        if self.paterns:
+        self.log.debug("__ self.patterns: `{}`".format(self.patterns))
+        if self.patterns:
             files = list()
             # get list of all available content of dirs
             for _dir in transfers_dirs:
@@ -159,14 +159,14 @@ class CleanUp(pyblish.api.InstancePlugin):
 
             self.log.debug("__ files: `{}`".format(files))
 
-            # remove all files which match regex patern
+            # remove all files which match regex pattern
             for f in files:
                 if os.path.normpath(f) in skip_cleanup_filepaths:
                     continue
 
-                for p in self.paterns:
-                    patern = re.compile(p)
-                    if not patern.findall(f):
+                for p in self.patterns:
+                    pattern = re.compile(p)
+                    if not pattern.findall(f):
                         continue
                     if not os.path.exists(f):
                         continue
diff --git a/client/ayon_core/plugins/publish/collect_anatomy_context_data.py b/client/ayon_core/plugins/publish/collect_anatomy_context_data.py
index 978ae5e1e1..fbdf26e76c 100644
--- a/client/ayon_core/plugins/publish/collect_anatomy_context_data.py
+++ b/client/ayon_core/plugins/publish/collect_anatomy_context_data.py
@@ -4,9 +4,9 @@ Requires:
     context -> anatomy
     context -> projectEntity
     context -> assetEntity
+    context -> task
     context -> username
     context -> datetimeData
-    session -> AVALON_TASK
 
 Provides:
     context -> anatomyData
diff --git a/client/ayon_core/plugins/publish/collect_comment.py b/client/ayon_core/plugins/publish/collect_comment.py
index dadb7b9e8d..458c0a5658 100644
--- a/client/ayon_core/plugins/publish/collect_comment.py
+++ b/client/ayon_core/plugins/publish/collect_comment.py
@@ -43,7 +43,7 @@ class CollectInstanceCommentDef(
 
     @classmethod
     def apply_settings(cls, project_setting, _):
-        plugin_settings = project_setting["global"]["publish"].get(
+        plugin_settings = project_setting["core"]["publish"].get(
             "collect_comment_per_instance"
         )
         if not plugin_settings:
diff --git a/client/ayon_core/plugins/publish/collect_context_entities.py b/client/ayon_core/plugins/publish/collect_context_entities.py
index 8480435e21..30bb184ef5 100644
--- a/client/ayon_core/plugins/publish/collect_context_entities.py
+++ b/client/ayon_core/plugins/publish/collect_context_entities.py
@@ -1,7 +1,6 @@
 """Collect Anatomy and global anatomy data.
 
 Requires:
-    session -> AVALON_ASSET
     context -> projectName
     context -> asset
     context -> task
diff --git a/client/ayon_core/plugins/publish/collect_from_create_context.py b/client/ayon_core/plugins/publish/collect_from_create_context.py
index 7adacbc463..66ca5745b2 100644
--- a/client/ayon_core/plugins/publish/collect_from_create_context.py
+++ b/client/ayon_core/plugins/publish/collect_from_create_context.py
@@ -57,9 +57,9 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
         asset_name = create_context.get_current_asset_name()
         task_name = create_context.get_current_task_name()
         for key, value in (
-            ("AVALON_PROJECT", project_name),
-            ("AVALON_ASSET", asset_name),
-            ("AVALON_TASK", task_name)
+            ("AYON_PROJECT_NAME", project_name),
+            ("AYON_FOLDER_PATH", asset_name),
+            ("AYON_TASK_NAME", task_name)
         ):
             if value is None:
                 os.environ.pop(key, None)
diff --git a/client/ayon_core/plugins/publish/collect_host_name.py b/client/ayon_core/plugins/publish/collect_host_name.py
index 89e4e03c1a..e76579bbd2 100644
--- a/client/ayon_core/plugins/publish/collect_host_name.py
+++ b/client/ayon_core/plugins/publish/collect_host_name.py
@@ -24,13 +24,13 @@ class CollectHostName(pyblish.api.ContextPlugin):
         if host_name and app_name and app_label:
             return
 
-        # Use AVALON_APP to get host name if available
+        # Use AYON_HOST_NAME to get host name if available
         if not host_name:
-            host_name = os.environ.get("AVALON_APP")
+            host_name = os.environ.get("AYON_HOST_NAME")
 
-        # Use AVALON_APP_NAME to get full app name
+        # Use AYON_APP_NAME to get full app name
         if not app_name:
-            app_name = os.environ.get("AVALON_APP_NAME")
+            app_name = os.environ.get("AYON_APP_NAME")
 
         # Fill missing values based on app full name
         if (not host_name or not app_label) and app_name:
diff --git a/client/ayon_core/plugins/publish/collect_input_representations_to_versions.py b/client/ayon_core/plugins/publish/collect_input_representations_to_versions.py
index b5c9872e74..6caee1be6a 100644
--- a/client/ayon_core/plugins/publish/collect_input_representations_to_versions.py
+++ b/client/ayon_core/plugins/publish/collect_input_representations_to_versions.py
@@ -1,7 +1,5 @@
 import pyblish.api
 
-from bson.objectid import ObjectId
-
 from ayon_core.client import get_representations
 
 
diff --git a/client/ayon_core/plugins/publish/collect_rendered_files.py b/client/ayon_core/plugins/publish/collect_rendered_files.py
index a7b6064b7a..9a316b69a4 100644
--- a/client/ayon_core/plugins/publish/collect_rendered_files.py
+++ b/client/ayon_core/plugins/publish/collect_rendered_files.py
@@ -179,14 +179,14 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
                     )
 
             # Remap workdir if it's set
-            workdir = os.getenv("AVALON_WORKDIR")
+            workdir = os.getenv("AYON_WORKDIR")
             remapped_workdir = None
             if workdir:
                 remapped_workdir = anatomy.roots_obj.path_remapper(
-                    os.getenv("AVALON_WORKDIR")
+                    os.getenv("AYON_WORKDIR")
                 )
             if remapped_workdir:
-                os.environ["AVALON_WORKDIR"] = remapped_workdir
+                os.environ["AYON_WORKDIR"] = remapped_workdir
         except Exception as e:
             self.log.error(e, exc_info=True)
             raise Exception("Error") from e
diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py
index 2b76527d5f..edba7d6d8a 100644
--- a/client/ayon_core/plugins/publish/extract_burnin.py
+++ b/client/ayon_core/plugins/publish/extract_burnin.py
@@ -65,8 +65,8 @@ class ExtractBurnin(publish.Extractor):
     # Default options for burnins for cases that are not set in presets.
     default_options = {
         "font_size": 42,
-        "font_color": [255, 255, 255, 255],
-        "bg_color": [0, 0, 0, 127],
+        "font_color": [255, 255, 255, 1.0],
+        "bg_color": [0, 0, 0, 0.5],
         "bg_padding": 5,
         "x_offset": 5,
         "y_offset": 5
@@ -96,7 +96,20 @@ class ExtractBurnin(publish.Extractor):
                 instance.data["representations"].remove(repre)
 
     def _get_burnins_per_representations(self, instance, src_burnin_defs):
-        self.log.debug("Filtering of representations and their burnins starts")
+        """
+
+        Args:
+            instance (pyblish.api.Instance): Pyblish instance.
+            src_burnin_defs (list): Burnin definitions.
+
+        Returns:
+            list[tuple[dict, list]]: List of tuples containing representation
+                and its burnin definitions.
+
+        """
+        self.log.debug(
+            "Filtering of representations and their burnins starts"
+        )
 
         filtered_repres = []
         repres = instance.data.get("representations") or []
@@ -111,16 +124,13 @@ class ExtractBurnin(publish.Extractor):
             )
 
             burnin_defs = copy.deepcopy(src_burnin_defs)
-            self.log.debug(
-                "burnin_defs.keys(): {}".format(burnin_defs.keys())
-            )
 
             # Filter output definition by `burnin` represetation key
-            repre_linked_burnins = {
-                name: output
-                for name, output in burnin_defs.items()
-                if name in repre_burnin_links
-            }
+            repre_linked_burnins = [
+                burnin_def
+                for burnin_def in burnin_defs
+                if burnin_def["name"] in repre_burnin_links
+            ]
             self.log.debug(
                 "repre_linked_burnins: {}".format(repre_linked_burnins)
             )
@@ -154,19 +164,21 @@ class ExtractBurnin(publish.Extractor):
 
         filtering_criteria = {
             "hosts": host_name,
-            "families": family,
+            "product_types": family,
+            "product_names": subset,
             "task_names": task_name,
             "task_types": task_type,
-            "subset": subset
         }
-        profile = filter_profiles(self.profiles, filtering_criteria,
-                                  logger=self.log)
-
+        profile = filter_profiles(
+            self.profiles,
+            filtering_criteria,
+            logger=self.log
+        )
         if not profile:
             self.log.debug((
                 "Skipped instance. None of profiles in presets are for"
-                " Host: \"{}\" | Families: \"{}\" | Task \"{}\""
-                " | Task type \"{}\" | Subset \"{}\" "
+                " Host: \"{}\" | Product type: \"{}\" | Task name \"{}\""
+                " | Task type \"{}\" | Product name \"{}\" "
             ).format(host_name, family, task_name, task_type, subset))
             return
 
@@ -175,7 +187,7 @@ class ExtractBurnin(publish.Extractor):
         if not burnin_defs:
             self.log.debug((
                 "Skipped instance. Burnin definitions are not set for profile"
-                " Host: \"{}\" | Families: \"{}\" | Task \"{}\""
+                " Host: \"{}\" | Product type: \"{}\" | Task name \"{}\""
                 " | Profile \"{}\""
             ).format(host_name, family, task_name, profile))
             return
@@ -275,7 +287,8 @@ class ExtractBurnin(publish.Extractor):
                 #  it in review?
                 # burnin_data["fps"] = fps
 
-            for filename_suffix, burnin_def in repre_burnin_defs.items():
+            for burnin_def in repre_burnin_defs:
+                filename_suffix = burnin_def["name"]
                 new_repre = copy.deepcopy(repre)
                 new_repre["stagingDir"] = src_repre_staging_dir
 
@@ -288,16 +301,28 @@ class ExtractBurnin(publish.Extractor):
                 burnin_values = {}
                 for key in self.positions:
                     value = burnin_def.get(key)
-                    if value:
-                        burnin_values[key] = value.replace(
-                            "{task}", "{task[name]}"
-                        )
+                    if not value:
+                        continue
+                    # TODO remove replacements
+                    burnin_values[key] = (
+                        value
+                        .replace("{task}", "{task[name]}")
+                        .replace("{product[name]}", "{subset}")
+                        .replace("{Product[name]}", "{Subset}")
+                        .replace("{PRODUCT[NAME]}", "{SUBSET}")
+                        .replace("{product[type]}", "{family}")
+                        .replace("{Product[type]}", "{Family}")
+                        .replace("{PRODUCT[TYPE]}", "{FAMILY}")
+                        .replace("{folder[name]}", "{asset}")
+                        .replace("{Folder[name]}", "{Asset}")
+                        .replace("{FOLDER[NAME]}", "{ASSET}")
+                    )
 
                 # Remove "delete" tag from new representation
                 if "delete" in new_repre["tags"]:
                     new_repre["tags"].remove("delete")
 
-                if len(repre_burnin_defs.keys()) > 1:
+                if len(repre_burnin_defs) > 1:
                     # Update name and outputName to be
                     # able have multiple outputs in case of more burnin presets
                     # Join previous "outputName" with filename suffix
@@ -401,8 +426,7 @@ class ExtractBurnin(publish.Extractor):
             bg_color_hex = "#{0:0>2X}{1:0>2X}{2:0>2X}".format(
                 bg_red, bg_green, bg_blue
             )
-            bg_color_alpha = float(bg_alpha) / 255
-            burnin_options["bg_opacity"] = bg_color_alpha
+            burnin_options["bg_opacity"] = bg_alpha
             burnin_options["bg_color"] = bg_color_hex
 
         # FG Color
@@ -412,8 +436,7 @@ class ExtractBurnin(publish.Extractor):
             fg_color_hex = "#{0:0>2X}{1:0>2X}{2:0>2X}".format(
                 fg_red, fg_green, fg_blue
             )
-            fg_color_alpha = float(fg_alpha) / 255
-            burnin_options["opacity"] = fg_color_alpha
+            burnin_options["opacity"] = fg_alpha
             burnin_options["font_color"] = fg_color_hex
 
         # Define font filepath
@@ -543,15 +566,16 @@ class ExtractBurnin(publish.Extractor):
         Burnin definitions without tags filter are marked as valid.
 
         Args:
-            outputs (list): Contain list of burnin definitions from presets.
+            burnin_defs (list): Burnin definitions.
             tags (list): Tags of processed representation.
 
         Returns:
             list: Containg all burnin definitions matching entered tags.
+
         """
-        filtered_burnins = {}
+        filtered_burnins = []
         repre_tags_low = set(tag.lower() for tag in tags)
-        for filename_suffix, burnin_def in burnin_defs.items():
+        for burnin_def in burnin_defs:
             valid = True
             tag_filters = burnin_def["filter"]["tags"]
             if tag_filters:
@@ -561,8 +585,7 @@ class ExtractBurnin(publish.Extractor):
                 valid = bool(repre_tags_low & tag_filters_low)
 
             if valid:
-                filtered_burnins[filename_suffix] = burnin_def
-
+                filtered_burnins.append(burnin_def)
         return filtered_burnins
 
     def input_output_paths(
@@ -724,7 +747,7 @@ class ExtractBurnin(publish.Extractor):
         Returns:
             list: Containg all valid output definitions.
         """
-        filtered_burnin_defs = {}
+        filtered_burnin_defs = []
 
         burnin_defs = profile.get("burnins")
         if not burnin_defs:
@@ -732,13 +755,11 @@ class ExtractBurnin(publish.Extractor):
 
         families = self.families_from_instance(instance)
 
-        for filename_suffix, orig_burnin_def in burnin_defs.items():
+        for orig_burnin_def in burnin_defs:
             burnin_def = copy.deepcopy(orig_burnin_def)
-            def_filter = burnin_def.get("filter", None) or {}
-            for key in ("families", "tags"):
-                if key not in def_filter:
-                    def_filter[key] = []
+            filename_suffix = burnin_def["name"]
 
+            def_filter = burnin_def["filter"]
             families_filters = def_filter["families"]
             if not self.families_filter_validation(
                 families, families_filters
@@ -752,10 +773,13 @@ class ExtractBurnin(publish.Extractor):
                 continue
 
             # Burnin values
+            new_burnin_def = {}
             burnin_values = {}
             for key, value in tuple(burnin_def.items()):
                 key_low = key.lower()
-                if key_low in self.positions and value:
+                if key_low not in self.positions:
+                    new_burnin_def[key] = value
+                elif value:
                     burnin_values[key_low] = value
 
             # Skip processing if burnin values are not set
@@ -767,9 +791,9 @@ class ExtractBurnin(publish.Extractor):
                 ).format(filename_suffix, str(orig_burnin_def)))
                 continue
 
-            burnin_values["filter"] = def_filter
+            new_burnin_def.update(burnin_values)
 
-            filtered_burnin_defs[filename_suffix] = burnin_values
+            filtered_burnin_defs.append(new_burnin_def)
 
             self.log.debug((
                 "Burnin definition \"{}\" passed first filtering."
diff --git a/client/ayon_core/plugins/publish/extract_color_transcode.py b/client/ayon_core/plugins/publish/extract_color_transcode.py
index 66ba8ad2be..77c4673bca 100644
--- a/client/ayon_core/plugins/publish/extract_color_transcode.py
+++ b/client/ayon_core/plugins/publish/extract_color_transcode.py
@@ -81,6 +81,7 @@ class ExtractOIIOTranscode(publish.Extractor):
         if not profile:
             return
 
+        profile_output_defs = profile["outputs"]
         new_representations = []
         repres = instance.data["representations"]
         for idx, repre in enumerate(list(repres)):
@@ -98,7 +99,8 @@ class ExtractOIIOTranscode(publish.Extractor):
                 self.log.warning("Config file doesn't exist, skipping")
                 continue
 
-            for output_name, output_def in profile.get("outputs", {}).items():
+            for output_def in profile_output_defs:
+                output_name = output_def["name"]
                 new_repre = copy.deepcopy(repre)
 
                 original_staging_dir = new_repre["stagingDir"]
@@ -318,10 +320,10 @@ class ExtractOIIOTranscode(publish.Extractor):
         subset = instance.data["subset"]
         filtering_criteria = {
             "hosts": host_name,
-            "families": family,
+            "product_types": family,
+            "product_names": subset,
             "task_names": task_name,
             "task_types": task_type,
-            "subsets": subset
         }
         profile = filter_profiles(self.profiles, filtering_criteria,
                                   logger=self.log)
@@ -329,8 +331,8 @@ class ExtractOIIOTranscode(publish.Extractor):
         if not profile:
             self.log.debug((
               "Skipped instance. None of profiles in presets are for"
-              " Host: \"{}\" | Families: \"{}\" | Task \"{}\""
-              " | Task type \"{}\" | Subset \"{}\" "
+              " Host: \"{}\" | Product types: \"{}\" | Task \"{}\""
+              " | Task type \"{}\" | Product names: \"{}\" "
             ).format(host_name, family, task_name, task_type, subset))
 
         return profile
diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py
index b0bc94c317..927c8a3538 100644
--- a/client/ayon_core/plugins/publish/extract_review.py
+++ b/client/ayon_core/plugins/publish/extract_review.py
@@ -1280,14 +1280,11 @@ class ExtractReview(pyblish.api.InstancePlugin):
                 "FFprobe couldn't read resolution from input file: \"{}\""
             ).format(full_input_path_single_file))
 
-        # NOTE Setting only one of `width` or `heigth` is not allowed
+        # NOTE Setting only one of `width` or `height` is not allowed
         # - settings value can't have None but has value of 0
-        output_width = (
-            output_def.get("output_width") or output_width or None
-        )
-        output_height = (
-            output_def.get("output_height") or output_height or None
-        )
+        output_width = output_def["width"] or output_width or None
+        output_height = output_def["height"] or output_height or None
+
         # Force to use input resolution if output resolution was not defined
         #   in settings. Resolution from instance is not used when
         #   'use_input_res' is set to 'True'.
diff --git a/client/ayon_core/plugins/publish/extract_thumbnail.py b/client/ayon_core/plugins/publish/extract_thumbnail.py
index 3874ddc13c..e392ce630a 100644
--- a/client/ayon_core/plugins/publish/extract_thumbnail.py
+++ b/client/ayon_core/plugins/publish/extract_thumbnail.py
@@ -42,15 +42,27 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
 
     integrate_thumbnail = False
     target_size = {
-        "type": "resize",
-        "width": 1920,
-        "height": 1080
+        "type": "source",
+        "resize": {
+            "width": 1920,
+            "height": 1080
+        }
     }
-    background_color = None
+    background_color = (0, 0, 0, 0.0)
     duration_split = 0.5
     # attribute presets from settings
-    oiiotool_defaults = None
-    ffmpeg_args = None
+    oiiotool_defaults = {
+        "type": "colorspace",
+        "colorspace": "color_picking",
+        "display_and_view": {
+            "display": "default",
+            "view": "sRGB"
+        }
+    }
+    ffmpeg_args = {
+        "input": [],
+        "output": []
+    }
     product_names = []
 
     def process(self, instance):
@@ -369,7 +381,6 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
 
         repre_display = colorspace_data.get("display")
         repre_view = colorspace_data.get("view")
-        oiio_default_type = None
         oiio_default_display = None
         oiio_default_view = None
         oiio_default_colorspace = None
@@ -387,11 +398,12 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         #   oiiotool_defaults
         elif self.oiiotool_defaults:
             oiio_default_type = self.oiiotool_defaults["type"]
-            if "colorspace" in oiio_default_type:
+            if "colorspace" == oiio_default_type:
                 oiio_default_colorspace = self.oiiotool_defaults["colorspace"]
             else:
-                oiio_default_display = self.oiiotool_defaults["display"]
-                oiio_default_view = self.oiiotool_defaults["view"]
+                display_and_view = self.oiiotool_defaults["display_and_view"]
+                oiio_default_display = display_and_view["display"]
+                oiio_default_view = display_and_view["view"]
 
         try:
             convert_colorspace(
@@ -507,11 +519,12 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         input_path,
     ):
         # get settings
-        if self.target_size.get("type") == "source":
+        if self.target_size["type"] == "source":
             return []
 
-        target_width = self.target_size["width"]
-        target_height = self.target_size["height"]
+        resize = self.target_size["resize"]
+        target_width = resize["width"]
+        target_height = resize["height"]
 
         # form arg string per application
         return get_rescaled_command_arguments(
diff --git a/client/ayon_core/plugins/publish/integrate.py b/client/ayon_core/plugins/publish/integrate.py
index a67c837daf..a502031595 100644
--- a/client/ayon_core/plugins/publish/integrate.py
+++ b/client/ayon_core/plugins/publish/integrate.py
@@ -6,7 +6,6 @@ import datetime
 
 import clique
 import six
-from bson.objectid import ObjectId
 import pyblish.api
 
 from ayon_core.client.operations import (
@@ -988,7 +987,6 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
         """
 
         return {
-            "_id": ObjectId(),
             "path": self.get_rootless_path(anatomy, path),
             "size": os.path.getsize(path),
             "hash": source_hash(path),
diff --git a/client/ayon_core/plugins/publish/integrate_subset_group.py b/client/ayon_core/plugins/publish/integrate_product_group.py
similarity index 85%
rename from client/ayon_core/plugins/publish/integrate_subset_group.py
rename to client/ayon_core/plugins/publish/integrate_product_group.py
index c2f1eac9e3..82646ed733 100644
--- a/client/ayon_core/plugins/publish/integrate_subset_group.py
+++ b/client/ayon_core/plugins/publish/integrate_product_group.py
@@ -17,24 +17,24 @@ from ayon_core.lib import (
 )
 
 
-class IntegrateSubsetGroup(pyblish.api.InstancePlugin):
+class IntegrateProductGroup(pyblish.api.InstancePlugin):
     """Integrate Subset Group for publish."""
 
     # Run after CollectAnatomyInstanceData
     order = pyblish.api.IntegratorOrder - 0.1
-    label = "Subset Group"
+    label = "Product Group"
 
     # Attributes set by settings
-    subset_grouping_profiles = None
+    product_grouping_profiles = None
 
     def process(self, instance):
         """Look into subset group profiles set by settings.
 
-        Attribute 'subset_grouping_profiles' is defined by settings.
+        Attribute 'product_grouping_profiles' is defined by settings.
         """
 
-        # Skip if 'subset_grouping_profiles' is empty
-        if not self.subset_grouping_profiles:
+        # Skip if 'product_grouping_profiles' is empty
+        if not self.product_grouping_profiles:
             return
 
         if instance.data.get("subsetGroup"):
@@ -47,7 +47,7 @@ class IntegrateSubsetGroup(pyblish.api.InstancePlugin):
         # Skip if there is no matching profile
         filter_criteria = self.get_profile_filter_criteria(instance)
         profile = filter_profiles(
-            self.subset_grouping_profiles,
+            self.product_grouping_profiles,
             filter_criteria,
             logger=self.log
         )
@@ -58,7 +58,7 @@ class IntegrateSubsetGroup(pyblish.api.InstancePlugin):
         template = profile["template"]
 
         fill_pairs = prepare_template_data({
-            "family": filter_criteria["families"],
+            "family": filter_criteria["product_types"],
             "task": filter_criteria["tasks"],
             "host": filter_criteria["hosts"],
             "subset": instance.data["subset"],
@@ -91,7 +91,7 @@ class IntegrateSubsetGroup(pyblish.api.InstancePlugin):
 
         # Return filter criteria
         return {
-            "families": anatomy_data["family"],
+            "product_types": anatomy_data["family"],
             "tasks": task.get("name"),
             "hosts": instance.context.data["hostName"],
             "task_types": task.get("type")
diff --git a/client/ayon_core/scripts/non_python_host_launch.py b/client/ayon_core/scripts/non_python_host_launch.py
index 97632e98ad..4c18fd0ccc 100644
--- a/client/ayon_core/scripts/non_python_host_launch.py
+++ b/client/ayon_core/scripts/non_python_host_launch.py
@@ -79,7 +79,7 @@ def main(argv):
     if after_script_idx is not None:
         launch_args = sys_args[after_script_idx:]
 
-    host_name = os.environ["AVALON_APP"].lower()
+    host_name = os.environ["AYON_HOST_NAME"].lower()
     if host_name == "photoshop":
         # TODO refactor launch logic according to AE
         from ayon_core.hosts.photoshop.api.lib import main
@@ -90,7 +90,7 @@ def main(argv):
     else:
         title = "Unknown host name"
         message = (
-            "BUG: Environment variable AVALON_APP contains unknown"
+            "BUG: Environment variable AYON_HOST_NAME contains unknown"
             " host name \"{}\""
         ).format(host_name)
         show_error_messagebox(title, message)
diff --git a/client/ayon_core/scripts/remote_publish.py b/client/ayon_core/scripts/remote_publish.py
deleted file mode 100644
index 7e7bf2493b..0000000000
--- a/client/ayon_core/scripts/remote_publish.py
+++ /dev/null
@@ -1,12 +0,0 @@
-try:
-    from ayon_core.lib import Logger
-    from ayon_core.pipeline.publish.lib import remote_publish
-except ImportError as exc:
-    # Ensure Deadline fails by output an error that contains "Fatal Error:"
-    raise ImportError("Fatal Error: %s" % exc)
-
-
-if __name__ == "__main__":
-    # Perform remote publish with thorough error checking
-    log = Logger.get_logger(__name__)
-    remote_publish(log)
diff --git a/client/ayon_core/settings/__init__.py b/client/ayon_core/settings/__init__.py
index ed3aaef7d4..074dbf8d03 100644
--- a/client/ayon_core/settings/__init__.py
+++ b/client/ayon_core/settings/__init__.py
@@ -7,8 +7,8 @@ from .lib import (
     get_system_settings,
     get_project_settings,
     get_current_project_settings,
-    get_local_settings,
 )
+from .ayon_settings import get_ayon_settings
 
 
 __all__ = (
@@ -19,5 +19,6 @@ __all__ = (
     "get_system_settings",
     "get_project_settings",
     "get_current_project_settings",
-    "get_local_settings",
+
+    "get_ayon_settings",
 )
diff --git a/client/ayon_core/settings/ayon_settings.py b/client/ayon_core/settings/ayon_settings.py
index 2577a3af06..013752da4f 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -62,36 +62,6 @@ def _convert_general(ayon_settings, output, default_settings):
     }
 
 
-def _convert_kitsu_system_settings(
-    ayon_settings, output, addon_versions, default_settings
-):
-    if "kitsu" in ayon_settings:
-        output["kitsu"] = ayon_settings["kitsu"]
-
-    enabled = addon_versions.get("kitsu") is not None
-    kitsu_settings = default_settings["modules"]["kitsu"]
-    kitsu_settings["enabled"] = enabled
-    if enabled:
-        kitsu_settings["server"] = ayon_settings["kitsu"]["server"]
-    output["modules"]["kitsu"] = kitsu_settings
-
-
-def _convert_deadline_system_settings(
-    ayon_settings, output, addon_versions, default_settings
-):
-    enabled = addon_versions.get("deadline") is not None
-    deadline_settings = default_settings["modules"]["deadline"]
-    deadline_settings["enabled"] = enabled
-    if enabled:
-        ayon_deadline = ayon_settings["deadline"]
-        deadline_settings["deadline_urls"] = {
-            item["name"]: item["value"]
-            for item in ayon_deadline["deadline_urls"]
-        }
-
-    output["modules"]["deadline"] = deadline_settings
-
-
 def _convert_royalrender_system_settings(
     ayon_settings, output, addon_versions, default_settings
 ):
@@ -113,8 +83,6 @@ def _convert_modules_system(
     # TODO add all modules
     # TODO add 'enabled' values
     for func in (
-        _convert_kitsu_system_settings,
-        _convert_deadline_system_settings,
         _convert_royalrender_system_settings,
     ):
         func(ayon_settings, output, addon_versions, default_settings)
@@ -122,6 +90,7 @@ def _convert_modules_system(
     for key in {
         "timers_manager",
         "clockify",
+        "deadline",
     }:
         if addon_versions.get(key):
             output[key] = ayon_settings
@@ -164,9 +133,6 @@ def convert_system_settings(ayon_settings, default_settings, addon_versions):
     output = {
         "modules": {}
     }
-    if "applications" in ayon_settings:
-        output["applications"] = ayon_settings["applications"]
-
     if "core" in ayon_settings:
         _convert_general(ayon_settings, output, default_settings)
 
@@ -188,59 +154,6 @@ def convert_system_settings(ayon_settings, default_settings, addon_versions):
 
 
 # --------- Project settings ---------
-def _convert_blender_project_settings(ayon_settings, output):
-    if "blender" not in ayon_settings:
-        return
-    ayon_blender = ayon_settings["blender"]
-
-    output["blender"] = ayon_blender
-
-
-def _convert_celaction_project_settings(ayon_settings, output):
-    if "celaction" not in ayon_settings:
-        return
-
-    ayon_celaction = ayon_settings["celaction"]
-
-    output["celaction"] = ayon_celaction
-
-
-def _convert_flame_project_settings(ayon_settings, output):
-    if "flame" not in ayon_settings:
-        return
-
-    ayon_flame = ayon_settings["flame"]
-
-    output["flame"] = ayon_flame
-
-
-def _convert_fusion_project_settings(ayon_settings, output):
-    if "fusion" not in ayon_settings:
-        return
-
-    ayon_fusion = ayon_settings["fusion"]
-
-    output["fusion"] = ayon_fusion
-
-
-def _convert_maya_project_settings(ayon_settings, output):
-    if "maya" not in ayon_settings:
-        return
-
-    ayon_maya = ayon_settings["maya"]
-
-    output["maya"] = ayon_maya
-
-
-def _convert_3dsmax_project_settings(ayon_settings, output):
-    if "max" not in ayon_settings:
-        return
-
-    ayon_max = ayon_settings["max"]
-
-    output["max"] = ayon_max
-
-
 def _convert_nuke_knobs(knobs):
     new_knobs = []
     for knob in knobs:
@@ -456,56 +369,6 @@ def _convert_hiero_project_settings(ayon_settings, output):
     output["hiero"] = ayon_hiero
 
 
-def _convert_photoshop_project_settings(ayon_settings, output):
-    if "photoshop" not in ayon_settings:
-        return
-
-    ayon_photoshop = ayon_settings["photoshop"]
-    output["photoshop"] = ayon_photoshop
-
-
-def _convert_substancepainter_project_settings(ayon_settings, output):
-    if "substancepainter" not in ayon_settings:
-        return
-
-    ayon_substance_painter = ayon_settings["substancepainter"]
-    output["substancepainter"] = ayon_substance_painter
-
-
-def _convert_tvpaint_project_settings(ayon_settings, output):
-    if "tvpaint" not in ayon_settings:
-        return
-
-    ayon_tvpaint = ayon_settings["tvpaint"]
-    output["tvpaint"] = ayon_tvpaint
-
-
-def _convert_traypublisher_project_settings(ayon_settings, output):
-    if "traypublisher" not in ayon_settings:
-        return
-
-    ayon_traypublisher = ayon_settings["traypublisher"]
-
-    output["traypublisher"] = ayon_traypublisher
-
-
-def _convert_webpublisher_project_settings(ayon_settings, output):
-    if "webpublisher" not in ayon_settings:
-        return
-
-    ayon_webpublisher = ayon_settings["webpublisher"]
-
-    ayon_publish = ayon_webpublisher["publish"]
-
-    ayon_collect_files = ayon_publish["CollectPublishedFiles"]
-    ayon_collect_files["task_type_to_family"] = {
-        item["name"]: item["value"]
-        for item in ayon_collect_files["task_type_to_family"]
-    }
-
-    output["webpublisher"] = ayon_webpublisher
-
-
 def _convert_royalrender_project_settings(ayon_settings, output):
     if "royalrender" not in ayon_settings:
         return
@@ -518,272 +381,14 @@ def _convert_royalrender_project_settings(ayon_settings, output):
     }
 
 
-def _convert_kitsu_project_settings(ayon_settings, output):
-    if "kitsu" not in ayon_settings:
-        return
-
-    ayon_kitsu_settings = ayon_settings["kitsu"]
-    ayon_kitsu_settings.pop("server")
-
-    integrate_note = ayon_kitsu_settings["publish"]["IntegrateKitsuNote"]
-    status_change_conditions = integrate_note["status_change_conditions"]
-    if "product_type_requirements" in status_change_conditions:
-        status_change_conditions["family_requirements"] = (
-            status_change_conditions.pop("product_type_requirements"))
-
-    output["kitsu"] = ayon_kitsu_settings
-
-
-def _convert_shotgrid_project_settings(ayon_settings, output):
-    if "shotgrid" not in ayon_settings:
-        return
-
-    ayon_shotgrid = ayon_settings["shotgrid"]
-    # This means that a different variant of addon is used
-    if "leecher_backend_url" not in ayon_shotgrid:
-        return
-
-    for key in {
-        "leecher_backend_url",
-        "filter_projects_by_login",
-        "shotgrid_settings",
-        "leecher_manager_url",
-    }:
-        ayon_shotgrid.pop(key)
-
-    asset_field = ayon_shotgrid["fields"]["asset"]
-    asset_field["type"] = asset_field.pop("asset_type")
-
-    task_field = ayon_shotgrid["fields"]["task"]
-    if "task" in task_field:
-        task_field["step"] = task_field.pop("task")
-
-    output["shotgrid"] = ayon_settings["shotgrid"]
-
-
-def _convert_slack_project_settings(ayon_settings, output):
-    if "slack" not in ayon_settings:
-        return
-
-    ayon_slack = ayon_settings["slack"]
-    ayon_slack.pop("enabled", None)
-    for profile in ayon_slack["publish"]["CollectSlackFamilies"]["profiles"]:
-        profile["tasks"] = profile.pop("task_names")
-        profile["subsets"] = profile.pop("subset_names")
-
-    output["slack"] = ayon_slack
-
-
-def _convert_global_project_settings(ayon_settings, output, default_settings):
-    if "core" not in ayon_settings:
-        return
-
-    ayon_core = ayon_settings["core"]
-
-    # Publish conversion
-    ayon_publish = ayon_core["publish"]
-
-    # ExtractThumbnail plugin
-    ayon_extract_thumbnail = ayon_publish["ExtractThumbnail"]
-    # fix display and view at oiio defaults
-    ayon_default_oiio = copy.deepcopy(
-        ayon_extract_thumbnail["oiiotool_defaults"])
-    display_and_view = ayon_default_oiio.pop("display_and_view")
-    ayon_default_oiio["display"] = display_and_view["display"]
-    ayon_default_oiio["view"] = display_and_view["view"]
-    ayon_extract_thumbnail["oiiotool_defaults"] = ayon_default_oiio
-    # fix target size
-    ayon_default_resize = copy.deepcopy(ayon_extract_thumbnail["target_size"])
-    resize = ayon_default_resize.pop("resize")
-    ayon_default_resize["width"] = resize["width"]
-    ayon_default_resize["height"] = resize["height"]
-    ayon_extract_thumbnail["target_size"] = ayon_default_resize
-    # fix background color
-    ayon_extract_thumbnail["background_color"] = _convert_color(
-        ayon_extract_thumbnail["background_color"]
-    )
-
-    # ExtractOIIOTranscode plugin
-    extract_oiio_transcode = ayon_publish["ExtractOIIOTranscode"]
-    extract_oiio_transcode_profiles = extract_oiio_transcode["profiles"]
-    for profile in extract_oiio_transcode_profiles:
-        new_outputs = {}
-        name_counter = {}
-        if "product_names" in profile:
-            profile["subsets"] = profile.pop("product_names")
-        for profile_output in profile["outputs"]:
-            if "name" in profile_output:
-                name = profile_output.pop("name")
-            else:
-                # Backwards compatibility for setting without 'name' in model
-                name = profile_output["extension"]
-                if name in new_outputs:
-                    name_counter[name] += 1
-                    name = "{}_{}".format(name, name_counter[name])
-                else:
-                    name_counter[name] = 0
-
-            new_outputs[name] = profile_output
-        profile["outputs"] = new_outputs
-
-    # Extract Burnin plugin
-    extract_burnin = ayon_publish["ExtractBurnin"]
-    extract_burnin_options = extract_burnin["options"]
-    for color_key in ("font_color", "bg_color"):
-        extract_burnin_options[color_key] = _convert_color(
-            extract_burnin_options[color_key]
-        )
-
-    for profile in extract_burnin["profiles"]:
-        extract_burnin_defs = profile["burnins"]
-        if "product_names" in profile:
-            profile["subsets"] = profile.pop("product_names")
-            profile["families"] = profile.pop("product_types")
-
-        for burnin_def in extract_burnin_defs:
-            for key in (
-                "TOP_LEFT",
-                "TOP_CENTERED",
-                "TOP_RIGHT",
-                "BOTTOM_LEFT",
-                "BOTTOM_CENTERED",
-                "BOTTOM_RIGHT",
-            ):
-                burnin_def[key] = (
-                    burnin_def[key]
-                    .replace("{product[name]}", "{subset}")
-                    .replace("{Product[name]}", "{Subset}")
-                    .replace("{PRODUCT[NAME]}", "{SUBSET}")
-                    .replace("{product[type]}", "{family}")
-                    .replace("{Product[type]}", "{Family}")
-                    .replace("{PRODUCT[TYPE]}", "{FAMILY}")
-                    .replace("{folder[name]}", "{asset}")
-                    .replace("{Folder[name]}", "{Asset}")
-                    .replace("{FOLDER[NAME]}", "{ASSET}")
-                )
-        profile["burnins"] = {
-            extract_burnin_def.pop("name"): extract_burnin_def
-            for extract_burnin_def in extract_burnin_defs
-        }
-
-    if "IntegrateProductGroup" in ayon_publish:
-        subset_group = ayon_publish.pop("IntegrateProductGroup")
-        subset_group_profiles = subset_group.pop("product_grouping_profiles")
-        for profile in subset_group_profiles:
-            profile["families"] = profile.pop("product_types")
-        subset_group["subset_grouping_profiles"] = subset_group_profiles
-        ayon_publish["IntegrateSubsetGroup"] = subset_group
-
-    # Cleanup plugin
-    ayon_cleanup = ayon_publish["CleanUp"]
-    if "patterns" in ayon_cleanup:
-        ayon_cleanup["paterns"] = ayon_cleanup.pop("patterns")
-
-    # Project root settings - json string to dict
-    ayon_core["project_environments"] = json.loads(
-        ayon_core["project_environments"]
-    )
-    ayon_core["project_folder_structure"] = json.dumps(json.loads(
-        ayon_core["project_folder_structure"]
-    ))
-
-    # Tools settings
-    ayon_tools = ayon_core["tools"]
-    ayon_create_tool = ayon_tools["creator"]
-    if "product_name_profiles" in ayon_create_tool:
-        product_name_profiles = ayon_create_tool.pop("product_name_profiles")
-        for profile in product_name_profiles:
-            profile["families"] = profile.pop("product_types")
-        ayon_create_tool["subset_name_profiles"] = product_name_profiles
-
-    for profile in ayon_create_tool["subset_name_profiles"]:
-        template = profile["template"]
-        profile["template"] = (
-            template
-            .replace("{task[name]}", "{task}")
-            .replace("{Task[name]}", "{Task}")
-            .replace("{TASK[NAME]}", "{TASK}")
-            .replace("{product[type]}", "{family}")
-            .replace("{Product[type]}", "{Family}")
-            .replace("{PRODUCT[TYPE]}", "{FAMILY}")
-            .replace("{folder[name]}", "{asset}")
-            .replace("{Folder[name]}", "{Asset}")
-            .replace("{FOLDER[NAME]}", "{ASSET}")
-        )
-
-    product_smart_select_key = "families_smart_select"
-    if "product_types_smart_select" in ayon_create_tool:
-        product_smart_select_key = "product_types_smart_select"
-
-    new_smart_select_families = {
-        item["name"]: item["task_names"]
-        for item in ayon_create_tool.pop(product_smart_select_key)
-    }
-    ayon_create_tool["families_smart_select"] = new_smart_select_families
-
-    ayon_loader_tool = ayon_tools["loader"]
-    if "product_type_filter_profiles" in ayon_loader_tool:
-        product_type_filter_profiles = (
-            ayon_loader_tool.pop("product_type_filter_profiles"))
-        for profile in product_type_filter_profiles:
-            profile["filter_families"] = profile.pop("filter_product_types")
-
-        ayon_loader_tool["family_filter_profiles"] = (
-            product_type_filter_profiles)
-
-    ayon_publish_tool = ayon_tools["publish"]
-    for profile in ayon_publish_tool["hero_template_name_profiles"]:
-        if "product_types" in profile:
-            profile["families"] = profile.pop("product_types")
-
-    for profile in ayon_publish_tool["template_name_profiles"]:
-        if "product_types" in profile:
-            profile["families"] = profile.pop("product_types")
-
-    ayon_core["sync_server"] = (
-        default_settings["global"]["sync_server"]
-    )
-    output["global"] = ayon_core
-
-
 def convert_project_settings(ayon_settings, default_settings):
-    # Missing settings
-    # - standalonepublisher
     default_settings = copy.deepcopy(default_settings)
     output = {}
-    exact_match = {
-        "aftereffects",
-        "harmony",
-        "houdini",
-        "resolve",
-        "unreal",
-        "applications",
-        "deadline",
-    }
-    for key in exact_match:
-        if key in ayon_settings:
-            output[key] = ayon_settings[key]
 
-    _convert_blender_project_settings(ayon_settings, output)
-    _convert_celaction_project_settings(ayon_settings, output)
-    _convert_flame_project_settings(ayon_settings, output)
-    _convert_fusion_project_settings(ayon_settings, output)
-    _convert_maya_project_settings(ayon_settings, output)
-    _convert_3dsmax_project_settings(ayon_settings, output)
     _convert_nuke_project_settings(ayon_settings, output)
     _convert_hiero_project_settings(ayon_settings, output)
-    _convert_photoshop_project_settings(ayon_settings, output)
-    _convert_substancepainter_project_settings(ayon_settings, output)
-    _convert_tvpaint_project_settings(ayon_settings, output)
-    _convert_traypublisher_project_settings(ayon_settings, output)
-    _convert_webpublisher_project_settings(ayon_settings, output)
 
     _convert_royalrender_project_settings(ayon_settings, output)
-    _convert_kitsu_project_settings(ayon_settings, output)
-    _convert_shotgrid_project_settings(ayon_settings, output)
-    _convert_slack_project_settings(ayon_settings, output)
-
-    _convert_global_project_settings(ayon_settings, output, default_settings)
 
     for key, value in ayon_settings.items():
         if key not in output:
diff --git a/client/ayon_core/settings/lib.py b/client/ayon_core/settings/lib.py
index ee453956d2..4dde488d6c 100644
--- a/client/ayon_core/settings/lib.py
+++ b/client/ayon_core/settings/lib.py
@@ -48,11 +48,6 @@ def clear_metadata_from_settings(values):
             clear_metadata_from_settings(item)
 
 
-def get_local_settings():
-    # TODO implement ayon implementation
-    return {}
-
-
 def load_openpype_default_settings():
     """Load openpype default settings."""
     return load_jsons_from_dir(DEFAULTS_DIR)
@@ -203,53 +198,31 @@ def merge_overrides(source_dict, override_dict):
 def get_site_local_overrides(project_name, site_name, local_settings=None):
     """Site overrides from local settings for passet project and site name.
 
+    Deprecated:
+        This function is not implemented for AYON and will be removed.
+
     Args:
         project_name (str): For which project are overrides.
         site_name (str): For which site are overrides needed.
         local_settings (dict): Preloaded local settings. They are loaded
             automatically if not passed.
     """
-    # Check if local settings were passed
-    if local_settings is None:
-        local_settings = get_local_settings()
 
-    output = {}
-
-    # Skip if local settings are empty
-    if not local_settings:
-        return output
-
-    local_project_settings = local_settings.get("projects") or {}
-
-    # Prepare overrides for entered project and for default project
-    project_locals = None
-    if project_name:
-        project_locals = local_project_settings.get(project_name)
-    default_project_locals = local_project_settings.get(DEFAULT_PROJECT_KEY)
-
-    # First load and use local settings from default project
-    if default_project_locals and site_name in default_project_locals:
-        output.update(default_project_locals[site_name])
-
-    # Apply project specific local settings if there are any
-    if project_locals and site_name in project_locals:
-        output.update(project_locals[site_name])
-
-    return output
+    return {}
 
 
 def get_current_project_settings():
     """Project settings for current context project.
 
-    Project name should be stored in environment variable `AVALON_PROJECT`.
+    Project name should be stored in environment variable `AYON_PROJECT_NAME`.
     This function should be used only in host context where environment
     variable must be set and should not happen that any part of process will
     change the value of the enviornment variable.
     """
-    project_name = os.environ.get("AVALON_PROJECT")
+    project_name = os.environ.get("AYON_PROJECT_NAME")
     if not project_name:
         raise ValueError(
-            "Missing context project in environemt variable `AVALON_PROJECT`."
+            "Missing context project in environemt variable `AYON_PROJECT_NAME`."
         )
     return get_project_settings(project_name)
 
diff --git a/client/ayon_core/tools/ayon_utils/widgets/__init__.py b/client/ayon_core/tools/ayon_utils/widgets/__init__.py
index f58de17c4a..b1b7dd7527 100644
--- a/client/ayon_core/tools/ayon_utils/widgets/__init__.py
+++ b/client/ayon_core/tools/ayon_utils/widgets/__init__.py
@@ -9,6 +9,7 @@ from .folders_widget import (
     FoldersWidget,
     FoldersQtModel,
     FOLDERS_MODEL_SENDER_NAME,
+    SimpleFoldersWidget,
 )
 
 from .tasks_widget import (
@@ -31,6 +32,7 @@ __all__ = (
     "FoldersWidget",
     "FoldersQtModel",
     "FOLDERS_MODEL_SENDER_NAME",
+    "SimpleFoldersWidget",
 
     "TasksWidget",
     "TasksQtModel",
diff --git a/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py b/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py
index 1e395b0368..cf81d1c8ff 100644
--- a/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py
+++ b/client/ayon_core/tools/ayon_utils/widgets/folders_widget.py
@@ -2,6 +2,11 @@ import collections
 
 from qtpy import QtWidgets, QtGui, QtCore
 
+from ayon_core.lib.events import QueuedEventSystem
+from ayon_core.tools.ayon_utils.models import (
+    HierarchyModel,
+    HierarchyExpectedSelection,
+)
 from ayon_core.tools.utils import (
     RecursiveSortFilterProxyModel,
     TreeView,
@@ -390,6 +395,15 @@ class FoldersWidget(QtWidgets.QWidget):
 
         return self._get_selected_item_id()
 
+    def get_selected_folder_path(self):
+        """Get selected folder id.
+
+        Returns:
+            Union[str, None]: Folder path which is selected.
+        """
+
+        return self._get_selected_item_value(FOLDER_PATH_ROLE)
+
     def get_selected_folder_label(self):
         """Selected folder label.
 
@@ -473,9 +487,12 @@ class FoldersWidget(QtWidgets.QWidget):
         self.refreshed.emit()
 
     def _get_selected_item_id(self):
+        return self._get_selected_item_value(FOLDER_ID_ROLE)
+
+    def _get_selected_item_value(self, role):
         selection_model = self._folders_view.selectionModel()
         for index in selection_model.selectedIndexes():
-            item_id = index.data(FOLDER_ID_ROLE)
+            item_id = index.data(role)
             if item_id is not None:
                 return item_id
         return None
@@ -514,3 +531,110 @@ class FoldersWidget(QtWidgets.QWidget):
         if folder_id is not None:
             self.set_selected_folder(folder_id)
         self._controller.expected_folder_selected(folder_id)
+
+
+class SimpleSelectionModel(object):
+    """Model handling selection changes.
+
+    Triggering events:
+    - "selection.project.changed"
+    - "selection.folder.changed"
+    """
+
+    event_source = "selection.model"
+
+    def __init__(self, controller):
+        self._controller = controller
+
+        self._project_name = None
+        self._folder_id = None
+        self._task_id = None
+        self._task_name = None
+
+    def get_selected_project_name(self):
+        return self._project_name
+
+    def set_selected_project(self, project_name):
+        self._project_name = project_name
+        self._controller.emit_event(
+            "selection.project.changed",
+            {"project_name": project_name},
+            self.event_source
+        )
+
+    def get_selected_folder_id(self):
+        return self._folder_id
+
+    def set_selected_folder(self, folder_id):
+        if folder_id == self._folder_id:
+            return
+        self._folder_id = folder_id
+        self._controller.emit_event(
+            "selection.folder.changed",
+            {
+                "project_name": self._project_name,
+                "folder_id": folder_id,
+            },
+            self.event_source
+        )
+
+
+class SimpleFoldersController(object):
+    def __init__(self):
+        self._event_system = self._create_event_system()
+        self._hierarchy_model = HierarchyModel(self)
+        self._selection_model = SimpleSelectionModel(self)
+        self._expected_selection = HierarchyExpectedSelection(
+            self, handle_project=False, handle_folder=True, handle_task=False
+        )
+
+    def emit_event(self, topic, data=None, source=None):
+        """Use implemented event system to trigger event."""
+
+        if data is None:
+            data = {}
+        self._event_system.emit(topic, data, source)
+
+    def register_event_callback(self, topic, callback):
+        self._event_system.add_callback(topic, callback)
+
+    # Model functions
+    def get_folder_items(self, project_name, sender=None):
+        return self._hierarchy_model.get_folder_items(project_name, sender)
+
+    def set_selected_project(self, project_name):
+        self._selection_model.set_selected_project(project_name)
+
+    def set_selected_folder(self, folder_id):
+        self._selection_model.set_selected_folder(folder_id)
+
+    def get_expected_selection_data(self):
+        self._expected_selection.get_expected_selection_data()
+
+    def expected_folder_selected(self, folder_id):
+        self._expected_selection.expected_folder_selected(folder_id)
+
+    def _create_event_system(self):
+        return QueuedEventSystem()
+
+
+class SimpleFoldersWidget(FoldersWidget):
+    def __init__(self, controller=None, *args, **kwargs):
+        if controller is None:
+            controller = SimpleFoldersController()
+        super(SimpleFoldersWidget, self).__init__(controller, *args, **kwargs)
+
+    def set_project_name(self, project_name):
+        self._controller.set_selected_project(project_name)
+        super(SimpleFoldersWidget, self).set_project_name(project_name)
+
+    def _on_project_selection_change(self, event):
+        """Ignore project selection change from controller.
+
+        Only who can trigger project change is this widget with
+            'set_project_name' which already cares about project change.
+
+        Args:
+            event (Event): Triggered event.
+        """
+        pass
diff --git a/client/ayon_core/tools/creator/window.py b/client/ayon_core/tools/creator/window.py
index 676e1c3959..5862725076 100644
--- a/client/ayon_core/tools/creator/window.py
+++ b/client/ayon_core/tools/creator/window.py
@@ -377,23 +377,25 @@ class CreatorWindow(QtWidgets.QDialog):
 
         self._creators_model.reset()
 
-        pype_project_setting = (
+        product_types_smart_select = (
             get_current_project_settings()
             ["global"]
             ["tools"]
             ["creator"]
-            ["families_smart_select"]
+            ["product_types_smart_select"]
         )
         current_index = None
         family = None
         task_name = get_current_task_name() or None
         lowered_task_name = task_name.lower()
         if task_name:
-            for _family, _task_names in pype_project_setting.items():
-                _low_task_names = {name.lower() for name in _task_names}
+            for smart_item in product_types_smart_select:
+                _low_task_names = {
+                    name.lower() for name in smart_item["task_names"]
+                }
                 for _task_name in _low_task_names:
                     if _task_name in lowered_task_name:
-                        family = _family
+                        family = smart_item["name"]
                         break
                 if family:
                     break
diff --git a/client/ayon_core/tools/experimental_tools/tools_def.py b/client/ayon_core/tools/experimental_tools/tools_def.py
index 568c7032d0..7def3551de 100644
--- a/client/ayon_core/tools/experimental_tools/tools_def.py
+++ b/client/ayon_core/tools/experimental_tools/tools_def.py
@@ -1,5 +1,4 @@
 import os
-from ayon_core.settings import get_local_settings
 
 # Constant key under which local settings are stored
 LOCAL_EXPERIMENTAL_KEY = "experimental_tools"
@@ -89,9 +88,13 @@ class ExperimentalTools:
                 "New publisher",
                 "Combined creation and publishing into one tool.",
                 self._show_publisher,
-                hosts_filter=["blender", "maya", "nuke", "celaction", "flame",
-                              "fusion", "harmony", "hiero", "resolve",
-                              "tvpaint", "unreal"]
+                hosts_filter=[
+                    "celaction",
+                    "flame",
+                    "harmony",
+                    "hiero",
+                    "resolve",
+                ]
             )
         ]
 
@@ -139,7 +142,7 @@ class ExperimentalTools:
 
     def get_tools_for_host(self, host_name=None):
         if not host_name:
-            host_name = os.environ.get("AVALON_APP")
+            host_name = os.environ.get("AYON_HOST_NAME")
         tools = []
         for tool in self.tools:
             if (
@@ -151,7 +154,10 @@ class ExperimentalTools:
 
     def refresh_availability(self):
         """Reload local settings and check if any tool changed ability."""
-        local_settings = get_local_settings()
+
+        # NOTE AYON does not have implemented settings for experimental
+        #   tools.
+        local_settings = {}
         experimental_settings = (
             local_settings.get(LOCAL_EXPERIMENTAL_KEY)
         ) or {}
diff --git a/client/ayon_core/tools/launcher/models/actions.py b/client/ayon_core/tools/launcher/models/actions.py
index 37024b5810..53d2b78dc3 100644
--- a/client/ayon_core/tools/launcher/models/actions.py
+++ b/client/ayon_core/tools/launcher/models/actions.py
@@ -69,9 +69,9 @@ class ApplicationAction(LauncherAction):
 
     _log = None
     required_session_keys = (
-        "AVALON_PROJECT",
-        "AVALON_ASSET",
-        "AVALON_TASK"
+        "AYON_PROJECT_NAME",
+        "AYON_FOLDER_PATH",
+        "AYON_TASK_NAME"
     )
 
     @property
@@ -85,7 +85,7 @@ class ApplicationAction(LauncherAction):
             if not session.get(key):
                 return False
 
-        project_name = session["AVALON_PROJECT"]
+        project_name = session["AYON_PROJECT_NAME"]
         project_entity = self.project_entities[project_name]
         apps = project_entity["attrib"].get("applications")
         if not apps or self.application.full_name not in apps:
@@ -119,9 +119,9 @@ class ApplicationAction(LauncherAction):
             ApplicationLaunchFailed,
         )
 
-        project_name = session["AVALON_PROJECT"]
-        asset_name = session["AVALON_ASSET"]
-        task_name = session["AVALON_TASK"]
+        project_name = session["AYON_PROJECT_NAME"]
+        asset_name = session["AYON_FOLDER_PATH"]
+        task_name = session["AYON_TASK_NAME"]
         try:
             self.application.launch(
                 project_name=project_name,
@@ -416,6 +416,10 @@ class ActionsModel:
                 task_name = task["name"]
 
         return {
+            "AYON_PROJECT_NAME": project_name,
+            "AYON_FOLDER_PATH": folder_path,
+            "AYON_TASK_NAME": task_name,
+            # Deprecated - kept for backwards compatibility
             "AVALON_PROJECT": project_name,
             "AVALON_ASSET": folder_path,
             "AVALON_TASK": task_name,
diff --git a/client/ayon_core/tools/publisher/control.py b/client/ayon_core/tools/publisher/control.py
index 988362fee4..5ccd428551 100644
--- a/client/ayon_core/tools/publisher/control.py
+++ b/client/ayon_core/tools/publisher/control.py
@@ -1807,9 +1807,9 @@ class PublisherController(BasePublisherController):
             context_title = self._host.get_context_title()
 
         if context_title is None:
-            context_title = os.environ.get("AVALON_APP_NAME")
+            context_title = os.environ.get("AYON_APP_NAME")
             if context_title is None:
-                context_title = os.environ.get("AVALON_APP")
+                context_title = os.environ.get("AYON_HOST_NAME")
 
         return context_title
 
diff --git a/client/ayon_core/tools/push_to_project/models/integrate.py b/client/ayon_core/tools/push_to_project/models/integrate.py
index 175716cf10..3de1beb2d2 100644
--- a/client/ayon_core/tools/push_to_project/models/integrate.py
+++ b/client/ayon_core/tools/push_to_project/models/integrate.py
@@ -8,8 +8,6 @@ import sys
 import traceback
 import uuid
 
-from bson.objectid import ObjectId
-
 from ayon_core.client import (
     get_project,
     get_assets,
@@ -1080,7 +1078,6 @@ class ProjectPushItemProcess:
             new_repre_files = []
             for (path, rootless_path) in repre_filepaths:
                 new_repre_files.append({
-                    "_id": ObjectId(),
                     "path": rootless_path,
                     "size": os.path.getsize(path),
                     "hash": source_hash(path),
diff --git a/client/ayon_core/tools/pyblish_pype/control.py b/client/ayon_core/tools/pyblish_pype/control.py
index 1a3e7a15f0..0e25fa9e27 100644
--- a/client/ayon_core/tools/pyblish_pype/control.py
+++ b/client/ayon_core/tools/pyblish_pype/control.py
@@ -208,7 +208,7 @@ class Controller(QtCore.QObject):
         if not presets:
             return {}
 
-        result = presets.get("global", {}).get("filters", {})
+        result = presets.get("core", {}).get("filters", {})
         hosts = pyblish.api.registered_hosts()
         for host in hosts:
             host_presets = presets.get(host, {}).get("filters")
diff --git a/client/ayon_core/tools/texture_copy/app.py b/client/ayon_core/tools/texture_copy/app.py
index 9b4406d8e7..eef648eaf9 100644
--- a/client/ayon_core/tools/texture_copy/app.py
+++ b/client/ayon_core/tools/texture_copy/app.py
@@ -132,8 +132,8 @@ class TextureCopy:
 def texture_copy(asset, project, path):
     t.echo("*** Running Texture tool ***")
     t.echo(">>> Initializing avalon session ...")
-    os.environ["AVALON_PROJECT"] = project
-    os.environ["AVALON_ASSET"] = asset
+    os.environ["AYON_PROJECT_NAME"] = project
+    os.environ["AYON_FOLDER_PATH"] = asset
     TextureCopy().process(asset, project, path)
 
 
diff --git a/client/ayon_core/tools/workfile_template_build/window.py b/client/ayon_core/tools/workfile_template_build/window.py
index ae4946d41d..feb11c5e75 100644
--- a/client/ayon_core/tools/workfile_template_build/window.py
+++ b/client/ayon_core/tools/workfile_template_build/window.py
@@ -27,7 +27,7 @@ class WorkfileBuildPlaceholderDialog(QtWidgets.QDialog):
 
         host_name = getattr(self._host, "name", None)
         if not host_name:
-            host_name = os.getenv("AVALON_APP") or "NA"
+            host_name = os.getenv("AYON_HOST_NAME") or "NA"
         self._host_name = host_name
 
         plugins_combo = QtWidgets.QComboBox(self)
diff --git a/client/ayon_core/version.py b/client/ayon_core/version.py
index 914e415b8c..f3ad9713d5 100644
--- a/client/ayon_core/version.py
+++ b/client/ayon_core/version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 """Package declaring AYON core addon version."""
-__version__ = "0.2.1-dev.1"
+__version__ = "0.3.0-dev.1"
diff --git a/package.py b/package.py
index 3b451e0078..470bbf256b 100644
--- a/package.py
+++ b/package.py
@@ -1,6 +1,6 @@
 name = "core"
 title = "Core"
-version = "0.2.1-dev.1"
+version = "0.3.0-dev.1"
 
 client_dir = "ayon_core"
 
diff --git a/server/settings/publish_plugins.py b/server/settings/publish_plugins.py
index c01fb92b9c..9b5f3ae571 100644
--- a/server/settings/publish_plugins.py
+++ b/server/settings/publish_plugins.py
@@ -387,14 +387,22 @@ class ExtractReviewOutputDefModel(BaseSettingsModel):
             "Crop input overscan. See the documentation for more information."
         )
     )
-    overscan_color: ColorRGB_uint8 = SettingsField(
-        (0, 0, 0),
+    overscan_color: ColorRGBA_uint8 = SettingsField(
+        (0, 0, 0, 0.0),
         title="Overscan color",
         description=(
             "Overscan color is used when input aspect ratio is not"
             " same as output aspect ratio."
         )
     )
+    # overscan_color: ColorRGB_uint8 = SettingsField(
+    #     (0, 0, 0),
+    #     title="Overscan color",
+    #     description=(
+    #         "Overscan color is used when input aspect ratio is not"
+    #         " same as output aspect ratio."
+    #     )
+    # )
     width: int = SettingsField(
         0,
         ge=0,
@@ -901,7 +909,8 @@ DEFAULT_PUBLISH_VALUES = {
                             "single_frame_filter": "single_frame"
                         },
                         "overscan_crop": "",
-                        "overscan_color": [0, 0, 0],
+                        # "overscan_color": [0, 0, 0],
+                        "overscan_color": [0, 0, 0, 0.0],
                         "width": 1920,
                         "height": 1080,
                         "scale_pixel_aspect": True,
@@ -946,7 +955,8 @@ DEFAULT_PUBLISH_VALUES = {
                             "single_frame_filter": "multi_frame"
                         },
                         "overscan_crop": "",
-                        "overscan_color": [0, 0, 0],
+                        # "overscan_color": [0, 0, 0],
+                        "overscan_color": [0, 0, 0, 0.0],
                         "width": 0,
                         "height": 0,
                         "scale_pixel_aspect": True,
diff --git a/server_addon/create_ayon_addons.py b/server_addon/create_ayon_addons.py
index 5e06d8ee8a..9553980f5d 100644
--- a/server_addon/create_ayon_addons.py
+++ b/server_addon/create_ayon_addons.py
@@ -191,8 +191,11 @@ def create_addon_package(
 
     # Copy server content
     package_py = addon_output_dir / "package.py"
+    addon_name = addon_dir.name
+    if addon_name == "royal_render":
+        addon_name = "royalrender"
     package_py_content = PACKAGE_PY_TEMPLATE.format(
-        addon_name=addon_dir.name, addon_version=addon_version
+        addon_name=addon_name, addon_version=addon_version
     )
 
     with open(package_py, "w+") as pkg_py:
diff --git a/server_addon/maya/server/settings/loaders.py b/server_addon/maya/server/settings/loaders.py
index b8264a56ef..418a7046ae 100644
--- a/server_addon/maya/server/settings/loaders.py
+++ b/server_addon/maya/server/settings/loaders.py
@@ -1,72 +1,88 @@
 from ayon_server.settings import BaseSettingsModel, SettingsField
-from ayon_server.types import ColorRGB_float
+from ayon_server.types import ColorRGB_float, ColorRGBA_uint8
 
 
 class ColorsSetting(BaseSettingsModel):
-    model: ColorRGB_float = SettingsField(
-        (0.82, 0.52, 0.12),
-        title="Model:"
-    )
-    rig: ColorRGB_float = SettingsField(
-        (0.23, 0.89, 0.92),
-        title="Rig:"
-    )
-    pointcache: ColorRGB_float = SettingsField(
-        (0.37, 0.82, 0.12),
-        title="Pointcache:"
-    )
-    animation: ColorRGB_float = SettingsField(
-        (0.37, 0.82, 0.12),
-        title="Animation:"
-    )
-    ass: ColorRGB_float = SettingsField(
-        (0.98, 0.53, 0.21),
-        title="Arnold StandIn:"
-    )
-    camera: ColorRGB_float = SettingsField(
-        (0.53, 0.45, 0.96),
-        title="Camera:"
-    )
-    fbx: ColorRGB_float = SettingsField(
-        (0.84, 0.65, 1.0),
-        title="FBX:"
-    )
-    mayaAscii: ColorRGB_float = SettingsField(
-        (0.26, 0.68, 1.0),
-        title="Maya Ascii:"
-    )
-    mayaScene: ColorRGB_float = SettingsField(
-        (0.26, 0.68, 1.0),
-        title="Maya Scene:"
-    )
-    setdress: ColorRGB_float = SettingsField(
-        (1.0, 0.98, 0.35),
-        title="Set Dress:"
-    )
-    layout: ColorRGB_float = SettingsField(
-        (1.0, 0.98, 0.35),
-        title="Layout:"
-    )
-    vdbcache: ColorRGB_float = SettingsField(
-        (0.98, 0.21, 0.0),
-        title="VDB Cache:"
-    )
-    vrayproxy: ColorRGB_float = SettingsField(
-        (1.0, 0.59, 0.05),
-        title="VRay Proxy:"
-    )
-    vrayscene_layer: ColorRGB_float = SettingsField(
-        (1.0, 0.59, 0.05),
-        title="VRay Scene:"
-    )
-    yeticache: ColorRGB_float = SettingsField(
-        (0.39, 0.81, 0.86),
-        title="Yeti Cache:"
-    )
-    yetiRig: ColorRGB_float = SettingsField(
-        (0.0, 0.80, 0.49),
-        title="Yeti Rig:"
-    )
+    model: ColorRGBA_uint8 = SettingsField(
+        (209, 132, 30, 1.0), title="Model:")
+    rig: ColorRGBA_uint8 = SettingsField(
+        (59, 226, 235, 1.0), title="Rig:")
+    pointcache: ColorRGBA_uint8 = SettingsField(
+        (94, 209, 30, 1.0), title="Pointcache:")
+    animation: ColorRGBA_uint8 = SettingsField(
+        (94, 209, 30, 1.0), title="Animation:")
+    ass: ColorRGBA_uint8 = SettingsField(
+        (249, 135, 53, 1.0), title="Arnold StandIn:")
+    camera: ColorRGBA_uint8 = SettingsField(
+        (136, 114, 244, 1.0), title="Camera:")
+    fbx: ColorRGBA_uint8 = SettingsField(
+        (215, 166, 255, 1.0), title="FBX:")
+    mayaAscii: ColorRGBA_uint8 = SettingsField(
+        (67, 174, 255, 1.0), title="Maya Ascii:")
+    mayaScene: ColorRGBA_uint8 = SettingsField(
+        (67, 174, 255, 1.0), title="Maya Scene:")
+    setdress: ColorRGBA_uint8 = SettingsField(
+        (255, 250, 90, 1.0), title="Set Dress:")
+    layout: ColorRGBA_uint8 = SettingsField((
+        255, 250, 90, 1.0), title="Layout:")
+    vdbcache: ColorRGBA_uint8 = SettingsField(
+        (249, 54, 0, 1.0), title="VDB Cache:")
+    vrayproxy: ColorRGBA_uint8 = SettingsField(
+        (255, 150, 12, 1.0), title="VRay Proxy:")
+    vrayscene_layer: ColorRGBA_uint8 = SettingsField(
+        (255, 150, 12, 1.0), title="VRay Scene:")
+    yeticache: ColorRGBA_uint8 = SettingsField(
+        (99, 206, 220, 1.0), title="Yeti Cache:")
+    yetiRig: ColorRGBA_uint8 = SettingsField(
+        (0, 205, 125, 1.0), title="Yeti Rig:")
+    # model: ColorRGB_float = SettingsField(
+    #     (0.82, 0.52, 0.12), title="Model:"
+    # )
+    # rig: ColorRGB_float = SettingsField(
+    #     (0.23, 0.89, 0.92), title="Rig:"
+    # )
+    # pointcache: ColorRGB_float = SettingsField(
+    #     (0.37, 0.82, 0.12), title="Pointcache:"
+    # )
+    # animation: ColorRGB_float = SettingsField(
+    #     (0.37, 0.82, 0.12), title="Animation:"
+    # )
+    # ass: ColorRGB_float = SettingsField(
+    #     (0.98, 0.53, 0.21), title="Arnold StandIn:"
+    # )
+    # camera: ColorRGB_float = SettingsField(
+    #     (0.53, 0.45, 0.96), title="Camera:"
+    # )
+    # fbx: ColorRGB_float = SettingsField(
+    #     (0.84, 0.65, 1.0), title="FBX:"
+    # )
+    # mayaAscii: ColorRGB_float = SettingsField(
+    #     (0.26, 0.68, 1.0), title="Maya Ascii:"
+    # )
+    # mayaScene: ColorRGB_float = SettingsField(
+    #     (0.26, 0.68, 1.0), title="Maya Scene:"
+    # )
+    # setdress: ColorRGB_float = SettingsField(
+    #     (1.0, 0.98, 0.35), title="Set Dress:"
+    # )
+    # layout: ColorRGB_float = SettingsField(
+    #     (1.0, 0.98, 0.35), title="Layout:"
+    # )
+    # vdbcache: ColorRGB_float = SettingsField(
+    #     (0.98, 0.21, 0.0), title="VDB Cache:"
+    # )
+    # vrayproxy: ColorRGB_float = SettingsField(
+    #     (1.0, 0.59, 0.05), title="VRay Proxy:"
+    # )
+    # vrayscene_layer: ColorRGB_float = SettingsField(
+    #     (1.0, 0.59, 0.05), title="VRay Scene:"
+    # )
+    # yeticache: ColorRGB_float = SettingsField(
+    #     (0.39, 0.81, 0.86), title="Yeti Cache:"
+    # )
+    # yetiRig: ColorRGB_float = SettingsField(
+    #     (0.0, 0.80, 0.49), title="Yeti Rig:"
+    # )
 
 
 class ReferenceLoaderModel(BaseSettingsModel):
@@ -99,22 +115,38 @@ class LoadersModel(BaseSettingsModel):
 
 DEFAULT_LOADERS_SETTING = {
     "colors": {
-        "model": [0.82, 0.52, 0.12],
-        "rig": [0.23, 0.89, 0.92],
-        "pointcache": [0.37, 0.82, 0.12],
-        "animation": [0.37, 0.82, 0.12],
-        "ass": [0.98, 0.53, 0.21],
-        "camera":[0.53, 0.45, 0.96],
-        "fbx": [0.84, 0.65, 1.0],
-        "mayaAscii": [0.26, 0.68, 1.0],
-        "mayaScene": [0.26, 0.68, 1.0],
-        "setdress": [1.0, 0.98, 0.35],
-        "layout": [1.0, 0.98, 0.35],
-        "vdbcache": [0.98, 0.21, 0.0],
-        "vrayproxy": [1.0, 0.59, 0.05],
-        "vrayscene_layer": [1.0, 0.59, 0.05],
-        "yeticache": [0.39, 0.81, 0.86],
-        "yetiRig": [0.0, 0.80, 0.49],
+        "model": [209, 132, 30, 1.0],
+        "rig": [59, 226, 235, 1.0],
+        "pointcache": [94, 209, 30, 1.0],
+        "animation": [94, 209, 30, 1.0],
+        "ass": [249, 135, 53, 1.0],
+        "camera": [136, 114, 244, 1.0],
+        "fbx": [215, 166, 255, 1.0],
+        "mayaAscii": [67, 174, 255, 1.0],
+        "mayaScene": [67, 174, 255, 1.0],
+        "setdress": [255, 250, 90, 1.0],
+        "layout": [255, 250, 90, 1.0],
+        "vdbcache": [249, 54, 0, 1.0],
+        "vrayproxy": [255, 150, 12, 1.0],
+        "vrayscene_layer": [255, 150, 12, 1.0],
+        "yeticache": [99, 206, 220, 1.0],
+        "yetiRig": [0, 205, 125, 1.0]
+        # "model": [0.82, 0.52, 0.12],
+        # "rig": [0.23, 0.89, 0.92],
+        # "pointcache": [0.37, 0.82, 0.12],
+        # "animation": [0.37, 0.82, 0.12],
+        # "ass": [0.98, 0.53, 0.21],
+        # "camera":[0.53, 0.45, 0.96],
+        # "fbx": [0.84, 0.65, 1.0],
+        # "mayaAscii": [0.26, 0.68, 1.0],
+        # "mayaScene": [0.26, 0.68, 1.0],
+        # "setdress": [1.0, 0.98, 0.35],
+        # "layout": [1.0, 0.98, 0.35],
+        # "vdbcache": [0.98, 0.21, 0.0],
+        # "vrayproxy": [1.0, 0.59, 0.05],
+        # "vrayscene_layer": [1.0, 0.59, 0.05],
+        # "yeticache": [0.39, 0.81, 0.86],
+        # "yetiRig": [0.0, 0.80, 0.49],
     },
     "reference_loader": {
         "namespace": "{folder[name]}_{product[name]}_##_",
diff --git a/server_addon/maya/server/settings/publish_playblast.py b/server_addon/maya/server/settings/publish_playblast.py
index dcedf3ccc9..39f48bacbe 100644
--- a/server_addon/maya/server/settings/publish_playblast.py
+++ b/server_addon/maya/server/settings/publish_playblast.py
@@ -6,7 +6,7 @@ from ayon_server.settings import (
     ensure_unique_names,
     task_types_enum,
 )
-from ayon_server.types import ColorRGB_float
+from ayon_server.types import ColorRGBA_uint8, ColorRGB_float
 
 
 def hardware_falloff_enum():
@@ -54,18 +54,27 @@ class DisplayOptionsSetting(BaseSettingsModel):
     override_display: bool = SettingsField(
         True, title="Override display options"
     )
-    background: ColorRGB_float = SettingsField(
-        (0.5, 0.5, 0.5), title="Background Color"
+    background: ColorRGBA_uint8 = SettingsField(
+        (125, 125, 125, 1.0), title="Background Color"
     )
+    # background: ColorRGB_float = SettingsField(
+    #     (0.5, 0.5, 0.5), title="Background Color"
+    # )
     displayGradient: bool = SettingsField(
         True, title="Display background gradient"
     )
-    backgroundTop: ColorRGB_float = SettingsField(
-        (0.5, 0.5, 0.5), title="Background Top"
+    backgroundTop: ColorRGBA_uint8 = SettingsField(
+        (125, 125, 125, 1.0), title="Background Top"
     )
-    backgroundBottom: ColorRGB_float = SettingsField(
-        (0.5, 0.5, 0.5), title="Background Bottom"
+    backgroundBottom: ColorRGBA_uint8 = SettingsField(
+        (125, 125, 125, 1.0), title="Background Bottom"
     )
+    # backgroundTop: ColorRGB_float = SettingsField(
+    #     (0.5, 0.5, 0.5), title="Background Top"
+    # )
+    # backgroundBottom: ColorRGB_float = SettingsField(
+    #     (0.5, 0.5, 0.5), title="Background Bottom"
+    # )
 
 
 class GenericSetting(BaseSettingsModel):
@@ -282,21 +291,12 @@ DEFAULT_PLAYBLAST_SETTING = {
         },
         "DisplayOptions": {
             "override_display": True,
-            "background": [
-                0.5,
-                0.5,
-                0.5
-            ],
-            "backgroundBottom": [
-                0.5,
-                0.5,
-                0.5
-            ],
-            "backgroundTop": [
-                0.5,
-                0.5,
-                0.5
-            ],
+            "background": [125, 125, 125, 1.0],
+            "backgroundBottom": [125, 125, 125, 1.0],
+            "backgroundTop": [125, 125, 125, 1.0],
+            # "background": [0.5, 0.5, 0.5],
+            # "backgroundBottom": [0.5, 0.5, 0.5],
+            # "backgroundTop": [0.5, 0.5, 0.5],
             "displayGradient": True
         },
         "Generic": {
diff --git a/server_addon/tvpaint/server/settings/publish_plugins.py b/server_addon/tvpaint/server/settings/publish_plugins.py
index 37ad3e0e70..0d978e5714 100644
--- a/server_addon/tvpaint/server/settings/publish_plugins.py
+++ b/server_addon/tvpaint/server/settings/publish_plugins.py
@@ -1,5 +1,5 @@
 from ayon_server.settings import BaseSettingsModel, SettingsField
-from ayon_server.types import ColorRGB_uint8
+from ayon_server.types import ColorRGBA_uint8, ColorRGB_uint8
 
 
 class CollectRenderInstancesModel(BaseSettingsModel):
@@ -10,10 +10,12 @@ class CollectRenderInstancesModel(BaseSettingsModel):
 
 class ExtractSequenceModel(BaseSettingsModel):
     """Review BG color is used for whole scene review and for thumbnails."""
-    # TODO Use alpha color
-    review_bg: ColorRGB_uint8 = SettingsField(
-        (255, 255, 255),
+    review_bg: ColorRGBA_uint8 = SettingsField(
+        (255, 255, 255, 1.0),
         title="Review BG color")
+    # review_bg: ColorRGB_uint8 = SettingsField(
+    #     (255, 255, 255),
+    #     title="Review BG color")
 
 
 class ValidatePluginModel(BaseSettingsModel):
@@ -100,7 +102,8 @@ DEFAULT_PUBLISH_SETTINGS = {
         "ignore_render_pass_transparency": False
     },
     "ExtractSequence": {
-        "review_bg": [255, 255, 255]
+        # "review_bg": [255, 255, 255]
+        "review_bg": [255, 255, 255, 1.0]
     },
     "ValidateProjectSettings": {
         "enabled": True,