diff --git a/client/ayon_core/addon/base.py b/client/ayon_core/addon/base.py
index a3920c4acb..3b35476aed 100644
--- a/client/ayon_core/addon/base.py
+++ b/client/ayon_core/addon/base.py
@@ -788,6 +788,7 @@ class AddonsManager:
 
                 addon_classes.append(modules_item)
 
+        aliased_names = []
         for addon_cls in addon_classes:
             name = addon_cls.__name__
             if issubclass(addon_cls, OpenPypeModule):
@@ -807,6 +808,13 @@ class AddonsManager:
                 self._addons.append(addon)
                 self._addons_by_id[addon.id] = addon
                 self._addons_by_name[addon.name] = addon
+                # NOTE This will be removed with release 1.0.0 of ayon-core
+                #   please use carefully.
+                # Gives option to use alias name for addon for cases when
+                #   name in OpenPype was not the same as in AYON.
+                name_alias = getattr(addon, "openpype_alias", None)
+                if name_alias:
+                    aliased_names.append((name_alias, addon))
                 enabled_str = "X"
                 if not addon.enabled:
                     enabled_str = " "
@@ -822,6 +830,17 @@ class AddonsManager:
                     exc_info=True
                 )
 
+        for item in aliased_names:
+            name_alias, addon = item
+            if name_alias not in self._addons_by_name:
+                self._addons_by_name[name_alias] = addon
+                continue
+            self.log.warning(
+                "Alias name '{}' of addon '{}' is already assigned.".format(
+                    name_alias, addon.name
+                )
+            )
+
         if self._report is not None:
             report[self._report_total_key] = time.time() - time_start
             self._report["Initialization"] = report
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/api/pipeline.py b/client/ayon_core/hosts/aftereffects/api/pipeline.py
index 32e064d8cb..7ed244fd1d 100644
--- a/client/ayon_core/hosts/aftereffects/api/pipeline.py
+++ b/client/ayon_core/hosts/aftereffects/api/pipeline.py
@@ -9,6 +9,8 @@ from ayon_core.pipeline import (
     register_loader_plugin_path,
     register_creator_plugin_path,
     AVALON_CONTAINER_ID,
+    AVALON_INSTANCE_ID,
+    AYON_INSTANCE_ID,
 )
 from ayon_core.hosts.aftereffects.api.workfile_template_builder import (
     AEPlaceholderLoadPlugin,
@@ -142,7 +144,9 @@ class AfterEffectsHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         layers_meta = stub.get_metadata()
 
         for instance in layers_meta:
-            if instance.get("id") == "pyblish.avalon.instance":
+            if instance.get("id") in {
+                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+            }:
                 instances.append(instance)
         return instances
 
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/aftereffects/plugins/publish/collect_render.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
index a8a316ea80..32e3b4f3c3 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
@@ -98,7 +98,7 @@ class CollectAERender(publish.AbstractCollectRender):
                 source=current_file,
                 label="{} - {}".format(subset_name, family),
                 subset=subset_name,
-                asset=inst.data["asset"],
+                folderPath=inst.data["folderPath"],
                 task=task_name,
                 attachTo=False,
                 setMembers='',
@@ -175,7 +175,7 @@ class CollectAERender(publish.AbstractCollectRender):
             version_str = "v{:03d}".format(render_instance.version)
             if "#" not in file_name:  # single frame (mov)W
                 path = os.path.join(base_dir, "{}_{}_{}.{}".format(
-                    render_instance.asset,
+                    render_instance.folderPath,
                     render_instance.subset,
                     version_str,
                     ext
@@ -184,7 +184,7 @@ class CollectAERender(publish.AbstractCollectRender):
             else:
                 for frame in range(start, end + 1):
                     path = os.path.join(base_dir, "{}_{}_{}.{}.{}".format(
-                        render_instance.asset,
+                        render_instance.folderPath,
                         render_instance.subset,
                         version_str,
                         str(frame).zfill(self.padding_width),
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py
index 538d646ab4..107643f56c 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py
@@ -50,11 +50,11 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
         asset_entity = context.data["assetEntity"]
         project_entity = context.data["projectEntity"]
 
-        asset_name = get_asset_name_identifier(asset_entity)
+        folder_path = get_asset_name_identifier(asset_entity)
 
         instance_data = {
             "active": True,
-            "asset": asset_name,
+            "folderPath": folder_path,
             "task": task,
             "frameStart": context.data['frameStart'],
             "frameEnd": context.data['frameEnd'],
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py b/client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py
index c3938ecbda..e8f2e29a2f 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/publish/validate_instance_asset.py
@@ -30,7 +30,7 @@ class ValidateInstanceAssetRepair(pyblish.api.Action):
         for instance in instances:
             data = stub.read(instance[0])
 
-            data["asset"] = get_current_asset_name()
+            data["folderPath"] = get_current_asset_name()
             stub.imprint(instance[0].instance_id, data)
 
 
@@ -53,7 +53,7 @@ class ValidateInstanceAsset(pyblish.api.InstancePlugin):
     order = ValidateContentsOrder
 
     def process(self, instance):
-        instance_asset = instance.data["asset"]
+        instance_asset = instance.data["folderPath"]
         current_asset = get_current_asset_name()
         msg = (
             f"Instance asset {instance_asset} is not the same "
diff --git a/client/ayon_core/hosts/blender/api/pipeline.py b/client/ayon_core/hosts/blender/api/pipeline.py
index 77731a0fd3..fcac285f74 100644
--- a/client/ayon_core/hosts/blender/api/pipeline.py
+++ b/client/ayon_core/hosts/blender/api/pipeline.py
@@ -26,6 +26,7 @@ from ayon_core.pipeline import (
     deregister_loader_plugin_path,
     deregister_creator_plugin_path,
     AVALON_CONTAINER_ID,
+    AYON_CONTAINER_ID,
 )
 from ayon_core.lib import (
     Logger,
@@ -272,7 +273,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 +294,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 +380,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)
 
 
@@ -563,8 +564,9 @@ def ls() -> Iterator:
     called containers.
     """
 
-    for container in lib.lsattr("id", AVALON_CONTAINER_ID):
-        yield parse_container(container)
+    for id_type in {AYON_CONTAINER_ID, AVALON_CONTAINER_ID}:
+        for container in lib.lsattr("id", id_type):
+            yield parse_container(container)
 
 
 def publish():
diff --git a/client/ayon_core/hosts/blender/api/plugin.py b/client/ayon_core/hosts/blender/api/plugin.py
index 2cd8d1f291..d72754f148 100644
--- a/client/ayon_core/hosts/blender/api/plugin.py
+++ b/client/ayon_core/hosts/blender/api/plugin.py
@@ -10,6 +10,8 @@ from ayon_core.pipeline import (
     Creator,
     CreatedInstance,
     LoaderPlugin,
+    AVALON_INSTANCE_ID,
+    AYON_INSTANCE_ID,
 )
 from ayon_core.lib import BoolDef
 
@@ -193,7 +195,9 @@ class BaseCreator(Creator):
                 if not avalon_prop:
                     continue
 
-                if avalon_prop.get('id') != 'pyblish.avalon.instance':
+                if avalon_prop.get('id') not in {
+                    AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+                }:
                     continue
 
                 creator_id = avalon_prop.get('creator_identifier')
@@ -352,7 +356,7 @@ class BaseCreator(Creator):
 
         instance_data.update(
             {
-                "id": "pyblish.avalon.instance",
+                "id": AVALON_INSTANCE_ID,
                 "creator_identifier": self.identifier,
                 "subset": subset_name,
             }
diff --git a/client/ayon_core/hosts/blender/api/render_lib.py b/client/ayon_core/hosts/blender/api/render_lib.py
index 35aa1f12c9..91913f7913 100644
--- a/client/ayon_core/hosts/blender/api/render_lib.py
+++ b/client/ayon_core/hosts/blender/api/render_lib.py
@@ -47,6 +47,22 @@ def get_multilayer(settings):
                     ["multilayer_exr"])
 
 
+def get_renderer(settings):
+    """Get renderer from blender settings."""
+
+    return (settings["blender"]
+                    ["RenderSettings"]
+                    ["renderer"])
+
+
+def get_compositing(settings):
+    """Get compositing from blender settings."""
+
+    return (settings["blender"]
+                    ["RenderSettings"]
+                    ["compositing"])
+
+
 def get_render_product(output_path, name, aov_sep):
     """
     Generate the path to the render product. Blender interprets the `#`
@@ -91,66 +107,120 @@ def set_render_format(ext, multilayer):
         image_settings.file_format = "TIFF"
 
 
-def set_render_passes(settings):
-    aov_list = (settings["blender"]
-                        ["RenderSettings"]
-                        ["aov_list"])
-
-    custom_passes = (settings["blender"]
-                             ["RenderSettings"]
-                             ["custom_passes"])
+def set_render_passes(settings, renderer):
+    aov_list = set(settings["blender"]["RenderSettings"]["aov_list"])
+    custom_passes = settings["blender"]["RenderSettings"]["custom_passes"]
 
+    # Common passes for both renderers
     vl = bpy.context.view_layer
 
+    # Data Passes
     vl.use_pass_combined = "combined" in aov_list
     vl.use_pass_z = "z" in aov_list
     vl.use_pass_mist = "mist" in aov_list
     vl.use_pass_normal = "normal" in aov_list
+
+    # Light Passes
     vl.use_pass_diffuse_direct = "diffuse_light" in aov_list
     vl.use_pass_diffuse_color = "diffuse_color" in aov_list
     vl.use_pass_glossy_direct = "specular_light" in aov_list
     vl.use_pass_glossy_color = "specular_color" in aov_list
-    vl.eevee.use_pass_volume_direct = "volume_light" in aov_list
     vl.use_pass_emit = "emission" in aov_list
     vl.use_pass_environment = "environment" in aov_list
-    vl.use_pass_shadow = "shadow" in aov_list
     vl.use_pass_ambient_occlusion = "ao" in aov_list
 
-    cycles = vl.cycles
+    # Cryptomatte Passes
+    vl.use_pass_cryptomatte_object = "cryptomatte_object" in aov_list
+    vl.use_pass_cryptomatte_material = "cryptomatte_material" in aov_list
+    vl.use_pass_cryptomatte_asset = "cryptomatte_asset" in aov_list
 
-    cycles.denoising_store_passes = "denoising" in aov_list
-    cycles.use_pass_volume_direct = "volume_direct" in aov_list
-    cycles.use_pass_volume_indirect = "volume_indirect" in aov_list
+    if renderer == "BLENDER_EEVEE":
+        # Eevee exclusive passes
+        eevee = vl.eevee
+
+        # Light Passes
+        vl.use_pass_shadow = "shadow" in aov_list
+        eevee.use_pass_volume_direct = "volume_light" in aov_list
+
+        # Effects Passes
+        eevee.use_pass_bloom = "bloom" in aov_list
+        eevee.use_pass_transparent = "transparent" in aov_list
+
+        # Cryptomatte Passes
+        vl.use_pass_cryptomatte_accurate = "cryptomatte_accurate" in aov_list
+    elif renderer == "CYCLES":
+        # Cycles exclusive passes
+        cycles = vl.cycles
+
+        # Data Passes
+        vl.use_pass_position = "position" in aov_list
+        vl.use_pass_vector = "vector" in aov_list
+        vl.use_pass_uv = "uv" in aov_list
+        cycles.denoising_store_passes = "denoising" in aov_list
+        vl.use_pass_object_index = "object_index" in aov_list
+        vl.use_pass_material_index = "material_index" in aov_list
+        cycles.pass_debug_sample_count = "sample_count" in aov_list
+
+        # Light Passes
+        vl.use_pass_diffuse_indirect = "diffuse_indirect" in aov_list
+        vl.use_pass_glossy_indirect = "specular_indirect" in aov_list
+        vl.use_pass_transmission_direct = "transmission_direct" in aov_list
+        vl.use_pass_transmission_indirect = "transmission_indirect" in aov_list
+        vl.use_pass_transmission_color = "transmission_color" in aov_list
+        cycles.use_pass_volume_direct = "volume_light" in aov_list
+        cycles.use_pass_volume_indirect = "volume_indirect" in aov_list
+        cycles.use_pass_shadow_catcher = "shadow" in aov_list
 
     aovs_names = [aov.name for aov in vl.aovs]
     for cp in custom_passes:
-        cp_name = cp[0]
+        cp_name = cp["attribute"]
         if cp_name not in aovs_names:
             aov = vl.aovs.add()
             aov.name = cp_name
         else:
             aov = vl.aovs[cp_name]
-        aov.type = cp[1].get("type", "VALUE")
+        aov.type = cp["value"]
 
-    return aov_list, custom_passes
+    return list(aov_list), custom_passes
 
 
-def set_node_tree(output_path, name, aov_sep, ext, multilayer):
+def _create_aov_slot(name, aov_sep, slots, rpass_name, multi_exr, output_path):
+    filename = f"{name}{aov_sep}{rpass_name}.####"
+    slot = slots.new(rpass_name if multi_exr else filename)
+    filepath = str(output_path / filename.lstrip("/"))
+
+    return slot, filepath
+
+
+def set_node_tree(
+    output_path, render_product, name, aov_sep, ext, multilayer, compositing
+):
     # Set the scene to use the compositor node tree to render
     bpy.context.scene.use_nodes = True
 
     tree = bpy.context.scene.node_tree
 
-    # Get the Render Layers node
-    rl_node = None
+    comp_layer_type = "CompositorNodeRLayers"
+    output_type = "CompositorNodeOutputFile"
+    compositor_type = "CompositorNodeComposite"
+
+    # Get the Render Layer, Composite and the previous output nodes
+    render_layer_node = None
+    composite_node = None
+    old_output_node = None
     for node in tree.nodes:
-        if node.bl_idname == "CompositorNodeRLayers":
-            rl_node = node
+        if node.bl_idname == comp_layer_type:
+            render_layer_node = node
+        elif node.bl_idname == compositor_type:
+            composite_node = node
+        elif node.bl_idname == output_type and "AYON" in node.name:
+            old_output_node = node
+        if render_layer_node and composite_node and old_output_node:
             break
 
     # If there's not a Render Layers node, we create it
-    if not rl_node:
-        rl_node = tree.nodes.new("CompositorNodeRLayers")
+    if not render_layer_node:
+        render_layer_node = tree.nodes.new(comp_layer_type)
 
     # Get the enabled output sockets, that are the active passes for the
     # render.
@@ -158,48 +228,81 @@ def set_node_tree(output_path, name, aov_sep, ext, multilayer):
     exclude_sockets = ["Image", "Alpha", "Noisy Image"]
     passes = [
         socket
-        for socket in rl_node.outputs
+        for socket in render_layer_node.outputs
         if socket.enabled and socket.name not in exclude_sockets
     ]
 
-    # Remove all output nodes
-    for node in tree.nodes:
-        if node.bl_idname == "CompositorNodeOutputFile":
-            tree.nodes.remove(node)
-
     # Create a new output node
-    output = tree.nodes.new("CompositorNodeOutputFile")
+    output = tree.nodes.new(output_type)
 
     image_settings = bpy.context.scene.render.image_settings
     output.format.file_format = image_settings.file_format
 
+    slots = None
+
     # In case of a multilayer exr, we don't need to use the output node,
     # because the blender render already outputs a multilayer exr.
-    if ext == "exr" and multilayer:
-        output.layer_slots.clear()
-        return []
+    multi_exr = ext == "exr" and multilayer
+    slots = output.layer_slots if multi_exr else output.file_slots
+    output.base_path = render_product if multi_exr else str(output_path)
 
-    output.file_slots.clear()
-    output.base_path = str(output_path)
+    slots.clear()
 
     aov_file_products = []
 
+    old_links = {
+        link.from_socket.name: link for link in tree.links
+        if link.to_node == old_output_node}
+
+    # Create a new socket for the beauty output
+    pass_name = "rgba" if multi_exr else "beauty"
+    slot, _ = _create_aov_slot(
+        name, aov_sep, slots, pass_name, multi_exr, output_path)
+    tree.links.new(render_layer_node.outputs["Image"], slot)
+
+    if compositing:
+        # Create a new socket for the composite output
+        pass_name = "composite"
+        comp_socket, filepath = _create_aov_slot(
+            name, aov_sep, slots, pass_name, multi_exr, output_path)
+        aov_file_products.append(("Composite", filepath))
+
     # For each active render pass, we add a new socket to the output node
     # and link it
-    for render_pass in passes:
-        filepath = f"{name}{aov_sep}{render_pass.name}.####"
+    for rpass in passes:
+        slot, filepath = _create_aov_slot(
+            name, aov_sep, slots, rpass.name, multi_exr, output_path)
+        aov_file_products.append((rpass.name, filepath))
 
-        output.file_slots.new(filepath)
+        # If the rpass was not connected with the old output node, we connect
+        # it with the new one.
+        if not old_links.get(rpass.name):
+            tree.links.new(rpass, slot)
 
-        filename = str(output_path / filepath.lstrip("/"))
+    for link in list(old_links.values()):
+        # Check if the socket is still available in the new output node.
+        socket = output.inputs.get(link.to_socket.name)
+        # If it is, we connect it with the new output node.
+        if socket:
+            tree.links.new(link.from_socket, socket)
+        # Then, we remove the old link.
+        tree.links.remove(link)
 
-        aov_file_products.append((render_pass.name, filename))
+    # If there's a composite node, we connect its input with the new output
+    if compositing and composite_node:
+        for link in tree.links:
+            if link.to_node == composite_node:
+                tree.links.new(link.from_socket, comp_socket)
+                break
 
-        node_input = output.inputs[-1]
+    if old_output_node:
+        output.location = old_output_node.location
+        tree.nodes.remove(old_output_node)
 
-        tree.links.new(render_pass, node_input)
+    output.name = "AYON File Output"
+    output.label = "AYON File Output"
 
-    return aov_file_products
+    return [] if multi_exr else aov_file_products
 
 
 def imprint_render_settings(node, data):
@@ -228,17 +331,23 @@ def prepare_rendering(asset_group):
     aov_sep = get_aov_separator(settings)
     ext = get_image_format(settings)
     multilayer = get_multilayer(settings)
+    renderer = get_renderer(settings)
+    compositing = get_compositing(settings)
 
     set_render_format(ext, multilayer)
-    aov_list, custom_passes = set_render_passes(settings)
+    bpy.context.scene.render.engine = renderer
+    aov_list, custom_passes = set_render_passes(settings, renderer)
 
     output_path = Path.joinpath(dirpath, render_folder, file_name)
 
     render_product = get_render_product(output_path, name, aov_sep)
     aov_file_product = set_node_tree(
-        output_path, name, aov_sep, ext, multilayer)
+        output_path, render_product, name, aov_sep,
+        ext, multilayer, compositing)
 
-    bpy.context.scene.render.filepath = render_product
+    # Clear the render filepath, so that the output is handled only by the
+    # output node in the compositor.
+    bpy.context.scene.render.filepath = ""
 
     render_settings = {
         "render_folder": render_folder,
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/blender/plugins/create/create_action.py b/client/ayon_core/hosts/blender/plugins/create/create_action.py
index 2331daf7b7..82047fb5c6 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_action.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_action.py
@@ -22,7 +22,9 @@ class CreateAction(plugin.BaseCreator):
         )
 
         # Get instance name
-        name = plugin.prepare_scene_name(instance_data["asset"], subset_name)
+        name = plugin.prepare_scene_name(
+            instance_data["folderPath"], subset_name
+        )
 
         if pre_create_data.get("use_selection"):
             for obj in lib.get_selection():
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_render.py b/client/ayon_core/hosts/blender/plugins/create/create_render.py
index 82337a47f2..3f07f37d2f 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_render.py
@@ -1,8 +1,10 @@
 """Create render."""
 import bpy
 
+from ayon_core.lib import version_up
 from ayon_core.hosts.blender.api import plugin
 from ayon_core.hosts.blender.api.render_lib import prepare_rendering
+from ayon_core.hosts.blender.api.workio import save_file
 
 
 class CreateRenderlayer(plugin.BaseCreator):
@@ -37,6 +39,7 @@ class CreateRenderlayer(plugin.BaseCreator):
         # settings. Even the validator to check that the file is saved will
         # detect the file as saved, even if it isn't. The only solution for
         # now it is to force the file to be saved.
-        bpy.ops.wm.save_as_mainfile(filepath=bpy.data.filepath)
+        filepath = version_up(bpy.data.filepath)
+        save_file(filepath, copy=False)
 
         return collection
diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_deadline_publish.py b/client/ayon_core/hosts/blender/plugins/publish/validate_deadline_publish.py
index b9310f9da0..b37db44cd4 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/validate_deadline_publish.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/validate_deadline_publish.py
@@ -28,15 +28,27 @@ class ValidateDeadlinePublish(pyblish.api.InstancePlugin,
     def process(self, instance):
         if not self.is_active(instance.data):
             return
+
+        tree = bpy.context.scene.node_tree
+        output_type = "CompositorNodeOutputFile"
+        output_node = None
+        # Remove all output nodes that inlcude "AYON" in the name.
+        # There should be only one.
+        for node in tree.nodes:
+            if node.bl_idname == output_type and "AYON" in node.name:
+                output_node = node
+                break
+        if not output_node:
+            raise PublishValidationError(
+                "No output node found in the compositor tree."
+            )
         filepath = bpy.data.filepath
         file = os.path.basename(filepath)
         filename, ext = os.path.splitext(file)
-        if filename not in bpy.context.scene.render.filepath:
+        if filename not in output_node.base_path:
             raise PublishValidationError(
-                "Render output folder "
-                "doesn't match the blender scene name! "
-                "Use Repair action to "
-                "fix the folder file path."
+                "Render output folder doesn't match the blender scene name! "
+                "Use Repair action to fix the folder file path."
             )
 
     @classmethod
diff --git a/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py b/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py
index d0f4c59290..ef471dbd05 100644
--- a/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py
+++ b/client/ayon_core/hosts/celaction/plugins/publish/collect_celaction_instances.py
@@ -22,7 +22,7 @@ class CollectCelactionInstances(pyblish.api.ContextPlugin):
         asset_name = get_asset_name_identifier(asset_entity)
 
         shared_instance_data = {
-            "asset": asset_name,
+            "folderPath": asset_name,
             "frameStart": asset_entity["data"]["frameStart"],
             "frameEnd": asset_entity["data"]["frameEnd"],
             "handleStart": asset_entity["data"]["handleStart"],
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/flame/plugins/publish/collect_timeline_instances.py b/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py
index 636cbd8031..3819537010 100644
--- a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py
+++ b/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_instances.py
@@ -3,6 +3,7 @@ from types import NoneType
 import pyblish
 import ayon_core.hosts.flame.api as opfapi
 from ayon_core.hosts.flame.otio import flame_export
+from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID
 from ayon_core.pipeline.editorial import (
     is_overlapping_otio_ranges,
     get_media_range_with_retimes
@@ -47,7 +48,9 @@ class CollectTimelineInstances(pyblish.api.ContextPlugin):
             if not marker_data:
                 continue
 
-            if marker_data.get("id") != "pyblish.avalon.instance":
+            if marker_data.get("id") not in {
+                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+            }:
                 continue
 
             self.log.debug("__ segment.name: {}".format(
diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py b/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py
index 6a3e99aa55..2fcfb55e7c 100644
--- a/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py
+++ b/client/ayon_core/hosts/flame/plugins/publish/collect_timeline_otio.py
@@ -34,7 +34,7 @@ class CollecTimelineOTIO(pyblish.api.ContextPlugin):
             project_settings=context.data["project_settings"]
         )
 
-        asset_name = get_asset_name_identifier(asset_doc)
+        folder_path = get_asset_name_identifier(asset_doc)
 
         # adding otio timeline to context
         with opfapi.maintained_segment_selection(sequence) as selected_seg:
@@ -42,7 +42,7 @@ class CollecTimelineOTIO(pyblish.api.ContextPlugin):
 
             instance_data = {
                 "name": subset_name,
-                "asset": asset_name,
+                "folderPath": folder_path,
                 "subset": subset_name,
                 "family": "workfile",
                 "families": []
diff --git a/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py b/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py
index 9e55dbce96..cae08cd76b 100644
--- a/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py
+++ b/client/ayon_core/hosts/flame/plugins/publish/extract_subset_resources.py
@@ -55,7 +55,7 @@ class ExtractProductResources(publish.Extractor):
 
         # flame objects
         segment = instance.data["item"]
-        asset_name = instance.data["asset"]
+        folder_path = instance.data["folderPath"]
         segment_name = segment.name.get_value()
         clip_path = instance.data["path"]
         sequence_clip = instance.context.data["flameSequence"]
@@ -249,7 +249,7 @@ class ExtractProductResources(publish.Extractor):
                 out_mark = in_mark + source_duration_handles
                 exporting_clip = self.import_clip(clip_path)
                 exporting_clip.name.set_value("{}_{}".format(
-                    asset_name, segment_name))
+                    folder_path, segment_name))
 
             # add xml tags modifications
             modify_xml_data.update({
diff --git a/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py b/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py
index 3458bd3002..e36d2a22d5 100644
--- a/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py
+++ b/client/ayon_core/hosts/flame/plugins/publish/integrate_batch_group.py
@@ -168,10 +168,10 @@ class IntegrateBatchGroup(pyblish.api.InstancePlugin):
         handle_start = instance.data["handleStart"]
         handle_end = instance.data["handleEnd"]
         frame_duration = (frame_end - frame_start) + 1
-        asset_name = instance.data["asset"]
+        folder_path = instance.data["folderPath"]
 
         task_name = task_data["name"]
-        batchgroup_name = "{}_{}".format(asset_name, task_name)
+        batchgroup_name = "{}_{}".format(folder_path, task_name)
 
         batch_data = {
             "shematic_reels": [
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..3bf810ca23 100644
--- a/client/ayon_core/hosts/fusion/api/plugin.py
+++ b/client/ayon_core/hosts/fusion/api/plugin.py
@@ -12,7 +12,9 @@ from ayon_core.lib import (
 )
 from ayon_core.pipeline import (
     Creator,
-    CreatedInstance
+    CreatedInstance,
+    AVALON_INSTANCE_ID,
+    AYON_INSTANCE_ID,
 )
 
 
@@ -135,7 +137,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,
@@ -172,13 +174,13 @@ class GenericCreateSaver(Creator):
         if not isinstance(data, dict):
             return
 
-        required = {
-            "id": "pyblish.avalon.instance",
-            "creator_identifier": self.identifier,
-        }
-        for key, value in required.items():
-            if key not in data or data[key] != value:
-                return
+        if (
+            data.get("creator_identifier") != self.identifier
+            or data.get("id") not in {
+                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+            }
+        ):
+            return
 
         # Get active state from the actual tool state
         attrs = tool.GetAttrs()
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/fusion/plugins/publish/collect_render.py b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
index f8870da1c5..0a0e4b38af 100644
--- a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
@@ -68,7 +68,7 @@ class CollectFusionRender(
                 source=current_file,
                 label=inst.data["label"],
                 subset=subset_name,
-                asset=inst.data["asset"],
+                folderPath=inst.data["folderPath"],
                 task=task_name,
                 attachTo=False,
                 setMembers='',
diff --git a/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py b/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py
index eea232ac29..23a8cdb8a0 100644
--- a/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py
+++ b/client/ayon_core/hosts/fusion/plugins/publish/extract_render_local.py
@@ -72,7 +72,7 @@ class FusionRenderLocal(
         self.log.info(
             "Rendered '{nm}' for asset '{ast}' under the task '{tsk}'".format(
                 nm=instance.data["name"],
-                ast=instance.data["asset"],
+                ast=instance.data["folderPath"],
                 tsk=instance.data["task"],
             )
         )
diff --git a/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py b/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py
index 619b52077e..3131400de9 100644
--- a/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py
+++ b/client/ayon_core/hosts/fusion/plugins/publish/validate_unique_subsets.py
@@ -21,7 +21,9 @@ class ValidateUniqueSubsets(pyblish.api.ContextPlugin):
         # Collect instances per subset per asset
         instances_per_subset_asset = defaultdict(lambda: defaultdict(list))
         for instance in context:
-            asset = instance.data.get("asset", context.data.get("asset"))
+            asset = instance.data.get(
+                "folderPath", context.data.get("folderPath")
+            )
             subset = instance.data.get("subset", context.data.get("subset"))
             instances_per_subset_asset[asset][subset].append(instance)
 
diff --git a/client/ayon_core/hosts/harmony/api/README.md b/client/ayon_core/hosts/harmony/api/README.md
index 680a88c423..457e22fb2e 100644
--- a/client/ayon_core/hosts/harmony/api/README.md
+++ b/client/ayon_core/hosts/harmony/api/README.md
@@ -212,6 +212,7 @@ class CreateComposite(harmony.Creator):
 
 The creator plugin can be configured to use other node types. For example here is a write node creator:
 ```python
+from uuid import uuid4
 import ayon_core.hosts.harmony.api as harmony
 
 
@@ -242,6 +243,7 @@ class CreateRender(harmony.Creator):
 #### Collector Plugin
 ```python
 import pyblish.api
+from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID
 import ayon_core.hosts.harmony.api as harmony
 
 
@@ -252,7 +254,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
     a composite node and marked with a unique identifier;
 
     Identifier:
-        id (str): "pyblish.avalon.instance"
+        id (str): "ayon.create.instance"
     """
 
     label = "Instances"
@@ -272,7 +274,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
                 continue
 
             # Skip containers.
-            if "container" in data["id"]:
+            if data["id"] not in {AYON_INSTANCE_ID, AVALON_INSTANCE_ID}:
                 continue
 
             instance = context.create_instance(node.split("/")[-1])
@@ -287,6 +289,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
 #### Extractor Plugin
 ```python
 import os
+from uuid import uuid4
 
 import pyblish.api
 import ayon_core.hosts.harmony.api as harmony
@@ -418,6 +421,7 @@ class ExtractImage(pyblish.api.InstancePlugin):
 #### Loader Plugin
 ```python
 import os
+from uuid import uuid4
 
 import ayon_core.hosts.harmony.api as harmony
 
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/collect_farm_render.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py
index faeff7bddd..6a9c349185 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_farm_render.py
@@ -98,7 +98,7 @@ class CollectFarmRender(publish.AbstractCollectRender):
 
         self_name = self.__class__.__name__
 
-        asset_name = context.data["asset"]
+        folder_path = context.data["folderPath"]
 
         for node in context.data["allNodes"]:
             data = harmony.read(node)
@@ -142,7 +142,7 @@ class CollectFarmRender(publish.AbstractCollectRender):
                 source=context.data["currentFile"],
                 label=node.split("/")[1],
                 subset=subset_name,
-                asset=asset_name,
+                folderPath=folder_path,
                 task=task_name,
                 attachTo=False,
                 setMembers=[node],
diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py
index 3eb689aff6..9ce99a3c3d 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py
@@ -13,7 +13,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
     a composite node and marked with a unique identifier.
 
     Identifier:
-        id (str): "pyblish.avalon.instance"
+        id (str): "ayon.create.instance"
     """
 
     label = "Instances"
diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py
index 9343fab86d..66b1ee6085 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py
@@ -31,7 +31,7 @@ class CollectPalettes(pyblish.api.ContextPlugin):
             if (not any([re.search(pattern, task_name)
                          for pattern in self.allowed_tasks])):
                 return
-        asset_name = context.data["asset"]
+        folder_path = context.data["folderPath"]
 
         for name, id in palettes.items():
             instance = context.create_instance(name)
@@ -39,7 +39,7 @@ class CollectPalettes(pyblish.api.ContextPlugin):
                 "id": id,
                 "family": "harmony.palette",
                 'families': [],
-                "asset": asset_name,
+                "folderPath": folder_path,
                 "subset": "{}{}".format("palette", name)
             })
             self.log.info(
diff --git a/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py b/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py
index 4be2a0fc26..1ea1f15124 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py
@@ -36,5 +36,5 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
             "family": family,
             "families": [family],
             "representations": [],
-            "asset": context.data["asset"]
+            "folderPath": context.data["folderPath"]
         })
diff --git a/client/ayon_core/hosts/harmony/plugins/publish/validate_instances.py b/client/ayon_core/hosts/harmony/plugins/publish/validate_instances.py
index a57a863d6f..fdba834de6 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/validate_instances.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/validate_instances.py
@@ -27,9 +27,10 @@ class ValidateInstanceRepair(pyblish.api.Action):
         # Apply pyblish.logic to get the instances for the plug-in
         instances = pyblish.api.instances_by_plugin(failed, plugin)
 
+        folder_path = get_current_asset_name()
         for instance in instances:
             data = harmony.read(instance.data["setMembers"][0])
-            data["asset"] = get_current_asset_name()
+            data["folderPath"] = folder_path
             harmony.imprint(instance.data["setMembers"][0], data)
 
 
@@ -42,7 +43,7 @@ class ValidateInstance(pyblish.api.InstancePlugin):
     order = ValidateContentsOrder
 
     def process(self, instance):
-        instance_asset = instance.data["asset"]
+        instance_asset = instance.data["folderPath"]
         current_asset = get_current_asset_name()
         msg = (
             "Instance asset is not the same as current asset:"
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/lib.py b/client/ayon_core/hosts/hiero/api/lib.py
index 24ff76d30b..d74ff13f05 100644
--- a/client/ayon_core/hosts/hiero/api/lib.py
+++ b/client/ayon_core/hosts/hiero/api/lib.py
@@ -22,7 +22,12 @@ except ImportError:
 
 from ayon_core.client import get_project
 from ayon_core.settings import get_project_settings
-from ayon_core.pipeline import Anatomy, get_current_project_name
+from ayon_core.pipeline import (
+    Anatomy,
+    get_current_project_name,
+    AYON_INSTANCE_ID,
+    AVALON_INSTANCE_ID,
+)
 from ayon_core.pipeline.load import filter_containers
 from ayon_core.lib import Logger
 from . import tags
@@ -1217,7 +1222,9 @@ def sync_clip_name_to_data_asset(track_items_list):
         # ignore if no data on the clip or not publish instance
         if not data:
             continue
-        if data.get("id") != "pyblish.avalon.instance":
+        if data.get("id") not in {
+            AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+        }:
             continue
 
         # fix data if wrong name
diff --git a/client/ayon_core/hosts/hiero/api/pipeline.py b/client/ayon_core/hosts/hiero/api/pipeline.py
index 1897628678..a9ba2e4df3 100644
--- a/client/ayon_core/hosts/hiero/api/pipeline.py
+++ b/client/ayon_core/hosts/hiero/api/pipeline.py
@@ -15,6 +15,7 @@ from ayon_core.pipeline import (
     deregister_creator_plugin_path,
     deregister_loader_plugin_path,
     AVALON_CONTAINER_ID,
+    AYON_CONTAINER_ID,
 )
 from ayon_core.tools.utils import host_tools
 from . import lib, menu, events
@@ -158,7 +159,9 @@ def parse_container(item, validate=True):
     def data_to_container(item, data):
         if (
             not data
-            or data.get("id") != "pyblish.avalon.container"
+            or data.get("id") not in {
+                AYON_CONTAINER_ID, AVALON_CONTAINER_ID
+            }
         ):
             return
 
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/hiero/plugins/publish/collect_clip_effects.py b/client/ayon_core/hosts/hiero/plugins/publish/collect_clip_effects.py
index d7f646ebc9..3bd5b88942 100644
--- a/client/ayon_core/hosts/hiero/plugins/publish/collect_clip_effects.py
+++ b/client/ayon_core/hosts/hiero/plugins/publish/collect_clip_effects.py
@@ -118,9 +118,9 @@ class CollectClipEffects(pyblish.api.InstancePlugin):
             data["subset"] = name
             data["family"] = family
             data["families"] = [family]
-            data["name"] = data["subset"] + "_" + data["asset"]
+            data["name"] = data["subset"] + "_" + data["folderPath"]
             data["label"] = "{} - {}".format(
-                data['asset'], data["subset"]
+                data["folderPath"], data["subset"]
             )
             data["effects"] = effects
 
diff --git a/client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py b/client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py
index b981d89eef..6f99e6be29 100644
--- a/client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py
+++ b/client/ayon_core/hosts/hiero/plugins/publish/collect_frame_tag_instances.py
@@ -102,7 +102,7 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
         # first collect all available subset tag frames
         subset_data = {}
         context_asset_doc = context.data["assetEntity"]
-        context_asset_name = get_asset_name_identifier(context_asset_doc)
+        context_folder_path = get_asset_name_identifier(context_asset_doc)
 
         for tag_data in sequence_tags:
             frame = int(tag_data["start"])
@@ -120,7 +120,7 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
                 subset_data[subset] = {
                     "frames": [frame],
                     "format": tag_data["format"],
-                    "asset": context_asset_name
+                    "folderPath": context_folder_path
                 }
         return subset_data
 
@@ -133,7 +133,7 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
                 "label": "{} {}".format(name, subset_data["frames"]),
                 "family": "image",
                 "families": ["frame"],
-                "asset": subset_data["asset"],
+                "folderPath": subset_data["folderPath"],
                 "subset": name,
                 "format": subset_data["format"],
                 "frames": subset_data["frames"]
diff --git a/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py b/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py
index afff41fc74..d1edfed0d7 100644
--- a/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py
+++ b/client/ayon_core/hosts/hiero/plugins/publish/extract_clip_effects.py
@@ -57,7 +57,7 @@ class ExtractClipEffects(publish.Extractor):
             "sourceStart", "sourceStartH", "sourceEnd", "sourceEndH",
             "frameStart", "frameEnd",
             "clipIn", "clipOut", "clipInH", "clipOutH",
-            "asset", "version"
+            "folderPath", "version"
         ]
 
         # pass data to version
diff --git a/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py b/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py
index e41ca74320..e6381af939 100644
--- a/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py
+++ b/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py
@@ -1,5 +1,6 @@
 import pyblish
 
+from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID
 from ayon_core.pipeline.editorial import is_overlapping_otio_ranges
 
 from ayon_core.hosts.hiero import api as phiero
@@ -56,7 +57,9 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             if not tag_data:
                 continue
 
-            if tag_data.get("id") != "pyblish.avalon.instance":
+            if tag_data.get("id") not in {
+                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+            }:
                 continue
 
             # get clips subtracks and anotations
@@ -98,7 +101,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             data.update({
                 "name": "{}_{}".format(asset, subset),
                 "label": label,
-                "asset": asset,
+                "folderPath": asset,
                 "asset_name": asset_name,
                 "item": track_item,
                 "families": families,
@@ -189,7 +192,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
         if not hierarchy_data:
             return
 
-        asset = data["asset"]
+        asset = data["folderPath"]
         asset_name = data["asset_name"]
 
         # insert family into families
@@ -241,7 +244,6 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
         if not master_layer:
             return
 
-        asset = data.get("asset")
         item = data.get("item")
         clip_name = item.name()
 
@@ -249,7 +251,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
         if not self.test_any_audio(item):
             return
 
-        asset = data["asset"]
+        asset = data["folderPath"]
         asset_name = data["asset_name"]
 
         # insert family into families
diff --git a/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py b/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py
index e9e2aae653..15dd0dee26 100644
--- a/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py
+++ b/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py
@@ -17,7 +17,7 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
     order = pyblish.api.CollectorOrder - 0.491
 
     def process(self, context):
-        asset = context.data["asset"]
+        asset = context.data["folderPath"]
         asset_name = asset.split("/")[-1]
 
         active_timeline = hiero.ui.activeSequence()
@@ -64,7 +64,7 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
             "label": "{} - {}Main".format(
                 asset, family),
             "name": "{}_{}".format(asset_name, family),
-            "asset": context.data["asset"],
+            "folderPath": context.data["folderPath"],
             # TODO use 'get_subset_name'
             "subset": "{}{}Main".format(asset_name, family.capitalize()),
             "item": project,
diff --git a/client/ayon_core/hosts/houdini/api/pipeline.py b/client/ayon_core/hosts/houdini/api/pipeline.py
index d93ea9acec..cbc94a2408 100644
--- a/client/ayon_core/hosts/houdini/api/pipeline.py
+++ b/client/ayon_core/hosts/houdini/api/pipeline.py
@@ -15,6 +15,7 @@ from ayon_core.pipeline import (
     register_loader_plugin_path,
     register_inventory_action_path,
     AVALON_CONTAINER_ID,
+    AYON_CONTAINER_ID,
 )
 from ayon_core.pipeline.load import any_outdated_containers
 from ayon_core.hosts.houdini import HOUDINI_HOST_DIR
@@ -271,8 +272,11 @@ def parse_container(container):
 
 def ls():
     containers = []
-    for identifier in (AVALON_CONTAINER_ID,
-                       "pyblish.mindbender.container"):
+    for identifier in (
+        AYON_CONTAINER_ID,
+        AVALON_CONTAINER_ID,
+        "pyblish.mindbender.container"
+    ):
         containers += lib.lsattr("id", identifier)
 
     for container in sorted(containers,
diff --git a/client/ayon_core/hosts/houdini/api/plugin.py b/client/ayon_core/hosts/houdini/api/plugin.py
index e8f89bfbb4..57fd194000 100644
--- a/client/ayon_core/hosts/houdini/api/plugin.py
+++ b/client/ayon_core/hosts/houdini/api/plugin.py
@@ -11,7 +11,9 @@ from ayon_core.pipeline import (
     CreatorError,
     LegacyCreator,
     Creator as NewCreator,
-    CreatedInstance
+    CreatedInstance,
+    AYON_INSTANCE_ID,
+    AVALON_INSTANCE_ID,
 )
 from ayon_core.lib import BoolDef
 from .lib import imprint, read, lsattr, add_self_publish_button
@@ -118,7 +120,10 @@ class HoudiniCreatorBase(object):
             cache = dict()
             cache_legacy = dict()
 
-            for node in lsattr("id", "pyblish.avalon.instance"):
+            nodes = []
+            for id_type in [AYON_INSTANCE_ID, AVALON_INSTANCE_ID]:
+                nodes.extend(lsattr("id", id_type))
+            for node in nodes:
 
                 creator_identifier_parm = node.parm("creator_identifier")
                 if creator_identifier_parm:
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.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py
index 2780da95d9..67e8f147d7 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py
@@ -2,6 +2,7 @@ import hou
 
 import pyblish.api
 
+from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID
 from ayon_core.hosts.houdini.api import lib
 
 
@@ -12,7 +13,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
     an specific node and marked with a unique identifier;
 
     Identifier:
-        id (str): "pyblish.avalon.instance
+        id (str): "ayon.create.instance"
 
     Specific node:
         The specific node is important because it dictates in which way the
@@ -44,7 +45,9 @@ class CollectInstances(pyblish.api.ContextPlugin):
             if not node.parm("id"):
                 continue
 
-            if node.evalParm("id") != "pyblish.avalon.instance":
+            if node.evalParm("id") not in {
+                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+            }:
                 continue
 
             # instance was created by new creator code, skip it as
@@ -72,7 +75,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
 
             # Create nice name if the instance has a frame range.
             label = data.get("name", node.name())
-            label += " (%s)" % data["asset"]  # include asset in name
+            label += " (%s)" % data["folderPath"]  # include folder in name
 
             instance = context.create_instance(label)
 
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..7a3087c268 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):
@@ -12,7 +12,7 @@ class CollectInstancesUsdLayered(pyblish.api.ContextPlugin):
     layers remain set to 'publish' by the user.
 
     This works differently from most of our Avalon instances in the pipeline.
-    As opposed to storing `pyblish.avalon.instance` as id on the node we store
+    As opposed to storing `ayon.create.instance` as id on the node we store
     `pyblish.avalon.usdlayered`.
 
     Additionally this instance has no need for storing family, asset, subset
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..791b530eed 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):
@@ -55,7 +55,7 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
         self.log.debug("Add bootstrap for: %s" % bootstrap)
 
         project_name = instance.context.data["projectName"]
-        asset_name = instance.data["asset"]
+        asset_name = instance.data["folderPath"]
         asset_doc = get_asset_by_name(project_name, asset_name)
         assert asset_doc, "Asset must exist: %s" % asset_name
 
@@ -95,7 +95,7 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
             new.data["optional"] = False
 
             # Copy some data from the instance for which we bootstrap
-            for key in ["asset"]:
+            for key in ["folderPath"]:
                 new.data[key] = instance.data[key]
 
     def _subset_exists(self, project_name, instance, subset_name, asset_doc):
@@ -107,7 +107,7 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
         for inst in context:
             if (
                 inst.data["subset"] == subset_name
-                and inst.data["asset"] == asset_doc_name
+                and inst.data["folderPath"] == asset_doc_name
             ):
                 return True
 
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py
index e36cd875ba..70dc28e925 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_usd_layers.py
@@ -55,7 +55,7 @@ class CollectUsdLayers(pyblish.api.InstancePlugin):
             layer_inst.data["families"] = [family]
             layer_inst.data["subset"] = "__stub__"
             layer_inst.data["label"] = label
-            layer_inst.data["asset"] = instance.data["asset"]
+            layer_inst.data["folderPath"] = instance.data["folderPath"]
             layer_inst.data["instance_node"] = instance.data["instance_node"]
             # include same USD ROP
             layer_inst.append(rop_node)
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py b/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py
index 7160e3d282..56c335f50e 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/extract_usd_layered.py
@@ -285,7 +285,7 @@ class ExtractUSDLayered(publish.Extractor):
         # to detect whether we should make this into a new publish
         # version. If not, skip it.
         asset = get_asset_by_name(
-            project_name, dependency.data["asset"], fields=["_id"]
+            project_name, dependency.data["folderPath"], fields=["_id"]
         )
         subset = get_subset_by_name(
             project_name,
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py
index 8fa20ace02..c8b9ed9bab 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_usd_shade_model_exists.py
@@ -18,7 +18,7 @@ class ValidateUSDShadeModelExists(pyblish.api.InstancePlugin):
 
     def process(self, instance):
         project_name = instance.context.data["projectName"]
-        asset_name = instance.data["asset"]
+        asset_name = instance.data["folderPath"]
         subset = instance.data["subset"]
 
         # Assume shading variation starts after a dot separator
diff --git a/client/ayon_core/hosts/max/api/pipeline.py b/client/ayon_core/hosts/max/api/pipeline.py
index ff0267b39a..46c5aeec11 100644
--- a/client/ayon_core/hosts/max/api/pipeline.py
+++ b/client/ayon_core/hosts/max/api/pipeline.py
@@ -12,6 +12,7 @@ from ayon_core.pipeline import (
     register_creator_plugin_path,
     register_loader_plugin_path,
     AVALON_CONTAINER_ID,
+    AYON_CONTAINER_ID,
 )
 from ayon_core.hosts.max.api.menu import OpenPypeMenu
 from ayon_core.hosts.max.api import lib
@@ -63,9 +64,8 @@ class MaxHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         rt.callbacks.addScript(rt.Name('postWorkspaceChange'),
                                self._deferred_menu_creation)
 
-    def has_unsaved_changes(self):
-        # TODO: how to get it from 3dsmax?
-        return True
+    def workfile_has_unsaved_changes(self):
+        return rt.getSaveRequired()
 
     def get_workfile_extensions(self):
         return [".max"]
@@ -152,7 +152,9 @@ def ls() -> list:
     objs = rt.objects
     containers = [
         obj for obj in objs
-        if rt.getUserProp(obj, "id") == AVALON_CONTAINER_ID
+        if rt.getUserProp(obj, "id") in {
+            AYON_CONTAINER_ID, AVALON_CONTAINER_ID
+        }
     ]
 
     for container in sorted(containers, key=attrgetter("name")):
diff --git a/client/ayon_core/hosts/max/api/plugin.py b/client/ayon_core/hosts/max/api/plugin.py
index 3551450c24..18f752631d 100644
--- a/client/ayon_core/hosts/max/api/plugin.py
+++ b/client/ayon_core/hosts/max/api/plugin.py
@@ -6,7 +6,13 @@ import six
 from pymxs import runtime as rt
 
 from ayon_core.lib import BoolDef
-from ayon_core.pipeline import CreatedInstance, Creator, CreatorError
+from ayon_core.pipeline import (
+    CreatedInstance,
+    Creator,
+    CreatorError,
+    AYON_INSTANCE_ID,
+    AVALON_INSTANCE_ID,
+)
 
 from .lib import imprint, lsattr, read
 
@@ -162,7 +168,11 @@ class MaxCreatorBase(object):
             return shared_data
 
         shared_data["max_cached_subsets"] = {}
-        cached_instances = lsattr("id", "pyblish.avalon.instance")
+
+        cached_instances = []
+        for id_type in [AYON_INSTANCE_ID, AVALON_INSTANCE_ID]:
+            cached_instances.extend(lsattr("id", id_type))
+
         for i in cached_instances:
             creator_id = rt.GetUserProp(i, "creator_identifier")
             if creator_id not in shared_data["max_cached_subsets"]:
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/max/plugins/create/create_workfile.py b/client/ayon_core/hosts/max/plugins/create/create_workfile.py
new file mode 100644
index 0000000000..27864c28d5
--- /dev/null
+++ b/client/ayon_core/hosts/max/plugins/create/create_workfile.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+"""Creator plugin for creating workfiles."""
+from ayon_core.pipeline import CreatedInstance, AutoCreator
+from ayon_core.client import get_asset_by_name, get_asset_name_identifier
+from ayon_core.hosts.max.api import plugin
+from ayon_core.hosts.max.api.lib import read, imprint
+from pymxs import runtime as rt
+
+
+class CreateWorkfile(plugin.MaxCreatorBase, AutoCreator):
+    """Workfile auto-creator."""
+    identifier = "io.ayon.creators.max.workfile"
+    label = "Workfile"
+    family = "workfile"
+    icon = "fa5.file"
+
+    default_variant = "Main"
+
+    def create(self):
+        variant = self.default_variant
+        current_instance = next(
+            (
+                instance for instance in self.create_context.instances
+                if instance.creator_identifier == self.identifier
+            ), None)
+        project_name = self.project_name
+        asset_name = self.create_context.get_current_asset_name()
+        task_name = self.create_context.get_current_task_name()
+        host_name = self.create_context.host_name
+
+        if current_instance is None:
+            asset_doc = get_asset_by_name(project_name, asset_name)
+            subset_name = self.get_subset_name(
+                variant, task_name, asset_doc, project_name, host_name
+            )
+            data = {
+                "folderPath": asset_name,
+                "task": task_name,
+                "variant": variant
+            }
+
+            data.update(
+                self.get_dynamic_data(
+                    variant, task_name, asset_doc,
+                    project_name, host_name, current_instance)
+            )
+            self.log.info("Auto-creating workfile instance...")
+            instance_node = self.create_node(subset_name)
+            data["instance_node"] = instance_node.name
+            current_instance = CreatedInstance(
+                self.family, subset_name, data, self
+            )
+            self._add_instance_to_context(current_instance)
+            imprint(instance_node.name, current_instance.data)
+        elif (
+            current_instance["folderPath"] != asset_name
+            or current_instance["task"] != task_name
+        ):
+            # Update instance context if is not the same
+            asset_doc = get_asset_by_name(project_name, asset_name)
+            subset_name = self.get_subset_name(
+                variant, task_name, asset_doc, project_name, host_name
+            )
+            asset_name = get_asset_name_identifier(asset_doc)
+
+            current_instance["folderPath"] = asset_name
+            current_instance["task"] = task_name
+            current_instance["subset"] = subset_name
+
+    def collect_instances(self):
+        self.cache_subsets(self.collection_shared_data)
+        for instance in self.collection_shared_data["max_cached_subsets"].get(self.identifier, []):  # noqa
+            if not rt.getNodeByName(instance):
+                continue
+            created_instance = CreatedInstance.from_existing(
+                read(rt.GetNodeByName(instance)), self
+            )
+            self._add_instance_to_context(created_instance)
+
+    def update_instances(self, update_list):
+        for created_inst, _ in update_list:
+            instance_node = created_inst.get("instance_node")
+            imprint(
+                instance_node,
+                created_inst.data_to_store()
+            )
+
+    def remove_instances(self, instances):
+        """Remove specified instance from the scene.
+
+        This is only removing `id` parameter so instance is no longer
+        instance, because it might contain valuable data for artist.
+
+        """
+        for instance in instances:
+            instance_node = rt.GetNodeByName(
+                instance.data.get("instance_node"))
+            if instance_node:
+                rt.Delete(instance_node)
+
+            self._remove_instance_from_context(instance)
+
+    def create_node(self, subset_name):
+        if rt.getNodeByName(subset_name):
+            node = rt.getNodeByName(subset_name)
+            return node
+        node = rt.Container(name=subset_name)
+        node.isHidden = True
+        return node
diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_current_file.py b/client/ayon_core/hosts/max/plugins/publish/collect_current_file.py
new file mode 100644
index 0000000000..6f8b8dda4b
--- /dev/null
+++ b/client/ayon_core/hosts/max/plugins/publish/collect_current_file.py
@@ -0,0 +1,23 @@
+import os
+import pyblish.api
+
+from pymxs import runtime as rt
+
+
+class CollectCurrentFile(pyblish.api.ContextPlugin):
+    """Inject the current working file."""
+
+    order = pyblish.api.CollectorOrder - 0.5
+    label = "Max Current File"
+    hosts = ['max']
+
+    def process(self, context):
+        """Inject the current working file"""
+        folder = rt.maxFilePath
+        file = rt.maxFileName
+        if not folder or not file:
+            self.log.error("Scene is not saved.")
+        current_file = os.path.join(folder, file)
+
+        context.data["currentFile"] = current_file
+        self.log.debug("Scene path: {}".format(current_file))
diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_members.py b/client/ayon_core/hosts/max/plugins/publish/collect_members.py
index 2970cf0e24..f3fde00fe0 100644
--- a/client/ayon_core/hosts/max/plugins/publish/collect_members.py
+++ b/client/ayon_core/hosts/max/plugins/publish/collect_members.py
@@ -12,7 +12,9 @@ class CollectMembers(pyblish.api.InstancePlugin):
     hosts = ['max']
 
     def process(self, instance):
-
+        if instance.data["family"] == "workfile":
+            self.log.debug("Skipping Collecting Members for workfile family.")
+            return
         if instance.data.get("instance_node"):
             container = rt.GetNodeByName(instance.data["instance_node"])
             instance.data["members"] = [
diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_render.py b/client/ayon_core/hosts/max/plugins/publish/collect_render.py
index a97e8a154e..66226e24fa 100644
--- a/client/ayon_core/hosts/max/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/max/plugins/publish/collect_render.py
@@ -94,7 +94,7 @@ class CollectRender(pyblish.api.InstancePlugin):
         renderer = str(renderer_class).split(":")[0]
         # also need to get the render dir for conversion
         data = {
-            "asset": instance.data["asset"],
+            "folderPath": instance.data["folderPath"],
             "subset": str(instance.name),
             "publish": True,
             "maxversion": str(get_max_version()),
diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_workfile.py b/client/ayon_core/hosts/max/plugins/publish/collect_workfile.py
index 0eb4bb731e..6eec0f7292 100644
--- a/client/ayon_core/hosts/max/plugins/publish/collect_workfile.py
+++ b/client/ayon_core/hosts/max/plugins/publish/collect_workfile.py
@@ -6,57 +6,41 @@ import pyblish.api
 from pymxs import runtime as rt
 
 
-class CollectWorkfile(pyblish.api.ContextPlugin):
+class CollectWorkfile(pyblish.api.InstancePlugin):
     """Inject the current working file into context"""
 
     order = pyblish.api.CollectorOrder - 0.01
     label = "Collect 3dsmax Workfile"
     hosts = ['max']
+    families = ["workfile"]
 
-    def process(self, context):
+    def process(self, instance):
         """Inject the current working file."""
+        context = instance.context
         folder = rt.maxFilePath
         file = rt.maxFileName
         if not folder or not file:
             self.log.error("Scene is not saved.")
-        current_file = os.path.join(folder, file)
-
-        context.data['currentFile'] = current_file
-
-        filename, ext = os.path.splitext(file)
-
-        task = context.data["task"]
+        ext = os.path.splitext(file)[-1].lstrip(".")
 
         data = {}
 
-        # create instance
-        instance = context.create_instance(name=filename)
-        subset = 'workfile' + task.capitalize()
-
         data.update({
-            "subset": subset,
-            "asset": context.data["asset"],
-            "label": subset,
-            "publish": True,
-            "family": 'workfile',
-            "families": ['workfile'],
-            "setMembers": [current_file],
-            "frameStart": context.data['frameStart'],
-            "frameEnd": context.data['frameEnd'],
-            "handleStart": context.data['handleStart'],
-            "handleEnd": context.data['handleEnd']
+            "setMembers": context.data["currentFile"],
+            "frameStart": context.data["frameStart"],
+            "frameEnd": context.data["frameEnd"],
+            "handleStart": context.data["handleStart"],
+            "handleEnd": context.data["handleEnd"]
         })
 
-        data['representations'] = [{
-            'name': ext.lstrip("."),
-            'ext': ext.lstrip("."),
-            'files': file,
+        data["representations"] = [{
+            "name": ext,
+            "ext": ext,
+            "files": file,
             "stagingDir": folder,
         }]
 
         instance.data.update(data)
-
-        self.log.info('Collected instance: {}'.format(file))
-        self.log.info('Scene path: {}'.format(current_file))
-        self.log.info('staging Dir: {}'.format(folder))
-        self.log.info('subset: {}'.format(subset))
+        self.log.debug("Collected data: {}".format(data))
+        self.log.debug("Collected instance: {}".format(file))
+        self.log.debug("staging Dir: {}".format(folder))
diff --git a/client/ayon_core/hosts/max/plugins/publish/save_scene.py b/client/ayon_core/hosts/max/plugins/publish/save_scene.py
index a40788ab41..1c59335ceb 100644
--- a/client/ayon_core/hosts/max/plugins/publish/save_scene.py
+++ b/client/ayon_core/hosts/max/plugins/publish/save_scene.py
@@ -1,11 +1,9 @@
 import pyblish.api
-import os
+from ayon_core.pipeline import registered_host
 
 
 class SaveCurrentScene(pyblish.api.ContextPlugin):
-    """Save current scene
-
-    """
+    """Save current scene"""
 
     label = "Save current file"
     order = pyblish.api.ExtractorOrder - 0.49
@@ -13,9 +11,13 @@ class SaveCurrentScene(pyblish.api.ContextPlugin):
     families = ["maxrender", "workfile"]
 
     def process(self, context):
-        from pymxs import runtime as rt
-        folder = rt.maxFilePath
-        file = rt.maxFileName
-        current = os.path.join(folder, file)
-        assert context.data["currentFile"] == current
-        rt.saveMaxFile(current)
+        host = registered_host()
+        current_file = host.get_current_workfile()
+
+        assert context.data["currentFile"] == current_file
+
+        if host.workfile_has_unsaved_changes():
+            self.log.info(f"Saving current file: {current_file}")
+            host.save_workfile(current_file)
+        else:
+            self.log.debug("No unsaved changes, skipping file save..")
\ No newline at end of file
diff --git a/client/ayon_core/hosts/max/startup/startup.ms b/client/ayon_core/hosts/max/startup/startup.ms
index b80ead4b74..4c597901f3 100644
--- a/client/ayon_core/hosts/max/startup/startup.ms
+++ b/client/ayon_core/hosts/max/startup/startup.ms
@@ -8,5 +8,8 @@
     local pythonpath = systemTools.getEnvVariable "MAX_PYTHONPATH"
     systemTools.setEnvVariable "PYTHONPATH" pythonpath
 
+    /*opens the create menu on startup to ensure users are presented with a useful default view.*/
+    max create mode
+
     python.ExecuteFile startup
 )
\ No newline at end of file
diff --git a/client/ayon_core/hosts/maya/api/action.py b/client/ayon_core/hosts/maya/api/action.py
index 1edca82ee4..4beb1e3e5b 100644
--- a/client/ayon_core/hosts/maya/api/action.py
+++ b/client/ayon_core/hosts/maya/api/action.py
@@ -15,7 +15,7 @@ class GenerateUUIDsOnInvalidAction(pyblish.api.Action):
     receive new UUIDs are actually invalid.
 
     Requires:
-        - instance.data["asset"]
+        - instance.data["folderPath"]
 
     """
 
@@ -78,7 +78,7 @@ class GenerateUUIDsOnInvalidAction(pyblish.api.Action):
         #   should be always available, but kept a way to query it by name.
         asset_doc = instance.data.get("assetEntity")
         if not asset_doc:
-            asset_name = instance.data["asset"]
+            asset_name = instance.data["folderPath"]
             project_name = instance.context.data["projectName"]
             self.log.info((
                 "Asset is not stored on instance."
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/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 3a29fe433b..77b18fb394 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -24,7 +24,8 @@ from ayon_core.client import (
     get_asset_by_name,
     get_subsets,
     get_last_versions,
-    get_representation_by_name
+    get_representation_by_name,
+    get_asset_name_identifier,
 )
 from ayon_core.settings import get_project_settings
 from ayon_core.pipeline import (
@@ -35,7 +36,11 @@ from ayon_core.pipeline import (
     loaders_from_representation,
     get_representation_path,
     load_container,
-    registered_host
+    registered_host,
+    AVALON_CONTAINER_ID,
+    AVALON_INSTANCE_ID,
+    AYON_INSTANCE_ID,
+    AYON_CONTAINER_ID,
 )
 from ayon_core.lib import NumberDef
 from ayon_core.pipeline.context_tools import get_current_project_asset
@@ -2100,7 +2105,7 @@ def get_related_sets(node):
     """Return objectSets that are relationships for a look for `node`.
 
     Filters out based on:
-    - id attribute is NOT `pyblish.avalon.container`
+    - id attribute is NOT `AVALON_CONTAINER_ID`
     - shapes and deformer shapes (alembic creates meshShapeDeformed)
     - set name ends with any from a predefined list
     - set in not in viewport set (isolate selected for example)
@@ -2120,7 +2125,12 @@ def get_related_sets(node):
     defaults = {"defaultLightSet", "defaultObjectSet"}
 
     # Ids to ignore
-    ignored = {"pyblish.avalon.instance", "pyblish.avalon.container"}
+    ignored = {
+        AVALON_INSTANCE_ID,
+        AVALON_CONTAINER_ID,
+        AYON_INSTANCE_ID,
+        AYON_CONTAINER_ID,
+    }
 
     view_sets = get_isolate_view_sets()
 
@@ -3143,21 +3153,27 @@ def fix_incompatible_containers():
 
 def update_content_on_context_change():
     """
-    This will update scene content to match new asset on context change
+    This will update scene content to match new folder on context change
     """
     scene_sets = cmds.listSets(allSets=True)
     asset_doc = get_current_project_asset()
-    new_asset = asset_doc["name"]
+    new_folder_path = get_asset_name_identifier(asset_doc)
     new_data = asset_doc["data"]
     for s in scene_sets:
         try:
-            if cmds.getAttr("{}.id".format(s)) == "pyblish.avalon.instance":
+            if cmds.getAttr("{}.id".format(s)) in {
+                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+            }:
                 attr = cmds.listAttr(s)
                 print(s)
-                if "asset" in attr:
-                    print("  - setting asset to: [ {} ]".format(new_asset))
-                    cmds.setAttr("{}.asset".format(s),
-                                 new_asset, type="string")
+                if "folderPath" in attr:
+                    print(
+                        "  - setting folder to: [ {} ]".format(new_folder_path)
+                    )
+                    cmds.setAttr(
+                        "{}.folderPath".format(s),
+                        new_folder_path, type="string"
+                    )
                 if "frameStart" in attr:
                     cmds.setAttr("{}.frameStart".format(s),
                                  new_data["frameStart"])
diff --git a/client/ayon_core/hosts/maya/api/pipeline.py b/client/ayon_core/hosts/maya/api/pipeline.py
index dc6353618a..90fb2e5888 100644
--- a/client/ayon_core/hosts/maya/api/pipeline.py
+++ b/client/ayon_core/hosts/maya/api/pipeline.py
@@ -33,6 +33,7 @@ from ayon_core.pipeline import (
     deregister_loader_plugin_path,
     deregister_inventory_action_path,
     deregister_creator_plugin_path,
+    AYON_CONTAINER_ID,
     AVALON_CONTAINER_ID,
 )
 from ayon_core.pipeline.load import any_outdated_containers
@@ -246,7 +247,7 @@ def _set_project():
         None
 
     """
-    workdir = os.getenv("AVALON_WORKDIR")
+    workdir = os.getenv("AYON_WORKDIR")
 
     try:
         os.makedirs(workdir)
@@ -376,9 +377,11 @@ def _ls():
             yield iterator.thisNode()
             iterator.next()
 
-    ids = {AVALON_CONTAINER_ID,
-           # Backwards compatibility
-           "pyblish.mindbender.container"}
+    ids = {
+        AYON_CONTAINER_ID,
+        # Backwards compatibility
+        AVALON_CONTAINER_ID
+    }
 
     # Iterate over all 'set' nodes in the scene to detect whether
     # they have the avalon container ".id" attribute.
@@ -628,7 +631,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 +680,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..7a01f1a174 100644
--- a/client/ayon_core/hosts/maya/api/plugin.py
+++ b/client/ayon_core/hosts/maya/api/plugin.py
@@ -10,6 +10,9 @@ from maya.app.renderSetup.model import renderSetup
 from ayon_core.lib import BoolDef, Logger
 from ayon_core.settings import get_project_settings
 from ayon_core.pipeline import (
+    AYON_INSTANCE_ID,
+    AYON_CONTAINER_ID,
+    AVALON_INSTANCE_ID,
     AVALON_CONTAINER_ID,
     Anatomy,
 
@@ -110,7 +113,9 @@ class MayaCreatorBase(object):
 
             for node in cmds.ls(type="objectSet"):
 
-                if _get_attr(node, attr="id") != "pyblish.avalon.instance":
+                if _get_attr(node, attr="id") not in {
+                    AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+                }:
                     continue
 
                 creator_id = _get_attr(node, attr="creator_identifier")
@@ -612,7 +617,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
@@ -992,5 +997,7 @@ class ReferenceLoader(Loader):
             id_attr = "{}.id".format(node)
             if not cmds.attributeQuery("id", node=node, exists=True):
                 continue
-            if cmds.getAttr(id_attr) == AVALON_CONTAINER_ID:
+            if cmds.getAttr(id_attr) not in {
+                AYON_CONTAINER_ID, AVALON_CONTAINER_ID
+            }:
                 cmds.sets(node, forceElement=container)
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/workfile_template_builder.py b/client/ayon_core/hosts/maya/api/workfile_template_builder.py
index c3c61e5444..e9db8ffe79 100644
--- a/client/ayon_core/hosts/maya/api/workfile_template_builder.py
+++ b/client/ayon_core/hosts/maya/api/workfile_template_builder.py
@@ -2,7 +2,12 @@ import json
 
 from maya import cmds
 
-from ayon_core.pipeline import registered_host, get_current_asset_name
+from ayon_core.pipeline import (
+    registered_host,
+    get_current_asset_name,
+    AYON_INSTANCE_ID,
+    AVALON_INSTANCE_ID,
+)
 from ayon_core.pipeline.workfile.workfile_template_builder import (
     TemplateAlreadyImported,
     AbstractTemplateBuilder,
@@ -73,7 +78,9 @@ class MayaTemplateBuilder(AbstractTemplateBuilder):
         for node in imported_sets:
             if not cmds.attributeQuery("id", node=node, exists=True):
                 continue
-            if cmds.getAttr("{}.id".format(node)) != "pyblish.avalon.instance":
+            if cmds.getAttr("{}.id".format(node)) not in {
+                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+            }:
                 continue
             if not cmds.attributeQuery("asset", node=node, exists=True):
                 continue
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_instances.py b/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
index 0b29851db0..2d745d0ca8 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
@@ -11,7 +11,7 @@ class CollectNewInstances(pyblish.api.InstancePlugin):
     an objectSet and marked with a unique identifier;
 
     Identifier:
-        id (str): "pyblish.avalon.instance"
+        id (str): "ayon.create.instance"
 
     Limitations:
         - Does not take into account nodes connected to those
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..d5392fba4a 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:
@@ -308,7 +307,7 @@ class CollectMayaRender(pyblish.api.InstancePlugin):
                     _instance.data["version"] = context.data["version"]
 
         # Define nice label
-        label = "{0} ({1})".format(layer_name, instance.data["asset"])
+        label = "{0} ({1})".format(layer_name, instance.data["folderPath"])
         label += "  [{0}-{1}]".format(
             int(data["frameStartHandle"]), int(data["frameEndHandle"])
         )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py b/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py
index db008cc2be..979f49f7fe 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py
@@ -99,7 +99,7 @@ class CollectVrayScene(pyblish.api.InstancePlugin):
         instance.data.update(data)
 
         # Define nice label
-        label = "{0} ({1})".format(layer_name, instance.data["asset"])
+        label = "{0} ({1})".format(layer_name, instance.data["folderPath"])
         label += "  [{0}-{1}]".format(
             int(data["frameStartHandle"]), int(data["frameEndHandle"])
         )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py
index cd6f3bab6a..135185fe5c 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_maya_scene_raw.py
@@ -5,7 +5,11 @@ import os
 from maya import cmds
 
 from ayon_core.hosts.maya.api.lib import maintained_selection
-from ayon_core.pipeline import AVALON_CONTAINER_ID, publish
+from ayon_core.pipeline import (
+    AYON_CONTAINER_ID,
+    AVALON_CONTAINER_ID,
+    publish,
+)
 from ayon_core.pipeline.publish import AYONPyblishPluginMixin
 from ayon_core.lib import BoolDef
 
@@ -136,7 +140,9 @@ class ExtractMayaSceneRaw(publish.Extractor, AYONPyblishPluginMixin):
                 continue
 
             id_attr = "{}.id".format(obj_set)
-            if cmds.getAttr(id_attr) != AVALON_CONTAINER_ID:
+            if cmds.getAttr(id_attr) not in {
+                AYON_CONTAINER_ID, AVALON_CONTAINER_ID
+            }:
                 continue
 
             set_content = set(cmds.sets(obj_set, query=True))
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
index 7b44c92194..edbb5f845e 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
@@ -61,7 +61,7 @@ class ExtractUnrealSkeletalMeshFbx(publish.Extractor):
         # we rely on hierarchy under one root.
         original_parent = to_extract[0].split("|")[1]
 
-        parent_node = instance.data.get("asset")
+        parent_node = instance.data.get("folderPath")
         # this needs to be done for AYON
         # WARNING: since AYON supports duplicity of asset names,
         #          this needs to be refactored throughout the pipeline.
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py
index c683c1b30f..43b4f06e3f 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_in_context.py
@@ -37,7 +37,7 @@ class ValidateInstanceInContext(pyblish.api.InstancePlugin,
         if not self.is_active(instance.data):
             return
 
-        asset = instance.data.get("asset")
+        asset = instance.data.get("folderPath")
         context_asset = self.get_context_asset(instance)
         if asset != context_asset:
             raise PublishValidationError(
@@ -74,4 +74,4 @@ class ValidateInstanceInContext(pyblish.api.InstancePlugin,
 
     @staticmethod
     def get_context_asset(instance):
-        return instance.context.data["asset"]
+        return instance.context.data["folderPath"]
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/plugins/publish/validate_shader_name.py b/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py
index cb7f975535..86ca0ca400 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_shader_name.py
@@ -51,7 +51,7 @@ class ValidateShaderName(pyblish.api.InstancePlugin,
 
         descendants = cmds.ls(descendants, noIntermediate=True, long=True)
         shapes = cmds.ls(descendants, type=["nurbsSurface", "mesh"], long=True)
-        asset_name = instance.data.get("asset")
+        asset_name = instance.data.get("folderPath")
 
         # Check the number of connected shadingEngines per shape
         regex_compile = re.compile(cls.regex)
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..a2ec8fdb98 100644
--- a/client/ayon_core/hosts/nuke/api/lib.py
+++ b/client/ayon_core/hosts/nuke/api/lib.py
@@ -45,6 +45,8 @@ from ayon_core.pipeline import (
     get_current_host_name,
     get_current_project_name,
     get_current_asset_name,
+    AYON_INSTANCE_ID,
+    AVALON_INSTANCE_ID,
 )
 from ayon_core.pipeline.context_tools import (
     get_custom_workfile_template_from_session
@@ -120,7 +122,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
@@ -2300,12 +2302,16 @@ Reopening Nuke should synchronize these paths and resolve any discrepancies.
                 # backward compatibility
                 # TODO: remove this once old avalon data api will be removed
                 avalon_knob_data
-                and avalon_knob_data.get("id") != "pyblish.avalon.instance"
+                and avalon_knob_data.get("id") not in {
+                    AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+                }
             ):
                 continue
             elif (
                 node_data
-                and node_data.get("id") != "pyblish.avalon.instance"
+                and node_data.get("id") not in {
+                    AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+                }
             ):
                 continue
 
@@ -2605,7 +2611,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 +2959,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 +3209,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/pipeline.py b/client/ayon_core/hosts/nuke/api/pipeline.py
index 7483d404ec..c747996d9d 100644
--- a/client/ayon_core/hosts/nuke/api/pipeline.py
+++ b/client/ayon_core/hosts/nuke/api/pipeline.py
@@ -18,6 +18,8 @@ from ayon_core.pipeline import (
     register_loader_plugin_path,
     register_creator_plugin_path,
     register_inventory_action_path,
+    AYON_INSTANCE_ID,
+    AVALON_INSTANCE_ID,
     AVALON_CONTAINER_ID,
     get_current_asset_name,
     get_current_task_name,
@@ -179,7 +181,7 @@ def add_nuke_callbacks():
     nuke.addOnScriptLoad(WorkfileSettings().set_context_settings)
 
 
-    if nuke_settings["nuke_dirmap"]["enabled"]:
+    if nuke_settings["dirmap"]["enabled"]:
         log.info("Added Nuke's dir-mapping callback ...")
         # Add dirmap for file paths.
         nuke.addFilenameFilter(dirmap_file_name_filter)
@@ -550,7 +552,9 @@ def list_instances(creator_id=None):
         if not instance_data:
             continue
 
-        if instance_data["id"] != "pyblish.avalon.instance":
+        if instance_data["id"] not in {
+            AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+        }:
             continue
 
         if creator_id and instance_data["creator_identifier"] != creator_id:
diff --git a/client/ayon_core/hosts/nuke/api/plugin.py b/client/ayon_core/hosts/nuke/api/plugin.py
index 4b8ddac167..59042acee1 100644
--- a/client/ayon_core/hosts/nuke/api/plugin.py
+++ b/client/ayon_core/hosts/nuke/api/plugin.py
@@ -19,7 +19,9 @@ from ayon_core.pipeline import (
     CreatorError,
     Creator as NewCreator,
     CreatedInstance,
-    get_current_task_name
+    get_current_task_name,
+    AYON_INSTANCE_ID,
+    AVALON_INSTANCE_ID,
 )
 from ayon_core.pipeline.colorspace import (
     get_display_view_colorspace_name,
@@ -493,7 +495,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"]
@@ -1265,7 +1267,9 @@ def convert_to_valid_instaces():
         if not avalon_knob_data:
             continue
 
-        if avalon_knob_data["id"] != "pyblish.avalon.instance":
+        if avalon_knob_data["id"] not in {
+            AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+        }:
             continue
 
         transfer_data.update({
@@ -1348,7 +1352,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/create/convert_legacy.py b/client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py
index 815170ac8b..f113bec887 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/convert_legacy.py
@@ -1,3 +1,4 @@
+from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID
 from ayon_core.pipeline.create.creator_plugins import SubsetConvertorPlugin
 from ayon_core.hosts.nuke.api.lib import (
     INSTANCE_DATA_KNOB,
@@ -34,7 +35,9 @@ class LegacyConverted(SubsetConvertorPlugin):
             if not avalon_knob_data:
                 continue
 
-            if avalon_knob_data["id"] != "pyblish.avalon.instance":
+            if avalon_knob_data["id"] not in {
+                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+            }:
                 continue
 
             # catch and break
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py
index b4814c6a00..52ef4a58d4 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_asset_context.py
@@ -23,10 +23,10 @@ class ValidateCorrectAssetContext(
     current asset (shot). This validator checks if this is so. It is optional
     so it can be disabled when needed.
 
-    Checking `asset` and `task` keys.
+    Checking `folderPath` and `task` keys.
     """
     order = ValidateContentsOrder
-    label = "Validate asset context"
+    label = "Validate Folder context"
     hosts = ["nuke"]
     actions = [
         RepairAction,
@@ -85,7 +85,7 @@ class ValidateCorrectAssetContext(
         """Get invalid keys from instance data and context data."""
 
         invalid_keys = []
-        testing_keys = ["asset", "task"]
+        testing_keys = ["folderPath", "task"]
         for _key in testing_keys:
             if _key not in instance.data:
                 invalid_keys.append(_key)
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/README.md b/client/ayon_core/hosts/photoshop/api/README.md
index 72e2217829..02868753d1 100644
--- a/client/ayon_core/hosts/photoshop/api/README.md
+++ b/client/ayon_core/hosts/photoshop/api/README.md
@@ -75,7 +75,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
     an LayerSet and marked with a unique identifier;
 
     Identifier:
-        id (str): "pyblish.avalon.instance"
+        id (str): "ayon.create.instance"
     """
 
     label = "Instances"
diff --git a/client/ayon_core/hosts/photoshop/api/pipeline.py b/client/ayon_core/hosts/photoshop/api/pipeline.py
index 046ec8e6ee..4e9a861220 100644
--- a/client/ayon_core/hosts/photoshop/api/pipeline.py
+++ b/client/ayon_core/hosts/photoshop/api/pipeline.py
@@ -9,6 +9,8 @@ from ayon_core.pipeline import (
     register_loader_plugin_path,
     register_creator_plugin_path,
     AVALON_CONTAINER_ID,
+    AYON_INSTANCE_ID,
+    AVALON_INSTANCE_ID,
 )
 
 from ayon_core.host import (
@@ -62,7 +64,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)
@@ -121,7 +123,9 @@ class PhotoshopHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
         layers_meta = stub.get_layers_metadata()
         if layers_meta:
             for instance in layers_meta:
-                if instance.get("id") == "pyblish.avalon.instance":
+                if instance.get("id") in {
+                    AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+                }:
                     instances.append(instance)
 
         return instances
diff --git a/client/ayon_core/hosts/photoshop/api/ws_stub.py b/client/ayon_core/hosts/photoshop/api/ws_stub.py
index 42bad05f26..78cb5fac5d 100644
--- a/client/ayon_core/hosts/photoshop/api/ws_stub.py
+++ b/client/ayon_core/hosts/photoshop/api/ws_stub.py
@@ -119,14 +119,14 @@ class PhotoshopServerStub:
             "active":true,
             "subset":"imageBG",
             "family":"image",
-            "id":"pyblish.avalon.instance",
-            "asset":"Town",
+            "id":"ayon.create.instance",
+            "folderPath":"Town",
             "uuid": "8"
         }] - for created instances
         OR
         [{
             "schema": "openpype:container-2.0",
-            "id": "pyblish.avalon.instance",
+            "id": "ayon.create.instance",
             "name": "imageMG",
             "namespace": "Jungle_imageMG_001",
             "loader": "ImageLoader",
@@ -420,8 +420,8 @@ class PhotoshopServerStub:
             (list)
             example:
                 {"8":{"active":true,"subset":"imageBG",
-                      "family":"image","id":"pyblish.avalon.instance",
-                      "asset":"Town"}}
+                      "family":"image","id":"ayon.create.instance",
+                      "folderPath":"/Town"}}
                 8 is layer(group) id - used for deletion, update etc.
         """
         res = self.websocketserver.call(self.client.call('Photoshop.read'))
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_auto_image.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py
index 051a3da0a1..479d9139af 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_image.py
@@ -28,7 +28,7 @@ class CollectAutoImage(pyblish.api.ContextPlugin):
         task_name = context.data["task"]
         host_name = context.data["hostName"]
         asset_doc = context.data["assetEntity"]
-        asset_name = get_asset_name_identifier(asset_doc)
+        folder_path = get_asset_name_identifier(asset_doc)
 
         auto_creator = proj_settings.get(
             "photoshop", {}).get(
@@ -86,7 +86,7 @@ class CollectAutoImage(pyblish.api.ContextPlugin):
 
             instance = context.create_instance(subset_name)
             instance.data["family"] = family
-            instance.data["asset"] = asset_name
+            instance.data["folderPath"] = folder_path
             instance.data["subset"] = subset_name
             instance.data["ids"] = publishable_ids
             instance.data["publish"] = True
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py
index c8d4ddf111..e31508e641 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_review.py
@@ -67,7 +67,7 @@ class CollectAutoReview(pyblish.api.ContextPlugin):
         host_name = context.data["hostName"]
         asset_doc = context.data["assetEntity"]
 
-        asset_name = get_asset_name_identifier(asset_doc)
+        folder_path = get_asset_name_identifier(asset_doc)
 
         subset_name = get_subset_name(
             family,
@@ -87,7 +87,7 @@ class CollectAutoReview(pyblish.api.ContextPlugin):
             "family": family,
             "families": [],
             "representations": [],
-            "asset": asset_name,
+            "folderPath": folder_path,
             "publish": self.publish
         })
 
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py
index 365fd0a684..12fc31a2f2 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_auto_workfile.py
@@ -71,7 +71,7 @@ class CollectAutoWorkfile(pyblish.api.ContextPlugin):
         host_name = context.data["hostName"]
         asset_doc = context.data["assetEntity"]
 
-        asset_name = get_asset_name_identifier(asset_doc)
+        folder_path = get_asset_name_identifier(asset_doc)
         subset_name = get_subset_name(
             family,
             variant,
@@ -91,7 +91,7 @@ class CollectAutoWorkfile(pyblish.api.ContextPlugin):
             "family": family,
             "families": [],
             "representations": [],
-            "asset": asset_name
+            "folderPath": folder_path
         })
 
         # creating representation
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..a32b5f8fa5 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
@@ -2,7 +2,7 @@
 
 Provides:
     context -> Loaded batch file.
-        - asset
+        - folderPath
         - task  (task name)
         - taskType
         - project_name
@@ -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,10 +68,10 @@ 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["folderPath"] = asset_name
         context.data["task"] = task_name
         context.data["taskType"] = task_type
         context.data["project_name"] = project_name
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py
index 6a09cff3c7..2d3a9f4848 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_color_coded_instances.py
@@ -26,7 +26,7 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
         only separate subsets per marked layer.
 
     Identifier:
-        id (str): "pyblish.avalon.instance"
+        id (str): "ayon.create.instance"
     """
 
     label = "Collect Color-coded Instances"
@@ -56,7 +56,7 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
         existing_subset_names = self._get_existing_subset_names(context)
 
         # from CollectBatchData
-        asset_name = context.data["asset"]
+        asset_name = context.data["folderPath"]
         task_name = context.data["task"]
         variant = context.data["variant"]
         project_name = context.data["projectEntity"]["name"]
@@ -163,7 +163,7 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
         instance = context.create_instance(layer.name)
         instance.data["family"] = family
         instance.data["publish"] = True
-        instance.data["asset"] = asset
+        instance.data["folderPath"] = asset
         instance.data["task"] = task_name
         instance.data["subset"] = subset
         instance.data["layer"] = layer
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py b/client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py
index dc0f2efd52..67a7303316 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/validate_instance_asset.py
@@ -31,7 +31,7 @@ class ValidateInstanceAssetRepair(pyblish.api.Action):
         current_asset_name = get_current_asset_name()
         for instance in instances:
             data = stub.read(instance[0])
-            data["asset"] = current_asset_name
+            data["folderPath"] = current_asset_name
             stub.imprint(instance[0], data)
 
 
@@ -54,7 +54,7 @@ class ValidateInstanceAsset(OptionalPyblishPluginMixin,
     order = ValidateContentsOrder
 
     def process(self, instance):
-        instance_asset = instance.data["asset"]
+        instance_asset = instance.data["folderPath"]
         current_asset = get_current_asset_name()
 
         if instance_asset != current_asset:
diff --git a/client/ayon_core/hosts/resolve/api/lib.py b/client/ayon_core/hosts/resolve/api/lib.py
index 2c648bb4cc..5eb88afdcb 100644
--- a/client/ayon_core/hosts/resolve/api/lib.py
+++ b/client/ayon_core/hosts/resolve/api/lib.py
@@ -519,7 +519,7 @@ def imprint(timeline_item, data=None):
 
     Examples:
         data = {
-            'asset': 'sq020sh0280',
+            'folderPath': 'sq020sh0280',
             'family': 'render',
             'subset': 'subsetMain'
         }
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/resolve/plugins/publish/precollect_instances.py b/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py
index 0ae6206496..78c5fbbbf7 100644
--- a/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py
+++ b/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py
@@ -2,6 +2,7 @@ from pprint import pformat
 
 import pyblish
 
+from ayon_core.pipeline import AYON_INSTANCE_ID, AVALON_INSTANCE_ID
 from ayon_core.hosts.resolve.api.lib import (
     get_current_timeline_items,
     get_timeline_item_pype_tag,
@@ -39,7 +40,9 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             if not tag_data:
                 continue
 
-            if tag_data.get("id") != "pyblish.avalon.instance":
+            if tag_data.get("id") not in {
+                AYON_INSTANCE_ID, AVALON_INSTANCE_ID
+            }:
                 continue
 
             media_pool_item = timeline_item.GetMediaPoolItem()
@@ -66,7 +69,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             data.update({
                 "name": "{}_{}".format(asset, subset),
                 "label": "{} {}".format(asset, subset),
-                "asset": asset,
+                "folderPath": asset,
                 "item": timeline_item,
                 "publish": get_publish_attribute(timeline_item),
                 "fps": context.data["fps"],
@@ -124,7 +127,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
         if not hierarchy_data:
             return
 
-        asset = data["asset"]
+        asset = data["folderPath"]
         subset = "shotMain"
 
         # insert family into families
@@ -134,7 +137,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             "name": "{}_{}".format(asset, subset),
             "label": "{} {}".format(asset, subset),
             "subset": subset,
-            "asset": asset,
+            "folderPath": asset,
             "family": family,
             "families": [],
             "publish": get_publish_attribute(timeline_item)
diff --git a/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py b/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py
index 5f8cf6b5d9..814b1e159f 100644
--- a/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py
+++ b/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py
@@ -28,7 +28,7 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
         instance_data = {
             "name": "{}_{}".format(asset_name, subset),
             "label": "{} {}".format(current_asset_name, subset),
-            "asset": current_asset_name,
+            "folderPath": current_asset_name,
             "subset": subset,
             "item": project,
             "family": "workfile",
diff --git a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py b/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py
index b8279c99cd..03e17192d2 100644
--- a/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py
+++ b/client/ayon_core/hosts/substancepainter/plugins/publish/collect_textureset_images.py
@@ -27,8 +27,8 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
 
         config = self.get_export_config(instance)
         asset_doc = get_asset_by_name(
-            project_name=instance.context.data["projectName"],
-            asset_name=instance.data["asset"]
+            instance.context.data["projectName"],
+            instance.data["folderPath"]
         )
 
         instance.data["exportConfig"] = config
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/traypublisher/plugins/create/create_online.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py
index db11d30afe..36d2fba976 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py
@@ -53,7 +53,7 @@ class OnlineCreator(TrayPublishCreator):
         # disable check for existing subset with the same name
         """
         asset = get_asset_by_name(
-            self.project_name, instance_data["asset"], fields=["_id"])
+            self.project_name, instance_data["folderPath"], fields=["_id"])
 
         if get_subset_by_name(
                 self.project_name, origin_basename, asset["_id"],
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py
index b19eb36168..d489528c57 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/collect_shot_instances.py
@@ -17,7 +17,7 @@ class CollectShotInstance(pyblish.api.InstancePlugin):
     families = ["shot"]
 
     SHARED_KEYS = [
-        "asset",
+        "folderPath",
         "fps",
         "handleStart",
         "handleEnd",
@@ -132,7 +132,7 @@ class CollectShotInstance(pyblish.api.InstancePlugin):
             "sourceIn": _cr_attrs["sourceIn"],
             "sourceOut": _cr_attrs["sourceOut"],
             "workfileFrameStart": workfile_start_frame,
-            "asset": _cr_attrs["folderPath"],
+            "folderPath": _cr_attrs["folderPath"],
         }
 
     def _solve_hierarchy_context(self, instance):
@@ -170,7 +170,7 @@ class CollectShotInstance(pyblish.api.InstancePlugin):
         parents = instance.data.get('parents', [])
 
         # Split by '/' for AYON where asset is a path
-        asset_name = instance.data["asset"].split("/")[-1]
+        asset_name = instance.data["folderPath"].split("/")[-1]
         actual = {asset_name: in_info}
 
         for parent in reversed(parents):
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py
index 6a85f92ce1..b75ae674e8 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_existing_version.py
@@ -40,7 +40,7 @@ class ValidateExistingVersion(
 
         formatting_data = {
             "subset_name": subset_name,
-            "asset_name": instance.data["asset"],
+            "asset_name": instance.data["folderPath"],
             "version": version
         }
         raise PublishXmlValidationError(
diff --git a/client/ayon_core/hosts/tvpaint/api/pipeline.py b/client/ayon_core/hosts/tvpaint/api/pipeline.py
index d636e68cfa..6194851cfb 100644
--- a/client/ayon_core/hosts/tvpaint/api/pipeline.py
+++ b/client/ayon_core/hosts/tvpaint/api/pipeline.py
@@ -52,7 +52,7 @@ expected that there are also keys `["instances0", "instances1"]`.
 Workfile data looks like:
 ```
 [avalon]
-instances0=[{{__dq__}id{__dq__}: {__dq__}pyblish.avalon.instance{__dq__...
+instances0=[{{__dq__}id{__dq__}: {__dq__}ayon.create.instance{__dq__...
 instances1=...more data...
 instances=2
 ```
@@ -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..1cf21a1fae 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
@@ -65,7 +65,7 @@ class CollectWorkfileData(pyblish.api.ContextPlugin):
         # Collect and store current context to have reference
         current_context = {
             "project_name": context.data["projectName"],
-            "asset_name": context.data["asset"],
+            "asset_name": context.data["folderPath"],
             "task_name": context.data["task"]
         }
         self.log.debug("Current context is: {}".format(current_context))
@@ -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]
@@ -105,7 +105,7 @@ class CollectWorkfileData(pyblish.api.ContextPlugin):
             ))
 
         # Store context asset name
-        context.data["asset"] = asset_name
+        context.data["folderPath"] = asset_name
         context.data["task"] = task_name
         self.log.info(
             "Context is set to Asset: \"{}\" and Task: \"{}\"".format(
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_asset_name.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py
index 62603a460b..927d601e34 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_asset_name.py
@@ -20,7 +20,7 @@ class FixAssetNames(pyblish.api.Action):
     on = "failed"
 
     def process(self, context, plugin):
-        context_asset_name = context.data["asset"]
+        context_asset_name = context.data["folderPath"]
         old_instance_items = list_instances()
         new_instance_items = []
         for instance_item in old_instance_items:
@@ -51,9 +51,9 @@ class ValidateAssetName(
     def process(self, context):
         if not self.is_active(context.data):
             return
-        context_asset_name = context.data["asset"]
+        context_asset_name = context.data["folderPath"]
         for instance in context:
-            asset_name = instance.data.get("asset")
+            asset_name = instance.data.get("folderPath")
             if asset_name and asset_name == context_asset_name:
                 continue
 
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/hosts/unreal/plugins/publish/collect_render_instances.py b/client/ayon_core/hosts/unreal/plugins/publish/collect_render_instances.py
index 8641094610..8bbf5a5c62 100644
--- a/client/ayon_core/hosts/unreal/plugins/publish/collect_render_instances.py
+++ b/client/ayon_core/hosts/unreal/plugins/publish/collect_render_instances.py
@@ -64,7 +64,7 @@ class CollectRenderInstances(pyblish.api.InstancePlugin):
 
                     new_data = new_instance.data
 
-                    new_data["asset"] = seq_name
+                    new_data["folderPath"] = seq_name
                     new_data["setMembers"] = seq_name
                     new_data["family"] = "render"
                     new_data["families"] = ["render", "review"]
diff --git a/client/ayon_core/lib/applications.py b/client/ayon_core/lib/applications.py
index 70aa9811c7..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,
@@ -419,7 +418,14 @@ class ApplicationManager:
         # Prepare known applications
         app_defs = applications_addon_settings["applications"]
         additional_apps = app_defs.pop("additional_apps")
-        app_defs.update(additional_apps)
+        for additional_app in additional_apps:
+            app_name = additional_app.pop("name")
+            if app_name in app_defs:
+                self.log.warning((
+                    "Additional application '{}' is already"
+                    " in built-in applications."
+                ).format(app_name))
+            app_defs[app_name] = additional_app
 
         for group_name, variant_defs in app_defs.items():
             group = ApplicationGroup(group_name, variant_defs, self)
@@ -1521,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():
@@ -1649,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),
@@ -1691,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(
@@ -1717,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?
@@ -1763,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)
 
@@ -1880,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
 
 
@@ -1909,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"]
@@ -1959,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/clockify_module.py b/client/ayon_core/modules/clockify/clockify_module.py
index adb7eb66af..58407bfe94 100644
--- a/client/ayon_core/modules/clockify/clockify_module.py
+++ b/client/ayon_core/modules/clockify/clockify_module.py
@@ -2,22 +2,27 @@ import os
 import threading
 import time
 
-from ayon_core.modules import OpenPypeModule, ITrayModule, IPluginPaths
+from ayon_core.modules import AYONAddon, ITrayModule, IPluginPaths
 from ayon_core.client import get_asset_by_name
 
 from .constants import CLOCKIFY_FTRACK_USER_PATH, CLOCKIFY_FTRACK_SERVER_PATH
 
 
-class ClockifyModule(OpenPypeModule, ITrayModule, IPluginPaths):
+class ClockifyModule(AYONAddon, ITrayModule, IPluginPaths):
     name = "clockify"
 
-    def initialize(self, modules_settings):
-        clockify_settings = modules_settings[self.name]
-        self.enabled = clockify_settings["enabled"]
-        self.workspace_name = clockify_settings["workspace_name"]
+    def initialize(self, studio_settings):
+        enabled = self.name in studio_settings
+        workspace_name = None
+        if enabled:
+            clockify_settings = studio_settings[self.name]
+            workspace_name = clockify_settings["workspace_name"]
 
-        if self.enabled and not self.workspace_name:
-            raise Exception("Clockify Workspace is not set in settings.")
+        if enabled and workspace_name:
+            self.log.warning("Clockify Workspace is not set in settings.")
+            enabled = False
+        self.enabled = enabled
+        self.workspace_name = workspace_name
 
         self.timer_manager = None
         self.MessageWidgetClass = None
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 dbc000a163..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
@@ -44,7 +44,10 @@ class VrayRenderPluginInfo():
 @attr.s
 class RedshiftRenderPluginInfo():
     SceneFile = attr.ib(default=None)
-    Version = attr.ib(default=None)
+    # Use "1" as the default Redshift version just because it
+    # default fallback version in Deadline's Redshift plugin
+    # if no version was specified
+    Version = attr.ib(default="1")
 
 
 class HoudiniSubmitDeadline(
@@ -204,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..0b0e293943 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",
@@ -112,7 +112,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
         output_dir = self._get_publish_folder(
             anatomy,
             deepcopy(instance.data["anatomyData"]),
-            instance.data.get("asset"),
+            instance.data.get("folderPath"),
             instance.data["subset"],
             instance.context,
             instance.data["family"],
@@ -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["folderPath"],
+            "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())),
@@ -359,7 +359,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
 
         # publish job file
         publish_job = {
-            "asset": instance_skeleton_data["asset"],
+            "folderPath": instance_skeleton_data["folderPath"],
             "frameStart": instance_skeleton_data["frameStart"],
             "frameEnd": instance_skeleton_data["frameEnd"],
             "fps": instance_skeleton_data["fps"],
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..77094fd8bd 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",
@@ -189,7 +189,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         output_dir = self._get_publish_folder(
             anatomy,
             deepcopy(instance.data["anatomyData"]),
-            instance.data.get("asset"),
+            instance.data.get("folderPath"),
             instances[0]["subset"],
             instance.context,
             instances[0]["family"],
@@ -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["folderPath"],
+            "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(
@@ -620,7 +475,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
 
         # publish job file
         publish_job = {
-            "asset": instance_skeleton_data["asset"],
+            "folderPath": instance_skeleton_data["folderPath"],
             "frameStart": instance_skeleton_data["frameStart"],
             "frameEnd": instance_skeleton_data["frameEnd"],
             "fps": instance_skeleton_data["fps"],
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/__init__.py b/client/ayon_core/modules/royalrender/__init__.py
index cc92e3b50d..121530beda 100644
--- a/client/ayon_core/modules/royalrender/__init__.py
+++ b/client/ayon_core/modules/royalrender/__init__.py
@@ -1,6 +1,6 @@
-from .royal_render_module import RoyalRenderModule
+from .addon import RoyalRenderAddon
 
 
 __all__ = (
-    "RoyalRenderModule",
+    "RoyalRenderAddon",
 )
diff --git a/client/ayon_core/modules/royalrender/addon.py b/client/ayon_core/modules/royalrender/addon.py
new file mode 100644
index 0000000000..e69cf9feec
--- /dev/null
+++ b/client/ayon_core/modules/royalrender/addon.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+"""Module providing support for Royal Render."""
+import os
+
+from ayon_core.addon import AYONAddon, IPluginPaths
+
+
+class RoyalRenderAddon(AYONAddon, IPluginPaths):
+    """Class providing basic Royal Render implementation logic."""
+    name = "royalrender"
+
+    # _rr_api = None
+    # @property
+    # def rr_api(self):
+    #     if not self._rr_api:
+    #         # import royal render modules
+    #         from .api import Api
+    #         self._rr_api = Api(self.settings)
+    #     return self._rr_api
+
+    def initialize(self, studio_settings):
+        # type: (dict) -> None
+        self.enabled = self.name in studio_settings
+
+    @staticmethod
+    def get_plugin_paths():
+        # type: () -> dict
+        """Royal Render plugin paths.
+
+        Returns:
+            dict: Dictionary of plugin paths for RR.
+        """
+        current_dir = os.path.dirname(os.path.abspath(__file__))
+        return {
+            "publish": [os.path.join(current_dir, "plugins", "publish")]
+        }
diff --git a/client/ayon_core/modules/royalrender/lib.py b/client/ayon_core/modules/royalrender/lib.py
index b53c5e6186..60c0427d99 100644
--- a/client/ayon_core/modules/royalrender/lib.py
+++ b/client/ayon_core/modules/royalrender/lib.py
@@ -108,9 +108,7 @@ class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin,
 
         context = instance.context
 
-        self._rr_root = self._resolve_rr_path(context, instance.data.get(
-            "rrPathName"))  # noqa
-        self.log.debug(self._rr_root)
+        self._rr_root = instance.data.get("rrPathName")
         if not self._rr_root:
             raise KnownPublishError(
                 ("Missing RoyalRender root. "
@@ -210,35 +208,6 @@ class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin,
         """Host specific mapping for RRJob"""
         raise NotImplementedError
 
-    @staticmethod
-    def _resolve_rr_path(context, rr_path_name):
-        # type: (pyblish.api.Context, str) -> str
-        rr_settings = (
-            context.data
-            ["system_settings"]
-            ["modules"]
-            ["royalrender"]
-        )
-        try:
-            default_servers = rr_settings["rr_paths"]
-            project_servers = (
-                context.data
-                ["project_settings"]
-                ["royalrender"]
-                ["rr_paths"]
-            )
-            rr_servers = {
-                k: default_servers[k]
-                for k in project_servers
-                if k in default_servers
-            }
-
-        except (AttributeError, KeyError):
-            # Handle situation were we had only one url for royal render.
-            return context.data["defaultRRPath"][platform.system().lower()]
-
-        return rr_servers[rr_path_name][platform.system().lower()]
-
     def expected_files(self, instance, path, start_frame, end_frame):
         """Get expected files.
 
@@ -350,7 +319,7 @@ class BaseCreateRoyalRenderJob(pyblish.api.InstancePlugin,
 
         add_kwargs = {
             "project": anatomy_data["project"]["name"],
-            "asset": instance.context.data["asset"],
+            "asset": instance.context.data["folderPath"],
             "task": anatomy_data["task"]["name"],
             "app": instance.context.data.get("appName"),
             "envgroup": "farm"
@@ -361,8 +330,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/collect_rr_path_from_instance.py b/client/ayon_core/modules/royalrender/plugins/publish/collect_rr_path_from_instance.py
index e978ce5bed..d860df4684 100644
--- a/client/ayon_core/modules/royalrender/plugins/publish/collect_rr_path_from_instance.py
+++ b/client/ayon_core/modules/royalrender/plugins/publish/collect_rr_path_from_instance.py
@@ -18,30 +18,24 @@ class CollectRRPathFromInstance(pyblish.api.InstancePlugin):
     def _collect_rr_path_name(instance):
         # type: (pyblish.api.Instance) -> str
         """Get Royal Render pat name from render instance."""
-        rr_settings = (
-            instance.context.data
-            ["system_settings"]
-            ["modules"]
-            ["royalrender"]
-        )
-        if not instance.data.get("rrPaths"):
+
+        # TODO there are no "rrPaths" on instance, if Publisher should expose
+        # this (eg. artist could select specific server) it must be added
+        # to publisher
+        instance_rr_paths = instance.data.get("rrPaths")
+        if instance_rr_paths is None:
             return "default"
-        try:
-            default_servers = rr_settings["rr_paths"]
-            project_servers = (
-                instance.context.data
-                ["project_settings"]
-                ["royalrender"]
-                ["rr_paths"]
-            )
-            rr_servers = {
-                k: default_servers[k]
-                for k in project_servers
-                if k in default_servers
-            }
 
-        except (AttributeError, KeyError):
-            # Handle situation were we had only one url for royal render.
-            return rr_settings["rr_paths"]["default"]
+        rr_settings = instance.context.data["project_settings"]["royalrender"]
+        rr_paths = rr_settings["rr_paths"]
+        selected_paths = rr_settings["selected_rr_paths"]
 
-        return list(rr_servers.keys())[int(instance.data.get("rrPaths"))]
+        rr_servers = {
+            path_key
+            for path_key in selected_paths
+            if path_key in rr_paths
+        }
+        for instance_rr_path in instance_rr_paths:
+            if instance_rr_path in rr_servers:
+                return instance_rr_path
+        return "default"
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py b/client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py
index cd34ba9bb3..4460e11004 100644
--- a/client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py
+++ b/client/ayon_core/modules/royalrender/plugins/publish/collect_sequences_from_job.py
@@ -189,8 +189,8 @@ class CollectSequencesFromJob(pyblish.api.ContextPlugin):
                     "family": families[0],  # backwards compatibility / pyblish
                     "families": list(families),
                     "subset": subset,
-                    "asset": data.get(
-                        "asset", context.data["asset"]
+                    "folderPath": data.get(
+                        "folderPath", context.data["folderPath"]
                     ),
                     "stagingDir": root,
                     "frameStart": start,
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..256c8b7a83 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",
     ]
@@ -132,7 +132,7 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
 
         # publish job file
         publish_job = {
-            "asset": instance_skeleton_data["asset"],
+            "folderPath": instance_skeleton_data["folderPath"],
             "frameStart": instance_skeleton_data["frameStart"],
             "frameEnd": instance_skeleton_data["frameEnd"],
             "fps": instance_skeleton_data["fps"],
@@ -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["folderPath"],
+            "AYON_TASK_NAME": anatomy_data["task"]["name"],
             "AYON_USERNAME": anatomy_data["user"]
         })
 
@@ -216,7 +216,7 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
             SeqEnd=1,
             SeqStep=1,
             SeqFileOffset=0,
-            Version=self._sanitize_version(os.environ.get("OPENPYPE_VERSION")),
+            Version=os.environ["AYON_BUNDLE_NAME"],
             SceneName=abs_metadata_path,
             # command line arguments
             CustomAddCmdFlags=" ".join(args),
@@ -243,26 +243,3 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
             job.WaitForPreIDs += jobs_pre_ids
 
         return job
-
-    def _sanitize_version(self, version):
-        """Returns version in format MAJOR.MINORPATCH
-
-        3.15.7-nightly.2 >> 3.157
-        """
-        VERSION_REGEX = re.compile(
-            r"(?P<major>0|[1-9]\d*)"
-            r"\.(?P<minor>0|[1-9]\d*)"
-            r"\.(?P<patch>0|[1-9]\d*)"
-            r"(?:-(?P<prerelease>[a-zA-Z\d\-.]*))?"
-            r"(?:\+(?P<buildmetadata>[a-zA-Z\d\-.]*))?"
-        )
-
-        valid_parts = VERSION_REGEX.findall(version)
-        if len(valid_parts) != 1:
-            # Return invalid version with filled 'origin' attribute
-            return version
-
-        # Unpack found version
-        major, minor, patch, pre, post = valid_parts[0]
-
-        return "{}.{}{}".format(major, minor, patch)
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py b/client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py
index a76bdfc26c..dcec2ac810 100644
--- a/client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py
+++ b/client/ayon_core/modules/royalrender/plugins/publish/submit_jobs_to_royalrender.py
@@ -25,16 +25,6 @@ class SubmitJobsToRoyalRender(pyblish.api.ContextPlugin):
         self._submission_parameters = []
 
     def process(self, context):
-        rr_settings = (
-            context.data
-            ["system_settings"]
-            ["modules"]
-            ["royalrender"]
-        )
-
-        if rr_settings["enabled"] is not True:
-            self.log.warning("RoyalRender modules is disabled.")
-            return
 
         # iterate over all instances and try to find RRJobs
         jobs = []
@@ -51,7 +41,7 @@ class SubmitJobsToRoyalRender(pyblish.api.ContextPlugin):
                 instance_rr_path = instance.data["rrPathName"]
 
         if jobs:
-            self._rr_root = self._resolve_rr_path(context, instance_rr_path)
+            self._rr_root = instance_rr_path
             if not self._rr_root:
                 raise KnownPublishError(
                     ("Missing RoyalRender root. "
@@ -100,32 +90,3 @@ class SubmitJobsToRoyalRender(pyblish.api.ContextPlugin):
 
     def get_submission_parameters(self):
         return [SubmitterParameter("RequiredMemory", "0")]
-
-    @staticmethod
-    def _resolve_rr_path(context, rr_path_name):
-        # type: (pyblish.api.Context, str) -> str
-        rr_settings = (
-            context.data
-            ["system_settings"]
-            ["modules"]
-            ["royalrender"]
-        )
-        try:
-            default_servers = rr_settings["rr_paths"]
-            project_servers = (
-                context.data
-                ["project_settings"]
-                ["royalrender"]
-                ["rr_paths"]
-            )
-            rr_servers = {
-                k: default_servers[k]
-                for k in project_servers
-                if k in default_servers
-            }
-
-        except (AttributeError, KeyError):
-            # Handle situation were we had only one url for royal render.
-            return context.data["defaultRRPath"][platform.system().lower()]
-
-        return rr_servers[rr_path_name][platform.system().lower()]
diff --git a/client/ayon_core/modules/royalrender/royal_render_module.py b/client/ayon_core/modules/royalrender/royal_render_module.py
deleted file mode 100644
index 66b09832d8..0000000000
--- a/client/ayon_core/modules/royalrender/royal_render_module.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Module providing support for Royal Render."""
-import os
-import ayon_core.modules
-from ayon_core.modules import OpenPypeModule, IPluginPaths
-
-
-class RoyalRenderModule(OpenPypeModule, IPluginPaths):
-    """Class providing basic Royal Render implementation logic."""
-    name = "royalrender"
-
-    @property
-    def api(self):
-        if not self._api:
-            # import royal render modules
-            from . import api as rr_api
-            self._api = rr_api.Api(self.settings)
-
-        return self._api
-
-    def __init__(self, manager, settings):
-        # type: (ayon_core.addon.AddonsManager, dict) -> None
-        self.rr_paths = {}
-        self._api = None
-        self.settings = settings
-        super(RoyalRenderModule, self).__init__(manager, settings)
-
-    def initialize(self, module_settings):
-        # type: (dict) -> None
-        rr_settings = module_settings[self.name]
-        self.enabled = rr_settings["enabled"]
-        self.rr_paths = rr_settings.get("rr_paths")
-
-    @staticmethod
-    def get_plugin_paths():
-        # type: () -> dict
-        """Royal Render plugin paths.
-
-        Returns:
-            dict: Dictionary of plugin paths for RR.
-        """
-        current_dir = os.path.dirname(os.path.abspath(__file__))
-        return {
-            "publish": [os.path.join(current_dir, "plugins", "publish")]
-        }
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/modules/timers_manager/plugins/publish/start_timer.py b/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py
index 51f707ecf6..a3eb49ee70 100644
--- a/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py
+++ b/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py
@@ -24,7 +24,7 @@ class StartTimer(pyblish.api.ContextPlugin):
             return
 
         project_name = context.data["projectName"]
-        asset_name = context.data.get("asset")
+        asset_name = context.data.get("folderPath")
         task_name = context.data.get("task")
         if not project_name or not asset_name or not task_name:
             self.log.info((
diff --git a/client/ayon_core/modules/timers_manager/timers_manager.py b/client/ayon_core/modules/timers_manager/timers_manager.py
index daba0cead9..f8f0e4a526 100644
--- a/client/ayon_core/modules/timers_manager/timers_manager.py
+++ b/client/ayon_core/modules/timers_manager/timers_manager.py
@@ -3,8 +3,8 @@ import platform
 
 
 from ayon_core.client import get_asset_by_name
-from ayon_core.modules import (
-    OpenPypeModule,
+from ayon_core.addon import (
+    AYONAddon,
     ITrayService,
     IPluginPaths
 )
@@ -76,7 +76,7 @@ class ExampleTimersManagerConnector:
 
 
 class TimersManager(
-    OpenPypeModule,
+    AYONAddon,
     ITrayService,
     IPluginPaths
 ):
@@ -99,23 +99,27 @@ class TimersManager(
         "start_timer"
     )
 
-    def initialize(self, modules_settings):
-        timers_settings = modules_settings[self.name]
+    def initialize(self, studio_settings):
+        timers_settings = studio_settings.get(self.name)
+        enabled = timers_settings is not None
 
-        self.enabled = timers_settings["enabled"]
+        auto_stop = False
+        full_time = 0
+        message_time = 0
+        if enabled:
+            # When timer will stop if idle manager is running (minutes)
+            full_time = int(timers_settings["full_time"] * 60)
+            # How many minutes before the timer is stopped will popup the message
+            message_time = int(timers_settings["message_time"] * 60)
 
-        # When timer will stop if idle manager is running (minutes)
-        full_time = int(timers_settings["full_time"] * 60)
-        # How many minutes before the timer is stopped will popup the message
-        message_time = int(timers_settings["message_time"] * 60)
-
-        auto_stop = timers_settings["auto_stop"]
-        platform_name = platform.system().lower()
-        # Turn of auto stop on MacOs because pynput requires root permissions
-        #    and on linux can cause thread locks on application close
-        if full_time <= 0 or platform_name in ("darwin", "linux"):
-            auto_stop = False
+            auto_stop = timers_settings["auto_stop"]
+            platform_name = platform.system().lower()
+            # Turn of auto stop on MacOs because pynput requires root permissions
+            #    and on linux can cause thread locks on application close
+            if full_time <= 0 or platform_name in ("darwin", "linux"):
+                auto_stop = False
 
+        self.enabled = enabled
         self.auto_stop = auto_stop
         self.time_show_message = full_time - message_time
         self.time_stop_timer = full_time
diff --git a/client/ayon_core/pipeline/__init__.py b/client/ayon_core/pipeline/__init__.py
index c5507b0a7b..679e9a195e 100644
--- a/client/ayon_core/pipeline/__init__.py
+++ b/client/ayon_core/pipeline/__init__.py
@@ -1,6 +1,8 @@
 from .constants import (
     AVALON_CONTAINER_ID,
+    AVALON_INSTANCE_ID,
     AYON_CONTAINER_ID,
+    AYON_INSTANCE_ID,
     HOST_WORKFILE_EXTENSIONS,
 )
 
@@ -101,7 +103,9 @@ uninstall = uninstall_host
 
 __all__ = (
     "AVALON_CONTAINER_ID",
+    "AVALON_INSTANCE_ID",
     "AYON_CONTAINER_ID",
+    "AYON_INSTANCE_ID",
     "HOST_WORKFILE_EXTENSIONS",
 
     # --- Anatomy ---
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 d77f301498..7100984217 100644
--- a/client/ayon_core/pipeline/colorspace.py
+++ b/client/ayon_core/pipeline/colorspace.py
@@ -254,7 +254,7 @@ def get_imageio_file_rules_colorspace_from_filepath(
 
     # match file rule from path
     colorspace_name = None
-    for file_rule in file_rules.values():
+    for file_rule in file_rules:
         pattern = file_rule["pattern"]
         extension = file_rule["ext"]
         ext_match = re.match(
@@ -281,7 +281,7 @@ def get_config_file_rules_colorspace_from_filepath(config_path, filepath):
         filepath (str): path leading to a file
 
     Returns:
-        Any[str, None]: matching colorspace name
+        Union[str, None]: matching colorspace name
     """
     if not compatibility_check():
         # python environment is not compatible with PyOpenColorIO
@@ -918,28 +918,13 @@ def get_imageio_file_rules(project_name, host_name, project_settings=None):
                                            Defaults to None.
 
     Returns:
-        dict: file rules data
+        list[dict[str, Any]]: file rules data
     """
     project_settings = project_settings or get_project_settings(project_name)
 
     imageio_global, imageio_host = _get_imageio_settings(
         project_settings, host_name)
 
-    # get file rules from global and host_name
-    frules_global = imageio_global["file_rules"]
-    activate_global_rules = (
-        frules_global.get("activate_global_file_rules", False)
-        # TODO: remove this in future - backward compatibility
-        or frules_global.get("enabled")
-    )
-    global_rules = frules_global["rules"]
-
-    if not activate_global_rules:
-        log.info(
-            "Colorspace global file rules are disabled."
-        )
-        global_rules = {}
-
     # host is optional, some might not have any settings
     frules_host = imageio_host.get("file_rules", {})
 
@@ -949,8 +934,24 @@ def get_imageio_file_rules(project_name, host_name, project_settings=None):
         # TODO: remove this in future - backward compatibility
         activate_host_rules = frules_host.get("enabled", False)
 
-    # return host rules if activated or global rules
-    return frules_host["rules"] if activate_host_rules else global_rules
+    if activate_host_rules:
+        return frules_host["rules"]
+
+    # get file rules from global and host_name
+    frules_global = imageio_global["file_rules"]
+    activate_global_rules = (
+        frules_global.get("activate_global_file_rules", False)
+        # TODO: remove this in future - backward compatibility
+        or frules_global.get("enabled")
+    )
+
+    if not activate_global_rules:
+        log.info(
+            "Colorspace global file rules are disabled."
+        )
+        return []
+
+    return frules_global["rules"]
 
 
 def get_remapped_colorspace_to_native(
@@ -1017,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/constants.py b/client/ayon_core/pipeline/constants.py
index 755a5fb380..7a08cbb3aa 100644
--- a/client/ayon_core/pipeline/constants.py
+++ b/client/ayon_core/pipeline/constants.py
@@ -1,5 +1,9 @@
 # Metadata ID of loaded container into scene
-AVALON_CONTAINER_ID = AYON_CONTAINER_ID = "pyblish.avalon.container"
+AYON_CONTAINER_ID = "ayon.load.container"
+AYON_INSTANCE_ID = "ayon.create.instance"
+# Backwards compatibility
+AVALON_CONTAINER_ID = "pyblish.avalon.container"
+AVALON_INSTANCE_ID = "pyblish.avalon.instance"
 
 # TODO get extensions from host implementations
 HOST_WORKFILE_EXTENSIONS = {
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/README.md b/client/ayon_core/pipeline/create/README.md
index 012572a776..5e3bd7dc1a 100644
--- a/client/ayon_core/pipeline/create/README.md
+++ b/client/ayon_core/pipeline/create/README.md
@@ -14,7 +14,7 @@ Except creating and removing instances are all changes not automatically propaga
 
 
 ## CreatedInstance
-Product of creation is "instance" which holds basic data defying it. Core data are `creator_identifier`, `family` and `subset`. Other data can be keys used to fill subset name or metadata modifying publishing process of the instance (more described later). All instances have `id` which holds constant `pyblish.avalon.instance` and `instance_id` which is identifier of the instance.
+Product of creation is "instance" which holds basic data defying it. Core data are `creator_identifier`, `family` and `subset`. Other data can be keys used to fill subset name or metadata modifying publishing process of the instance (more described later). All instances have `id` which holds constant `ayon.create.instance` or `pyblish.avalon.instance` (for backwards compatibility) and `instance_id` which is identifier of the instance.
 Family tells how should be instance processed and subset what name will published item have.
 - There are cases when subset is not fully filled during creation and may change during publishing. That is in most of cases caused because instance is related to other instance or instance data do not represent final product.
 
@@ -24,7 +24,7 @@ Family tells how should be instance processed and subset what name will publishe
 {
     # Immutable data after creation
     ## Identifier that this data represents instance for publishing (automatically assigned)
-    "id": "pyblish.avalon.instance",
+    "id": "ayon.create.instance",
     ## Identifier of this specific instance (automatically assigned)
     "instance_id": <uuid4>,
     ## Instance family (used from Creator)
@@ -48,7 +48,7 @@ Family tells how should be instance processed and subset what name will publishe
         <Plugin name>: {...},
         ...
     },
-    ## Additional data related to instance (`asset`, `task`, etc.)
+    ## Additional data related to instance (`folderPath`, `task`, etc.)
     ...
 }
 ```
diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py
index be685ea2cc..c50170f070 100644
--- a/client/ayon_core/pipeline/create/context.py
+++ b/client/ayon_core/pipeline/create/context.py
@@ -27,7 +27,11 @@ from ayon_core.lib.attribute_definitions import (
     get_default_values,
 )
 from ayon_core.host import IPublishHost, IWorkfileHost
-from ayon_core.pipeline import Anatomy
+from ayon_core.pipeline import (
+    Anatomy,
+    AYON_INSTANCE_ID,
+    AVALON_INSTANCE_ID,
+)
 from ayon_core.pipeline.plugin_discover import DiscoverResult
 
 from .creator_plugins import (
@@ -937,7 +941,11 @@ class CreatedInstance:
         # QUESTION Does it make sense to have data stored as ordered dict?
         self._data = collections.OrderedDict()
         # QUESTION Do we need this "id" information on instance?
-        self._data["id"] = "pyblish.avalon.instance"
+        item_id = data.get("id")
+        # TODO use only 'AYON_INSTANCE_ID' when all hosts support it
+        if item_id not in {AYON_INSTANCE_ID, AVALON_INSTANCE_ID}:
+            item_id = AVALON_INSTANCE_ID
+        self._data["id"] = item_id
         self._data["family"] = family
         self._data["subset"] = subset_name
         self._data["active"] = data.get("active", True)
@@ -1536,7 +1544,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..bc1528b9cd 100644
--- a/client/ayon_core/pipeline/create/legacy_create.py
+++ b/client/ayon_core/pipeline/create/legacy_create.py
@@ -10,6 +10,7 @@ import logging
 import collections
 
 from ayon_core.client import get_asset_by_id
+from ayon_core.pipeline.constants import AVALON_INSTANCE_ID
 
 from .subset_name import get_subset_name
 
@@ -27,15 +28,16 @@ class LegacyCreator(object):
     log = logging.getLogger("LegacyCreator")
     log.propagate = True
 
-    def __init__(self, name, asset, options=None, data=None):
+    def __init__(self, name, folder_path, options=None, data=None):
         self.name = name  # For backwards compatibility
         self.options = options
 
         # Default data
         self.data = collections.OrderedDict()
-        self.data["id"] = "pyblish.avalon.instance"
+        # TODO use 'AYON_INSTANCE_ID' when all hosts support it
+        self.data["id"] = AVALON_INSTANCE_ID
         self.data["family"] = self.family
-        self.data["asset"] = asset
+        self.data["folderPath"] = folder_path
         self.data["subset"] = name
         self.data["active"] = True
 
@@ -45,7 +47,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 +56,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/create/utils.py b/client/ayon_core/pipeline/create/utils.py
index 0547c20c0a..c2655f319f 100644
--- a/client/ayon_core/pipeline/create/utils.py
+++ b/client/ayon_core/pipeline/create/utils.py
@@ -32,7 +32,7 @@ def get_last_versions_for_instances(
     subset_names_by_asset_name = collections.defaultdict(set)
     instances_by_hierarchy = {}
     for instance in instances:
-        asset_name = instance.data.get("asset")
+        asset_name = instance.data.get("folderPath")
         subset_name = instance.subset_name
         if not asset_name or not subset_name:
             if use_value_for_missing:
diff --git a/client/ayon_core/pipeline/farm/pyblish_functions.py b/client/ayon_core/pipeline/farm/pyblish_functions.py
index 9423d8501c..4652d34011 100644
--- a/client/ayon_core/pipeline/farm/pyblish_functions.py
+++ b/client/ayon_core/pipeline/farm/pyblish_functions.py
@@ -197,7 +197,7 @@ def create_skeleton_instance(
 
     if data.get("extendFrames", False):
         time_data.start, time_data.end = extend_frames(
-            data["asset"],
+            data["folderPath"],
             data["subset"],
             time_data.start,
             time_data.end,
@@ -228,7 +228,7 @@ def create_skeleton_instance(
         "family": family,
         "subset": data["subset"],
         "families": families,
-        "asset": data["asset"],
+        "folderPath": data["folderPath"],
         "frameStart": time_data.start,
         "frameEnd": time_data.end,
         "handleStart": time_data.handle_start,
@@ -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])
@@ -777,7 +777,7 @@ def create_skeleton_instance_cache(instance):
 
     if data.get("extendFrames", False):
         time_data.start, time_data.end = extend_frames(
-            data["asset"],
+            data["folderPath"],
             data["subset"],
             time_data.start,
             time_data.end,
@@ -805,7 +805,7 @@ def create_skeleton_instance_cache(instance):
         "family": family,
         "subset": data["subset"],
         "families": families,
-        "asset": data["asset"],
+        "folderPath": data["folderPath"],
         "frameStart": time_data.start,
         "frameEnd": time_data.end,
         "handleStart": time_data.handle_start,
@@ -1011,7 +1011,7 @@ def copy_extend_frames(instance, representation):
     version = get_last_version_by_subset_name(
         project_name,
         instance.data.get("subset"),
-        asset_name=instance.data.get("asset")
+        asset_name=instance.data.get("folderPath")
     )
 
     # get its files based on extension
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/abstract_collect_render.py b/client/ayon_core/pipeline/publish/abstract_collect_render.py
index 764532cadb..6ca1d81bc7 100644
--- a/client/ayon_core/pipeline/publish/abstract_collect_render.py
+++ b/client/ayon_core/pipeline/publish/abstract_collect_render.py
@@ -30,7 +30,7 @@ class RenderInstance(object):
     label = attr.ib()  # label to show in GUI
     subset = attr.ib()  # subset name
     task = attr.ib()  # task name
-    asset = attr.ib()  # asset name
+    folderPath = attr.ib()  # folder path
     attachTo = attr.ib()  # subset name to attach render to
     setMembers = attr.ib()  # list of nodes/members producing render output
     publish = attr.ib()  # bool, True to publish instance
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/pipeline/schema/container-3.0.json b/client/ayon_core/pipeline/schema/container-3.0.json
new file mode 100644
index 0000000000..c9227bab11
--- /dev/null
+++ b/client/ayon_core/pipeline/schema/container-3.0.json
@@ -0,0 +1,59 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+
+    "title": "ayon:container-3.0",
+    "description": "A loaded asset",
+
+    "type": "object",
+
+    "additionalProperties": true,
+
+    "required": [
+        "schema",
+        "id",
+        "objectName",
+        "name",
+        "namespace",
+        "loader",
+        "representation"
+    ],
+    "properties": {
+        "schema": {
+            "description": "Schema identifier for payload",
+            "type": "string",
+            "enum": ["ayon:container-3.0"],
+            "example": "ayon:container-3.0"
+        },
+          "id": {
+            "description": "Identifier for finding object in host",
+            "type": "string",
+            "enum": ["ayon.load.container"],
+            "example": "ayon.load.container"
+        },
+        "objectName": {
+            "description": "Name of internal object, such as the objectSet in Maya.",
+            "type": "string",
+            "example": "Bruce_:rigDefault_CON"
+        },
+        "loader": {
+            "description": "Name of loader plug-in used to produce this container",
+            "type": "string",
+            "example": "ModelLoader"
+        },
+        "name": {
+            "description": "Internal object name of container in application",
+            "type": "string",
+            "example": "modelDefault_01"
+        },
+        "namespace": {
+            "description": "Internal namespace of container in application",
+            "type": "string",
+            "example": "Bruce_"
+        },
+        "representation": {
+            "description": "Unique id of representation in database",
+            "type": "string",
+            "example": "59523f355f8c1b5f6c5e8348"
+        }
+    }
+}
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_anatomy_instance_data.py b/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
index 336ac02b8e..f6326bb9e8 100644
--- a/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
+++ b/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
@@ -3,7 +3,7 @@ Requires:
     context     -> anatomyData
     context     -> projectEntity
     context     -> assetEntity
-    instance    -> asset
+    instance    -> folderPath
     instance    -> subset
     instance    -> family
 
@@ -68,7 +68,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
         instances_with_missing_asset_doc = collections.defaultdict(list)
         for instance in context:
             instance_asset_doc = instance.data.get("assetEntity")
-            _asset_name = instance.data["asset"]
+            _asset_name = instance.data["folderPath"]
 
             # There is possibility that assetEntity on instance is already set
             # which can happen in standalone publisher
@@ -296,7 +296,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
             if hierarchy:
                 parent_name = hierarchy.split("/")[-1]
 
-            asset_name = instance.data["asset"].split("/")[-1]
+            asset_name = instance.data["folderPath"].split("/")[-1]
             anatomy_data.update({
                 "asset": asset_name,
                 "hierarchy": hierarchy,
@@ -337,7 +337,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
 
         # Try to find task data based on hierarchy context and asset name
         hierarchy_context = instance.context.data.get("hierarchyContext")
-        asset_name = instance.data.get("asset")
+        asset_name = instance.data.get("folderPath")
         if not hierarchy_context or not asset_name:
             return
 
diff --git a/client/ayon_core/plugins/publish/collect_audio.py b/client/ayon_core/plugins/publish/collect_audio.py
index 6da3fd0685..f0efd546e7 100644
--- a/client/ayon_core/plugins/publish/collect_audio.py
+++ b/client/ayon_core/plugins/publish/collect_audio.py
@@ -66,7 +66,7 @@ class CollectAudio(pyblish.api.ContextPlugin):
         # Add audio to instance if exists.
         instances_by_asset_name = collections.defaultdict(list)
         for instance in filtered_instances:
-            asset_name = instance.data["asset"]
+            asset_name = instance.data["folderPath"]
             instances_by_asset_name[asset_name].append(instance)
 
         asset_names = set(instances_by_asset_name.keys())
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..64ef73e2d9 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
@@ -26,7 +25,7 @@ class CollectContextEntities(pyblish.api.ContextPlugin):
 
     def process(self, context):
         project_name = context.data["projectName"]
-        asset_name = context.data["asset"]
+        asset_name = context.data["folderPath"]
         task_name = context.data["task"]
 
         project_entity = get_project(project_name)
diff --git a/client/ayon_core/plugins/publish/collect_current_context.py b/client/ayon_core/plugins/publish/collect_current_context.py
index 90b9fcdcbd..418ca8eff6 100644
--- a/client/ayon_core/plugins/publish/collect_current_context.py
+++ b/client/ayon_core/plugins/publish/collect_current_context.py
@@ -1,7 +1,7 @@
 """
 Provides:
     context -> projectName (str)
-    context -> asset (str)
+    context -> folderPath (str)
     context -> task (str)
 """
 
@@ -21,7 +21,7 @@ class CollectCurrentContext(pyblish.api.ContextPlugin):
     def process(self, context):
         # Check if values are already set
         project_name = context.data.get("projectName")
-        asset_name = context.data.get("asset")
+        asset_name = context.data.get("folderPath")
         task_name = context.data.get("task")
 
         current_context = get_current_context()
@@ -29,13 +29,12 @@ class CollectCurrentContext(pyblish.api.ContextPlugin):
             context.data["projectName"] = current_context["project_name"]
 
         if not asset_name:
-            context.data["asset"] = current_context["asset_name"]
+            context.data["folderPath"] = current_context["asset_name"]
 
         if not task_name:
             context.data["task"] = current_context["task_name"]
 
         # QUESTION should we be explicit with keys? (the same on instances)
-        #   - 'asset' -> 'assetName'
         #   - 'task' -> 'taskName'
 
         self.log.info((
@@ -45,6 +44,6 @@ class CollectCurrentContext(pyblish.api.ContextPlugin):
             "Task: {task_name}"
         ).format(
             project_name=context.data["projectName"],
-            asset_name=context.data["asset"],
+            asset_name=context.data["folderPath"],
             task_name=context.data["task"]
         ))
diff --git a/client/ayon_core/plugins/publish/collect_frames_fix.py b/client/ayon_core/plugins/publish/collect_frames_fix.py
index 4903991d40..6996844eda 100644
--- a/client/ayon_core/plugins/publish/collect_frames_fix.py
+++ b/client/ayon_core/plugins/publish/collect_frames_fix.py
@@ -41,7 +41,7 @@ class CollectFramesFixDef(
         instance.data["frames_to_fix"] = frames_to_fix
 
         subset_name = instance.data["subset"]
-        asset_name = instance.data["asset"]
+        asset_name = instance.data["folderPath"]
 
         project_entity = instance.data["projectEntity"]
         project_name = project_entity["name"]
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..7152446de8 100644
--- a/client/ayon_core/plugins/publish/collect_from_create_context.py
+++ b/client/ayon_core/plugins/publish/collect_from_create_context.py
@@ -38,7 +38,6 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
 
         for created_instance in create_context.instances:
             instance_data = created_instance.data_to_store()
-            instance_data["asset"] = instance_data.pop("folderPath")
             if instance_data["active"]:
                 thumbnail_path = thumbnail_paths_by_instance_id.get(
                     created_instance.id
@@ -57,9 +56,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)
@@ -80,7 +79,7 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
         instance = context.create_instance(subset)
         instance.data.update({
             "subset": subset,
-            "asset": in_data["asset"],
+            "folderPath": in_data["folderPath"],
             "task": in_data["task"],
             "label": in_data.get("label") or subset,
             "name": subset,
diff --git a/client/ayon_core/plugins/publish/collect_hierarchy.py b/client/ayon_core/plugins/publish/collect_hierarchy.py
index 32f10ba4c8..d7077d030a 100644
--- a/client/ayon_core/plugins/publish/collect_hierarchy.py
+++ b/client/ayon_core/plugins/publish/collect_hierarchy.py
@@ -62,7 +62,7 @@ class CollectHierarchy(pyblish.api.ContextPlugin):
                 "pixelAspect": instance.data["pixelAspect"]
             }
             # Split by '/' for AYON where asset is a path
-            name = instance.data["asset"].split("/")[-1]
+            name = instance.data["folderPath"].split("/")[-1]
             actual = {name: shot_data}
 
             for parent in reversed(instance.data["parents"]):
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..fcea773208 100644
--- a/client/ayon_core/plugins/publish/collect_rendered_files.py
+++ b/client/ayon_core/plugins/publish/collect_rendered_files.py
@@ -71,14 +71,19 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
         """
         # validate basic necessary data
         data_err = "invalid json file - missing data"
-        required = ["asset", "user", "comment",
+        required = ["user", "comment",
                     "job", "instances", "version"]
         assert all(elem in data.keys() for elem in required), data_err
+        if "folderPath" not in data and "asset" not in data:
+            raise AssertionError(data_err)
+
+        if "folderPath" not in data:
+            data["folderPath"] = data.pop("asset")
 
         # set context by first json file
         ctx = self._context.data
 
-        ctx["asset"] = ctx.get("asset") or data.get("asset")
+        ctx["folderPath"] = ctx.get("folderPath") or data.get("folderPath")
         ctx["intent"] = ctx.get("intent") or data.get("intent")
         ctx["comment"] = ctx.get("comment") or data.get("comment")
         ctx["user"] = ctx.get("user") or data.get("user")
@@ -87,7 +92,7 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
         # basic sanity check to see if we are working in same context
         # if some other json file has different context, bail out.
         ctx_err = "inconsistent contexts in json files - %s"
-        assert ctx.get("asset") == data.get("asset"), ctx_err % "asset"
+        assert ctx.get("folderPath") == data.get("folderPath"), ctx_err % "folderPath"
         assert ctx.get("intent") == data.get("intent"), ctx_err % "intent"
         assert ctx.get("comment") == data.get("comment"), ctx_err % "comment"
         assert ctx.get("user") == data.get("user"), ctx_err % "user"
@@ -179,14 +184,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_hierarchy_to_ayon.py b/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py
index 0851b28134..7ceaf7d2ad 100644
--- a/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py
+++ b/client/ayon_core/plugins/publish/extract_hierarchy_to_ayon.py
@@ -45,7 +45,7 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
                 continue
 
             # Skip if instance asset does not match
-            instance_asset_name = instance.data.get("asset")
+            instance_asset_name = instance.data.get("folderPath")
             instances_by_asset_name[instance_asset_name].append(instance)
 
         project_doc = context.data["projectEntity"]
@@ -189,7 +189,7 @@ class ExtractHierarchyToAYON(pyblish.api.ContextPlugin):
         active_folder_paths = set()
         for instance in context:
             if instance.data.get("publish") is not False:
-                active_folder_paths.add(instance.data.get("asset"))
+                active_folder_paths.add(instance.data.get("folderPath"))
 
         active_folder_paths.discard(None)
 
diff --git a/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py b/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
index c6bdb59f59..dd45f3fc1a 100644
--- a/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
+++ b/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
@@ -68,7 +68,7 @@ class ExtractOtioAudioTracks(pyblish.api.ContextPlugin):
     def add_audio_to_instances(self, audio_file, instances):
         created_files = []
         for inst in instances:
-            name = inst.data["asset"]
+            name = inst.data["folderPath"]
 
             recycling_file = [f for f in created_files if name in f]
 
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/plugins/publish/integrate_thumbnail.py b/client/ayon_core/plugins/publish/integrate_thumbnail.py
index dd3fdd5073..03bc8d2d3d 100644
--- a/client/ayon_core/plugins/publish/integrate_thumbnail.py
+++ b/client/ayon_core/plugins/publish/integrate_thumbnail.py
@@ -196,12 +196,13 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
             ))
 
             asset_entity = instance.data["assetEntity"]
+            folder_path = instance.data["folderPath"]
             thumbnail_info_by_entity_id[asset_entity["_id"]] = {
                 "thumbnail_id": thumbnail_id,
                 "entity_type": "asset",
             }
-            self.log.debug("Setting thumbnail for asset \"{}\" <{}>".format(
-                asset_entity["name"], version_id
+            self.log.debug("Setting thumbnail for folder \"{}\" <{}>".format(
+                folder_path, version_id
             ))
 
         op_session = OperationsSession()
diff --git a/client/ayon_core/plugins/publish/validate_editorial_asset_name.py b/client/ayon_core/plugins/publish/validate_editorial_asset_name.py
index d40263d7f3..dd1a19f602 100644
--- a/client/ayon_core/plugins/publish/validate_editorial_asset_name.py
+++ b/client/ayon_core/plugins/publish/validate_editorial_asset_name.py
@@ -113,7 +113,7 @@ class ValidateEditorialAssetName(pyblish.api.ContextPlugin):
     def get_parents(self, context):
         return_dict = {}
         for instance in context:
-            asset = instance.data["asset"]
+            asset = instance.data["folderPath"]
             families = instance.data.get("families", []) + [
                 instance.data["family"]
             ]
diff --git a/client/ayon_core/plugins/publish/validate_unique_subsets.py b/client/ayon_core/plugins/publish/validate_unique_subsets.py
index 75d12f8e01..5e0e90cff6 100644
--- a/client/ayon_core/plugins/publish/validate_unique_subsets.py
+++ b/client/ayon_core/plugins/publish/validate_unique_subsets.py
@@ -36,7 +36,7 @@ class ValidateSubsetUniqueness(pyblish.api.ContextPlugin):
                 continue
 
             # Ignore instance without asset data
-            asset = instance.data.get("asset")
+            asset = instance.data.get("folderPath")
             if asset is None:
                 self.log.warning("Instance found without `asset` data: "
                                  "{}".format(instance.name))
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 fe54714f75..503dcc926d 100644
--- a/client/ayon_core/settings/ayon_settings.py
+++ b/client/ayon_core/settings/ayon_settings.py
@@ -52,26 +52,6 @@ def _convert_color(color_value):
     return color_value
 
 
-def _convert_host_imageio(host_settings):
-    if "imageio" not in host_settings:
-        return
-
-    # --- imageio ---
-    ayon_imageio = host_settings["imageio"]
-    # TODO remove when fixed on server
-    if "ocio_config" in ayon_imageio["ocio_config"]:
-        ayon_imageio["ocio_config"]["filepath"] = (
-            ayon_imageio["ocio_config"].pop("ocio_config")
-        )
-    # Convert file rules
-    imageio_file_rules = ayon_imageio["file_rules"]
-    new_rules = {}
-    for rule in imageio_file_rules["rules"]:
-        name = rule.pop("name")
-        new_rules[name] = rule
-    imageio_file_rules["rules"] = new_rules
-
-
 def _convert_general(ayon_settings, output, default_settings):
     output["core"] = ayon_settings["core"]
     version_check_interval = (
@@ -82,106 +62,24 @@ 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_timers_manager_system_settings(
-    ayon_settings, output, addon_versions, default_settings
-):
-    enabled = addon_versions.get("timers_manager") is not None
-    manager_settings = default_settings["modules"]["timers_manager"]
-    manager_settings["enabled"] = enabled
-    if enabled:
-        ayon_manager = ayon_settings["timers_manager"]
-        manager_settings.update({
-            key: ayon_manager[key]
-            for key in {
-                "auto_stop",
-                "full_time",
-                "message_time",
-                "disregard_publishing"
-            }
-        })
-    output["modules"]["timers_manager"] = manager_settings
-
-
-def _convert_clockify_system_settings(
-    ayon_settings, output, addon_versions, default_settings
-):
-    enabled = addon_versions.get("clockify") is not None
-    clockify_settings = default_settings["modules"]["clockify"]
-    clockify_settings["enabled"] = enabled
-    if enabled:
-        clockify_settings["workspace_name"] = (
-            ayon_settings["clockify"]["workspace_name"]
-        )
-    output["modules"]["clockify"] = clockify_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
-):
-    enabled = addon_versions.get("royalrender") is not None
-    rr_settings = default_settings["modules"]["royalrender"]
-    rr_settings["enabled"] = enabled
-    if enabled:
-        ayon_royalrender = ayon_settings["royalrender"]
-        rr_settings["rr_paths"] = {
-            item["name"]: item["value"]
-            for item in ayon_royalrender["rr_paths"]
-        }
-    output["modules"]["royalrender"] = rr_settings
-
-
 def _convert_modules_system(
     ayon_settings, output, addon_versions, default_settings
 ):
-    # TODO add all modules
-    # TODO add 'enabled' values
-    for func in (
-        _convert_kitsu_system_settings,
-        _convert_timers_manager_system_settings,
-        _convert_clockify_system_settings,
-        _convert_deadline_system_settings,
-        _convert_royalrender_system_settings,
-    ):
-        func(ayon_settings, output, addon_versions, default_settings)
+    for key in {
+        "timers_manager",
+        "clockify",
+        "royalrender",
+        "deadline",
+    }:
+        if addon_versions.get(key):
+            output[key] = ayon_settings
+        else:
+            output.pop(key, None)
 
     modules_settings = output["modules"]
     for module_name in (
         "sync_server",
-        "log_viewer",
-        "standalonepublish_tool",
-        "project_manager",
         "job_queue",
-        "avalon",
         "addon_paths",
     ):
         settings = default_settings["modules"][module_name]
@@ -214,9 +112,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)
 
@@ -238,67 +133,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"]
-    _convert_host_imageio(ayon_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"]
-    _convert_host_imageio(ayon_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"]
-
-    _convert_host_imageio(ayon_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"]
-    _convert_host_imageio(ayon_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"]
-
-    _convert_host_imageio(ayon_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"]
-
-    _convert_host_imageio(ayon_max)
-
-    output["max"] = ayon_max
-
-
 def _convert_nuke_knobs(knobs):
     new_knobs = []
     for knob in knobs:
@@ -442,7 +276,6 @@ def _convert_nuke_project_settings(ayon_settings, output):
 
     # --- ImageIO ---
     # NOTE 'monitorOutLut' is maybe not yet in v3 (ut should be)
-    _convert_host_imageio(ayon_nuke)
     ayon_imageio = ayon_nuke["imageio"]
 
     # workfile
@@ -491,7 +324,6 @@ def _convert_hiero_project_settings(ayon_settings, output):
         return
 
     ayon_hiero = ayon_settings["hiero"]
-    _convert_host_imageio(ayon_hiero)
 
     new_gui_filters = {}
     for item in ayon_hiero.pop("filters", []):
@@ -516,62 +348,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"]
-    _convert_host_imageio(ayon_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"]
-    _convert_host_imageio(ayon_substance_painter)
-    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"]
-    _convert_host_imageio(ayon_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"]
-
-    _convert_host_imageio(ayon_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"]
-    _convert_host_imageio(ayon_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
@@ -584,274 +360,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"]
-
-    _convert_host_imageio(ayon_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_host_imageio(output[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/defaults/project_settings/blender.json b/client/ayon_core/settings/defaults/project_settings/blender.json
index 385e97ef91..48f3ef8ef0 100644
--- a/client/ayon_core/settings/defaults/project_settings/blender.json
+++ b/client/ayon_core/settings/defaults/project_settings/blender.json
@@ -22,7 +22,8 @@
         "aov_separator": "underscore",
         "image_format": "exr",
         "multilayer_exr": true,
-        "aov_list": [],
+        "renderer": "CYCLES",
+        "aov_list": ["combined"],
         "custom_passes": []
     },
     "workfile_builder": {
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/publisher/widgets/assets_widget.py b/client/ayon_core/tools/publisher/widgets/assets_widget.py
index faad37104d..1c5016de99 100644
--- a/client/ayon_core/tools/publisher/widgets/assets_widget.py
+++ b/client/ayon_core/tools/publisher/widgets/assets_widget.py
@@ -5,13 +5,13 @@ from qtpy import QtWidgets, QtCore, QtGui
 from ayon_core.tools.utils import (
     PlaceholderLineEdit,
     RecursiveSortFilterProxyModel,
-    get_asset_icon,
 )
 from ayon_core.tools.utils.assets_widget import (
     SingleSelectAssetsWidget,
     ASSET_ID_ROLE,
     ASSET_NAME_ROLE,
     ASSET_PATH_ROLE,
+    get_asset_icon,
 )
 
 
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/subsetmanager/README.md b/client/ayon_core/tools/subsetmanager/README.md
index 062214834a..35b80ea114 100644
--- a/client/ayon_core/tools/subsetmanager/README.md
+++ b/client/ayon_core/tools/subsetmanager/README.md
@@ -14,6 +14,6 @@ Host is expected to implemented:
 - `list_instances` - returning list of dictionaries (instances), must contain
     unique uuid field
     example: 
-    ```[{"uuid":"15","active":true,"subset":"imageBG","family":"image","id":"pyblish.avalon.instance","asset":"Town"}]```
+    ```[{"uuid":"15","active":true,"subset":"imageBG","family":"image","id":"ayon.create.instance","asset":"Town"}]```
 - `remove_instance(instance)` - removes instance from file's metadata
     instance is a dictionary, with uuid field 
\ No newline at end of file
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/utils/__init__.py b/client/ayon_core/tools/utils/__init__.py
index 7be0ea5e9f..445b4d9b97 100644
--- a/client/ayon_core/tools/utils/__init__.py
+++ b/client/ayon_core/tools/utils/__init__.py
@@ -37,10 +37,6 @@ from .lib import (
     get_qt_app,
     get_ayon_qt_app,
     get_openpype_qt_app,
-    get_asset_icon,
-    get_asset_icon_by_name,
-    get_asset_icon_name_from_doc,
-    get_asset_icon_color_from_doc,
 )
 
 from .models import (
@@ -100,10 +96,6 @@ __all__ = (
     "get_qt_app",
     "get_ayon_qt_app",
     "get_openpype_qt_app",
-    "get_asset_icon",
-    "get_asset_icon_by_name",
-    "get_asset_icon_name_from_doc",
-    "get_asset_icon_color_from_doc",
 
     "RecursiveSortFilterProxyModel",
 
diff --git a/client/ayon_core/tools/utils/assets_widget.py b/client/ayon_core/tools/utils/assets_widget.py
index 7bacf3291d..7c3fd8d97c 100644
--- a/client/ayon_core/tools/utils/assets_widget.py
+++ b/client/ayon_core/tools/utils/assets_widget.py
@@ -10,6 +10,7 @@ from ayon_core.client import (
 )
 from ayon_core.style import (
     get_default_tools_icon_color,
+    get_default_entity_icon_color,
 )
 from ayon_core.tools.flickcharm import FlickCharm
 
@@ -21,7 +22,7 @@ from .widgets import PlaceholderLineEdit
 from .models import RecursiveSortFilterProxyModel
 from .lib import (
     DynamicQThread,
-    get_asset_icon
+    get_qta_icon_by_name_and_color
 )
 
 ASSET_ID_ROLE = QtCore.Qt.UserRole + 1
@@ -31,6 +32,59 @@ ASSET_UNDERLINE_COLORS_ROLE = QtCore.Qt.UserRole + 4
 ASSET_PATH_ROLE = QtCore.Qt.UserRole + 5
 
 
+def _get_default_asset_icon_name(has_children):
+    if has_children:
+        return "fa.folder"
+    return "fa.folder-o"
+
+
+def _get_asset_icon_color_from_doc(asset_doc):
+    if asset_doc:
+        return asset_doc["data"].get("color")
+    return None
+
+
+def _get_asset_icon_name_from_doc(asset_doc):
+    if asset_doc:
+        return asset_doc["data"].get("icon")
+    return None
+
+
+def _get_asset_icon_color(asset_doc):
+    icon_color = _get_asset_icon_color_from_doc(asset_doc)
+    if icon_color:
+        return icon_color
+    return get_default_entity_icon_color()
+
+
+def _get_asset_icon_name(asset_doc, has_children=True):
+    icon_name = _get_asset_icon_name_from_doc(asset_doc)
+    if icon_name:
+        return icon_name
+    return _get_default_asset_icon_name(has_children)
+
+
+def get_asset_icon(asset_doc, has_children=False):
+    """Get asset icon.
+
+    Deprecated:
+        This function will be removed in future releases. Use on your own
+            risk.
+
+    Args:
+        asset_doc (dict): Asset document.
+        has_children (Optional[bool]): Asset has children assets.
+
+    Returns:
+        QIcon: Asset icon.
+
+    """
+    icon_name = _get_asset_icon_name(asset_doc, has_children)
+    icon_color = _get_asset_icon_color(asset_doc)
+
+    return get_qta_icon_by_name_and_color(icon_name, icon_color)
+
+
 class _AssetsView(TreeViewSpinner, DeselectableTreeView):
     """Asset items view.
 
diff --git a/client/ayon_core/tools/utils/lib.py b/client/ayon_core/tools/utils/lib.py
index b7edd6be71..e785cec390 100644
--- a/client/ayon_core/tools/utils/lib.py
+++ b/client/ayon_core/tools/utils/lib.py
@@ -234,62 +234,6 @@ def get_qta_icon_by_name_and_color(icon_name, icon_color):
     return icon
 
 
-def get_asset_icon_name(asset_doc, has_children=True):
-    icon_name = get_asset_icon_name_from_doc(asset_doc)
-    if icon_name:
-        return icon_name
-    return get_default_asset_icon_name(has_children)
-
-
-def get_asset_icon_color(asset_doc):
-    icon_color = get_asset_icon_color_from_doc(asset_doc)
-    if icon_color:
-        return icon_color
-    return get_default_entity_icon_color()
-
-
-def get_default_asset_icon_name(has_children):
-    if has_children:
-        return "fa.folder"
-    return "fa.folder-o"
-
-
-def get_asset_icon_name_from_doc(asset_doc):
-    if asset_doc:
-        return asset_doc["data"].get("icon")
-    return None
-
-
-def get_asset_icon_color_from_doc(asset_doc):
-    if asset_doc:
-        return asset_doc["data"].get("color")
-    return None
-
-
-def get_asset_icon_by_name(icon_name, icon_color, has_children=False):
-    if not icon_name:
-        icon_name = get_default_asset_icon_name(has_children)
-
-    if icon_color:
-        icon_color = QtGui.QColor(icon_color)
-    else:
-        icon_color = get_default_entity_icon_color()
-    icon = get_qta_icon_by_name_and_color(icon_name, icon_color)
-    if icon is not None:
-        return icon
-    return get_qta_icon_by_name_and_color(
-        get_default_asset_icon_name(has_children),
-        icon_color
-    )
-
-
-def get_asset_icon(asset_doc, has_children=False):
-    icon_name = get_asset_icon_name(asset_doc, has_children)
-    icon_color = get_asset_icon_color(asset_doc)
-
-    return get_qta_icon_by_name_and_color(icon_name, icon_color)
-
-
 def get_default_task_icon(color=None):
     if color is None:
         color = get_default_entity_icon_color()
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 d7266d852b..470bbf256b 100644
--- a/package.py
+++ b/package.py
@@ -1,8 +1,11 @@
 name = "core"
 title = "Core"
-version = "0.2.1-dev.1"
+version = "0.3.0-dev.1"
 
 client_dir = "ayon_core"
 
 plugin_for = ["ayon_server"]
-ayon_version = ">=1.0.3,<2.0.0"
+requires = [
+   "~ayon_server-1.0.3+<2.0.0",
+]
+
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/applications/server/__init__.py b/server_addon/applications/server/__init__.py
index e782e8a591..d5c2de3df3 100644
--- a/server_addon/applications/server/__init__.py
+++ b/server_addon/applications/server/__init__.py
@@ -92,8 +92,9 @@ class ApplicationsAddon(BaseServerAddon):
     settings_model = ApplicationsAddonSettings
 
     async def get_default_settings(self):
-        applications_path = os.path.join(self.addon_dir, "applications.json")
-        tools_path = os.path.join(self.addon_dir, "tools.json")
+        server_dir = os.path.join(self.addon_dir, "server")
+        applications_path = os.path.join(server_dir, "applications.json")
+        tools_path = os.path.join(server_dir, "tools.json")
         default_values = copy.deepcopy(DEFAULT_VALUES)
         with open(applications_path, "r") as stream:
             default_values.update(json.load(stream))
diff --git a/server_addon/blender/server/settings/render_settings.py b/server_addon/blender/server/settings/render_settings.py
index f91ba1627a..f992ea6fcc 100644
--- a/server_addon/blender/server/settings/render_settings.py
+++ b/server_addon/blender/server/settings/render_settings.py
@@ -23,6 +23,13 @@ def image_format_enum():
     ]
 
 
+def renderers_enum():
+    return [
+        {"value": "CYCLES", "label": "Cycles"},
+        {"value": "BLENDER_EEVEE", "label": "Eevee"},
+    ]
+
+
 def aov_list_enum():
     return [
         {"value": "empty", "label": "< none >"},
@@ -30,18 +37,52 @@ def aov_list_enum():
         {"value": "z", "label": "Z"},
         {"value": "mist", "label": "Mist"},
         {"value": "normal", "label": "Normal"},
-        {"value": "diffuse_light", "label": "Diffuse Light"},
+        {"value": "position", "label": "Position (Cycles Only)"},
+        {"value": "vector", "label": "Vector (Cycles Only)"},
+        {"value": "uv", "label": "UV (Cycles Only)"},
+        {"value": "denoising", "label": "Denoising Data (Cycles Only)"},
+        {"value": "object_index", "label": "Object Index (Cycles Only)"},
+        {"value": "material_index", "label": "Material Index (Cycles Only)"},
+        {"value": "sample_count", "label": "Sample Count (Cycles Only)"},
+        {"value": "diffuse_light", "label": "Diffuse Light/Direct"},
+        {
+            "value": "diffuse_indirect",
+            "label": "Diffuse Indirect (Cycles Only)"
+        },
         {"value": "diffuse_color", "label": "Diffuse Color"},
-        {"value": "specular_light", "label": "Specular Light"},
-        {"value": "specular_color", "label": "Specular Color"},
-        {"value": "volume_light", "label": "Volume Light"},
+        {"value": "specular_light", "label": "Specular (Glossy) Light/Direct"},
+        {
+            "value": "specular_indirect",
+            "label": "Specular (Glossy) Indirect (Cycles Only)"
+        },
+        {"value": "specular_color", "label": "Specular (Glossy) Color"},
+        {
+            "value": "transmission_light",
+            "label": "Transmission Light/Direct (Cycles Only)"
+        },
+        {
+            "value": "transmission_indirect",
+            "label": "Transmission Indirect (Cycles Only)"
+        },
+        {
+            "value": "transmission_color",
+            "label": "Transmission Color (Cycles Only)"
+        },
+        {"value": "volume_light", "label": "Volume Light/Direct"},
+        {"value": "volume_indirect", "label": "Volume Indirect (Cycles Only)"},
         {"value": "emission", "label": "Emission"},
         {"value": "environment", "label": "Environment"},
-        {"value": "shadow", "label": "Shadow"},
+        {"value": "shadow", "label": "Shadow/Shadow Catcher"},
         {"value": "ao", "label": "Ambient Occlusion"},
-        {"value": "denoising", "label": "Denoising"},
-        {"value": "volume_direct", "label": "Direct Volumetric Scattering"},
-        {"value": "volume_indirect", "label": "Indirect Volumetric Scattering"}
+        {"value": "bloom", "label": "Bloom (Eevee Only)"},
+        {"value": "transparent", "label": "Transparent (Eevee Only)"},
+        {"value": "cryptomatte_object", "label": "Cryptomatte Object"},
+        {"value": "cryptomatte_material", "label": "Cryptomatte Material"},
+        {"value": "cryptomatte_asset", "label": "Cryptomatte Asset"},
+        {
+            "value": "cryptomatte_accurate",
+            "label": "Cryptomatte Accurate Mode (Eevee Only)"
+        },
     ]
 
 
@@ -81,6 +122,14 @@ class RenderSettingsModel(BaseSettingsModel):
     multilayer_exr: bool = SettingsField(
         title="Multilayer (EXR)"
     )
+    renderer: str = SettingsField(
+        "CYCLES",
+        title="Renderer",
+        enum_resolver=renderers_enum
+    )
+    compositing: bool = SettingsField(
+        title="Enable Compositing"
+    )
     aov_list: list[str] = SettingsField(
         default_factory=list,
         enum_resolver=aov_list_enum,
@@ -102,6 +151,8 @@ DEFAULT_RENDER_SETTINGS = {
     "aov_separator": "underscore",
     "image_format": "exr",
     "multilayer_exr": True,
-    "aov_list": [],
+    "renderer": "CYCLES",
+    "compositing": True,
+    "aov_list": ["combined"],
     "custom_passes": []
 }
diff --git a/server_addon/blender/server/version.py b/server_addon/blender/server/version.py
index 1276d0254f..0a8da88258 100644
--- a/server_addon/blender/server/version.py
+++ b/server_addon/blender/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"
diff --git a/server_addon/create_ayon_addons.py b/server_addon/create_ayon_addons.py
index 08443d6588..9553980f5d 100644
--- a/server_addon/create_ayon_addons.py
+++ b/server_addon/create_ayon_addons.py
@@ -40,6 +40,11 @@ IGNORED_HOSTS = [
 
 IGNORED_MODULES = []
 
+PACKAGE_PY_TEMPLATE = """name = "{addon_name}"
+version = "{addon_version}"
+plugin_for = ["ayon_server"]
+"""
+
 
 class ZipFileLongPaths(zipfile.ZipFile):
     """Allows longer paths in zip files.
@@ -144,18 +149,12 @@ def create_addon_zip(
     output_dir: Path,
     addon_name: str,
     addon_version: str,
-    keep_source: bool
+    keep_source: bool,
 ):
     zip_filepath = output_dir / f"{addon_name}-{addon_version}.zip"
+
     addon_output_dir = output_dir / addon_name / addon_version
     with ZipFileLongPaths(zip_filepath, "w", zipfile.ZIP_DEFLATED) as zipf:
-        zipf.writestr(
-            "manifest.json",
-            json.dumps({
-                "addon_name": addon_name,
-                "addon_version": addon_version
-            })
-        )
         # Add client code content to zip
         src_root = os.path.normpath(str(addon_output_dir.absolute()))
         src_root_offset = len(src_root) + 1
@@ -167,9 +166,10 @@ def create_addon_zip(
             for filename in filenames:
                 src_path = os.path.join(root, filename)
                 if rel_root:
-                    dst_path = os.path.join("addon", rel_root, filename)
+                    dst_path = os.path.join(rel_root, filename)
                 else:
-                    dst_path = os.path.join("addon", filename)
+                    dst_path = filename
+
                 zipf.write(src_path, dst_path)
 
     if not keep_source:
@@ -180,9 +180,8 @@ def create_addon_package(
     addon_dir: Path,
     output_dir: Path,
     create_zip: bool,
-    keep_source: bool
+    keep_source: bool,
 ):
-    server_dir = addon_dir / "server"
     addon_version = get_addon_version(addon_dir)
 
     addon_output_dir = output_dir / addon_dir.name / addon_version
@@ -191,18 +190,21 @@ def create_addon_package(
     addon_output_dir.mkdir(parents=True)
 
     # Copy server content
-    src_root = os.path.normpath(str(server_dir.absolute()))
-    src_root_offset = len(src_root) + 1
-    for root, _, filenames in os.walk(str(server_dir)):
-        dst_root = addon_output_dir
-        if root != src_root:
-            rel_root = root[src_root_offset:]
-            dst_root = dst_root / rel_root
+    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_name, addon_version=addon_version
+    )
 
-        dst_root.mkdir(parents=True, exist_ok=True)
-        for filename in filenames:
-            src_path = os.path.join(root, filename)
-            shutil.copy(src_path, str(dst_root))
+    with open(package_py, "w+") as pkg_py:
+        pkg_py.write(package_py_content)
+
+    server_dir = addon_dir / "server"
+    shutil.copytree(
+        server_dir, addon_output_dir / "server", dirs_exist_ok=True
+    )
 
     if create_zip:
         create_addon_zip(
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,