diff --git a/client/ayon_core/hooks/pre_add_last_workfile_arg.py b/client/ayon_core/hooks/pre_add_last_workfile_arg.py
index 8144afd401..d11bb106d6 100644
--- a/client/ayon_core/hooks/pre_add_last_workfile_arg.py
+++ b/client/ayon_core/hooks/pre_add_last_workfile_arg.py
@@ -27,7 +27,8 @@ class AddLastWorkfileToLaunchArgs(PreLaunchHook):
         "tvpaint",
         "substancepainter",
         "aftereffects",
-        "wrap"
+        "wrap",
+        "openrv"
     }
     launch_types = {LaunchTypes.local}
 
diff --git a/client/ayon_core/hooks/pre_ocio_hook.py b/client/ayon_core/hooks/pre_ocio_hook.py
index a709fd9fa4..08d9563975 100644
--- a/client/ayon_core/hooks/pre_ocio_hook.py
+++ b/client/ayon_core/hooks/pre_ocio_hook.py
@@ -19,6 +19,7 @@ class OCIOEnvHook(PreLaunchHook):
         "nuke",
         "hiero",
         "resolve",
+        "openrv"
     }
     launch_types = set()
 
@@ -30,7 +31,7 @@ class OCIOEnvHook(PreLaunchHook):
             asset_name=self.data["folder_path"],
             task_name=self.data["task_name"],
             host_name=self.host_name,
-            system_settings=self.data["system_settings"]
+            settings=self.data["project_settings"]
         )
 
         config_data = get_imageio_config(
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 bd005f5d4f..93aec33222 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/create/create_render.py
@@ -11,7 +11,7 @@ from ayon_core.pipeline import (
 from ayon_core.hosts.aftereffects.api.pipeline import cache_and_get_instances
 from ayon_core.hosts.aftereffects.api.lib import set_settings
 from ayon_core.lib import prepare_template_data
-from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
+from ayon_core.pipeline.create import PRODUCT_NAME_ALLOWED_SYMBOLS
 
 
 class RenderCreator(Creator):
@@ -22,7 +22,7 @@ class RenderCreator(Creator):
     """
     identifier = "render"
     label = "Render"
-    family = "render"
+    product_type = "render"
     description = "Render creator"
 
     create_allow_context_change = True
@@ -31,7 +31,7 @@ class RenderCreator(Creator):
     mark_for_review = True
     force_setting_values = True
 
-    def create(self, subset_name_from_ui, data, pre_create_data):
+    def create(self, product_name, data, pre_create_data):
         stub = api.get_stub()  # only after After Effects is up
 
         try:
@@ -58,33 +58,37 @@ class RenderCreator(Creator):
                                 len(comps) > 1)
         for comp in comps:
             composition_name = re.sub(
-                "[^{}]+".format(SUBSET_NAME_ALLOWED_SYMBOLS),
+                "[^{}]+".format(PRODUCT_NAME_ALLOWED_SYMBOLS),
                 "",
                 comp.name
             )
             if use_composition_name:
-                if "{composition}" not in subset_name_from_ui.lower():
-                    subset_name_from_ui += "{Composition}"
+                if "{composition}" not in product_name.lower():
+                    product_name += "{Composition}"
 
                 dynamic_fill = prepare_template_data({"composition":
                                                       composition_name})
-                subset_name = subset_name_from_ui.format(**dynamic_fill)
+                comp_product_name = product_name.format(**dynamic_fill)
                 data["composition_name"] = composition_name
             else:
-                subset_name = subset_name_from_ui
-                subset_name = re.sub(r"\{composition\}", '', subset_name,
-                                     flags=re.IGNORECASE)
+                comp_product_name = re.sub(
+                    r"\{composition\}",
+                    "",
+                    product_name,
+                    flags=re.IGNORECASE
+                )
 
             for inst in self.create_context.instances:
-                if subset_name == inst.subset_name:
+                if comp_product_name == inst.product_name:
                     raise CreatorError("{} already exists".format(
-                        inst.subset_name))
+                        inst.product_name))
 
             data["members"] = [comp.id]
             data["orig_comp_name"] = composition_name
 
-            new_instance = CreatedInstance(self.family, subset_name, data,
-                                           self)
+            new_instance = CreatedInstance(
+                self.product_type, comp_product_name, data, self
+            )
             if "farm" in pre_create_data:
                 use_farm = pre_create_data["farm"]
                 new_instance.creator_attributes["farm"] = use_farm
@@ -96,7 +100,7 @@ class RenderCreator(Creator):
                                    new_instance.data_to_store())
             self._add_instance_to_context(new_instance)
 
-            stub.rename_item(comp.id, subset_name)
+            stub.rename_item(comp.id, comp_product_name)
             if self.force_setting_values:
                 set_settings(True, True, [comp.id], print_msg=False)
 
@@ -107,7 +111,7 @@ class RenderCreator(Creator):
                             "selected by default.",
                     default=True, label="Use selection"),
             BoolDef("use_composition_name",
-                    label="Use composition name in subset"),
+                    label="Use composition name in product"),
             UISeparatorDef(),
             BoolDef("farm", label="Render on farm"),
             BoolDef(
@@ -133,9 +137,14 @@ class RenderCreator(Creator):
 
     def collect_instances(self):
         for instance_data in cache_and_get_instances(self):
-            # legacy instances have family=='render' or 'renderLocal', use them
-            creator_id = (instance_data.get("creator_identifier") or
-                          instance_data.get("family", '').replace("Local", ''))
+            # legacy instances have product_type=='render' or 'renderLocal', use them
+            creator_id = instance_data.get("creator_identifier")
+            if not creator_id:
+                # NOTE this is for backwards compatibility but probably can be
+                #   removed
+                creator_id = instance_data.get("family", "")
+                creator_id = creator_id.replace("Local", "")
+
             if creator_id == self.identifier:
                 instance_data = self._handle_legacy(instance_data)
                 instance = CreatedInstance.from_existing(
@@ -147,10 +156,10 @@ class RenderCreator(Creator):
         for created_inst, _changes in update_list:
             api.get_stub().imprint(created_inst.get("instance_id"),
                                    created_inst.data_to_store())
-            subset_change = _changes.get("subset")
-            if subset_change:
+            name_change = _changes.get("productName")
+            if name_change:
                 api.get_stub().rename_item(created_inst.data["members"][0],
-                                           subset_change.new_value)
+                                           name_change.new_value)
 
     def remove_instances(self, instances):
         """Removes metadata and renames to original comp name if available."""
@@ -183,15 +192,15 @@ class RenderCreator(Creator):
     def get_detail_description(self):
         return """Creator for Render instances
 
-        Main publishable item in AfterEffects will be of `render` family.
+        Main publishable item in AfterEffects will be of `render` product type.
         Result of this item (instance) is picture sequence or video that could
         be a final delivery product or loaded and used in another DCCs.
 
-        Select single composition and create instance of 'render' family or
-        turn off 'Use selection' to create instance for all compositions.
+        Select single composition and create instance of 'render' product type
+        or turn off 'Use selection' to create instance for all compositions.
 
-        'Use composition name in subset' allows to explicitly add composition
-        name into created subset name.
+        'Use composition name in product' allows to explicitly add composition
+        name into created product name.
 
         Position of composition name could be set in
         `project_settings/global/tools/creator/product_name_profiles` with
@@ -201,15 +210,16 @@ class RenderCreator(Creator):
         be handled at same time.
 
         If {composition} placeholder is not us 'product_name_profiles'
-        composition name will be capitalized and set at the end of subset name
-        if necessary.
+        composition name will be capitalized and set at the end of
+        product name if necessary.
 
         If composition name should be used, it will be cleaned up of characters
         that would cause an issue in published file names.
         """
 
-    def get_dynamic_data(self, variant, task_name, asset_doc,
-                         project_name, host_name, instance):
+    def get_dynamic_data(
+        self, project_name, asset_doc, task_name, variant, host_name, instance
+    ):
         dynamic_data = {}
         if instance is not None:
             composition_name = instance.get("composition_name")
@@ -234,9 +244,9 @@ class RenderCreator(Creator):
             instance_data["task"] = self.create_context.get_current_task_name()
 
         if not instance_data.get("creator_attributes"):
-            is_old_farm = instance_data["family"] != "renderLocal"
+            is_old_farm = instance_data.get("family") != "renderLocal"
             instance_data["creator_attributes"] = {"farm": is_old_farm}
-            instance_data["family"] = self.family
+            instance_data["productType"] = self.product_type
 
         if instance_data["creator_attributes"].get("mark_for_review") is None:
             instance_data["creator_attributes"]["mark_for_review"] = True
diff --git a/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py b/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py
index 49f965800d..282e06d0bf 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/create/workfile_creator.py
@@ -9,7 +9,7 @@ from ayon_core.hosts.aftereffects.api.pipeline import cache_and_get_instances
 
 class AEWorkfileCreator(AutoCreator):
     identifier = "workfile"
-    family = "workfile"
+    product_type = "workfile"
 
     default_variant = "Main"
 
@@ -20,9 +20,9 @@ class AEWorkfileCreator(AutoCreator):
         for instance_data in cache_and_get_instances(self):
             creator_id = instance_data.get("creator_identifier")
             if creator_id == self.identifier:
-                subset_name = instance_data["subset"]
+                product_name = instance_data["productName"]
                 instance = CreatedInstance(
-                    self.family, subset_name, instance_data, self
+                    self.product_type, product_name, instance_data, self
                 )
                 self._add_instance_to_context(instance)
 
@@ -33,7 +33,7 @@ class AEWorkfileCreator(AutoCreator):
     def create(self, options=None):
         existing_instance = None
         for instance in self.create_context.instances:
-            if instance.family == self.family:
+            if instance.product_type == self.product_type:
                 existing_instance = instance
                 break
 
@@ -49,9 +49,12 @@ class AEWorkfileCreator(AutoCreator):
 
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
             )
             data = {
                 "folderPath": asset_name,
@@ -59,12 +62,16 @@ class AEWorkfileCreator(AutoCreator):
                 "variant": self.default_variant,
             }
             data.update(self.get_dynamic_data(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name, None
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
+                None,
             ))
 
             new_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             self._add_instance_to_context(new_instance)
 
@@ -76,10 +83,13 @@ class AEWorkfileCreator(AutoCreator):
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
             )
             existing_instance["folderPath"] = asset_name
             existing_instance["task"] = task_name
-            existing_instance["subset"] = subset_name
+            existing_instance["productName"] = product_name
diff --git a/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py b/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py
index f23d7ec0bd..c7f743fce4 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/load/load_background.py
@@ -11,7 +11,7 @@ from ayon_core.hosts.aftereffects.api.lib import (
 
 class BackgroundLoader(api.AfterEffectsLoader):
     """
-        Load images from Background family
+        Load images from Background product type
         Creates for each background separate folder with all imported images
         from background json AND automatically created composition with layers,
         each layer for separate image.
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 32e3b4f3c3..afd58ca758 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_render.py
@@ -60,8 +60,8 @@ class CollectAERender(publish.AbstractCollectRender):
             if not inst.data.get("active", True):
                 continue
 
-            family = inst.data["family"]
-            if family not in ["render", "renderLocal"]:  # legacy
+            product_type = inst.data["productType"]
+            if product_type not in ["render", "renderLocal"]:  # legacy
                 continue
 
             comp_id = int(inst.data["members"][0])
@@ -81,29 +81,32 @@ class CollectAERender(publish.AbstractCollectRender):
             fps = comp_info.frameRate
             # TODO add resolution when supported by extension
 
-            task_name = inst.data.get("task")  # legacy
+            task_name = inst.data.get("task")
 
             render_q = CollectAERender.get_stub().get_render_info(comp_id)
             if not render_q:
                 raise ValueError("No file extension set in Render Queue")
             render_item = render_q[0]
 
+            product_type = "render"
             instance_families = inst.data.get("families", [])
-            subset_name = inst.data["subset"]
+            instance_families.append(product_type)
+            product_name = inst.data["productName"]
             instance = AERenderInstance(
-                family="render",
+                productType=product_type,
+                family=product_type,
                 families=instance_families,
                 version=version,
                 time="",
                 source=current_file,
-                label="{} - {}".format(subset_name, family),
-                subset=subset_name,
+                label="{} - {}".format(product_name, product_type),
+                productName=product_name,
                 folderPath=inst.data["folderPath"],
                 task=task_name,
                 attachTo=False,
                 setMembers='',
                 publish=True,
-                name=subset_name,
+                name=product_name,
                 resolutionWidth=render_item.width,
                 resolutionHeight=render_item.height,
                 pixelAspect=1,
@@ -176,7 +179,7 @@ class CollectAERender(publish.AbstractCollectRender):
             if "#" not in file_name:  # single frame (mov)W
                 path = os.path.join(base_dir, "{}_{}_{}.{}".format(
                     render_instance.folderPath,
-                    render_instance.subset,
+                    render_instance.productName,
                     version_str,
                     ext
                 ))
@@ -185,7 +188,7 @@ class CollectAERender(publish.AbstractCollectRender):
                 for frame in range(start, end + 1):
                     path = os.path.join(base_dir, "{}_{}_{}.{}.{}".format(
                         render_instance.folderPath,
-                        render_instance.subset,
+                        render_instance.productName,
                         version_str,
                         str(frame).zfill(self.padding_width),
                         ext
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_review.py b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_review.py
index a933b9fed2..667e9cf8b9 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_review.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_review.py
@@ -3,7 +3,7 @@ Requires:
     None
 
 Provides:
-    instance     -> family ("review")
+    instance     -> families ("review")
 """
 import pyblish.api
 
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 107643f56c..cd8e102500 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py
+++ b/client/ayon_core/hosts/aftereffects/plugins/publish/collect_workfile.py
@@ -2,9 +2,6 @@ import os
 
 import pyblish.api
 
-from ayon_core.client import get_asset_name_identifier
-from ayon_core.pipeline.create import get_subset_name
-
 
 class CollectWorkfile(pyblish.api.ContextPlugin):
     """ Adds the AE render instances """
@@ -15,86 +12,24 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
     default_variant = "Main"
 
     def process(self, context):
-        existing_instance = None
+        workfile_instance = None
         for instance in context:
-            if instance.data["family"] == "workfile":
-                self.log.debug("Workfile instance found, won't create new")
-                existing_instance = instance
+            if instance.data["productType"] == "workfile":
+                self.log.debug("Workfile instance found")
+                workfile_instance = instance
                 break
 
         current_file = context.data["currentFile"]
         staging_dir = os.path.dirname(current_file)
         scene_file = os.path.basename(current_file)
-        if existing_instance is None:  # old publish
-            instance = self._get_new_instance(context, scene_file)
-        else:
-            instance = existing_instance
+        if workfile_instance is None:
+            self.log.debug("Workfile instance not found. Skipping")
+            return
 
         # creating representation
-        representation = {
-            'name': 'aep',
-            'ext': 'aep',
-            'files': scene_file,
+        workfile_instance.data["representations"].append({
+            "name": "aep",
+            "ext": "aep",
+            "files": scene_file,
             "stagingDir": staging_dir,
-        }
-
-        if not instance.data.get("representations"):
-            instance.data["representations"] = []
-        instance.data["representations"].append(representation)
-
-        instance.data["publish"] = instance.data["active"]  # for DL
-
-    def _get_new_instance(self, context, scene_file):
-        task = context.data["task"]
-        version = context.data["version"]
-        asset_entity = context.data["assetEntity"]
-        project_entity = context.data["projectEntity"]
-
-        folder_path = get_asset_name_identifier(asset_entity)
-
-        instance_data = {
-            "active": True,
-            "folderPath": folder_path,
-            "task": task,
-            "frameStart": context.data['frameStart'],
-            "frameEnd": context.data['frameEnd'],
-            "handleStart": context.data['handleStart'],
-            "handleEnd": context.data['handleEnd'],
-            "fps": asset_entity["data"]["fps"],
-            "resolutionWidth": asset_entity["data"].get(
-                "resolutionWidth",
-                project_entity["data"]["resolutionWidth"]),
-            "resolutionHeight": asset_entity["data"].get(
-                "resolutionHeight",
-                project_entity["data"]["resolutionHeight"]),
-            "pixelAspect": 1,
-            "step": 1,
-            "version": version
-        }
-
-        # workfile instance
-        family = "workfile"
-        subset = get_subset_name(
-            family,
-            self.default_variant,
-            context.data["anatomyData"]["task"]["name"],
-            context.data["assetEntity"],
-            context.data["anatomyData"]["project"]["name"],
-            host_name=context.data["hostName"],
-            project_settings=context.data["project_settings"]
-        )
-        # Create instance
-        instance = context.create_instance(subset)
-
-        # creating instance data
-        instance.data.update({
-            "subset": subset,
-            "label": scene_file,
-            "family": family,
-            "families": [family],
-            "representations": list()
         })
-
-        instance.data.update(instance_data)
-
-        return instance
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml b/client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml
index edf62a5141..d89a851c64 100644
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml
+++ b/client/ayon_core/hosts/aftereffects/plugins/publish/help/validate_instance_asset.xml
@@ -3,9 +3,9 @@
 <error id="main">
 <title>Subset context</title>
 <description>
-## Invalid subset context
+## Invalid product context
 
-Context of the given subset doesn't match your current scene.
+Context of the given product doesn't match your current scene.
 
 ### How to repair?
 
@@ -15,7 +15,7 @@ You can fix this with "repair" button on the right and refresh Publish at the bo
 ### __Detailed Info__ (optional)
 
 This might happen if you are reuse old workfile and open it in different context.
-(Eg. you created subset "renderCompositingDefault" from asset "Robot' in "your_project_Robot_compositing.aep", now you opened this workfile in a context "Sloth" but existing subset for "Robot" asset stayed in the workfile.)
+(Eg. you created product name "renderCompositingDefault" from folder "Robot' in "your_project_Robot_compositing.aep", now you opened this workfile in a context "Sloth" but existing product for "Robot" asset stayed in the workfile.)
 </detail>
 </error>
 </root>
\ No newline at end of file
diff --git a/client/ayon_core/hosts/aftereffects/plugins/publish/pre_collect_render.py b/client/ayon_core/hosts/aftereffects/plugins/publish/pre_collect_render.py
deleted file mode 100644
index de3c935dff..0000000000
--- a/client/ayon_core/hosts/aftereffects/plugins/publish/pre_collect_render.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import json
-import pyblish.api
-from ayon_core.hosts.aftereffects.api import AfterEffectsHost
-
-
-class PreCollectRender(pyblish.api.ContextPlugin):
-    """
-    Checks if render instance is of old type, adds to families to both
-    existing collectors work same way.
-
-    Could be removed in the future when no one uses old publish.
-    """
-
-    label = "PreCollect Render"
-    order = pyblish.api.CollectorOrder + 0.400
-    hosts = ["aftereffects"]
-
-    family_remapping = {
-        "render": ("render.farm", "farm"),   # (family, label)
-        "renderLocal": ("render.local", "local")
-    }
-
-    def process(self, context):
-        if context.data.get("newPublishing"):
-            self.log.debug("Not applicable for New Publisher, skip")
-            return
-
-        for inst in AfterEffectsHost().list_instances():
-            if inst.get("creator_attributes"):
-                raise ValueError("Instance created in New publisher, "
-                                 "cannot be published in Pyblish.\n"
-                                 "Please publish in New Publisher "
-                                 "or recreate instances with legacy Creators")
-
-            if inst["family"] not in self.family_remapping.keys():
-                continue
-
-            if not inst["members"]:
-                raise ValueError("Couldn't find id, unable to publish. " +
-                                 "Please recreate instance.")
-
-            instance = context.create_instance(inst["subset"])
-            inst["families"] = [self.family_remapping[inst["family"]][0]]
-            instance.data.update(inst)
-
-            self._debug_log(instance)
-
-    def _debug_log(self, instance):
-        def _default_json(value):
-            return str(value)
-
-        self.log.info(
-            json.dumps(instance.data, indent=4, default=_default_json)
-        )
diff --git a/client/ayon_core/hosts/blender/api/plugin.py b/client/ayon_core/hosts/blender/api/plugin.py
index d72754f148..5f9cb4a830 100644
--- a/client/ayon_core/hosts/blender/api/plugin.py
+++ b/client/ayon_core/hosts/blender/api/plugin.py
@@ -30,13 +30,13 @@ VALID_EXTENSIONS = [".blend", ".json", ".abc", ".fbx"]
 
 
 def prepare_scene_name(
-    asset: str, subset: str, namespace: Optional[str] = None
+    folder_name: str, product_name: str, namespace: Optional[str] = None
 ) -> str:
     """Return a consistent name for an asset."""
-    name = f"{asset}"
+    name = f"{folder_name}"
     if namespace:
         name = f"{name}_{namespace}"
-    name = f"{name}_{subset}"
+    name = f"{name}_{product_name}"
 
     # Blender name for a collection or object cannot be longer than 63
     # characters. If the name is longer, it will raise an error.
@@ -47,7 +47,7 @@ def prepare_scene_name(
 
 
 def get_unique_number(
-    asset: str, subset: str
+    folder_name: str, product_name: str
 ) -> str:
     """Return a unique number based on the asset name."""
     avalon_container = bpy.data.collections.get(AVALON_CONTAINERS)
@@ -64,10 +64,10 @@ def get_unique_number(
         if c.get(AVALON_PROPERTY)}
     container_names = obj_group_names.union(coll_group_names)
     count = 1
-    name = f"{asset}_{count:0>2}_{subset}"
+    name = f"{folder_name}_{count:0>2}_{product_name}"
     while name in container_names:
         count += 1
-        name = f"{asset}_{count:0>2}_{subset}"
+        name = f"{folder_name}_{count:0>2}_{product_name}"
     return f"{count:0>2}"
 
 
@@ -161,24 +161,22 @@ class BaseCreator(Creator):
     create_as_asset_group = False
 
     @staticmethod
-    def cache_subsets(shared_data):
+    def cache_instance_data(shared_data):
         """Cache instances for Creators shared data.
 
-        Create `blender_cached_subsets` key when needed in shared data and
+        Create `blender_cached_instances` key when needed in shared data and
         fill it with all collected instances from the scene under its
         respective creator identifiers.
 
         If legacy instances are detected in the scene, create
-        `blender_cached_legacy_subsets` key and fill it with
-        all legacy subsets from this family as a value.  # key or value?
+        `blender_cached_legacy_instances` key and fill it with
+        all legacy products from this family as a value.  # key or value?
 
         Args:
             shared_data(Dict[str, Any]): Shared data.
 
-        Return:
-            Dict[str, Any]: Shared data with cached subsets.
         """
-        if not shared_data.get('blender_cached_subsets'):
+        if not shared_data.get('blender_cached_instances'):
             cache = {}
             cache_legacy = {}
 
@@ -210,19 +208,19 @@ class BaseCreator(Creator):
                         # Legacy creator instance
                         cache_legacy.setdefault(family, []).append(obj_or_col)
 
-            shared_data["blender_cached_subsets"] = cache
-            shared_data["blender_cached_legacy_subsets"] = cache_legacy
+            shared_data["blender_cached_instances"] = cache
+            shared_data["blender_cached_legacy_instances"] = cache_legacy
 
         return shared_data
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
         """Override abstract method from Creator.
         Create new instance and store it.
 
         Args:
-            subset_name(str): Subset name of created instance.
+            product_name(str): Subset name of created instance.
             instance_data(dict): Instance base data.
             pre_create_data(dict): Data based on pre creation attributes.
                 Those may affect how creator works.
@@ -236,7 +234,7 @@ class BaseCreator(Creator):
         # Create asset group
         asset_name = instance_data["folderPath"].split("/")[-1]
 
-        name = prepare_scene_name(asset_name, subset_name)
+        name = prepare_scene_name(asset_name, product_name)
         if self.create_as_asset_group:
             # Create instance as empty
             instance_node = bpy.data.objects.new(name=name, object_data=None)
@@ -247,10 +245,10 @@ class BaseCreator(Creator):
             instance_node = bpy.data.collections.new(name=name)
             instances.children.link(instance_node)
 
-        self.set_instance_data(subset_name, instance_data)
+        self.set_instance_data(product_name, instance_data)
 
         instance = CreatedInstance(
-            self.family, subset_name, instance_data, self
+            self.product_type, product_name, instance_data, self
         )
         instance.transient_data["instance_node"] = instance_node
         self._add_instance_to_context(instance)
@@ -263,18 +261,18 @@ class BaseCreator(Creator):
         """Override abstract method from BaseCreator.
         Collect existing instances related to this creator plugin."""
 
-        # Cache subsets in shared data
-        self.cache_subsets(self.collection_shared_data)
+        # Cache instances in shared data
+        self.cache_instance_data(self.collection_shared_data)
 
-        # Get cached subsets
-        cached_subsets = self.collection_shared_data.get(
-            "blender_cached_subsets"
+        # Get cached instances
+        cached_instances = self.collection_shared_data.get(
+            "blender_cached_instances"
         )
-        if not cached_subsets:
+        if not cached_instances:
             return
 
         # Process only instances that were created by this creator
-        for instance_node in cached_subsets.get(self.identifier, []):
+        for instance_node in cached_instances.get(self.identifier, []):
             property = instance_node.get(AVALON_PROPERTY)
             # Create instance object from existing data
             instance = CreatedInstance.from_existing(
@@ -306,16 +304,17 @@ class BaseCreator(Creator):
                 )
                 return
 
-            # Rename the instance node in the scene if subset or asset changed.
+            # Rename the instance node in the scene if product
+            #   or folder changed.
             # Do not rename the instance if the family is workfile, as the
             # workfile instance is included in the AVALON_CONTAINER collection.
             if (
-                "subset" in changes.changed_keys
+                "productName" in changes.changed_keys
                 or "folderPath" in changes.changed_keys
-            ) and created_instance.family != "workfile":
+            ) and created_instance.product_type != "workfile":
                 asset_name = data["folderPath"].split("/")[-1]
                 name = prepare_scene_name(
-                    asset=asset_name, subset=data["subset"]
+                    asset_name, data["productName"]
                 )
                 node.name = name
 
@@ -341,13 +340,13 @@ class BaseCreator(Creator):
 
     def set_instance_data(
         self,
-        subset_name: str,
+        product_name: str,
         instance_data: dict
     ):
         """Fill instance data with required items.
 
         Args:
-            subset_name(str): Subset name of created instance.
+            product_name(str): Subset name of created instance.
             instance_data(dict): Instance base data.
             instance_node(bpy.types.ID): Instance node in blender scene.
         """
@@ -358,7 +357,7 @@ class BaseCreator(Creator):
             {
                 "id": AVALON_INSTANCE_ID,
                 "creator_identifier": self.identifier,
-                "subset": subset_name,
+                "productName": product_name,
             }
         )
 
@@ -466,14 +465,14 @@ class AssetLoader(LoaderPlugin):
         filepath = self.filepath_from_context(context)
         assert Path(filepath).exists(), f"{filepath} doesn't exist."
 
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
         unique_number = get_unique_number(
-            asset, subset
+            folder_name, product_name
         )
-        namespace = namespace or f"{asset}_{unique_number}"
+        namespace = namespace or f"{folder_name}_{unique_number}"
         name = name or prepare_scene_name(
-            asset, subset, unique_number
+            folder_name, product_name, unique_number
         )
 
         nodes = self.process_asset(
@@ -499,10 +498,10 @@ class AssetLoader(LoaderPlugin):
         #         loader=self.__class__.__name__,
         #     )
 
-        # asset = context["asset"]["name"]
-        # subset = context["subset"]["name"]
+        # folder_name = context["asset"]["name"]
+        # product_name = context["subset"]["name"]
         # instance_name = prepare_scene_name(
-        #     asset, subset, unique_number
+        #     folder_name, product_name, unique_number
         # ) + '_CON'
 
         # return self._get_instance_collection(instance_name, nodes)
diff --git a/client/ayon_core/hosts/blender/plugins/create/convert_legacy.py b/client/ayon_core/hosts/blender/plugins/create/convert_legacy.py
index fcd4a7a26e..65a5a4a9b6 100644
--- a/client/ayon_core/hosts/blender/plugins/create/convert_legacy.py
+++ b/client/ayon_core/hosts/blender/plugins/create/convert_legacy.py
@@ -1,24 +1,24 @@
 # -*- coding: utf-8 -*-
-"""Converter for legacy Houdini subsets."""
+"""Converter for legacy Houdini products."""
 from ayon_core.pipeline.create.creator_plugins import SubsetConvertorPlugin
 from ayon_core.hosts.blender.api.lib import imprint
 
 
 class BlenderLegacyConvertor(SubsetConvertorPlugin):
-    """Find and convert any legacy subsets in the scene.
+    """Find and convert any legacy products in the scene.
 
-    This Converter will find all legacy subsets in the scene and will
-    transform them to the current system. Since the old subsets doesn't
+    This Converter will find all legacy products in the scene and will
+    transform them to the current system. Since the old products doesn't
     retain any information about their original creators, the only mapping
-    we can do is based on their families.
+    we can do is based on their product types.
 
-    Its limitation is that you can have multiple creators creating subset
-    of the same family and there is no way to handle it. This code should
-    nevertheless cover all creators that came with OpenPype.
+    Its limitation is that you can have multiple creators creating product
+    of the same product type and there is no way to handle it. This code
+    should nevertheless cover all creators that came with OpenPype.
 
     """
     identifier = "io.openpype.creators.blender.legacy"
-    family_to_id = {
+    product_type_to_id = {
         "action": "io.openpype.creators.blender.action",
         "camera": "io.openpype.creators.blender.camera",
         "animation": "io.openpype.creators.blender.animation",
@@ -33,42 +33,42 @@ class BlenderLegacyConvertor(SubsetConvertorPlugin):
 
     def __init__(self, *args, **kwargs):
         super(BlenderLegacyConvertor, self).__init__(*args, **kwargs)
-        self.legacy_subsets = {}
+        self.legacy_instances = {}
 
     def find_instances(self):
-        """Find legacy subsets in the scene.
+        """Find legacy products in the scene.
 
-        Legacy subsets are the ones that doesn't have `creator_identifier`
+        Legacy products are the ones that doesn't have `creator_identifier`
         parameter on them.
 
         This is using cached entries done in
-        :py:meth:`~BaseCreator.cache_subsets()`
+        :py:meth:`~BaseCreator.cache_instance_data()`
 
         """
-        self.legacy_subsets = self.collection_shared_data.get(
-            "blender_cached_legacy_subsets")
-        if not self.legacy_subsets:
+        self.legacy_instances = self.collection_shared_data.get(
+            "blender_cached_legacy_instances")
+        if not self.legacy_instances:
             return
         self.add_convertor_item(
-            "Found {} incompatible subset{}".format(
-                len(self.legacy_subsets),
-                "s" if len(self.legacy_subsets) > 1 else ""
+            "Found {} incompatible product{}".format(
+                len(self.legacy_instances),
+                "s" if len(self.legacy_instances) > 1 else ""
             )
         )
 
     def convert(self):
-        """Convert all legacy subsets to current.
+        """Convert all legacy products to current.
 
         It is enough to add `creator_identifier` and `instance_node`.
 
         """
-        if not self.legacy_subsets:
+        if not self.legacy_instances:
             return
 
-        for family, instance_nodes in self.legacy_subsets.items():
-            if family in self.family_to_id:
+        for product_type, instance_nodes in self.legacy_instances.items():
+            if product_type in self.product_type_to_id:
                 for instance_node in instance_nodes:
-                    creator_identifier = self.family_to_id[family]
+                    creator_identifier = self.product_type_to_id[product_type]
                     self.log.info(
                         "Converting {} to {}".format(instance_node.name,
                                                      creator_identifier)
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 82047fb5c6..070b9843c3 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_action.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_action.py
@@ -10,20 +10,20 @@ class CreateAction(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.action"
     label = "Action"
-    family = "action"
+    product_type = "action"
     icon = "male"
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
         # Run parent create method
         collection = super().create(
-            subset_name, instance_data, pre_create_data
+            product_name, instance_data, pre_create_data
         )
 
         # Get instance name
         name = plugin.prepare_scene_name(
-            instance_data["folderPath"], subset_name
+            instance_data["folderPath"], product_name
         )
 
         if pre_create_data.get("use_selection"):
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_animation.py b/client/ayon_core/hosts/blender/plugins/create/create_animation.py
index 8671d3bfdb..b806a5a7ca 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_animation.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_animation.py
@@ -8,15 +8,15 @@ class CreateAnimation(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.animation"
     label = "Animation"
-    family = "animation"
+    product_type = "animation"
     icon = "male"
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
         # Run parent create method
         collection = super().create(
-            subset_name, instance_data, pre_create_data
+            product_name, instance_data, pre_create_data
         )
 
         if pre_create_data.get("use_selection"):
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_blendScene.py b/client/ayon_core/hosts/blender/plugins/create/create_blendScene.py
index 6afb2ca6a0..51250bf18b 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_blendScene.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_blendScene.py
@@ -10,16 +10,16 @@ class CreateBlendScene(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.blendscene"
     label = "Blender Scene"
-    family = "blendScene"
+    product_type = "blendScene"
     icon = "cubes"
 
     maintain_selection = False
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
 
-        instance_node = super().create(subset_name,
+        instance_node = super().create(product_name,
                                        instance_data,
                                        pre_create_data)
 
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_camera.py b/client/ayon_core/hosts/blender/plugins/create/create_camera.py
index c63a294cf9..cd82bec236 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_camera.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_camera.py
@@ -11,16 +11,16 @@ class CreateCamera(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.camera"
     label = "Camera"
-    family = "camera"
+    product_type = "camera"
     icon = "video-camera"
 
     create_as_asset_group = True
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
 
-        asset_group = super().create(subset_name,
+        asset_group = super().create(product_name,
                                      instance_data,
                                      pre_create_data)
 
@@ -30,8 +30,8 @@ class CreateCamera(plugin.BaseCreator):
                 obj.parent = asset_group
         else:
             plugin.deselect_all()
-            camera = bpy.data.cameras.new(subset_name)
-            camera_obj = bpy.data.objects.new(subset_name, camera)
+            camera = bpy.data.cameras.new(product_name)
+            camera_obj = bpy.data.objects.new(product_name, camera)
 
             instances = bpy.data.collections.get(AVALON_INSTANCES)
             instances.objects.link(camera_obj)
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_layout.py b/client/ayon_core/hosts/blender/plugins/create/create_layout.py
index 3da3916aef..289c39fc38 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_layout.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_layout.py
@@ -10,16 +10,16 @@ class CreateLayout(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.layout"
     label = "Layout"
-    family = "layout"
+    product_type = "layout"
     icon = "cubes"
 
     create_as_asset_group = True
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
 
-        asset_group = super().create(subset_name,
+        asset_group = super().create(product_name,
                                      instance_data,
                                      pre_create_data)
 
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_model.py b/client/ayon_core/hosts/blender/plugins/create/create_model.py
index b6d89c8862..837ba47417 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_model.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_model.py
@@ -10,15 +10,15 @@ class CreateModel(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.model"
     label = "Model"
-    family = "model"
+    product_type = "model"
     icon = "cube"
 
     create_as_asset_group = True
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
-        asset_group = super().create(subset_name,
+        asset_group = super().create(product_name,
                                      instance_data,
                                      pre_create_data)
 
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_pointcache.py b/client/ayon_core/hosts/blender/plugins/create/create_pointcache.py
index 20ef3fbde4..0aa2d62c17 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_pointcache.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_pointcache.py
@@ -8,15 +8,15 @@ class CreatePointcache(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.pointcache"
     label = "Point Cache"
-    family = "pointcache"
+    product_type = "pointcache"
     icon = "gears"
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
         # Run parent create method
         collection = super().create(
-            subset_name, instance_data, pre_create_data
+            product_name, instance_data, pre_create_data
         )
 
         if pre_create_data.get("use_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 3f07f37d2f..bf3d1e62b3 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_render.py
@@ -12,16 +12,16 @@ class CreateRenderlayer(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.render"
     label = "Render"
-    family = "render"
+    product_type = "render"
     icon = "eye"
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
         try:
             # Run parent create method
             collection = super().create(
-                subset_name, instance_data, pre_create_data
+                product_name, instance_data, pre_create_data
             )
 
             prepare_rendering(collection)
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_review.py b/client/ayon_core/hosts/blender/plugins/create/create_review.py
index cf94819b3e..b478ec59f4 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_review.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_review.py
@@ -8,15 +8,15 @@ class CreateReview(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.review"
     label = "Review"
-    family = "review"
+    product_type = "review"
     icon = "video-camera"
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
         # Run parent create method
         collection = super().create(
-            subset_name, instance_data, pre_create_data
+            product_name, instance_data, pre_create_data
         )
 
         if pre_create_data.get("use_selection"):
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_rig.py b/client/ayon_core/hosts/blender/plugins/create/create_rig.py
index 07b33fe4ba..10b6b20d36 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_rig.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_rig.py
@@ -10,15 +10,15 @@ class CreateRig(plugin.BaseCreator):
 
     identifier = "io.openpype.creators.blender.rig"
     label = "Rig"
-    family = "rig"
+    product_type = "rig"
     icon = "wheelchair"
 
     create_as_asset_group = True
 
     def create(
-        self, subset_name: str, instance_data: dict, pre_create_data: dict
+        self, product_name: str, instance_data: dict, pre_create_data: dict
     ):
-        asset_group = super().create(subset_name,
+        asset_group = super().create(product_name,
                                      instance_data,
                                      pre_create_data)
 
diff --git a/client/ayon_core/hosts/blender/plugins/create/create_workfile.py b/client/ayon_core/hosts/blender/plugins/create/create_workfile.py
index 09947f85d1..ead3ed7749 100644
--- a/client/ayon_core/hosts/blender/plugins/create/create_workfile.py
+++ b/client/ayon_core/hosts/blender/plugins/create/create_workfile.py
@@ -19,7 +19,7 @@ class CreateWorkfile(BaseCreator, AutoCreator):
     """
     identifier = "io.openpype.creators.blender.workfile"
     label = "Workfile"
-    family = "workfile"
+    product_type = "workfile"
     icon = "fa5.file"
 
     def create(self):
@@ -43,8 +43,12 @@ class CreateWorkfile(BaseCreator, AutoCreator):
 
         if not workfile_instance:
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                task_name, task_name, asset_doc, project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                task_name,
+                host_name,
             )
             data = {
                 "folderPath": asset_name,
@@ -53,17 +57,17 @@ class CreateWorkfile(BaseCreator, AutoCreator):
             }
             data.update(
                 self.get_dynamic_data(
-                    task_name,
-                    task_name,
-                    asset_doc,
                     project_name,
+                    asset_doc,
+                    task_name,
+                    task_name,
                     host_name,
                     workfile_instance,
                 )
             )
             self.log.info("Auto-creating workfile instance...")
             workfile_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             self._add_instance_to_context(workfile_instance)
 
@@ -73,13 +77,17 @@ class CreateWorkfile(BaseCreator, AutoCreator):
         ):
             # Update instance context if it's different
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                task_name, task_name, asset_doc, project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
             )
 
             workfile_instance["folderPath"] = asset_name
             workfile_instance["task"] = task_name
-            workfile_instance["subset"] = subset_name
+            workfile_instance["productName"] = product_name
 
         instance_node = bpy.data.collections.get(AVALON_CONTAINERS)
         if not instance_node:
diff --git a/client/ayon_core/hosts/blender/plugins/load/import_workfile.py b/client/ayon_core/hosts/blender/plugins/load/import_workfile.py
index 061c6108ad..5a801da848 100644
--- a/client/ayon_core/hosts/blender/plugins/load/import_workfile.py
+++ b/client/ayon_core/hosts/blender/plugins/load/import_workfile.py
@@ -4,10 +4,10 @@ from ayon_core.hosts.blender.api import plugin
 
 
 def append_workfile(context, fname, do_import):
-    asset = context['asset']['name']
-    subset = context['subset']['name']
+    folder_name = context['asset']['name']
+    product_name = context['subset']['name']
 
-    group_name = plugin.prepare_scene_name(asset, subset)
+    group_name = plugin.prepare_scene_name(folder_name, product_name)
 
     # We need to preserve the original names of the scenes, otherwise,
     # if there are duplicate names in the current workfile, the imported
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_abc.py b/client/ayon_core/hosts/blender/plugins/load/load_abc.py
index b25f4eb277..4fa9881376 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_abc.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_abc.py
@@ -134,13 +134,15 @@ class CacheModelLoader(plugin.AssetLoader):
         """
 
         libpath = self.filepath_from_context(context)
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
 
-        asset_name = plugin.prepare_scene_name(asset, subset)
-        unique_number = plugin.get_unique_number(asset, subset)
-        group_name = plugin.prepare_scene_name(asset, subset, unique_number)
-        namespace = namespace or f"{asset}_{unique_number}"
+        asset_name = plugin.prepare_scene_name(folder_name, product_name)
+        unique_number = plugin.get_unique_number(folder_name, product_name)
+        group_name = plugin.prepare_scene_name(
+            folder_name, product_name, unique_number
+        )
+        namespace = namespace or f"{folder_name}_{unique_number}"
 
         containers = bpy.data.collections.get(AVALON_CONTAINERS)
         if not containers:
@@ -159,6 +161,7 @@ class CacheModelLoader(plugin.AssetLoader):
 
         self._link_objects(objects, asset_group, containers, asset_group)
 
+        product_type = context["subset"]["data"]["family"]
         asset_group[AVALON_PROPERTY] = {
             "schema": "openpype:container-2.0",
             "id": AVALON_CONTAINER_ID,
@@ -169,7 +172,7 @@ class CacheModelLoader(plugin.AssetLoader):
             "libpath": libpath,
             "asset_name": asset_name,
             "parent": str(context["representation"]["parent"]),
-            "family": context["representation"]["context"]["family"],
+            "productType": product_type,
             "objectName": group_name
         }
 
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_action.py b/client/ayon_core/hosts/blender/plugins/load/load_action.py
index 5c8ba0df44..61ea996b2a 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_action.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_action.py
@@ -44,11 +44,11 @@ class BlendActionLoader(plugin.AssetLoader):
         """
 
         libpath = self.filepath_from_context(context)
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
-        lib_container = plugin.prepare_scene_name(asset, subset)
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
+        lib_container = plugin.prepare_scene_name(folder_name, product_name)
         container_name = plugin.prepare_scene_name(
-            asset, subset, namespace
+            folder_name, product_name, namespace
         )
 
         container = bpy.data.collections.new(lib_container)
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_audio.py b/client/ayon_core/hosts/blender/plugins/load/load_audio.py
index 007889f6f6..023a987d63 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_audio.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_audio.py
@@ -39,13 +39,15 @@ class AudioLoader(plugin.AssetLoader):
             options: Additional settings dictionary
         """
         libpath = self.filepath_from_context(context)
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
 
-        asset_name = plugin.prepare_scene_name(asset, subset)
-        unique_number = plugin.get_unique_number(asset, subset)
-        group_name = plugin.prepare_scene_name(asset, subset, unique_number)
-        namespace = namespace or f"{asset}_{unique_number}"
+        asset_name = plugin.prepare_scene_name(folder_name, product_name)
+        unique_number = plugin.get_unique_number(folder_name, product_name)
+        group_name = plugin.prepare_scene_name(
+            folder_name, product_name, unique_number
+        )
+        namespace = namespace or f"{folder_name}_{unique_number}"
 
         avalon_container = bpy.data.collections.get(AVALON_CONTAINERS)
         if not avalon_container:
@@ -85,7 +87,7 @@ class AudioLoader(plugin.AssetLoader):
             "libpath": libpath,
             "asset_name": asset_name,
             "parent": str(context["representation"]["parent"]),
-            "family": context["representation"]["context"]["family"],
+            "productType": context["subset"]["data"]["family"],
             "objectName": group_name,
             "audio": audio
         }
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_blend.py b/client/ayon_core/hosts/blender/plugins/load/load_blend.py
index c9862f9841..84a4bd4398 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_blend.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_blend.py
@@ -127,20 +127,22 @@ class BlendLoader(plugin.AssetLoader):
             options: Additional settings dictionary
         """
         libpath = self.filepath_from_context(context)
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
 
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["subset"]["data"]["family"]
         except ValueError:
-            family = "model"
+            product_type = "model"
 
         representation = str(context["representation"]["_id"])
 
-        asset_name = plugin.prepare_scene_name(asset, subset)
-        unique_number = plugin.get_unique_number(asset, subset)
-        group_name = plugin.prepare_scene_name(asset, subset, unique_number)
-        namespace = namespace or f"{asset}_{unique_number}"
+        asset_name = plugin.prepare_scene_name(folder_name, product_name)
+        unique_number = plugin.get_unique_number(folder_name, product_name)
+        group_name = plugin.prepare_scene_name(
+            folder_name, product_name, unique_number
+        )
+        namespace = namespace or f"{folder_name}_{unique_number}"
 
         avalon_container = bpy.data.collections.get(AVALON_CONTAINERS)
         if not avalon_container:
@@ -149,8 +151,8 @@ class BlendLoader(plugin.AssetLoader):
 
         container, members = self._process_data(libpath, group_name)
 
-        if family == "layout":
-            self._post_process_layout(container, asset, representation)
+        if product_type == "layout":
+            self._post_process_layout(container, folder_name, representation)
 
         avalon_container.objects.link(container)
 
@@ -164,7 +166,7 @@ class BlendLoader(plugin.AssetLoader):
             "libpath": libpath,
             "asset_name": asset_name,
             "parent": str(context["representation"]["parent"]),
-            "family": context["representation"]["context"]["family"],
+            "productType": context["subset"]["data"]["family"],
             "objectName": group_name,
             "members": members,
         }
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_blendscene.py b/client/ayon_core/hosts/blender/plugins/load/load_blendscene.py
index 248bf5a901..ed9dcdeb09 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_blendscene.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_blendscene.py
@@ -34,7 +34,7 @@ class BlendSceneLoader(plugin.AssetLoader):
 
         return None
 
-    def _process_data(self, libpath, group_name, family):
+    def _process_data(self, libpath, group_name, product_type):
         # Append all the data from the .blend file
         with bpy.data.libraries.load(
             libpath, link=False, relative=False
@@ -82,25 +82,29 @@ class BlendSceneLoader(plugin.AssetLoader):
             options: Additional settings dictionary
         """
         libpath = self.filepath_from_context(context)
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
 
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["subset"]["data"]["family"]
         except ValueError:
-            family = "model"
+            product_type = "model"
 
-        asset_name = plugin.prepare_scene_name(asset, subset)
-        unique_number = plugin.get_unique_number(asset, subset)
-        group_name = plugin.prepare_scene_name(asset, subset, unique_number)
-        namespace = namespace or f"{asset}_{unique_number}"
+        asset_name = plugin.prepare_scene_name(folder_name, product_name)
+        unique_number = plugin.get_unique_number(folder_name, product_name)
+        group_name = plugin.prepare_scene_name(
+            folder_name, product_name, unique_number
+        )
+        namespace = namespace or f"{folder_name}_{unique_number}"
 
         avalon_container = bpy.data.collections.get(AVALON_CONTAINERS)
         if not avalon_container:
             avalon_container = bpy.data.collections.new(name=AVALON_CONTAINERS)
             bpy.context.scene.collection.children.link(avalon_container)
 
-        container, members = self._process_data(libpath, group_name, family)
+        container, members = self._process_data(
+            libpath, group_name, product_type
+        )
 
         avalon_container.children.link(container)
 
@@ -114,7 +118,7 @@ class BlendSceneLoader(plugin.AssetLoader):
             "libpath": libpath,
             "asset_name": asset_name,
             "parent": str(context["representation"]["parent"]),
-            "family": context["representation"]["context"]["family"],
+            "productType": context["subset"]["data"]["family"],
             "objectName": group_name,
             "members": members,
         }
@@ -167,8 +171,12 @@ class BlendSceneLoader(plugin.AssetLoader):
 
         self.exec_remove(container)
 
-        family = container["family"]
-        asset_group, members = self._process_data(libpath, group_name, family)
+        product_type = container.get("productType")
+        if product_type is None:
+            product_type = container["family"]
+        asset_group, members = self._process_data(
+            libpath, group_name, product_type
+        )
 
         for member in members:
             if member.name in collection_parents:
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_camera_abc.py b/client/ayon_core/hosts/blender/plugins/load/load_camera_abc.py
index 8f0bd6741d..65c73b4168 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_camera_abc.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_camera_abc.py
@@ -84,13 +84,15 @@ class AbcCameraLoader(plugin.AssetLoader):
 
         libpath = self.filepath_from_context(context)
 
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
 
-        asset_name = plugin.prepare_scene_name(asset, subset)
-        unique_number = plugin.get_unique_number(asset, subset)
-        group_name = plugin.prepare_scene_name(asset, subset, unique_number)
-        namespace = namespace or f"{asset}_{unique_number}"
+        asset_name = plugin.prepare_scene_name(folder_name, product_name)
+        unique_number = plugin.get_unique_number(folder_name, product_name)
+        group_name = plugin.prepare_scene_name(
+            folder_name, product_name, unique_number
+        )
+        namespace = namespace or f"{folder_name}_{unique_number}"
 
         avalon_container = bpy.data.collections.get(AVALON_CONTAINERS)
         if not avalon_container:
@@ -121,7 +123,7 @@ class AbcCameraLoader(plugin.AssetLoader):
             "libpath": libpath,
             "asset_name": asset_name,
             "parent": str(context["representation"]["parent"]),
-            "family": context["representation"]["context"]["family"],
+            "productType": context["subset"]["data"]["family"],
             "objectName": group_name,
         }
 
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_camera_fbx.py b/client/ayon_core/hosts/blender/plugins/load/load_camera_fbx.py
index 7642871dc7..3e5a4e6e75 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_camera_fbx.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_camera_fbx.py
@@ -87,13 +87,15 @@ class FbxCameraLoader(plugin.AssetLoader):
             options: Additional settings dictionary
         """
         libpath = self.filepath_from_context(context)
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
 
-        asset_name = plugin.prepare_scene_name(asset, subset)
-        unique_number = plugin.get_unique_number(asset, subset)
-        group_name = plugin.prepare_scene_name(asset, subset, unique_number)
-        namespace = namespace or f"{asset}_{unique_number}"
+        asset_name = plugin.prepare_scene_name(folder_name, product_name)
+        unique_number = plugin.get_unique_number(folder_name, product_name)
+        group_name = plugin.prepare_scene_name(
+            folder_name, product_name, unique_number
+        )
+        namespace = namespace or f"{folder_name}_{unique_number}"
 
         avalon_container = bpy.data.collections.get(AVALON_CONTAINERS)
         if not avalon_container:
@@ -124,7 +126,7 @@ class FbxCameraLoader(plugin.AssetLoader):
             "libpath": libpath,
             "asset_name": asset_name,
             "parent": str(context["representation"]["parent"]),
-            "family": context["representation"]["context"]["family"],
+            "productType": context["subset"]["data"]["family"],
             "objectName": group_name
         }
 
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_fbx.py b/client/ayon_core/hosts/blender/plugins/load/load_fbx.py
index 03993c9f5e..e9d5522568 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_fbx.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_fbx.py
@@ -131,13 +131,15 @@ class FbxModelLoader(plugin.AssetLoader):
             options: Additional settings dictionary
         """
         libpath = self.filepath_from_context(context)
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
 
-        asset_name = plugin.prepare_scene_name(asset, subset)
-        unique_number = plugin.get_unique_number(asset, subset)
-        group_name = plugin.prepare_scene_name(asset, subset, unique_number)
-        namespace = namespace or f"{asset}_{unique_number}"
+        asset_name = plugin.prepare_scene_name(folder_name, product_name)
+        unique_number = plugin.get_unique_number(folder_name, product_name)
+        group_name = plugin.prepare_scene_name(
+            folder_name, product_name, unique_number
+        )
+        namespace = namespace or f"{folder_name}_{unique_number}"
 
         avalon_container = bpy.data.collections.get(AVALON_CONTAINERS)
         if not avalon_container:
@@ -168,7 +170,7 @@ class FbxModelLoader(plugin.AssetLoader):
             "libpath": libpath,
             "asset_name": asset_name,
             "parent": str(context["representation"]["parent"]),
-            "family": context["representation"]["context"]["family"],
+            "productType": context["subset"]["data"]["family"],
             "objectName": group_name
         }
 
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_layout_json.py b/client/ayon_core/hosts/blender/plugins/load/load_layout_json.py
index f48862a803..126291464b 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_layout_json.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_layout_json.py
@@ -50,11 +50,11 @@ class JsonLayoutLoader(plugin.AssetLoader):
                 if anim_collection:
                     bpy.data.collections.remove(anim_collection)
 
-    def _get_loader(self, loaders, family):
+    def _get_loader(self, loaders, product_type):
         name = ""
-        if family == 'rig':
+        if product_type == 'rig':
             name = "BlendRigLoader"
-        elif family == 'model':
+        elif product_type == 'model':
             name = "BlendModelLoader"
 
         if name == "":
@@ -76,10 +76,12 @@ class JsonLayoutLoader(plugin.AssetLoader):
 
         for element in data:
             reference = element.get('reference')
-            family = element.get('family')
+            product_type = element.get("product_type")
+            if product_type is None:
+                product_type = element.get("family")
 
             loaders = loaders_from_representation(all_loaders, reference)
-            loader = self._get_loader(loaders, family)
+            loader = self._get_loader(loaders, product_type)
 
             if not loader:
                 continue
@@ -95,7 +97,7 @@ class JsonLayoutLoader(plugin.AssetLoader):
                 'parent': asset_group,
                 'transform': element.get('transform'),
                 'action': action,
-                'create_animation': True if family == 'rig' else False,
+                'create_animation': True if product_type == 'rig' else False,
                 'animation_asset': asset
             }
 
@@ -127,7 +129,7 @@ class JsonLayoutLoader(plugin.AssetLoader):
         # legacy_create(
         #     creator_plugin,
         #     name="camera",
-        #     # name=f"{unique_number}_{subset}_animation",
+        #     # name=f"{unique_number}_{product[name]}_animation",
         #     asset=asset,
         #     options={"useSelection": False}
         #     # data={"dependencies": str(context["representation"]["_id"])}
@@ -146,13 +148,15 @@ class JsonLayoutLoader(plugin.AssetLoader):
             options: Additional settings dictionary
         """
         libpath = self.filepath_from_context(context)
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
 
-        asset_name = plugin.prepare_scene_name(asset, subset)
-        unique_number = plugin.get_unique_number(asset, subset)
-        group_name = plugin.prepare_scene_name(asset, subset, unique_number)
-        namespace = namespace or f"{asset}_{unique_number}"
+        asset_name = plugin.prepare_scene_name(folder_name, product_name)
+        unique_number = plugin.get_unique_number(folder_name, product_name)
+        group_name = plugin.prepare_scene_name(
+            folder_name, product_name, unique_number
+        )
+        namespace = namespace or f"{folder_name}_{unique_number}"
 
         avalon_container = bpy.data.collections.get(AVALON_CONTAINERS)
         if not avalon_container:
@@ -177,7 +181,7 @@ class JsonLayoutLoader(plugin.AssetLoader):
             "libpath": libpath,
             "asset_name": asset_name,
             "parent": str(context["representation"]["parent"]),
-            "family": context["representation"]["context"]["family"],
+            "productType": context["subset"]["data"]["family"],
             "objectName": group_name
         }
 
@@ -239,7 +243,10 @@ class JsonLayoutLoader(plugin.AssetLoader):
 
         for obj in asset_group.children:
             obj_meta = obj.get(AVALON_PROPERTY)
-            if obj_meta.get('family') == 'rig':
+            product_type = obj_meta.get("productType")
+            if product_type is None:
+                product_type = obj_meta.get("family")
+            if product_type == "rig":
                 rig = None
                 for child in obj.children:
                     if child.type == 'ARMATURE':
diff --git a/client/ayon_core/hosts/blender/plugins/load/load_look.py b/client/ayon_core/hosts/blender/plugins/load/load_look.py
index f9ebf98912..27632f5705 100644
--- a/client/ayon_core/hosts/blender/plugins/load/load_look.py
+++ b/client/ayon_core/hosts/blender/plugins/load/load_look.py
@@ -93,18 +93,18 @@ class BlendLookLoader(plugin.AssetLoader):
         """
 
         libpath = self.filepath_from_context(context)
-        asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        folder_name = context["asset"]["name"]
+        product_name = context["subset"]["name"]
 
         lib_container = plugin.prepare_scene_name(
-            asset, subset
+            folder_name, product_name
         )
         unique_number = plugin.get_unique_number(
-            asset, subset
+            folder_name, product_name
         )
-        namespace = namespace or f"{asset}_{unique_number}"
+        namespace = namespace or f"{folder_name}_{unique_number}"
         container_name = plugin.prepare_scene_name(
-            asset, subset, unique_number
+            folder_name, product_name, unique_number
         )
 
         container = bpy.data.collections.new(lib_container)
@@ -131,7 +131,7 @@ class BlendLookLoader(plugin.AssetLoader):
         metadata["materials"] = materials
 
         metadata["parent"] = str(context["representation"]["parent"])
-        metadata["family"] = context["representation"]["context"]["family"]
+        metadata["product_type"] = context["subset"]["data"]["family"]
 
         nodes = list(container.objects)
         nodes.append(container)
diff --git a/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py b/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py
index f9338cd30a..d47c69a270 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/collect_instance.py
@@ -25,7 +25,7 @@ class CollectBlenderInstanceData(pyblish.api.InstancePlugin):
             members.extend(instance_node.children)
 
             # Special case for animation instances, include armatures
-            if instance.data["family"] == "animation":
+            if instance.data["productType"] == "animation":
                 for obj in instance_node.objects:
                     if obj.type == 'EMPTY' and obj.get(AVALON_PROPERTY):
                         members.extend(
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_abc.py b/client/ayon_core/hosts/blender/plugins/publish/extract_abc.py
index 2f89426e56..cf753637ea 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_abc.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_abc.py
@@ -19,9 +19,9 @@ class ExtractABC(publish.Extractor, publish.OptionalPyblishPluginMixin):
 
         # Define extract output file path
         stagingdir = self.staging_dir(instance)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        instance_name = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        instance_name = f"{folder_name}_{product_name}"
         filename = f"{instance_name}.abc"
         filepath = os.path.join(stagingdir, filename)
 
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_abc_animation.py b/client/ayon_core/hosts/blender/plugins/publish/extract_abc_animation.py
index 41ad2a99b8..0086dccd67 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_abc_animation.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_abc_animation.py
@@ -23,9 +23,9 @@ class ExtractAnimationABC(
 
         # Define extract output file path
         stagingdir = self.staging_dir(instance)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        instance_name = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        instance_name = f"{folder_name}_{product_name}"
         filename = f"{instance_name}.abc"
 
         filepath = os.path.join(stagingdir, filename)
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_blend.py b/client/ayon_core/hosts/blender/plugins/publish/extract_blend.py
index 00e4074f55..dd2e33df80 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_blend.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_blend.py
@@ -20,9 +20,9 @@ class ExtractBlend(publish.Extractor, publish.OptionalPyblishPluginMixin):
         # Define extract output file path
 
         stagingdir = self.staging_dir(instance)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        instance_name = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        instance_name = f"{folder_name}_{product_name}"
         filename = f"{instance_name}.blend"
         filepath = os.path.join(stagingdir, filename)
 
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_blend_animation.py b/client/ayon_core/hosts/blender/plugins/publish/extract_blend_animation.py
index 6b0d6195b6..da663b46ea 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_blend_animation.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_blend_animation.py
@@ -23,9 +23,9 @@ class ExtractBlendAnimation(
         # Define extract output file path
 
         stagingdir = self.staging_dir(instance)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        instance_name = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        instance_name = f"{folder_name}_{product_name}"
         filename = f"{instance_name}.blend"
         filepath = os.path.join(stagingdir, filename)
 
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_camera_abc.py b/client/ayon_core/hosts/blender/plugins/publish/extract_camera_abc.py
index efa1faa87c..ff14d70696 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_camera_abc.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_camera_abc.py
@@ -21,9 +21,9 @@ class ExtractCameraABC(publish.Extractor, publish.OptionalPyblishPluginMixin):
 
         # Define extract output file path
         stagingdir = self.staging_dir(instance)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        instance_name = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        instance_name = f"{folder_name}_{product_name}"
         filename = f"{instance_name}.abc"
         filepath = os.path.join(stagingdir, filename)
 
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_camera_fbx.py b/client/ayon_core/hosts/blender/plugins/publish/extract_camera_fbx.py
index b2b6cd602d..03059f1e13 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_camera_fbx.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_camera_fbx.py
@@ -20,9 +20,9 @@ class ExtractCamera(publish.Extractor, publish.OptionalPyblishPluginMixin):
 
         # Define extract output file path
         stagingdir = self.staging_dir(instance)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        instance_name = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        instance_name = f"{folder_name}_{product_name}"
         filename = f"{instance_name}.fbx"
         filepath = os.path.join(stagingdir, filename)
 
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_fbx.py b/client/ayon_core/hosts/blender/plugins/publish/extract_fbx.py
index 7e8c13fea8..8fea077e7c 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_fbx.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_fbx.py
@@ -21,9 +21,9 @@ class ExtractFBX(publish.Extractor, publish.OptionalPyblishPluginMixin):
 
         # Define extract output file path
         stagingdir = self.staging_dir(instance)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        instance_name = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        instance_name = f"{folder_name}_{product_name}"
         filename = f"{instance_name}.fbx"
         filepath = os.path.join(stagingdir, filename)
 
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_fbx_animation.py b/client/ayon_core/hosts/blender/plugins/publish/extract_fbx_animation.py
index 3ad4cc3aa9..b98167c741 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_fbx_animation.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_fbx_animation.py
@@ -145,9 +145,9 @@ class ExtractAnimationFBX(
 
         root.select_set(True)
         armature.select_set(True)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        instance_name = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        instance_name = f"{folder_name}_{product_name}"
         fbx_filename = f"{instance_name}_{armature.name}.fbx"
         filepath = os.path.join(stagingdir, fbx_filename)
 
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_layout.py b/client/ayon_core/hosts/blender/plugins/publish/extract_layout.py
index f868db3e74..16c0392070 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_layout.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_layout.py
@@ -133,7 +133,7 @@ class ExtractLayout(publish.Extractor, publish.OptionalPyblishPluginMixin):
 
         fbx_count = 0
 
-        project_name = instance.context.data["projectEntity"]["name"]
+        project_name = instance.context.data["projectName"]
         for asset in asset_group.children:
             metadata = asset.get(AVALON_PROPERTY)
             if not metadata:
@@ -147,7 +147,9 @@ class ExtractLayout(publish.Extractor, publish.OptionalPyblishPluginMixin):
                 continue
 
             version_id = metadata["parent"]
-            family = metadata["family"]
+            product_type = metadata.get("product_type")
+            if product_type is None:
+                product_type = metadata["family"]
 
             self.log.debug("Parent: {}".format(version_id))
             # Get blend reference
@@ -179,7 +181,8 @@ class ExtractLayout(publish.Extractor, publish.OptionalPyblishPluginMixin):
                 json_element["reference_fbx"] = str(fbx_id)
             if abc_id:
                 json_element["reference_abc"] = str(abc_id)
-            json_element["family"] = family
+
+            json_element["product_type"] = product_type
             json_element["instance_name"] = asset.name
             json_element["asset_name"] = metadata["asset_name"]
             json_element["file_path"] = metadata["libpath"]
@@ -215,7 +218,7 @@ class ExtractLayout(publish.Extractor, publish.OptionalPyblishPluginMixin):
             ]
 
             # Extract the animation as well
-            if family == "rig":
+            if product_type == "rig":
                 f, n = self._export_animation(
                     asset, instance, stagingdir, fbx_count)
                 if f:
@@ -225,9 +228,9 @@ class ExtractLayout(publish.Extractor, publish.OptionalPyblishPluginMixin):
 
             json_data.append(json_element)
 
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        instance_name = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        instance_name = f"{folder_name}_{product_name}"
         json_filename = f"{instance_name}.json"
 
         json_path = os.path.join(stagingdir, json_filename)
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py b/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py
index 04fc2c5c39..acb09d0d77 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_playblast.py
@@ -55,9 +55,9 @@ class ExtractPlayblast(publish.Extractor, publish.OptionalPyblishPluginMixin):
 
         # get output path
         stagingdir = self.staging_dir(instance)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        filename = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        filename = f"{folder_name}_{product_name}"
 
         path = os.path.join(stagingdir, filename)
 
diff --git a/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py b/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py
index ec701610ce..89168fb9c9 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/extract_thumbnail.py
@@ -32,9 +32,9 @@ class ExtractThumbnail(publish.Extractor):
             return
 
         stagingdir = self.staging_dir(instance)
-        asset_name = instance.data["assetEntity"]["name"]
-        subset = instance.data["subset"]
-        filename = f"{asset_name}_{subset}"
+        folder_name = instance.data["assetEntity"]["name"]
+        product_name = instance.data["productName"]
+        filename = f"{folder_name}_{product_name}"
 
         path = os.path.join(stagingdir, filename)
 
@@ -42,11 +42,11 @@ class ExtractThumbnail(publish.Extractor):
 
         camera = instance.data.get("review_camera", "AUTO")
         start = instance.data.get("frameStart", bpy.context.scene.frame_start)
-        family = instance.data.get("family")
+        product_type = instance.data["productType"]
         isolate = instance.data("isolate", None)
 
         presets = json.loads(self.presets)
-        preset = presets.get(family, {})
+        preset = presets.get(product_type, {})
 
         preset.update({
             "camera": camera,
diff --git a/client/ayon_core/hosts/blender/plugins/publish/integrate_animation.py b/client/ayon_core/hosts/blender/plugins/publish/integrate_animation.py
index c461d56e7c..a10144ebf5 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/integrate_animation.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/integrate_animation.py
@@ -28,25 +28,26 @@ class IntegrateAnimation(
         # Update the json file for the setdress to add the published
         # representations of the animations
         for json_dict in data:
+            json_product_name = json_dict["productName"]
             i = None
             for elem in instance.context:
-                if elem.data.get('subset') == json_dict['subset']:
+                if elem.data["productName"] == json_product_name:
                     i = elem
                     break
             if not i:
                 continue
             rep = None
-            pub_repr = i.data.get('published_representations')
+            pub_repr = i.data["published_representations"]
             for elem in pub_repr:
-                if pub_repr.get(elem).get('representation').get('name') == "fbx":
-                    rep = pub_repr.get(elem)
+                if pub_repr[elem]["representation"]["name"] == "fbx":
+                    rep = pub_repr[elem]
                     break
             if not rep:
                 continue
-            obj_id = rep.get('representation').get('_id')
+            obj_id = rep["representation"]["_id"]
 
             if obj_id:
-                json_dict['_id'] = str(obj_id)
+                json_dict["representation_id"] = str(obj_id)
 
         with open(json_path, "w") as file:
             json.dump(data, fp=file, indent=2)
diff --git a/client/ayon_core/hosts/blender/plugins/publish/validate_file_saved.py b/client/ayon_core/hosts/blender/plugins/publish/validate_file_saved.py
index 0b8762fed5..6a053eb47b 100644
--- a/client/ayon_core/hosts/blender/plugins/publish/validate_file_saved.py
+++ b/client/ayon_core/hosts/blender/plugins/publish/validate_file_saved.py
@@ -26,6 +26,7 @@ class ValidateFileSaved(pyblish.api.ContextPlugin,
     hosts = ["blender"]
     label = "Validate File Saved"
     optional = False
+    # TODO rename to 'exclude_product_types'
     exclude_families = []
     actions = [SaveWorkfileAction]
 
@@ -41,8 +42,8 @@ class ValidateFileSaved(pyblish.api.ContextPlugin,
 
         # Do not validate workfile has unsaved changes if only instances
         # present of families that should be excluded
-        families = {
-            instance.data["family"] for instance in context
+        product_types = {
+            instance.data["productType"] for instance in context
             # Consider only enabled instances
             if instance.data.get("publish", True)
             and instance.data.get("active", True)
@@ -52,7 +53,7 @@ class ValidateFileSaved(pyblish.api.ContextPlugin,
             return any(family in exclude_family
                        for exclude_family in self.exclude_families)
 
-        if all(is_excluded(family) for family in families):
+        if all(is_excluded(product_type) for product_type in product_types):
             self.log.debug("Only excluded families found, skipping workfile "
                            "unsaved changes validation..")
             return
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 ef471dbd05..4306a53bfe 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
@@ -46,17 +46,18 @@ class CollectCelactionInstances(pyblish.api.ContextPlugin):
             shared_instance_data.update(celaction_kwargs)
 
         # workfile instance
-        family = "workfile"
-        subset = family + task.capitalize()
+        product_type = "workfile"
+        product_name = product_type + task.capitalize()
         # Create instance
-        instance = context.create_instance(subset)
+        instance = context.create_instance(product_name)
 
         # creating instance data
         instance.data.update({
-            "subset": subset,
             "label": scene_file,
-            "family": family,
-            "families": [],
+            "productName": product_name,
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type],
             "representations": []
         })
 
@@ -76,17 +77,19 @@ class CollectCelactionInstances(pyblish.api.ContextPlugin):
         self.log.info('Publishing Celaction workfile')
 
         # render instance
-        subset = f"render{task}Main"
-        instance = context.create_instance(name=subset)
+        product_name = f"render{task}Main"
+        product_type = "render.farm"
+        instance = context.create_instance(name=product_name)
         # getting instance state
         instance.data["publish"] = True
 
         # add assetEntity data into instance
         instance.data.update({
-            "label": "{} - farm".format(subset),
-            "family": "render.farm",
-            "families": [],
-            "subset": subset
+            "label": "{} - farm".format(product_name),
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type],
+            "productName": product_name
         })
 
         # adding basic script data
diff --git a/client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py b/client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py
index f6db6c000d..abe670b691 100644
--- a/client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py
+++ b/client/ayon_core/hosts/celaction/plugins/publish/collect_render_path.py
@@ -19,12 +19,14 @@ class CollectRenderPath(pyblish.api.InstancePlugin):
         anatomy = instance.context.data["anatomy"]
         anatomy_data = copy.deepcopy(instance.data["anatomyData"])
         padding = anatomy.templates.get("frame_padding", 4)
+        product_type = "render"
         anatomy_data.update({
             "frame": f"%0{padding}d",
-            "family": "render",
+            "family": product_type,
             "representation": self.output_extension,
             "ext": self.output_extension
         })
+        anatomy_data["product"]["type"] = product_type
 
         anatomy_filled = anatomy.format(anatomy_data)
 
diff --git a/client/ayon_core/hosts/flame/api/pipeline.py b/client/ayon_core/hosts/flame/api/pipeline.py
index 88375f829f..532f89b5e9 100644
--- a/client/ayon_core/hosts/flame/api/pipeline.py
+++ b/client/ayon_core/hosts/flame/api/pipeline.py
@@ -147,8 +147,8 @@ def imprint(segment, data=None):
     Examples:
         data = {
             'asset': 'sq020sh0280',
-            'family': 'render',
-            'subset': 'subsetMain'
+            'productType': 'render',
+            'productName': 'productMain'
         }
     """
     data = data or {}
diff --git a/client/ayon_core/hosts/flame/api/plugin.py b/client/ayon_core/hosts/flame/api/plugin.py
index 720e6792b0..cf28a3cef3 100644
--- a/client/ayon_core/hosts/flame/api/plugin.py
+++ b/client/ayon_core/hosts/flame/api/plugin.py
@@ -353,9 +353,9 @@ class PublishableClip:
     rename_default = False
     hierarchy_default = "{_folder_}/{_sequence_}/{_track_}"
     clip_name_default = "shot_{_trackIndex_:0>3}_{_clipIndex_:0>4}"
-    subset_name_default = "[ track name ]"
     review_track_default = "[ none ]"
-    subset_family_default = "plate"
+    base_product_name_default = "[ track name ]"
+    base_product_type_default = "plate"
     count_from_default = 10
     count_steps_default = 10
     vertical_sync_default = False
@@ -368,7 +368,7 @@ class PublishableClip:
 
     def __init__(self, segment, **kwargs):
         self.rename_index = kwargs["rename_index"]
-        self.family = kwargs["family"]
+        self.product_type = kwargs["family"]
         self.log = kwargs["log"]
 
         # get main parent objects
@@ -486,10 +486,10 @@ class PublishableClip:
             "countFrom", {}).get("value") or self.count_from_default
         self.count_steps = self.ui_inputs.get(
             "countSteps", {}).get("value") or self.count_steps_default
-        self.subset_name = self.ui_inputs.get(
-            "subsetName", {}).get("value") or self.subset_name_default
-        self.subset_family = self.ui_inputs.get(
-            "subsetFamily", {}).get("value") or self.subset_family_default
+        self.base_product_name = self.ui_inputs.get(
+            "productName", {}).get("value") or self.base_product_name_default
+        self.base_product_type = self.ui_inputs.get(
+            "productType", {}).get("value") or self.base_product_type_default
         self.vertical_sync = self.ui_inputs.get(
             "vSyncOn", {}).get("value") or self.vertical_sync_default
         self.driving_layer = self.ui_inputs.get(
@@ -509,12 +509,14 @@ class PublishableClip:
             or self.retimed_framerange_default
         )
 
-        # build subset name from layer name
-        if self.subset_name == "[ track name ]":
-            self.subset_name = self.track_name
+        # build product name from layer name
+        if self.base_product_name == "[ track name ]":
+            self.base_product_name = self.track_name
 
-        # create subset for publishing
-        self.subset = self.subset_family + self.subset_name.capitalize()
+        # create product for publishing
+        self.product_name = (
+            self.base_product_type + self.base_product_name.capitalize()
+        )
 
     def _replace_hash_to_expression(self, name, text):
         """ Replace hash with number in correct padding. """
@@ -608,14 +610,14 @@ class PublishableClip:
                 _hero_data = deepcopy(hero_data)
                 _hero_data.update({"heroTrack": False})
                 if _in <= self.clip_in and _out >= self.clip_out:
-                    data_subset = hero_data["subset"]
+                    data_product_name = hero_data["productName"]
                     # add track index in case duplicity of names in hero data
-                    if self.subset in data_subset:
-                        _hero_data["subset"] = self.subset + str(
+                    if self.product_name in data_product_name:
+                        _hero_data["productName"] = self.product_name + str(
                             self.track_index)
-                    # in case track name and subset name is the same then add
-                    if self.subset_name == self.track_name:
-                        _hero_data["subset"] = self.subset
+                    # in case track name and product name is the same then add
+                    if self.base_product_name == self.track_name:
+                        _hero_data["productName"] = self.product_name
                     # assign data to return hierarchy data to tag
                     tag_hierarchy_data = _hero_data
                     break
@@ -637,9 +639,9 @@ class PublishableClip:
             "hierarchy": hierarchy_filled,
             "parents": self.parents,
             "hierarchyData": hierarchy_formatting_data,
-            "subset": self.subset,
-            "family": self.subset_family,
-            "families": [self.family]
+            "productName": self.product_name,
+            "productType": self.base_product_type,
+            "families": [self.base_product_type, self.product_type]
         }
 
     def _convert_to_entity(self, type, template):
@@ -704,7 +706,7 @@ class ClipLoader(LoaderPlugin):
     _mapping = None
     _host_settings = None
 
-    def apply_settings(cls, project_settings, system_settings):
+    def apply_settings(cls, project_settings):
 
         plugin_type_settings = (
             project_settings
diff --git a/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py b/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py
index ee99040ca3..c73ee7510c 100644
--- a/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py
+++ b/client/ayon_core/hosts/flame/plugins/create/create_shot_clip.py
@@ -6,7 +6,7 @@ class CreateShotClip(opfapi.Creator):
     """Publishable clip"""
 
     label = "Create Publishable Clip"
-    family = "clip"
+    product_type = "clip"
     icon = "film"
     defaults = ["Main"]
 
@@ -32,7 +32,7 @@ class CreateShotClip(opfapi.Creator):
 
         # open widget for plugins inputs
         results_back = self.create_widget(
-            "Pype publish attributes creator",
+            "AYON publish attributes creator",
             "Define sequential rename and fill hierarchy data.",
             gui_inputs
         )
@@ -62,7 +62,7 @@ class CreateShotClip(opfapi.Creator):
             "log": self.log,
             "ui_inputs": results_back,
             "avalon": self.data,
-            "family": self.data["family"]
+            "product_type": self.data["productType"]
         }
 
         for i, segment in enumerate(sorted_selected_segments):
@@ -203,19 +203,19 @@ class CreateShotClip(opfapi.Creator):
                 "target": "ui",
                 "order": 3,
                 "value": {
-                    "subsetName": {
+                    "productName": {
                         "value": ["[ track name ]", "main", "bg", "fg", "bg",
                                 "animatic"],
                         "type": "QComboBox",
                         "label": "Subset Name",
                         "target": "ui",
-                        "toolTip": "chose subset name pattern, if [ track name ] is selected, name of track layer will be used",  # noqa
+                        "toolTip": "chose product name pattern, if [ track name ] is selected, name of track layer will be used",  # noqa
                         "order": 0},
-                    "subsetFamily": {
+                    "productType": {
                         "value": ["plate", "take"],
                         "type": "QComboBox",
                         "label": "Subset Family",
-                        "target": "ui", "toolTip": "What use of this subset is for",  # noqa
+                        "target": "ui", "toolTip": "What use of this product is for",  # noqa
                         "order": 1},
                     "reviewTrack": {
                         "value": ["< none >"] + gui_tracks,
@@ -229,7 +229,7 @@ class CreateShotClip(opfapi.Creator):
                         "type": "QCheckBox",
                         "label": "Include audio",
                         "target": "tag",
-                        "toolTip": "Process subsets with corresponding audio",  # noqa
+                        "toolTip": "Process products with corresponding audio",  # noqa
                         "order": 3},
                     "sourceResolution": {
                         "value": False,
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 47d0331255..84f63b3177 100644
--- a/client/ayon_core/hosts/flame/plugins/load/load_clip.py
+++ b/client/ayon_core/hosts/flame/plugins/load/load_clip.py
@@ -11,7 +11,7 @@ from ayon_core.lib.transcoding import (
 
 
 class LoadClip(opfapi.ClipLoader):
-    """Load a subset to timeline as clip
+    """Load a product to timeline as clip
 
     Place clip to timeline on its asset origin timings collected
     during conforming to project
@@ -31,14 +31,14 @@ class LoadClip(opfapi.ClipLoader):
     # settings
     reel_group_name = "OpenPype_Reels"
     reel_name = "Loaded"
-    clip_name_template = "{asset}_{subset}<_{output}>"
+    clip_name_template = "{folder[name]}_{product[name]}<_{output}>"
 
     """ Anatomy keys from version context data and dynamically added:
         - {layerName} - original layer name token
         - {layerUID} - original layer UID token
         - {originalBasename} - original clip name taken from file
     """
-    layer_rename_template = "{asset}_{subset}<_{output}>"
+    layer_rename_template = "{folder[name]}_{product[name]}<_{output}>"
     layer_rename_patterns = []
 
     def load(self, context, name, namespace, options):
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 cdf96bd459..9f81103cb4 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
@@ -10,7 +10,7 @@ from ayon_core.lib.transcoding import (
 )
 
 class LoadClipBatch(opfapi.ClipLoader):
-    """Load a subset to timeline as clip
+    """Load a product to timeline as clip
 
     Place clip to timeline on its asset origin timings collected
     during conforming to project
@@ -29,14 +29,14 @@ class LoadClipBatch(opfapi.ClipLoader):
 
     # settings
     reel_name = "OP_LoadedReel"
-    clip_name_template = "{batch}_{asset}_{subset}<_{output}>"
+    clip_name_template = "{batch}_{folder[name]}_{product[name]}<_{output}>"
 
     """ Anatomy keys from version context data and dynamically added:
         - {layerName} - original layer name token
         - {layerUID} - original layer UID token
         - {originalBasename} - original clip name taken from file
     """
-    layer_rename_template = "{asset}_{subset}<_{output}>"
+    layer_rename_template = "{folder[name]}_{product[name]}<_{output}>"
     layer_rename_patterns = []
 
     def load(self, context, name, namespace, options):
@@ -50,17 +50,8 @@ class LoadClipBatch(opfapi.ClipLoader):
         version_name = version.get("name", None)
         colorspace = self.get_colorspace(context)
 
-        # TODO remove '{folder[name]}' and '{product[name]}' replacement
-        clip_name_template = (
-            self.clip_name_template
-            .replace("{folder[name]}", "{asset}")
-            .replace("{product[name]}", "{subset}")
-        )
-        layer_rename_template = (
-            self.layer_rename_template
-            .replace("{folder[name]}", "{asset}")
-            .replace("{product[name]}", "{subset}")
-        )
+        clip_name_template = self.clip_name_template
+        layer_rename_template = self.layer_rename_template
         # in case output is not in context replace key to representation
         if not context["representation"]["context"].get("output"):
             clip_name_template = clip_name_template.replace(
@@ -68,8 +59,22 @@ class LoadClipBatch(opfapi.ClipLoader):
             layer_rename_template = layer_rename_template.replace(
                 "output", "representation")
 
+        asset_doc = context["asset"]
+        subset_doc = context["subset"]
         formatting_data = deepcopy(context["representation"]["context"])
         formatting_data["batch"] = self.batch.name.get_value()
+        formatting_data.update({
+            "asset": asset_doc["name"],
+            "folder": {
+                "name": asset_doc["name"],
+            },
+            "subset": subset_doc["name"],
+            "family": subset_doc["data"]["family"],
+            "product": {
+                "name": subset_doc["name"],
+                "type": subset_doc["data"]["family"],
+            }
+        })
 
         clip_name = StringTemplate(clip_name_template).format(
             formatting_data)
diff --git a/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py b/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py
index 0fb41eab78..7442e7df48 100644
--- a/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py
+++ b/client/ayon_core/hosts/flame/plugins/publish/collect_test_selection.py
@@ -59,6 +59,6 @@ class CollectTestSelection(pyblish.api.ContextPlugin):
 
                 opfapi.imprint(segment, {
                     'asset': segment.name.get_value(),
-                    'family': 'render',
-                    'subset': 'subsetMain'
+                    'productType': 'render',
+                    'productName': 'productMain'
                 })
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 3819537010..9d6560023c 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
@@ -110,24 +110,25 @@ class CollectTimelineInstances(pyblish.api.ContextPlugin):
             # add ocio_data to instance data
             inst_data.update(otio_data)
 
-            asset = marker_data["asset"]
-            subset = marker_data["subset"]
+            folder_path = marker_data["folderPath"]
+            folder_name = folder_path.rsplit("/")[-1]
+            product_name = marker_data["productName"]
 
-            # insert family into families
-            family = marker_data["family"]
+            # insert product type into families
+            product_type = marker_data["productType"]
             families = [str(f) for f in marker_data["families"]]
-            families.insert(0, str(family))
+            families.insert(0, str(product_type))
 
             # form label
-            label = asset
-            if asset != clip_name:
+            label = folder_name
+            if folder_name != clip_name:
                 label += " ({})".format(clip_name)
-            label += " {} [{}]".format(subset, ", ".join(families))
+            label += " {} [{}]".format(product_name, ", ".join(families))
 
             inst_data.update({
-                "name": "{}_{}".format(asset, subset),
+                "name": "{}_{}".format(folder_name, product_name),
                 "label": label,
-                "asset": asset,
+                "folderPath": folder_path,
                 "item": segment,
                 "families": families,
                 "publish": marker_data["publish"],
@@ -335,26 +336,28 @@ class CollectTimelineInstances(pyblish.api.ContextPlugin):
         if not hierarchy_data:
             return
 
-        asset = data["asset"]
-        subset = "shotMain"
+        folder_path = data["folderPath"]
+        folder_name = folder_path.rsplit("/")[-1]
+        product_name = "shotMain"
 
-        # insert family into families
-        family = "shot"
+        # insert product type into families
+        product_type = "shot"
 
         # form label
-        label = asset
-        if asset != clip_name:
+        label = folder_name
+        if folder_name != clip_name:
             label += " ({}) ".format(clip_name)
-        label += " {}".format(subset)
-        label += " [{}]".format(family)
+        label += " {}".format(product_name)
+        label += " [{}]".format(product_type)
 
         data.update({
-            "name": "{}_{}".format(asset, subset),
+            "name": "{}_{}".format(folder_name, product_name),
             "label": label,
-            "subset": subset,
-            "asset": asset,
-            "family": family,
-            "families": []
+            "productName": product_name,
+            "folderPath": folder_path,
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type]
         })
 
         instance = context.create_instance(**data)
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 2fcfb55e7c..6d04d53cea 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
@@ -3,7 +3,7 @@ import pyblish.api
 from ayon_core.client import get_asset_name_identifier
 import ayon_core.hosts.flame.api as opfapi
 from ayon_core.hosts.flame.otio import flame_export
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.pipeline.create import get_product_name
 
 
 class CollecTimelineOTIO(pyblish.api.ContextPlugin):
@@ -14,7 +14,7 @@ class CollecTimelineOTIO(pyblish.api.ContextPlugin):
 
     def process(self, context):
         # plugin defined
-        family = "workfile"
+        product_type = "workfile"
         variant = "otioTimeline"
 
         # main
@@ -23,14 +23,14 @@ class CollecTimelineOTIO(pyblish.api.ContextPlugin):
         project = opfapi.get_current_project()
         sequence = opfapi.get_current_sequence(opfapi.CTX.selection)
 
-        # create subset name
-        subset_name = get_subset_name(
-            family,
-            variant,
-            task_name,
-            asset_doc,
+        # create product name
+        product_name = get_product_name(
             context.data["projectName"],
+            asset_doc,
+            task_name,
             context.data["hostName"],
+            product_type,
+            variant,
             project_settings=context.data["project_settings"]
         )
 
@@ -41,11 +41,12 @@ class CollecTimelineOTIO(pyblish.api.ContextPlugin):
             otio_timeline = flame_export.create_otio_timeline(sequence)
 
             instance_data = {
-                "name": subset_name,
+                "name": product_name,
                 "folderPath": folder_path,
-                "subset": subset_name,
-                "family": "workfile",
-                "families": []
+                "productName": product_name,
+                "productType": product_type,
+                "family": product_type,
+                "families": [product_type]
             }
 
             # create instance with workfile
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 e36d2a22d5..a66ee9f2c0 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
@@ -44,8 +44,8 @@ class IntegrateBatchGroup(pyblish.api.InstancePlugin):
                 ))
 
             # load plate to batch group
-            self.log.info("Loading subset `{}` into batch `{}`".format(
-                instance.data["subset"], bgroup.name.get_value()
+            self.log.info("Loading product `{}` into batch `{}`".format(
+                instance.data["productName"], bgroup.name.get_value()
             ))
             self._load_clip_to_context(instance, bgroup)
 
diff --git a/client/ayon_core/hosts/fusion/api/plugin.py b/client/ayon_core/hosts/fusion/api/plugin.py
index 3bf810ca23..95db8126e7 100644
--- a/client/ayon_core/hosts/fusion/api/plugin.py
+++ b/client/ayon_core/hosts/fusion/api/plugin.py
@@ -33,14 +33,16 @@ class GenericCreateSaver(Creator):
 
     # TODO: This should be renamed together with Nuke so it is aligned
     temp_rendering_path_template = (
-        "{workdir}/renders/fusion/{subset}/{subset}.{frame}.{ext}")
+        "{workdir}/renders/fusion/{product[name]}/"
+        "{product[name]}.{frame}.{ext}"
+    )
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         self.pass_pre_attributes_to_instance(instance_data, pre_create_data)
 
         instance = CreatedInstance(
-            family=self.family,
-            subset_name=subset_name,
+            product_type=self.product_type,
+            product_name=product_name,
             data=instance_data,
             creator=self,
         )
@@ -111,23 +113,23 @@ class GenericCreateSaver(Creator):
             tool.SetData(f"openpype.{key}", value)
 
     def _update_tool_with_data(self, tool, data):
-        """Update tool node name and output path based on subset data"""
-        if "subset" not in data:
+        """Update tool node name and output path based on product data"""
+        if "productName" not in data:
             return
 
-        original_subset = tool.GetData("openpype.subset")
+        original_product_name = tool.GetData("openpype.productName")
         original_format = tool.GetData(
             "openpype.creator_attributes.image_format"
         )
 
-        subset = data["subset"]
+        product_name = data["productName"]
         if (
-            original_subset != subset
+            original_product_name != product_name
             or original_format != data["creator_attributes"]["image_format"]
         ):
-            self._configure_saver_tool(data, tool, subset)
+            self._configure_saver_tool(data, tool, product_name)
 
-    def _configure_saver_tool(self, data, tool, subset):
+    def _configure_saver_tool(self, data, tool, product_name):
         formatting_data = deepcopy(data)
 
         # get frame padding from anatomy templates
@@ -137,25 +139,39 @@ class GenericCreateSaver(Creator):
         ext = data["creator_attributes"]["image_format"]
 
         # Subset change detected
+        product_type = formatting_data["productType"]
+        f_product_name = formatting_data["productName"]
+
+        folder_path = formatting_data["folderPath"]
+        folder_name = folder_path.rsplit("/", 1)[-1]
+
         workdir = os.path.normpath(os.getenv("AYON_WORKDIR"))
         formatting_data.update({
             "workdir": workdir,
             "frame": "0" * frame_padding,
             "ext": ext,
             "product": {
-                "name": formatting_data["subset"],
-                "type": formatting_data["family"],
+                "name": f_product_name,
+                "type": product_type,
             },
+            # TODO add more variants for 'folder' and 'task'
+            "folder": {
+                "name": folder_name,
+            },
+            "task": {
+                "name": data["task"],
+            },
+            # Backwards compatibility
+            "asset": folder_name,
+            "subset": f_product_name,
+            "family": product_type,
         })
 
         # build file path to render
         # TODO make sure the keys are available in 'formatting_data'
         temp_rendering_path_template = (
             self.temp_rendering_path_template
-            .replace("{product[name]}", "{subset}")
-            .replace("{product[type]}", "{family}")
-            .replace("{folder[name]}", "{asset}")
-            .replace("{task[name]}", "{task}")
+            .replace("{task}", "{task[name]}")
         )
 
         filepath = temp_rendering_path_template.format(**formatting_data)
@@ -164,9 +180,9 @@ class GenericCreateSaver(Creator):
         tool["Clip"] = comp.ReverseMapPath(os.path.normpath(filepath))
 
         # Rename tool
-        if tool.Name != subset:
-            print(f"Renaming {tool.Name} -> {subset}")
-            tool.SetAttrs({"TOOLS_Name": subset})
+        if tool.Name != product_name:
+            print(f"Renaming {tool.Name} -> {product_name}")
+            tool.SetAttrs({"TOOLS_Name": product_name})
 
     def get_managed_tool_data(self, tool):
         """Return data of the tool if it matches creator identifier"""
diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py b/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py
index 856d86cff6..8110898ae9 100644
--- a/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py
+++ b/client/ayon_core/hosts/fusion/plugins/create/create_image_saver.py
@@ -17,7 +17,7 @@ class CreateImageSaver(GenericCreateSaver):
     identifier = "io.openpype.creators.fusion.imagesaver"
     label = "Image (saver)"
     name = "image"
-    family = "image"
+    product_type = "image"
     description = "Fusion Saver to generate image"
 
     default_frame = 0
diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_saver.py b/client/ayon_core/hosts/fusion/plugins/create/create_saver.py
index 1a0dad7060..b5abb2d949 100644
--- a/client/ayon_core/hosts/fusion/plugins/create/create_saver.py
+++ b/client/ayon_core/hosts/fusion/plugins/create/create_saver.py
@@ -12,7 +12,7 @@ class CreateSaver(GenericCreateSaver):
     identifier = "io.openpype.creators.fusion.saver"
     label = "Render (saver)"
     name = "render"
-    family = "render"
+    product_type = "render"
     description = "Fusion Saver to generate image sequence"
 
     default_frame_range_option = "asset_db"
diff --git a/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py b/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py
index 08d39b0145..dfd9da3df1 100644
--- a/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py
+++ b/client/ayon_core/hosts/fusion/plugins/create/create_workfile.py
@@ -10,7 +10,7 @@ from ayon_core.pipeline import (
 
 class FusionWorkfileCreator(AutoCreator):
     identifier = "workfile"
-    family = "workfile"
+    product_type = "workfile"
     label = "Workfile"
     icon = "fa5.file"
 
@@ -27,9 +27,12 @@ class FusionWorkfileCreator(AutoCreator):
         if not data:
             return
 
+        product_name = data.get("productName")
+        if product_name is None:
+            product_name = data["subset"]
         instance = CreatedInstance(
-            family=self.family,
-            subset_name=data["subset"],
+            product_type=self.product_type,
+            product_name=product_name,
             data=data,
             creator=self
         )
@@ -59,7 +62,7 @@ class FusionWorkfileCreator(AutoCreator):
 
         existing_instance = None
         for instance in self.create_context.instances:
-            if instance.family == self.family:
+            if instance.product_type == self.product_type:
                 existing_instance = instance
                 break
 
@@ -75,9 +78,12 @@ class FusionWorkfileCreator(AutoCreator):
 
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
             )
             data = {
                 "folderPath": asset_name,
@@ -85,12 +91,17 @@ class FusionWorkfileCreator(AutoCreator):
                 "variant": self.default_variant,
             }
             data.update(self.get_dynamic_data(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name, None
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
+                None
+
             ))
 
             new_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             new_instance.transient_data["comp"] = comp
             self._add_instance_to_context(new_instance)
@@ -100,10 +111,13 @@ class FusionWorkfileCreator(AutoCreator):
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
             )
             existing_instance["folderPath"] = asset_name
             existing_instance["task"] = task_name
-            existing_instance["subset"] = subset_name
+            existing_instance["productName"] = product_name
diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py b/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py
index 5c183f5159..ad737aabed 100644
--- a/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py
+++ b/client/ayon_core/hosts/fusion/plugins/load/load_sequence.py
@@ -136,7 +136,7 @@ class FusionLoadSequence(load.LoaderPlugin):
         "render",
         "plate",
         "image",
-        "onilne",
+        "online",
     ]
     representations = ["*"]
     extensions = set(
diff --git a/client/ayon_core/hosts/fusion/plugins/load/load_usd.py b/client/ayon_core/hosts/fusion/plugins/load/load_usd.py
index 9c61894d66..de56d040ac 100644
--- a/client/ayon_core/hosts/fusion/plugins/load/load_usd.py
+++ b/client/ayon_core/hosts/fusion/plugins/load/load_usd.py
@@ -28,9 +28,8 @@ class FusionLoadUSD(load.LoaderPlugin):
     tool_type = "uLoader"
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
-        super(FusionLoadUSD, cls).apply_settings(project_settings,
-                                                 system_settings)
+    def apply_settings(cls, project_settings):
+        super(FusionLoadUSD, cls).apply_settings(project_settings)
         if cls.enabled:
             # Enable only in Fusion 18.5+
             fusion = get_fusion_module()
diff --git a/client/ayon_core/hosts/fusion/plugins/publish/collect_instances.py b/client/ayon_core/hosts/fusion/plugins/publish/collect_instances.py
index a0131248e8..2cbd4d82f4 100644
--- a/client/ayon_core/hosts/fusion/plugins/publish/collect_instances.py
+++ b/client/ayon_core/hosts/fusion/plugins/publish/collect_instances.py
@@ -26,7 +26,7 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
         instance.data["frame_range_source"] = frame_range_source
 
         # get asset frame ranges to all instances
-        # render family instances `asset_db` render target
+        # render product type instances `asset_db` render target
         start = context.data["frameStart"]
         end = context.data["frameEnd"]
         handle_start = context.data["handleStart"]
@@ -34,7 +34,7 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
         start_with_handle = start - handle_start
         end_with_handle = end + handle_end
 
-        # conditions for render family instances
+        # conditions for render product type instances
         if frame_range_source == "render_range":
             # set comp render frame ranges
             start = context.data["renderFrameStart"]
@@ -70,11 +70,11 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
             end_with_handle = frame
 
         # Include start and end render frame in label
-        subset = instance.data["subset"]
+        product_name = instance.data["productName"]
         label = (
-            "{subset} ({start}-{end}) [{handle_start}-{handle_end}]"
+            "{product_name} ({start}-{end}) [{handle_start}-{handle_end}]"
         ).format(
-            subset=subset,
+            product_name=product_name,
             start=int(start),
             end=int(end),
             handle_start=int(handle_start),
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 0a0e4b38af..36102d02cb 100644
--- a/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/fusion/plugins/publish/collect_render.py
@@ -49,31 +49,32 @@ class CollectFusionRender(
             if not inst.data.get("active", True):
                 continue
 
-            family = inst.data["family"]
-            if family not in ["render", "image"]:
+            product_type = inst.data["productType"]
+            if product_type not in ["render", "image"]:
                 continue
 
             task_name = context.data["task"]
             tool = inst.data["transientData"]["tool"]
 
             instance_families = inst.data.get("families", [])
-            subset_name = inst.data["subset"]
+            product_name = inst.data["productName"]
             instance = FusionRenderInstance(
-                family=family,
                 tool=tool,
                 workfileComp=comp,
+                productType=product_type,
+                family=product_type,
                 families=instance_families,
                 version=version,
                 time="",
                 source=current_file,
                 label=inst.data["label"],
-                subset=subset_name,
+                productName=product_name,
                 folderPath=inst.data["folderPath"],
                 task=task_name,
                 attachTo=False,
                 setMembers='',
                 publish=True,
-                name=subset_name,
+                name=product_name,
                 resolutionWidth=comp_frame_format_prefs.get("Width"),
                 resolutionHeight=comp_frame_format_prefs.get("Height"),
                 pixelAspect=aspect_x / aspect_y,
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 3131400de9..939ddbd117 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
@@ -7,7 +7,7 @@ from ayon_core.hosts.fusion.api.action import SelectInvalidAction
 
 
 class ValidateUniqueSubsets(pyblish.api.ContextPlugin):
-    """Ensure all instances have a unique subset name"""
+    """Ensure all instances have a unique product name"""
 
     order = pyblish.api.ValidatorOrder
     label = "Validate Unique Subsets"
@@ -18,27 +18,31 @@ class ValidateUniqueSubsets(pyblish.api.ContextPlugin):
     @classmethod
     def get_invalid(cls, context):
 
-        # Collect instances per subset per asset
-        instances_per_subset_asset = defaultdict(lambda: defaultdict(list))
+        # Collect instances per product per folder
+        instances_per_product_folder = defaultdict(lambda: defaultdict(list))
         for instance in context:
-            asset = instance.data.get(
-                "folderPath", context.data.get("folderPath")
+            folder_path = instance.data["folderPath"]
+            product_name = instance.data["productName"]
+            instances_per_product_folder[folder_path][product_name].append(
+                instance
             )
-            subset = instance.data.get("subset", context.data.get("subset"))
-            instances_per_subset_asset[asset][subset].append(instance)
 
         # Find which asset + subset combination has more than one instance
         # Those are considered invalid because they'd integrate to the same
         # destination.
         invalid = []
-        for asset, instances_per_subset in instances_per_subset_asset.items():
-            for subset, instances in instances_per_subset.items():
+        for folder_path, instances_per_product in (
+            instances_per_product_folder.items()
+        ):
+            for product_name, instances in instances_per_product.items():
                 if len(instances) > 1:
                     cls.log.warning(
-                        "{asset} > {subset} used by more than "
-                        "one instance: {instances}".format(
-                            asset=asset,
-                            subset=subset,
+                        (
+                            "{folder_path} > {product_name} used by more than "
+                            "one instance: {instances}"
+                        ).format(
+                            folder_path=folder_path,
+                            product_name=product_name,
                             instances=instances
                         )
                     )
@@ -52,6 +56,7 @@ class ValidateUniqueSubsets(pyblish.api.ContextPlugin):
     def process(self, context):
         invalid = self.get_invalid(context)
         if invalid:
-            raise PublishValidationError("Multiple instances are set to "
-                                         "the same asset > subset.",
-                                         title=self.label)
+            raise PublishValidationError(
+                "Multiple instances are set to the same folder > product.",
+                title=self.label
+            )
diff --git a/client/ayon_core/hosts/harmony/api/README.md b/client/ayon_core/hosts/harmony/api/README.md
index 457e22fb2e..5b90d45f98 100644
--- a/client/ayon_core/hosts/harmony/api/README.md
+++ b/client/ayon_core/hosts/harmony/api/README.md
@@ -204,7 +204,7 @@ class CreateComposite(harmony.Creator):
 
     name = "compositeDefault"
     label = "Composite"
-    family = "mindbender.template"
+    product_type = "mindbender.template"
 
     def __init__(self, *args, **kwargs):
         super(CreateComposite, self).__init__(*args, **kwargs)
@@ -221,7 +221,7 @@ class CreateRender(harmony.Creator):
 
     name = "writeDefault"
     label = "Write"
-    family = "mindbender.imagesequence"
+    product_type = "mindbender.imagesequence"
     node_type = "WRITE"
 
     def __init__(self, *args, **kwargs):
diff --git a/client/ayon_core/hosts/harmony/js/loaders/ImageSequenceLoader.js b/client/ayon_core/hosts/harmony/js/loaders/ImageSequenceLoader.js
index 25afeff214..ebbd7163f9 100644
--- a/client/ayon_core/hosts/harmony/js/loaders/ImageSequenceLoader.js
+++ b/client/ayon_core/hosts/harmony/js/loaders/ImageSequenceLoader.js
@@ -88,7 +88,7 @@ ImageSequenceLoader.getUniqueColumnName = function(columnPrefix) {
  * var args = [
  *    files, // Files in file sequences.
  *    asset, // Asset name.
- *    subset, // Subset name.
+ *    productName, // Product name.
  *    startFrame, // Sequence starting frame.
  *    groupId // Unique group ID (uuid4).
  * ];
@@ -106,7 +106,7 @@ ImageSequenceLoader.prototype.importFiles = function(args) {
     var doc = $.scn;
     var files = args[0];
     var asset = args[1];
-    var subset = args[2];
+    var productName = args[2];
     var startFrame = args[3];
     var groupId = args[4];
     var vectorFormat = null;
@@ -124,7 +124,7 @@ ImageSequenceLoader.prototype.importFiles = function(args) {
     var num = 0;
     var name = '';
     do {
-        name = asset + '_' + (num++) + '_' + subset;
+        name = asset + '_' + (num++) + '_' + productName;
     } while (currentGroup.getNodeByName(name) != null);
 
     extension = filename.substr(pos+1).toLowerCase();
diff --git a/client/ayon_core/hosts/harmony/js/loaders/TemplateLoader.js b/client/ayon_core/hosts/harmony/js/loaders/TemplateLoader.js
index 06ef1671ea..78167fcb39 100644
--- a/client/ayon_core/hosts/harmony/js/loaders/TemplateLoader.js
+++ b/client/ayon_core/hosts/harmony/js/loaders/TemplateLoader.js
@@ -31,7 +31,7 @@ var TemplateLoader = function() {};
  * var args = [
  *  templatePath, // Path to tpl file.
  *  assetName,    // Asset name.
- *  subsetName,   // Subset name.
+ *  productName,  // Product name.
  *  groupId       // unique ID (uuid4)
  * ];
  */
@@ -39,7 +39,7 @@ TemplateLoader.prototype.loadContainer = function(args) {
     var doc = $.scn;
     var templatePath = args[0];
     var assetName = args[1];
-    var subset = args[2];
+    var productName = args[2];
     var groupId = args[3];
 
     // Get the current group
@@ -62,7 +62,7 @@ TemplateLoader.prototype.loadContainer = function(args) {
     var num = 0;
     var containerGroupName = '';
     do {
-        containerGroupName = assetName + '_' + (num++) + '_' + subset;
+        containerGroupName = assetName + '_' + (num++) + '_' + productName;
     } while (currentGroup.getNodeByName(containerGroupName) != null);
 
     // import the template
diff --git a/client/ayon_core/hosts/harmony/plugins/create/create_farm_render.py b/client/ayon_core/hosts/harmony/plugins/create/create_farm_render.py
index 6b19764181..16c403de6a 100644
--- a/client/ayon_core/hosts/harmony/plugins/create/create_farm_render.py
+++ b/client/ayon_core/hosts/harmony/plugins/create/create_farm_render.py
@@ -9,7 +9,7 @@ class CreateFarmRender(plugin.Creator):
 
     name = "renderDefault"
     label = "Render on Farm"
-    family = "renderFarm"
+    product_type = "renderFarm"
     node_type = "WRITE"
 
     def __init__(self, *args, **kwargs):
diff --git a/client/ayon_core/hosts/harmony/plugins/create/create_render.py b/client/ayon_core/hosts/harmony/plugins/create/create_render.py
index 0a2cd33551..23e02bd8a5 100644
--- a/client/ayon_core/hosts/harmony/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/harmony/plugins/create/create_render.py
@@ -9,7 +9,7 @@ class CreateRender(plugin.Creator):
 
     name = "renderDefault"
     label = "Render"
-    family = "render"
+    product_type = "render"
     node_type = "WRITE"
 
     def __init__(self, *args, **kwargs):
diff --git a/client/ayon_core/hosts/harmony/plugins/create/create_template.py b/client/ayon_core/hosts/harmony/plugins/create/create_template.py
index 4f3fd85f00..c16e429436 100644
--- a/client/ayon_core/hosts/harmony/plugins/create/create_template.py
+++ b/client/ayon_core/hosts/harmony/plugins/create/create_template.py
@@ -6,7 +6,7 @@ class CreateTemplate(plugin.Creator):
 
     name = "templateDefault"
     label = "Template"
-    family = "harmony.template"
+    product_type = "harmony.template"
 
     def __init__(self, *args, **kwargs):
         super(CreateTemplate, self).__init__(*args, **kwargs)
diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_audio.py b/client/ayon_core/hosts/harmony/plugins/load/load_audio.py
index 14389166d7..1017d6c2a2 100644
--- a/client/ayon_core/hosts/harmony/plugins/load/load_audio.py
+++ b/client/ayon_core/hosts/harmony/plugins/load/load_audio.py
@@ -45,12 +45,12 @@ class ImportAudioLoader(load.LoaderPlugin):
             {"function": func, "args": [context["subset"]["name"], wav_file]}
         )
 
-        subset_name = context["subset"]["name"]
+        product_name = context["subset"]["name"]
 
         return harmony.containerise(
-            subset_name,
+            product_name,
             namespace,
-            subset_name,
+            product_name,
             context,
             self.__class__.__name__
         )
diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_background.py b/client/ayon_core/hosts/harmony/plugins/load/load_background.py
index 1c61cfa7a4..cc664bb24f 100644
--- a/client/ayon_core/hosts/harmony/plugins/load/load_background.py
+++ b/client/ayon_core/hosts/harmony/plugins/load/load_background.py
@@ -254,7 +254,7 @@ class BackgroundLoader(load.LoaderPlugin):
 
         bg_folder = os.path.dirname(path)
 
-        subset_name = context["subset"]["name"]
+        product_name = context["subset"]["name"]
         # read_node_name += "_{}".format(uuid.uuid4())
         container_nodes = []
 
@@ -272,9 +272,9 @@ class BackgroundLoader(load.LoaderPlugin):
             container_nodes.append(read_node)
 
         return harmony.containerise(
-            subset_name,
+            product_name,
             namespace,
-            subset_name,
+            product_name,
             context,
             self.__class__.__name__,
             nodes=container_nodes
diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_imagesequence.py b/client/ayon_core/hosts/harmony/plugins/load/load_imagesequence.py
index 4d87272de8..db67ff1123 100644
--- a/client/ayon_core/hosts/harmony/plugins/load/load_imagesequence.py
+++ b/client/ayon_core/hosts/harmony/plugins/load/load_imagesequence.py
@@ -47,7 +47,7 @@ class ImageSequenceLoader(load.LoaderPlugin):
             files.append(fname.parent.joinpath(remainder[0]).as_posix())
 
         asset = context["asset"]["name"]
-        subset = context["subset"]["name"]
+        product_name = context["subset"]["name"]
 
         group_id = str(uuid.uuid4())
         read_node = harmony.send(
@@ -56,7 +56,7 @@ class ImageSequenceLoader(load.LoaderPlugin):
                 "args": [
                     files,
                     asset,
-                    subset,
+                    product_name,
                     1,
                     group_id
                 ]
@@ -64,7 +64,7 @@ class ImageSequenceLoader(load.LoaderPlugin):
         )["result"]
 
         return harmony.containerise(
-            f"{asset}_{subset}",
+            f"{asset}_{product_name}",
             namespace,
             read_node,
             context,
diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_palette.py b/client/ayon_core/hosts/harmony/plugins/load/load_palette.py
index aa5894e026..1794ffda5e 100644
--- a/client/ayon_core/hosts/harmony/plugins/load/load_palette.py
+++ b/client/ayon_core/hosts/harmony/plugins/load/load_palette.py
@@ -27,8 +27,8 @@ class ImportPaletteLoader(load.LoaderPlugin):
         )
 
     def load_palette(self, representation):
-        subset_name = representation["context"]["subset"]
-        name = subset_name.replace("palette", "")
+        product_name = representation["context"]["subset"]
+        name = product_name.replace("palette", "")
 
         # Overwrite palette on disk.
         scene_path = harmony.send(
@@ -44,7 +44,7 @@ class ImportPaletteLoader(load.LoaderPlugin):
 
         harmony.save_scene()
 
-        msg = "Updated {}.".format(subset_name)
+        msg = "Updated {}.".format(product_name)
         msg += " You need to reload the scene to see the changes.\n"
         msg += "Please save workfile when ready and use Workfiles "
         msg += "to reopen it."
diff --git a/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py b/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py
index 0ea46f8f67..65f4fe6d0a 100644
--- a/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py
+++ b/client/ayon_core/hosts/harmony/plugins/load/load_template_workfile.py
@@ -40,12 +40,12 @@ class ImportTemplateLoader(load.LoaderPlugin):
 
         shutil.rmtree(temp_dir)
 
-        subset_name = context["subset"]["name"]
+        product_name = context["subset"]["name"]
 
         return harmony.containerise(
-            subset_name,
+            product_name,
             namespace,
-            subset_name,
+            product_name,
             context,
             self.__class__.__name__
         )
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 6a9c349185..156e2ac6ba 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
@@ -80,7 +80,7 @@ class CollectFarmRender(publish.AbstractCollectRender):
         for frame in range(start, end + 1):
             expected_files.append(
                 path / "{}-{}.{}".format(
-                    render_instance.subset,
+                    render_instance.productName,
                     str(frame).rjust(int(info[2]) + 1, "0"),
                     ext
                 )
@@ -89,7 +89,7 @@ class CollectFarmRender(publish.AbstractCollectRender):
         return expected_files
 
     def get_instances(self, context):
-        """Get instances per Write node in `renderFarm` family."""
+        """Get instances per Write node in `renderFarm` product type."""
         version = None
         if self.sync_workfile_version:
             version = context.data["version"]
@@ -111,7 +111,10 @@ class CollectFarmRender(publish.AbstractCollectRender):
             if "container" in data["id"]:
                 continue
 
-            if data["family"] != "renderFarm":
+            product_type = data.get("productType")
+            if product_type is None:
+                product_type = data.get("family")
+            if product_type != "renderFarm":
                 continue
 
             # 0 - filename / 1 - type / 2 - zeros / 3 - start / 4 - enabled
@@ -124,15 +127,14 @@ class CollectFarmRender(publish.AbstractCollectRender):
 
             # TODO: handle pixel aspect and frame step
             # TODO: set Deadline stuff (pools, priority, etc. by presets)
-            # because of using 'renderFarm' as a family, replace 'Farm' with
-            # capitalized task name - issue of avalon-core Creator app
-            subset_name = node.split("/")[1]
-            task_name = context.data["anatomyData"]["task"][
-                "name"].capitalize()
+            # because of using 'renderFarm' as a product type, replace 'Farm'
+            # with capitalized task name - issue of Creator tool
+            product_name = node.split("/")[1]
+            task_name = context.data["task"].capitalize()
             replace_str = ""
-            if task_name.lower() not in subset_name.lower():
+            if task_name.lower() not in product_name.lower():
                 replace_str = task_name
-            subset_name = subset_name.replace(
+            product_name = product_name.replace(
                 'Farm',
                 replace_str)
 
@@ -141,7 +143,7 @@ class CollectFarmRender(publish.AbstractCollectRender):
                 time=get_formatted_current_time(),
                 source=context.data["currentFile"],
                 label=node.split("/")[1],
-                subset=subset_name,
+                productName=product_name,
                 folderPath=folder_path,
                 task=task_name,
                 attachTo=False,
@@ -151,6 +153,7 @@ class CollectFarmRender(publish.AbstractCollectRender):
                 priority=50,
                 name=node.split("/")[1],
 
+                productType="render.farm",
                 family="render.farm",
                 families=["render.farm"],
                 farm=True,
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 9ce99a3c3d..5aad7d4751 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_instances.py
@@ -19,7 +19,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
     label = "Instances"
     order = pyblish.api.CollectorOrder
     hosts = ["harmony"]
-    families_mapping = {
+    product_type_mapping = {
         "render": ["review", "ftrack"],
         "harmony.template": [],
         "palette": ["palette", "ftrack"]
@@ -49,8 +49,14 @@ class CollectInstances(pyblish.api.ContextPlugin):
             if "container" in data["id"]:
                 continue
 
-            # skip render farm family as it is collected separately
-            if data["family"] == "renderFarm":
+            product_type = data.get("productType")
+            if product_type is None:
+                product_type = data["family"]
+                data["productType"] = product_type
+            data["family"] = product_type
+
+            # skip render farm product type as it is collected separately
+            if product_type == "renderFarm":
                 continue
 
             instance = context.create_instance(node.split("/")[-1])
@@ -59,11 +65,14 @@ class CollectInstances(pyblish.api.ContextPlugin):
             instance.data["publish"] = harmony.send(
                 {"function": "node.getEnable", "args": [node]}
             )["result"]
-            instance.data["families"] = self.families_mapping[data["family"]]
+
+            families = [product_type]
+            families.extend(self.product_type_mapping[product_type])
+            instance.data["families"] = families
 
             # If set in plugin, pair the scene Version in ftrack with
             # thumbnails and review media.
-            if (self.pair_media and instance.data["family"] == "scene"):
+            if (self.pair_media and product_type == "scene"):
                 context.data["scene_instance"] = instance
 
             # Produce diagnostic message for any graphical
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 66b1ee6085..9e0b500663 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_palettes.py
@@ -33,14 +33,16 @@ class CollectPalettes(pyblish.api.ContextPlugin):
                 return
         folder_path = context.data["folderPath"]
 
+        product_type = "harmony.palette"
         for name, id in palettes.items():
             instance = context.create_instance(name)
             instance.data.update({
                 "id": id,
-                "family": "harmony.palette",
-                'families': [],
+                "productType": product_type,
+                "family": product_type,
+                "families": [product_type],
                 "folderPath": folder_path,
-                "subset": "{}{}".format("palette", name)
+                "productName": "{}{}".format("palette", name)
             })
             self.log.info(
                 "Created instance:\n" + json.dumps(
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 1ea1f15124..b1010cfb57 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/collect_workfile.py
@@ -3,7 +3,7 @@
 import os
 import pyblish.api
 
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.pipeline.create import get_product_name
 
 
 class CollectWorkfile(pyblish.api.ContextPlugin):
@@ -15,26 +15,27 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
 
     def process(self, context):
         """Plugin entry point."""
-        family = "workfile"
+        product_type = "workfile"
         basename = os.path.basename(context.data["currentFile"])
-        subset = get_subset_name(
-            family,
-            "",
-            context.data["anatomyData"]["task"]["name"],
+        product_name = get_product_name(
+            context.data["projectName"],
             context.data["assetEntity"],
-            context.data["anatomyData"]["project"]["name"],
-            host_name=context.data["hostName"],
+            context.data["task"],
+            context.data["hostName"],
+            product_type,
+            "",
             project_settings=context.data["project_settings"]
         )
 
         # Create instance
-        instance = context.create_instance(subset)
+        instance = context.create_instance(product_name)
         instance.data.update({
-            "subset": subset,
+            "productName": product_name,
             "label": basename,
             "name": basename,
-            "family": family,
-            "families": [family],
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type],
             "representations": [],
             "folderPath": context.data["folderPath"]
         })
diff --git a/client/ayon_core/hosts/harmony/plugins/publish/extract_template.py b/client/ayon_core/hosts/harmony/plugins/publish/extract_template.py
index c481a34454..b2c7fa8174 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/extract_template.py
+++ b/client/ayon_core/hosts/harmony/plugins/publish/extract_template.py
@@ -75,7 +75,9 @@ class ExtractTemplate(publish.Extractor):
             instance.data["representations"] = [representation]
 
         instance.data["version_name"] = "{}_{}".format(
-            instance.data["subset"], instance.context.data["task"])
+            instance.data["productName"],
+            instance.context.data["task"]
+        )
 
     def get_backdrops(self, node: str) -> list:
         """Get backdrops for the node.
diff --git a/client/ayon_core/hosts/harmony/plugins/publish/help/validate_instances.xml b/client/ayon_core/hosts/harmony/plugins/publish/help/validate_instances.xml
index 3b040e8ea8..67ad7e2d21 100644
--- a/client/ayon_core/hosts/harmony/plugins/publish/help/validate_instances.xml
+++ b/client/ayon_core/hosts/harmony/plugins/publish/help/validate_instances.xml
@@ -3,9 +3,9 @@
 <error id="main">
 <title>Subset context</title>
 <description>
-## Invalid subset context
+## Invalid product context
 
-Asset name found '{found}' in subsets, expected '{expected}'.
+Asset name found '{found}' in products, expected '{expected}'.
 
 ### How to repair?
 
@@ -19,7 +19,7 @@ If this is unwanted, close workfile and open again, that way different asset val
 ### __Detailed Info__ (optional)
 
 This might happen if you are reuse old workfile and open it in different context.
-(Eg. you created subset "renderCompositingDefault" from asset "Robot' in "your_project_Robot_compositing.aep", now you opened this workfile in a context "Sloth" but existing subset for "Robot" asset stayed in the workfile.)
+(Eg. you created product "renderCompositingDefault" from asset "Robot' in "your_project_Robot_compositing.aep", now you opened this workfile in a context "Sloth" but existing product for "Robot" asset stayed in the workfile.)
 </detail>
 </error>
 </root>
\ No newline at end of file
diff --git a/client/ayon_core/hosts/hiero/api/lib.py b/client/ayon_core/hosts/hiero/api/lib.py
index d74ff13f05..ef0f9edca9 100644
--- a/client/ayon_core/hosts/hiero/api/lib.py
+++ b/client/ayon_core/hosts/hiero/api/lib.py
@@ -589,8 +589,8 @@ def imprint(track_item, data=None):
     Examples:
         data = {
             'asset': 'sq020sh0280',
-            'family': 'render',
-            'subset': 'subsetMain'
+            'productType': 'render',
+            'productName': 'productMain'
         }
     """
     data = data or {}
diff --git a/client/ayon_core/hosts/hiero/api/plugin.py b/client/ayon_core/hosts/hiero/api/plugin.py
index 574865488f..8f1be97680 100644
--- a/client/ayon_core/hosts/hiero/api/plugin.py
+++ b/client/ayon_core/hosts/hiero/api/plugin.py
@@ -439,7 +439,7 @@ class ClipLoader:
         """ Gets context and convert it to self.data
         data structure:
             {
-                "name": "assetName_subsetName_representationName"
+                "name": "assetName_productName_representationName"
                 "path": "path/to/file/created/by/get_repr..",
                 "binPath": "projectBinPath",
             }
@@ -448,10 +448,10 @@ class ClipLoader:
         repr = self.context["representation"]
         repr_cntx = repr["context"]
         asset = str(repr_cntx["asset"])
-        subset = str(repr_cntx["subset"])
+        product_name = str(repr_cntx["subset"])
         representation = str(repr_cntx["representation"])
         self.data["clip_name"] = self.clip_name_template.format(**repr_cntx)
-        self.data["track_name"] = "_".join([subset, representation])
+        self.data["track_name"] = "_".join([product_name, representation])
         self.data["versionData"] = self.context["version"]["data"]
         # gets file path
         file = get_representation_path_from_context(self.context)
@@ -659,9 +659,9 @@ class PublishClip:
     rename_default = False
     hierarchy_default = "{_folder_}/{_sequence_}/{_track_}"
     clip_name_default = "shot_{_trackIndex_:0>3}_{_clipIndex_:0>4}"
-    subset_name_default = "<track_name>"
+    base_product_name_default = "<track_name>"
     review_track_default = "< none >"
-    subset_family_default = "plate"
+    product_type_default = "plate"
     count_from_default = 10
     count_steps_default = 10
     vertical_sync_default = False
@@ -785,10 +785,10 @@ class PublishClip:
             "countFrom", {}).get("value") or self.count_from_default
         self.count_steps = self.ui_inputs.get(
             "countSteps", {}).get("value") or self.count_steps_default
-        self.subset_name = self.ui_inputs.get(
-            "subsetName", {}).get("value") or self.subset_name_default
-        self.subset_family = self.ui_inputs.get(
-            "subsetFamily", {}).get("value") or self.subset_family_default
+        self.base_product_name = self.ui_inputs.get(
+            "productName", {}).get("value") or self.base_product_name_default
+        self.product_type = self.ui_inputs.get(
+            "productType", {}).get("value") or self.product_type_default
         self.vertical_sync = self.ui_inputs.get(
             "vSyncOn", {}).get("value") or self.vertical_sync_default
         self.driving_layer = self.ui_inputs.get(
@@ -798,12 +798,14 @@ class PublishClip:
         self.audio = self.ui_inputs.get(
             "audio", {}).get("value") or False
 
-        # build subset name from layer name
-        if self.subset_name == "<track_name>":
-            self.subset_name = self.track_name
+        # build product name from layer name
+        if self.base_product_name == "<track_name>":
+            self.base_product_name = self.track_name
 
-        # create subset for publishing
-        self.subset = self.subset_family + self.subset_name.capitalize()
+        # create product for publishing
+        self.product_name = (
+            self.product_type + self.base_product_name.capitalize()
+        )
 
     def _replace_hash_to_expression(self, name, text):
         """ Replace hash with number in correct padding. """
@@ -885,14 +887,14 @@ class PublishClip:
             for (_in, _out), hero_data in self.vertical_clip_match.items():
                 hero_data.update({"heroTrack": False})
                 if _in == self.clip_in and _out == self.clip_out:
-                    data_subset = hero_data["subset"]
+                    data_product_name = hero_data["productName"]
                     # add track index in case duplicity of names in hero data
-                    if self.subset in data_subset:
-                        hero_data["subset"] = self.subset + str(
+                    if self.product_name in data_product_name:
+                        hero_data["productName"] = self.product_name + str(
                             self.track_index)
-                    # in case track name and subset name is the same then add
-                    if self.subset_name == self.track_name:
-                        hero_data["subset"] = self.subset
+                    # in case track name and product name is the same then add
+                    if self.base_product_name == self.track_name:
+                        hero_data["productName"] = self.product_name
                     # assign data to return hierarchy data to tag
                     tag_hierarchy_data = hero_data
 
@@ -913,9 +915,9 @@ class PublishClip:
             "hierarchy": hierarchy_filled,
             "parents": self.parents,
             "hierarchyData": hierarchy_formatting_data,
-            "subset": self.subset,
-            "family": self.subset_family,
-            "families": [self.data["family"]]
+            "productName": self.product_name,
+            "productType": self.product_type,
+            "families": [self.product_type, self.data["family"]]
         }
 
     def _convert_to_entity(self, type, template):
diff --git a/client/ayon_core/hosts/hiero/api/tags.py b/client/ayon_core/hosts/hiero/api/tags.py
index ad7c7e44a1..6491b1f384 100644
--- a/client/ayon_core/hosts/hiero/api/tags.py
+++ b/client/ayon_core/hosts/hiero/api/tags.py
@@ -28,8 +28,8 @@ def tag_data():
         #     "note": "Collecting track items to Nuke scripts.",
         #     "icon": "icons:TagNuke.png",
         #     "metadata": {
-        #         "family": "nukescript",
-        #         "subset": "main"
+        #         "productType": "nukescript",
+        #         "productName": "main"
         #     }
         # },
         "Comment": {
@@ -37,17 +37,17 @@ def tag_data():
             "note": "Comment on a shot.",
             "icon": "icons:TagComment.png",
             "metadata": {
-                "family": "comment",
-                "subset": "main"
+                "productType": "comment",
+                "productName": "main"
             }
         },
         "FrameMain": {
             "editable": "1",
-            "note": "Publishing a frame subset.",
+            "note": "Publishing a frame product.",
             "icon": "z_layer_main.png",
             "metadata": {
-                "family": "frame",
-                "subset": "main",
+                "productType": "frame",
+                "productName": "main",
                 "format": "png"
             }
         }
@@ -153,7 +153,7 @@ def add_tags_to_workfile():
             "note": task_type,
             "icon": "icons:TagGood.png",
             "metadata": {
-                "family": "task",
+                "productType": "task",
                 "type": task_type
             }
         }
@@ -173,7 +173,7 @@ def add_tags_to_workfile():
                         "path": "icons:TagActor.png"
                     },
                     "metadata": {
-                        "family": "assetbuild"
+                        "productType": "assetbuild"
                     }
                 }
 
diff --git a/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py b/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py
index ce84a9120e..90ea9ef50f 100644
--- a/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py
+++ b/client/ayon_core/hosts/hiero/plugins/create/create_shot_clip.py
@@ -10,7 +10,7 @@ class CreateShotClip(phiero.Creator):
     """Publishable clip"""
 
     label = "Create Publishable Clip"
-    family = "clip"
+    product_type = "clip"
     icon = "film"
     defaults = ["Main"]
 
@@ -133,19 +133,19 @@ class CreateShotClip(phiero.Creator):
             "target": "ui",
             "order": 3,
             "value": {
-                "subsetName": {
+                "productName": {
                     "value": ["<track_name>", "main", "bg", "fg", "bg",
                               "animatic"],
                     "type": "QComboBox",
-                    "label": "Subset Name",
+                    "label": "pRODUCT Name",
                     "target": "ui",
-                    "toolTip": "chose subset name pattern, if <track_name> is selected, name of track layer will be used",  # noqa
+                    "toolTip": "chose product name pattern, if <track_name> is selected, name of track layer will be used",  # noqa
                     "order": 0},
-                "subsetFamily": {
+                "productType": {
                     "value": ["plate", "take"],
                     "type": "QComboBox",
-                    "label": "Subset Family",
-                    "target": "ui", "toolTip": "What use of this subset is for",  # noqa
+                    "label": "Product Type",
+                    "target": "ui", "toolTip": "What use of this product is for",  # noqa
                     "order": 1},
                 "reviewTrack": {
                     "value": ["< none >"] + gui_tracks,
@@ -159,7 +159,7 @@ class CreateShotClip(phiero.Creator):
                     "type": "QCheckBox",
                     "label": "Include audio",
                     "target": "tag",
-                    "toolTip": "Process subsets with corresponding audio",  # noqa
+                    "toolTip": "Process productS with corresponding audio",  # noqa
                     "order": 3},
                 "sourceResolution": {
                     "value": False,
diff --git a/client/ayon_core/hosts/hiero/plugins/load/load_clip.py b/client/ayon_core/hosts/hiero/plugins/load/load_clip.py
index b8c51e7536..686edaa01f 100644
--- a/client/ayon_core/hosts/hiero/plugins/load/load_clip.py
+++ b/client/ayon_core/hosts/hiero/plugins/load/load_clip.py
@@ -14,7 +14,7 @@ import ayon_core.hosts.hiero.api as phiero
 
 
 class LoadClip(phiero.SequenceLoader):
-    """Load a subset to timeline as clip
+    """Load a product to timeline as clip
 
     Place clip to timeline on its asset origin timings collected
     during conforming to project
@@ -42,7 +42,7 @@ class LoadClip(phiero.SequenceLoader):
     clip_name_template = "{asset}_{subset}_{representation}"
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
+    def apply_settings(cls, project_settings):
         plugin_type_settings = (
             project_settings
             .get("hiero", {})
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 3bd5b88942..32b4864022 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
@@ -1,3 +1,4 @@
+from itertools import product
 import re
 import pyblish.api
 
@@ -12,13 +13,13 @@ class CollectClipEffects(pyblish.api.InstancePlugin):
     effect_categories = []
 
     def process(self, instance):
-        family = "effect"
+        product_type = "effect"
         effects = {}
         review = instance.data.get("review")
         review_track_index = instance.context.data.get("reviewTrackIndex")
         item = instance.data["item"]
 
-        if "audio" in instance.data["family"]:
+        if "audio" in instance.data["productType"]:
             return
 
         # frame range
@@ -61,16 +62,16 @@ class CollectClipEffects(pyblish.api.InstancePlugin):
         if not effects:
             return
 
-        subset = instance.data.get("subset")
-        effects.update({"assignTo": subset})
+        product_name = instance.data.get("productName")
+        effects.update({"assignTo": product_name})
 
-        subset_split = re.findall(r'[A-Z][^A-Z]*', subset)
+        product_name_split = re.findall(r'[A-Z][^A-Z]*', product_name)
 
-        if len(subset_split) > 0:
-            root_name = subset.replace(subset_split[0], "")
-            subset_split.insert(0, root_name.capitalize())
+        if len(product_name_split) > 0:
+            root_name = product_name.replace(product_name_split[0], "")
+            product_name_split.insert(0, root_name.capitalize())
 
-        subset_split.insert(0, "effect")
+        product_name_split.insert(0, "effect")
 
         effect_categories = {
             x["name"]: x["effect_classes"] for x in self.effect_categories
@@ -104,8 +105,8 @@ class CollectClipEffects(pyblish.api.InstancePlugin):
             effects_categorized[category]["assignTo"] = effects["assignTo"]
 
         for category, effects in effects_categorized.items():
-            name = "".join(subset_split)
-            name += category.capitalize()
+            product_name = "".join(product_name_split)
+            product_name += category.capitalize()
 
             # create new instance and inherit data
             data = {}
@@ -114,15 +115,17 @@ class CollectClipEffects(pyblish.api.InstancePlugin):
                     continue
                 data[key] = value
 
-            # change names
-            data["subset"] = name
-            data["family"] = family
-            data["families"] = [family]
-            data["name"] = data["subset"] + "_" + data["folderPath"]
-            data["label"] = "{} - {}".format(
-                data["folderPath"], data["subset"]
-            )
-            data["effects"] = effects
+            data.update({
+                "productName": product_name,
+                "productType": product_type,
+                "family": product_type,
+                "families": [product_type],
+                "name": product_name + "_" + data["folderPath"],
+                "label": "{} - {}".format(
+                    data["folderPath"], product_name
+                ),
+                "effects": effects,
+            })
 
             # create new instance
             _instance = instance.context.create_instance(**data)
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 6f99e6be29..d73b5d4667 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
@@ -13,8 +13,8 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
 
     Tag is expected to have metadata:
     {
-        "family": "frame"
-        "subset": "main"
+        "productType": "frame"
+        "productName": "main"
     }
     """
 
@@ -26,14 +26,14 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
         self._context = context
 
         # collect all sequence tags
-        subset_data = self._create_frame_subset_data_sequence(context)
+        product_data = self._create_frame_product_data_sequence(context)
 
-        self.log.debug("__ subset_data: {}".format(
-            pformat(subset_data)
+        self.log.debug("__ product_data: {}".format(
+            pformat(product_data)
         ))
 
         # create instances
-        self._create_instances(subset_data)
+        self._create_instances(product_data)
 
     def _get_tag_data(self, tag):
         data = {}
@@ -66,7 +66,7 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
 
         return data
 
-    def _create_frame_subset_data_sequence(self, context):
+    def _create_frame_product_data_sequence(self, context):
 
         sequence_tags = []
         sequence = context.data["activeTimeline"]
@@ -87,10 +87,13 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
             if not tag_data:
                 continue
 
-            if "family" not in tag_data:
+            product_type = tag_data.get("productType")
+            if product_type is None:
+                product_type = tag_data.get("family")
+            if not product_type:
                 continue
 
-            if tag_data["family"] != "frame":
+            if product_type != "frame":
                 continue
 
             sequence_tags.append(tag_data)
@@ -99,8 +102,8 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
             pformat(sequence_tags)
         ))
 
-        # first collect all available subset tag frames
-        subset_data = {}
+        # first collect all available product tag frames
+        product_data = {}
         context_asset_doc = context.data["assetEntity"]
         context_folder_path = get_asset_name_identifier(context_asset_doc)
 
@@ -110,33 +113,37 @@ class CollectFrameTagInstances(pyblish.api.ContextPlugin):
             if frame not in publish_frames:
                 continue
 
-            subset = tag_data["subset"]
+            product_name = tag_data.get("productName")
+            if product_name is None:
+                product_name = tag_data["subset"]
 
-            if subset in subset_data:
-                # update existing subset key
-                subset_data[subset]["frames"].append(frame)
+            if product_name in product_data:
+                # update existing product key
+                product_data[product_name]["frames"].append(frame)
             else:
-                # create new subset key
-                subset_data[subset] = {
+                # create new product key
+                product_data[product_name] = {
                     "frames": [frame],
                     "format": tag_data["format"],
                     "folderPath": context_folder_path
                 }
-        return subset_data
+        return product_data
 
-    def _create_instances(self, subset_data):
-        # create instance per subset
-        for subset_name, subset_data in subset_data.items():
-            name = "frame" + subset_name.title()
+    def _create_instances(self, product_data):
+        # create instance per product
+        product_type = "image"
+        for product_name, product_data in product_data.items():
+            name = "frame" + product_name.title()
             data = {
                 "name": name,
-                "label": "{} {}".format(name, subset_data["frames"]),
-                "family": "image",
-                "families": ["frame"],
-                "folderPath": subset_data["folderPath"],
-                "subset": name,
-                "format": subset_data["format"],
-                "frames": subset_data["frames"]
+                "label": "{} {}".format(name, product_data["frames"]),
+                "productType": product_type,
+                "family": product_type,
+                "families": [product_type, "frame"],
+                "folderPath": product_data["folderPath"],
+                "productName": name,
+                "format": product_data["format"],
+                "frames": product_data["frames"]
             }
             self._context.create_instance(**data)
 
diff --git a/client/ayon_core/hosts/hiero/plugins/publish/collect_tag_tasks.py b/client/ayon_core/hosts/hiero/plugins/publish/collect_tag_tasks.py
index 27968060e1..35a8c02cc0 100644
--- a/client/ayon_core/hosts/hiero/plugins/publish/collect_tag_tasks.py
+++ b/client/ayon_core/hosts/hiero/plugins/publish/collect_tag_tasks.py
@@ -16,10 +16,12 @@ class CollectClipTagTasks(api.InstancePlugin):
         tasks = {}
         for tag in tags:
             t_metadata = dict(tag.metadata())
-            t_family = t_metadata.get("tag.family", "")
+            t_product_type = t_metadata.get("tag.productType")
+            if t_product_type is None:
+                t_product_type = t_metadata.get("tag.family", "")
 
-            # gets only task family tags and collect labels
-            if "task" in t_family:
+            # gets only task product type tags and collect labels
+            if "task" in t_product_type:
                 t_task_name = t_metadata.get("tag.label", "")
                 t_task_type = t_metadata.get("tag.type", "")
                 tasks[t_task_name] = {"type": t_task_type}
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 d1edfed0d7..25b52968fa 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
@@ -21,8 +21,8 @@ class ExtractClipEffects(publish.Extractor):
         if not effects:
             return
 
-        subset = instance.data.get("subset")
-        family = instance.data["family"]
+        product_name = instance.data.get("productName")
+        product_type = instance.data["productType"]
 
         self.log.debug("creating staging dir")
         staging_dir = self.staging_dir(instance)
@@ -32,7 +32,7 @@ class ExtractClipEffects(publish.Extractor):
             instance.data["transfers"] = list()
 
         ext = "json"
-        file = subset + "." + ext
+        file = product_name + "." + ext
 
         # when instance is created during collection part
         resources_dir = instance.data["resourcesDir"]
@@ -68,8 +68,10 @@ class ExtractClipEffects(publish.Extractor):
         version_data.update({
             "colorspace": item.sourceMediaColourTransform(),
             "colorspaceScript": instance.context.data["colorspace"],
-            "families": [family, "plate"],
-            "subset": subset,
+            "families": [product_type, "plate"],
+            # TODO find out if 'subset' is needed (and 'productName')
+            "subset": product_name,
+            "productName": product_name,
             "fps": instance.context.data["fps"]
         })
         instance.data["versionData"] = version_data
@@ -77,7 +79,7 @@ class ExtractClipEffects(publish.Extractor):
         representation = {
             'files': file,
             'stagingDir': staging_dir,
-            'name': family + ext.title(),
+            'name': product_type + ext.title(),
             'ext': ext
         }
         instance.data["representations"].append(representation)
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 e6381af939..911b96c280 100644
--- a/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py
+++ b/client/ayon_core/hosts/hiero/plugins/publish/precollect_instances.py
@@ -87,22 +87,47 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
 
             asset, asset_name = self._get_asset_data(tag_data)
 
-            subset = tag_data["subset"]
+            product_name = tag_data.get("productName")
+            if product_name is None:
+                product_name = tag_data["subset"]
 
-            # insert family into families
             families = [str(f) for f in tag_data["families"]]
 
             # form label
             label = "{} -".format(asset)
             if asset_name != clip_name:
                 label += " ({})".format(clip_name)
-            label += " {}".format(subset)
+            label += " {}".format(product_name)
+
+            # TODO: remove backward compatibility
+            product_name = tag_data.get("productName")
+            if product_name is None:
+                # backward compatibility: subset -> productName
+                product_name = tag_data.get("subset")
+
+            # backward compatibility: product_name should not be missing
+            if not product_name:
+                self.log.error(
+                    "Product name is not defined for: {}".format(asset))
+
+            # TODO: remove backward compatibility
+            product_type = tag_data.get("productType")
+            if product_type is None:
+                # backward compatibility: family -> productType
+                product_type = tag_data.get("family")
+
+            # backward compatibility: product_type should not be missing
+            if not product_type:
+                self.log.error(
+                    "Product type is not defined for: {}".format(asset))
 
             data.update({
-                "name": "{}_{}".format(asset, subset),
+                "name": "{}_{}".format(asset, product_name),
                 "label": label,
                 "folderPath": asset,
                 "asset_name": asset_name,
+                "productName": product_name,
+                "productType": product_type,
                 "item": track_item,
                 "families": families,
                 "publish": tag_data["publish"],
@@ -146,7 +171,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             if not with_audio:
                 continue
 
-            # create audio subset instance
+            # create audio product instance
             self.create_audio_instance(context, **data)
 
             # add audioReview attribute to plate instance data
@@ -180,7 +205,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             })
 
     def create_shot_instance(self, context, **data):
-        subset = "shotMain"
+        product_name = "shotMain"
         master_layer = data.get("heroTrack")
         hierarchy_data = data.get("hierarchyData")
         item = data.get("item")
@@ -195,21 +220,21 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
         asset = data["folderPath"]
         asset_name = data["asset_name"]
 
-        # insert family into families
-        family = "shot"
+        product_type = "shot"
 
         # form label
         label = "{} -".format(asset)
         if asset_name != clip_name:
             label += " ({}) ".format(clip_name)
-        label += " {}".format(subset)
+        label += " {}".format(product_name)
 
         data.update({
-            "name": "{}_{}".format(asset, subset),
+            "name": "{}_{}".format(asset, product_name),
             "label": label,
-            "subset": subset,
-            "family": family,
-            "families": []
+            "productName": product_name,
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type]
         })
 
         instance = context.create_instance(**data)
@@ -238,7 +263,7 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
         return folder_path, asset_name
 
     def create_audio_instance(self, context, **data):
-        subset = "audioMain"
+        product_name = "audioMain"
         master_layer = data.get("heroTrack")
 
         if not master_layer:
@@ -254,21 +279,21 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
         asset = data["folderPath"]
         asset_name = data["asset_name"]
 
-        # insert family into families
-        family = "audio"
+        product_type = "audio"
 
         # form label
         label = "{} -".format(asset)
         if asset_name != clip_name:
             label += " ({}) ".format(clip_name)
-        label += " {}".format(subset)
+        label += " {}".format(product_name)
 
         data.update({
-            "name": "{}_{}".format(asset, subset),
+            "name": "{}_{}".format(asset, product_name),
             "label": label,
-            "subset": subset,
-            "family": family,
-            "families": ["clip"]
+            "productName": product_name,
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type, "clip"]
         })
         # remove review track attr if any
         data.pop("reviewTrack")
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 15dd0dee26..8df6cd4261 100644
--- a/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py
+++ b/client/ayon_core/hosts/hiero/plugins/publish/precollect_workfile.py
@@ -59,17 +59,20 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
             'files': base_name,
             "stagingDir": staging_dir,
         }
-        family = "workfile"
+        product_type = "workfile"
         instance_data = {
             "label": "{} - {}Main".format(
-                asset, family),
-            "name": "{}_{}".format(asset_name, family),
+                asset, product_type),
+            "name": "{}_{}".format(asset_name, product_type),
             "folderPath": context.data["folderPath"],
-            # TODO use 'get_subset_name'
-            "subset": "{}{}Main".format(asset_name, family.capitalize()),
+            # TODO use 'get_product_name'
+            "productName": "{}{}Main".format(
+                asset_name, product_type.capitalize()
+            ),
             "item": project,
-            "family": family,
-            "families": [],
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type],
             "representations": [workfile_representation, thumb_representation]
         }
 
diff --git a/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py b/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py
index ca937f4aa2..96d471115a 100644
--- a/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py
+++ b/client/ayon_core/hosts/hiero/plugins/publish_old_workflow/collect_assetbuilds.py
@@ -8,7 +8,7 @@ class CollectAssetBuilds(api.ContextPlugin):
 
     Tag is expected to have name of the asset and metadata:
         {
-            "family": "assetbuild"
+            "productType": "assetbuild"
         }
     """
 
@@ -29,7 +29,7 @@ class CollectAssetBuilds(api.ContextPlugin):
             asset_builds[asset_name] = asset_doc
 
         for instance in context:
-            if instance.data["family"] != "clip":
+            if instance.data["productType"] != "clip":
                 continue
 
             # Exclude non-tagged instances.
@@ -38,9 +38,11 @@ class CollectAssetBuilds(api.ContextPlugin):
 
             for tag in instance.data["tags"]:
                 t_metadata = dict(tag.metadata())
-                t_family = t_metadata.get("tag.family", "")
+                t_product_type = t_metadata.get("tag.productType")
+                if t_product_type is None:
+                    t_product_type = t_metadata.get("tag.family", "")
 
-                if t_family.lower() == "assetbuild":
+                if t_product_type.lower() == "assetbuild":
                     asset_names.append(tag["name"])
                     tagged = True
 
diff --git a/client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor.py b/client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor.py
index ad70be9a11..5d16ae2a0c 100644
--- a/client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor.py
+++ b/client/ayon_core/hosts/hiero/vendor/google/protobuf/descriptor.py
@@ -990,7 +990,7 @@ class FileDescriptor(DescriptorBase):
       :class:`descriptor_pb2.FileDescriptorProto`.
     dependencies (list[FileDescriptor]): List of other :class:`FileDescriptor`
       objects this :class:`FileDescriptor` depends on.
-    public_dependencies (list[FileDescriptor]): A subset of
+    public_dependencies (list[FileDescriptor]): A product of
       :attr:`dependencies`, which were declared as "public".
     message_types_by_name (dict(str, Descriptor)): Mapping from message names
       to their :class:`Descriptor`.
diff --git a/client/ayon_core/hosts/houdini/api/creator_node_shelves.py b/client/ayon_core/hosts/houdini/api/creator_node_shelves.py
index 567bb245db..57fdef753a 100644
--- a/client/ayon_core/hosts/houdini/api/creator_node_shelves.py
+++ b/client/ayon_core/hosts/houdini/api/creator_node_shelves.py
@@ -90,21 +90,21 @@ def create_interactive(creator_identifier, **kwargs):
     pane = stateutils.activePane(kwargs)
     if isinstance(pane, hou.NetworkEditor):
         pwd = pane.pwd()
-        subset_name = creator.get_subset_name(
-            variant=variant,
-            task_name=context.get_current_task_name(),
+        product_name = creator.get_product_name(
+            project_name=context.get_current_project_name(),
             asset_doc=get_asset_by_name(
                 project_name=context.get_current_project_name(),
                 asset_name=context.get_current_asset_name()
             ),
-            project_name=context.get_current_project_name(),
-            host_name=context.host_name
+            task_name=context.get_current_task_name(),
+            variant=variant,
+            host_name=context.host_name,
         )
 
         tool_fn = CATEGORY_GENERIC_TOOL.get(pwd.childTypeCategory())
         if tool_fn is not None:
             out_null = tool_fn(kwargs, "null")
-            out_null.setName("OUT_{}".format(subset_name), unique_name=True)
+            out_null.setName("OUT_{}".format(product_name), unique_name=True)
 
     before = context.instances_by_id.copy()
 
diff --git a/client/ayon_core/hosts/houdini/api/plugin.py b/client/ayon_core/hosts/houdini/api/plugin.py
index 57fd194000..13cf3c9949 100644
--- a/client/ayon_core/hosts/houdini/api/plugin.py
+++ b/client/ayon_core/hosts/houdini/api/plugin.py
@@ -99,24 +99,21 @@ class Creator(LegacyCreator):
 
 class HoudiniCreatorBase(object):
     @staticmethod
-    def cache_subsets(shared_data):
+    def cache_instance_data(shared_data):
         """Cache instances for Creators to shared data.
 
-        Create `houdini_cached_subsets` key when needed in shared data and
+        Create `houdini_cached_instances` key when needed in shared data and
         fill it with all collected instances from the scene under its
         respective creator identifiers.
 
-        Create `houdini_cached_legacy_subsets` key for any legacy instances
+        Create `houdini_cached_legacy_instance` key for any legacy instances
         detected in the scene as instances per family.
 
         Args:
             Dict[str, Any]: Shared data.
 
-        Return:
-            Dict[str, Any]: Shared data dictionary.
-
         """
-        if shared_data.get("houdini_cached_subsets") is None:
+        if shared_data.get("houdini_cached_instances") is None:
             cache = dict()
             cache_legacy = dict()
 
@@ -141,8 +138,8 @@ class HoudiniCreatorBase(object):
                     family = family_parm.eval()
                     cache_legacy.setdefault(family, []).append(node)
 
-            shared_data["houdini_cached_subsets"] = cache
-            shared_data["houdini_cached_legacy_subsets"] = cache_legacy
+            shared_data["houdini_cached_instances"] = cache
+            shared_data["houdini_cached_legacy_instance"] = cache_legacy
 
         return shared_data
 
@@ -177,7 +174,7 @@ class HoudiniCreator(NewCreator, HoudiniCreatorBase):
     settings_name = None
     add_publish_button = False
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         try:
             self.selected_nodes = []
 
@@ -192,15 +189,15 @@ class HoudiniCreator(NewCreator, HoudiniCreatorBase):
             asset_name = instance_data["folderPath"]
 
             instance_node = self.create_instance_node(
-                asset_name, subset_name, "/out", node_type)
+                asset_name, product_name, "/out", node_type)
 
             self.customize_node_look(instance_node)
 
             instance_data["instance_node"] = instance_node.path()
             instance_data["instance_id"] = instance_node.path()
             instance = CreatedInstance(
-                self.family,
-                subset_name,
+                self.product_type,
+                product_name,
                 instance_data,
                 self)
             self._add_instance_to_context(instance)
@@ -234,9 +231,9 @@ class HoudiniCreator(NewCreator, HoudiniCreatorBase):
 
     def collect_instances(self):
         # cache instances  if missing
-        self.cache_subsets(self.collection_shared_data)
+        self.cache_instance_data(self.collection_shared_data)
         for instance in self.collection_shared_data[
-                "houdini_cached_subsets"].get(self.identifier, []):
+                "houdini_cached_instances"].get(self.identifier, []):
 
             node_data = read(instance)
 
@@ -246,6 +243,8 @@ class HoudiniCreator(NewCreator, HoudiniCreatorBase):
             node_path = instance.path()
             node_data["instance_id"] = node_path
             node_data["instance_node"] = node_path
+            if "AYON_productName" in node_data:
+                node_data["productName"] = node_data.pop("AYON_productName")
 
             created_instance = CreatedInstance.from_existing(
                 node_data, self
@@ -269,6 +268,8 @@ class HoudiniCreator(NewCreator, HoudiniCreatorBase):
     def imprint(self, node, values, update=False):
         # Never store instance node and instance id since that data comes
         # from the node's path
+        if "productName" in values:
+            values["AYON_productName"] = values.pop("productName")
         values.pop("instance_node", None)
         values.pop("instance_id", None)
         imprint(node, values, update=update)
diff --git a/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py b/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py
index 6e503fba6b..008187d9c8 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/convert_legacy.py
@@ -1,24 +1,24 @@
 # -*- coding: utf-8 -*-
-"""Converter for legacy Houdini subsets."""
+"""Converter for legacy Houdini products."""
 from ayon_core.pipeline.create.creator_plugins import SubsetConvertorPlugin
 from ayon_core.hosts.houdini.api.lib import imprint
 
 
 class HoudiniLegacyConvertor(SubsetConvertorPlugin):
-    """Find and convert any legacy subsets in the scene.
+    """Find and convert any legacy products in the scene.
 
-    This Converter will find all legacy subsets in the scene and will
-    transform them to the current system. Since the old subsets doesn't
+    This Converter will find all legacy products in the scene and will
+    transform them to the current system. Since the old products doesn't
     retain any information about their original creators, the only mapping
     we can do is based on their families.
 
-    Its limitation is that you can have multiple creators creating subset
-    of the same family and there is no way to handle it. This code should
-    nevertheless cover all creators that came with OpenPype.
+    Its limitation is that you can have multiple creators creating product
+    name of the same product type and there is no way to handle it. This code
+    should nevertheless cover all creators that came with AYON.
 
     """
     identifier = "io.openpype.creators.houdini.legacy"
-    family_to_id = {
+    product_type_to_id = {
         "camera": "io.openpype.creators.houdini.camera",
         "ass": "io.openpype.creators.houdini.ass",
         "imagesequence": "io.openpype.creators.houdini.imagesequence",
@@ -33,44 +33,46 @@ class HoudiniLegacyConvertor(SubsetConvertorPlugin):
 
     def __init__(self, *args, **kwargs):
         super(HoudiniLegacyConvertor, self).__init__(*args, **kwargs)
-        self.legacy_subsets = {}
+        self.legacy_instances = {}
 
     def find_instances(self):
-        """Find legacy subsets in the scene.
+        """Find legacy products in the scene.
 
-        Legacy subsets are the ones that doesn't have `creator_identifier`
+        Legacy products are the ones that doesn't have `creator_identifier`
         parameter on them.
 
         This is using cached entries done in
-        :py:meth:`~HoudiniCreatorBase.cache_subsets()`
+        :py:meth:`~HoudiniCreatorBase.cache_instance_data()`
 
         """
-        self.legacy_subsets = self.collection_shared_data.get(
-            "houdini_cached_legacy_subsets")
-        if not self.legacy_subsets:
+        self.legacy_instances = self.collection_shared_data.get(
+            "houdini_cached_legacy_instance")
+        if not self.legacy_instances:
             return
-        self.add_convertor_item("Found {} incompatible subset{}.".format(
-            len(self.legacy_subsets), "s" if len(self.legacy_subsets) > 1 else "")
-        )
+        self.add_convertor_item("Found {} incompatible product{}.".format(
+            len(self.legacy_instances),
+            "s" if len(self.legacy_instances) > 1 else ""
+        ))
 
     def convert(self):
-        """Convert all legacy subsets to current.
+        """Convert all legacy products to current.
 
         It is enough to add `creator_identifier` and `instance_node`.
 
         """
-        if not self.legacy_subsets:
+        if not self.legacy_instances:
             return
 
-        for family, subsets in self.legacy_subsets.items():
-            if family in self.family_to_id:
-                for subset in subsets:
+        for product_type, legacy_instances in self.legacy_instances.items():
+            if product_type in self.product_type_to_id:
+                for instance in legacy_instances:
+                    creator_id = self.product_type_to_id[product_type]
                     data = {
-                        "creator_identifier": self.family_to_id[family],
-                        "instance_node": subset.path()
+                        "creator_identifier": creator_id,
+                        "instance_node": instance.path()
                     }
-                    if family == "pointcache":
+                    if product_type == "pointcache":
                         data["families"] = ["abc"]
                     self.log.info("Converting {} to {}".format(
-                        subset.path(), self.family_to_id[family]))
-                    imprint(subset, data)
+                        instance.path(), creator_id))
+                    imprint(instance, data)
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py b/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py
index b6661fe7e4..b61b4cbd46 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_alembic_camera.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""Creator plugin for creating alembic camera subsets."""
+"""Creator plugin for creating alembic camera products."""
 from ayon_core.hosts.houdini.api import plugin
 from ayon_core.pipeline import CreatedInstance, CreatorError
 
@@ -11,24 +11,24 @@ class CreateAlembicCamera(plugin.HoudiniCreator):
 
     identifier = "io.openpype.creators.houdini.camera"
     label = "Camera (Abc)"
-    family = "camera"
+    product_type = "camera"
     icon = "camera"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         import hou
 
         instance_data.pop("active", None)
         instance_data.update({"node_type": "alembic"})
 
         instance = super(CreateAlembicCamera, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
         instance_node = hou.node(instance.get("instance_node"))
         parms = {
             "filename": hou.text.expandString(
-                "$HIP/pyblish/{}.abc".format(subset_name)),
+                "$HIP/pyblish/{}.abc".format(product_name)),
             "use_sop_path": False,
         }
 
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py
index f60f5bc42f..6d992f136a 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_ass.py
@@ -9,7 +9,7 @@ class CreateArnoldAss(plugin.HoudiniCreator):
 
     identifier = "io.openpype.creators.houdini.ass"
     label = "Arnold ASS"
-    family = "ass"
+    product_type = "ass"
     icon = "magic"
 
     # Default extension: `.ass` or `.ass.gz`
@@ -17,7 +17,7 @@ class CreateArnoldAss(plugin.HoudiniCreator):
     # will override it by the value in the project settings
     ext = ".ass"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         import hou
 
         instance_data.pop("active", None)
@@ -27,7 +27,7 @@ class CreateArnoldAss(plugin.HoudiniCreator):
         creator_attributes["farm"] = pre_create_data["farm"]
 
         instance = super(CreateArnoldAss, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: plugin.CreatedInstance
 
@@ -41,7 +41,7 @@ class CreateArnoldAss(plugin.HoudiniCreator):
 
         filepath = "{}{}".format(
             hou.text.expandString("$HIP/pyblish/"),
-            "{}.$F4{}".format(subset_name, self.ext)
+            "{}.$F4{}".format(product_name, self.ext)
         )
         parms = {
             # Render frame range
@@ -54,7 +54,7 @@ class CreateArnoldAss(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # Lock any parameters in this list
-        to_lock = ["ar_ass_export_enable", "family", "id"]
+        to_lock = ["ar_ass_export_enable", "productType", "id"]
         self.lock_parameters(instance_node, to_lock)
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py
index 590a92f56f..b7c5910a4f 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_arnold_rop.py
@@ -7,7 +7,7 @@ class CreateArnoldRop(plugin.HoudiniCreator):
 
     identifier = "io.openpype.creators.houdini.arnold_rop"
     label = "Arnold ROP"
-    family = "arnold_rop"
+    product_type = "arnold_rop"
     icon = "magic"
 
     # Default extension
@@ -16,7 +16,7 @@ class CreateArnoldRop(plugin.HoudiniCreator):
     # Default to split export and render jobs
     export_job = True
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         import hou
 
         # Remove the active, we are checking the bypass flag of the nodes
@@ -29,7 +29,7 @@ class CreateArnoldRop(plugin.HoudiniCreator):
         instance_data["farm"] = pre_create_data.get("farm")
 
         instance = super(CreateArnoldRop, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: plugin.CreatedInstance
 
@@ -37,9 +37,9 @@ class CreateArnoldRop(plugin.HoudiniCreator):
 
         ext = pre_create_data.get("image_format")
 
-        filepath = "{renders_dir}{subset_name}/{subset_name}.$F4.{ext}".format(
+        filepath = "{renders_dir}{product_name}/{product_name}.$F4.{ext}".format(
             renders_dir=hou.text.expandString("$HIP/pyblish/renders/"),
-            subset_name=subset_name,
+            product_name=product_name,
             ext=ext,
         )
         parms = {
@@ -53,9 +53,9 @@ class CreateArnoldRop(plugin.HoudiniCreator):
 
         if pre_create_data.get("export_job"):
             ass_filepath = \
-                "{export_dir}{subset_name}/{subset_name}.$F4.ass".format(
+                "{export_dir}{product_name}/{product_name}.$F4.ass".format(
                     export_dir=hou.text.expandString("$HIP/pyblish/ass/"),
-                    subset_name=subset_name,
+                    product_name=product_name,
                 )
             parms["ar_ass_export_enable"] = 1
             parms["ar_ass_file"] = ass_filepath
@@ -63,7 +63,7 @@ class CreateArnoldRop(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # Lock any parameters in this list
-        to_lock = ["family", "id"]
+        to_lock = ["productType", "id"]
         self.lock_parameters(instance_node, to_lock)
 
     def get_pre_create_attr_defs(self):
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py b/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py
index 135c889b3e..92c89c71cb 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py
@@ -10,10 +10,10 @@ class CreateBGEO(plugin.HoudiniCreator):
     """BGEO pointcache creator."""
     identifier = "io.openpype.creators.houdini.bgeo"
     label = "PointCache (Bgeo)"
-    family = "pointcache"
+    product_type = "pointcache"
     icon = "gears"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         instance_data.pop("active", None)
 
@@ -23,7 +23,7 @@ class CreateBGEO(plugin.HoudiniCreator):
         creator_attributes["farm"] = pre_create_data["farm"]
 
         instance = super(CreateBGEO, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
@@ -32,7 +32,7 @@ class CreateBGEO(plugin.HoudiniCreator):
         file_path = "{}{}".format(
             hou.text.expandString("$HIP/pyblish/"),
             "{}.$F4.{}".format(
-                subset_name,
+                product_name,
                 pre_create_data.get("bgeo_type") or "bgeo.sc")
         )
         parms = {
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_composite.py b/client/ayon_core/hosts/houdini/plugins/create/create_composite.py
index b87e1fd5b1..a1104e5093 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_composite.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_composite.py
@@ -11,26 +11,26 @@ class CreateCompositeSequence(plugin.HoudiniCreator):
 
     identifier = "io.openpype.creators.houdini.imagesequence"
     label = "Composite (Image Sequence)"
-    family = "imagesequence"
+    product_type = "imagesequence"
     icon = "gears"
 
     ext = ".exr"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         import hou  # noqa
 
         instance_data.pop("active", None)
         instance_data.update({"node_type": "comp"})
 
         instance = super(CreateCompositeSequence, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
         instance_node = hou.node(instance.get("instance_node"))
         filepath = "{}{}".format(
             hou.text.expandString("$HIP/pyblish/"),
-            "{}.$F4{}".format(subset_name, self.ext)
+            "{}.$F4{}".format(product_name, self.ext)
         )
         parms = {
             "trange": 1,
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py b/client/ayon_core/hosts/houdini/plugins/create/create_hda.py
index faddc11b0c..994977de7d 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_hda.py
@@ -13,14 +13,14 @@ class CreateHDA(plugin.HoudiniCreator):
 
     identifier = "io.openpype.creators.houdini.hda"
     label = "Houdini Digital Asset (Hda)"
-    family = "hda"
+    product_type = "hda"
     icon = "gears"
     maintain_selection = False
 
-    def _check_existing(self, asset_name, subset_name):
+    def _check_existing(self, asset_name, product_name):
         # type: (str) -> bool
-        """Check if existing subset name versions already exists."""
-        # Get all subsets of the current asset
+        """Check if existing product name versions already exists."""
+        # Get all products of the current folder
         project_name = self.project_name
         asset_doc = get_asset_by_name(
             project_name, asset_name, fields=["_id"]
@@ -28,11 +28,11 @@ class CreateHDA(plugin.HoudiniCreator):
         subset_docs = get_subsets(
             project_name, asset_ids=[asset_doc["_id"]], fields=["name"]
         )
-        existing_subset_names_low = {
+        existing_product_names_low = {
             subset_doc["name"].lower()
             for subset_doc in subset_docs
         }
-        return subset_name.lower() in existing_subset_names_low
+        return product_name.lower() in existing_product_names_low
 
     def create_instance_node(
         self, asset_name, node_name, parent, node_type="geometry"
@@ -64,7 +64,7 @@ class CreateHDA(plugin.HoudiniCreator):
             hda_node.layoutChildren()
         elif self._check_existing(asset_name, node_name):
             raise plugin.OpenPypeCreatorError(
-                ("subset {} is already published with different HDA"
+                ("product {} is already published with different HDA"
                  "definition.").format(node_name))
         else:
             hda_node = to_hda
@@ -73,11 +73,11 @@ class CreateHDA(plugin.HoudiniCreator):
         self.customize_node_look(hda_node)
         return hda_node
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         instance_data.pop("active", None)
 
         instance = super(CreateHDA, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: plugin.CreatedInstance
 
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py
index 5211044fea..9eb9d80cd3 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_karma_rop.py
@@ -9,10 +9,10 @@ class CreateKarmaROP(plugin.HoudiniCreator):
     """Karma ROP"""
     identifier = "io.openpype.creators.houdini.karma_rop"
     label = "Karma ROP"
-    family = "karma_rop"
+    product_type = "karma_rop"
     icon = "magic"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         import hou  # noqa
 
         instance_data.pop("active", None)
@@ -23,7 +23,7 @@ class CreateKarmaROP(plugin.HoudiniCreator):
         instance_data["farm"] = pre_create_data.get("farm")
 
         instance = super(CreateKarmaROP, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
@@ -31,19 +31,19 @@ class CreateKarmaROP(plugin.HoudiniCreator):
 
         ext = pre_create_data.get("image_format")
 
-        filepath = "{renders_dir}{subset_name}/{subset_name}.$F4.{ext}".format(
+        filepath = "{renders_dir}{product_name}/{product_name}.$F4.{ext}".format(
             renders_dir=hou.text.expandString("$HIP/pyblish/renders/"),
-            subset_name=subset_name,
+            product_name=product_name,
             ext=ext,
         )
-        checkpoint = "{cp_dir}{subset_name}.$F4.checkpoint".format(
+        checkpoint = "{cp_dir}{product_name}.$F4.checkpoint".format(
             cp_dir=hou.text.expandString("$HIP/pyblish/"),
-            subset_name=subset_name
+            product_name=product_name
         )
 
-        usd_directory = "{usd_dir}{subset_name}_$RENDERID".format(
+        usd_directory = "{usd_dir}{product_name}_$RENDERID".format(
             usd_dir=hou.text.expandString("$HIP/pyblish/renders/usd_renders/"),     # noqa
-            subset_name=subset_name
+            product_name=product_name
         )
 
         parms = {
@@ -84,7 +84,7 @@ class CreateKarmaROP(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # Lock some Avalon attributes
-        to_lock = ["family", "id"]
+        to_lock = ["productType", "id"]
         self.lock_parameters(instance_node, to_lock)
 
     def get_pre_create_attr_defs(self):
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py
index 7f1da13d2e..bb10f3893c 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_ifd.py
@@ -9,10 +9,10 @@ class CreateMantraIFD(plugin.HoudiniCreator):
     """Mantra .ifd Archive"""
     identifier = "io.openpype.creators.houdini.mantraifd"
     label = "Mantra IFD"
-    family = "mantraifd"
+    product_type = "mantraifd"
     icon = "gears"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         import hou
         instance_data.pop("active", None)
         instance_data.update({"node_type": "ifd"})
@@ -20,7 +20,7 @@ class CreateMantraIFD(plugin.HoudiniCreator):
             "creator_attributes", dict())
         creator_attributes["farm"] = pre_create_data["farm"]
         instance = super(CreateMantraIFD, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
@@ -28,7 +28,7 @@ class CreateMantraIFD(plugin.HoudiniCreator):
 
         filepath = "{}{}".format(
             hou.text.expandString("$HIP/pyblish/"),
-            "{}.$F4.ifd".format(subset_name))
+            "{}.$F4.ifd".format(product_name))
         parms = {
             # Render frame range
             "trange": 1,
@@ -40,7 +40,7 @@ class CreateMantraIFD(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # Lock any parameters in this list
-        to_lock = ["soho_outputmode", "family", "id"]
+        to_lock = ["soho_outputmode", "productType", "id"]
         self.lock_parameters(instance_node, to_lock)
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py
index 02252f35d1..f15f49f463 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_mantra_rop.py
@@ -9,13 +9,13 @@ class CreateMantraROP(plugin.HoudiniCreator):
     """Mantra ROP"""
     identifier = "io.openpype.creators.houdini.mantra_rop"
     label = "Mantra ROP"
-    family = "mantra_rop"
+    product_type = "mantra_rop"
     icon = "magic"
 
     # Default to split export and render jobs
     export_job = True
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         import hou  # noqa
 
         instance_data.pop("active", None)
@@ -26,7 +26,7 @@ class CreateMantraROP(plugin.HoudiniCreator):
         instance_data["farm"] = pre_create_data.get("farm")
 
         instance = super(CreateMantraROP, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
@@ -34,9 +34,9 @@ class CreateMantraROP(plugin.HoudiniCreator):
 
         ext = pre_create_data.get("image_format")
 
-        filepath = "{renders_dir}{subset_name}/{subset_name}.$F4.{ext}".format(
+        filepath = "{renders_dir}{product_name}/{product_name}.$F4.{ext}".format(
             renders_dir=hou.text.expandString("$HIP/pyblish/renders/"),
-            subset_name=subset_name,
+            product_name=product_name,
             ext=ext,
         )
 
@@ -49,9 +49,9 @@ class CreateMantraROP(plugin.HoudiniCreator):
 
         if pre_create_data.get("export_job"):
             ifd_filepath = \
-                "{export_dir}{subset_name}/{subset_name}.$F4.ifd".format(
+                "{export_dir}{product_name}/{product_name}.$F4.ifd".format(
                     export_dir=hou.text.expandString("$HIP/pyblish/ifd/"),
-                    subset_name=subset_name,
+                    product_name=product_name,
                 )
             parms["soho_outputmode"] = 1
             parms["soho_diskfile"] = ifd_filepath
@@ -75,7 +75,7 @@ class CreateMantraROP(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # Lock some Avalon attributes
-        to_lock = ["family", "id"]
+        to_lock = ["productType", "id"]
         self.lock_parameters(instance_node, to_lock)
 
     def get_pre_create_attr_defs(self):
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py b/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py
index 07dcc17f25..9e0a335c3a 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py
@@ -11,10 +11,10 @@ class CreatePointCache(plugin.HoudiniCreator):
     """Alembic ROP to pointcache"""
     identifier = "io.openpype.creators.houdini.pointcache"
     label = "PointCache (Abc)"
-    family = "pointcache"
+    product_type = "pointcache"
     icon = "gears"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         instance_data.pop("active", None)
         instance_data.update({"node_type": "alembic"})
         creator_attributes = instance_data.setdefault(
@@ -22,7 +22,7 @@ class CreatePointCache(plugin.HoudiniCreator):
         creator_attributes["farm"] = pre_create_data["farm"]
 
         instance = super(CreatePointCache, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
@@ -35,7 +35,7 @@ class CreatePointCache(plugin.HoudiniCreator):
             "format": 2,
             "facesets": 0,
             "filename": hou.text.expandString(
-                "$HIP/pyblish/{}.abc".format(subset_name))
+                "$HIP/pyblish/{}.abc".format(product_name))
         }
 
         if self.selected_nodes:
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py
index fa42411a1c..6a9321b95a 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_proxy.py
@@ -9,10 +9,10 @@ class CreateRedshiftProxy(plugin.HoudiniCreator):
     """Redshift Proxy"""
     identifier = "io.openpype.creators.houdini.redshiftproxy"
     label = "Redshift Proxy"
-    family = "redshiftproxy"
+    product_type = "redshiftproxy"
     icon = "magic"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         # Remove the active, we are checking the bypass flag of the nodes
         instance_data.pop("active", None)
@@ -30,14 +30,14 @@ class CreateRedshiftProxy(plugin.HoudiniCreator):
         creator_attributes["farm"] = pre_create_data["farm"]
 
         instance = super(CreateRedshiftProxy, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
         instance_node = hou.node(instance.get("instance_node"))
 
         parms = {
-            "RS_archive_file": '$HIP/pyblish/{}.$F4.rs'.format(subset_name),
+            "RS_archive_file": '$HIP/pyblish/{}.$F4.rs'.format(product_name),
         }
 
         if self.selected_nodes:
@@ -46,7 +46,7 @@ class CreateRedshiftProxy(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # Lock some Avalon attributes
-        to_lock = ["family", "id", "prim_to_detail_pattern"]
+        to_lock = ["productType", "id", "prim_to_detail_pattern"]
         self.lock_parameters(instance_node, to_lock)
 
     def get_network_categories(self):
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py
index 8e88c690b9..3d6d657cf0 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_redshift_rop.py
@@ -11,14 +11,14 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
 
     identifier = "io.openpype.creators.houdini.redshift_rop"
     label = "Redshift ROP"
-    family = "redshift_rop"
+    product_type = "redshift_rop"
     icon = "magic"
     ext = "exr"
 
     # Default to split export and render jobs
     split_render = True
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         instance_data.pop("active", None)
         instance_data.update({"node_type": "Redshift_ROP"})
@@ -28,7 +28,7 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
         instance_data["farm"] = pre_create_data.get("farm")
 
         instance = super(CreateRedshiftROP, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
@@ -56,9 +56,9 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
         ipr_rop.parm("linked_rop").set(instance_node.path())
 
         ext = pre_create_data.get("image_format")
-        filepath = "{renders_dir}{subset_name}/{subset_name}.{fmt}".format(
+        filepath = "{renders_dir}{product_name}/{product_name}.{fmt}".format(
             renders_dir=hou.text.expandString("$HIP/pyblish/renders/"),
-            subset_name=subset_name,
+            product_name=product_name,
             fmt="${aov}.$F4.{ext}".format(aov="AOV", ext=ext)
         )
 
@@ -83,7 +83,7 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
             parms["RS_renderCamera"] = camera or ""
 
         export_dir = hou.text.expandString("$HIP/pyblish/rs/")
-        rs_filepath = f"{export_dir}{subset_name}/{subset_name}.$F4.rs"
+        rs_filepath = f"{export_dir}{product_name}/{product_name}.$F4.rs"
         parms["RS_archive_file"] = rs_filepath
 
         if pre_create_data.get("split_render", self.split_render):
@@ -92,7 +92,7 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # Lock some Avalon attributes
-        to_lock = ["family", "id"]
+        to_lock = ["productType", "id"]
         self.lock_parameters(instance_node, to_lock)
 
     def remove_instances(self, instances):
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_review.py b/client/ayon_core/hosts/houdini/plugins/create/create_review.py
index c512a61105..18f7ce498d 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_review.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_review.py
@@ -12,10 +12,10 @@ class CreateReview(plugin.HoudiniCreator):
 
     identifier = "io.openpype.creators.houdini.review"
     label = "Review"
-    family = "review"
+    product_type = "review"
     icon = "video-camera"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         instance_data.pop("active", None)
         instance_data.update({"node_type": "opengl"})
@@ -23,7 +23,7 @@ class CreateReview(plugin.HoudiniCreator):
         instance_data["keepImages"] = pre_create_data.get("keepImages")
 
         instance = super(CreateReview, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
@@ -31,9 +31,10 @@ class CreateReview(plugin.HoudiniCreator):
 
         frame_range = hou.playbar.frameRange()
 
-        filepath = "{root}/{subset}/{subset}.$F4.{ext}".format(
+        filepath = "{root}/{product_name}/{product_name}.$F4.{ext}".format(
             root=hou.text.expandString("$HIP/pyblish"),
-            subset="`chs(\"subset\")`",  # keep dynamic link to subset
+            # keep dynamic link to product name
+            product_name="`chs(\"AYON_productName\")`",
             ext=pre_create_data.get("image_format") or "png"
         )
 
@@ -89,7 +90,7 @@ class CreateReview(plugin.HoudiniCreator):
         if os.getenv("OCIO"):
             self.set_colorcorrect_to_default_view_space(instance_node)
 
-        to_lock = ["id", "family"]
+        to_lock = ["id", "productType"]
 
         self.lock_parameters(instance_node, to_lock)
 
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py b/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py
index 319be3568d..bc8a2507cd 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py
@@ -11,17 +11,17 @@ class CreateStaticMesh(plugin.HoudiniCreator):
 
     identifier = "io.openpype.creators.houdini.staticmesh.fbx"
     label = "Static Mesh (FBX)"
-    family = "staticMesh"
+    product_type = "staticMesh"
     icon = "fa5s.cubes"
 
     default_variants = ["Main"]
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         instance_data.update({"node_type": "filmboxfbx"})
 
         instance = super(CreateStaticMesh, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
@@ -30,7 +30,7 @@ class CreateStaticMesh(plugin.HoudiniCreator):
 
         # prepare parms
         output_path = hou.text.expandString(
-            "$HIP/pyblish/{}.fbx".format(subset_name)
+            "$HIP/pyblish/{}.fbx".format(product_name)
         )
 
         parms = {
@@ -48,7 +48,7 @@ class CreateStaticMesh(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # Lock any parameters in this list
-        to_lock = ["family", "id"]
+        to_lock = ["productType", "id"]
         self.lock_parameters(instance_node, to_lock)
 
     def get_network_categories(self):
@@ -88,14 +88,14 @@ class CreateStaticMesh(plugin.HoudiniCreator):
         return attrs + [createsubnetroot, vcformat, convert_units]
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         """
-        The default subset name templates for Unreal include {asset} and thus
+        The default prodcut name templates for Unreal include {asset} and thus
         we should pass that along as dynamic data.
         """
         dynamic_data = super(CreateStaticMesh, self).get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["asset"] = asset_doc["name"]
         return dynamic_data
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_usd.py b/client/ayon_core/hosts/houdini/plugins/create/create_usd.py
index db9c77fffe..ee05639368 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_usd.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_usd.py
@@ -10,24 +10,24 @@ class CreateUSD(plugin.HoudiniCreator):
     """Universal Scene Description"""
     identifier = "io.openpype.creators.houdini.usd"
     label = "USD (experimental)"
-    family = "usd"
+    product_type = "usd"
     icon = "gears"
     enabled = False
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         instance_data.pop("active", None)
         instance_data.update({"node_type": "usd"})
 
         instance = super(CreateUSD, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
         instance_node = hou.node(instance.get("instance_node"))
 
         parms = {
-            "lopoutput": "$HIP/pyblish/{}.usd".format(subset_name),
+            "lopoutput": "$HIP/pyblish/{}.usd".format(product_name),
             "enableoutputprocessor_simplerelativepaths": False,
         }
 
@@ -40,7 +40,7 @@ class CreateUSD(plugin.HoudiniCreator):
         to_lock = [
             "fileperframe",
             # Lock some Avalon attributes
-            "family",
+            "productType",
             "id",
         ]
         self.lock_parameters(instance_node, to_lock)
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py b/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py
index 72a2d2fc7f..0a5c8896a8 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_usdrender.py
@@ -8,10 +8,10 @@ class CreateUSDRender(plugin.HoudiniCreator):
     """USD Render ROP in /stage"""
     identifier = "io.openpype.creators.houdini.usdrender"
     label = "USD Render (experimental)"
-    family = "usdrender"
+    product_type = "usdrender"
     icon = "magic"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         import hou  # noqa
 
         instance_data["parent"] = hou.node("/stage")
@@ -21,7 +21,7 @@ class CreateUSDRender(plugin.HoudiniCreator):
         instance_data.update({"node_type": "usdrender"})
 
         instance = super(CreateUSDRender, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
@@ -37,5 +37,5 @@ class CreateUSDRender(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # Lock some Avalon attributes
-        to_lock = ["family", "id"]
+        to_lock = ["productType", "id"]
         self.lock_parameters(instance_node, to_lock)
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py b/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py
index 507917b7a5..9ac7ebdff7 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_vbd_cache.py
@@ -12,10 +12,10 @@ class CreateVDBCache(plugin.HoudiniCreator):
     identifier = "io.openpype.creators.houdini.vdbcache"
     name = "vbdcache"
     label = "VDB Cache"
-    family = "vdbcache"
+    product_type = "vdbcache"
     icon = "cloud"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         import hou
 
         instance_data.pop("active", None)
@@ -24,14 +24,14 @@ class CreateVDBCache(plugin.HoudiniCreator):
             "creator_attributes", dict())
         creator_attributes["farm"] = pre_create_data["farm"]
         instance = super(CreateVDBCache, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
         instance_node = hou.node(instance.get("instance_node"))
         file_path = "{}{}".format(
             hou.text.expandString("$HIP/pyblish/"),
-            "{}.$F4.vdb".format(subset_name))
+            "{}.$F4.vdb".format(product_name))
         parms = {
             "sopoutput": file_path,
             "initsim": True,
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py b/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py
index 609828e201..739796dc7c 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_vray_rop.py
@@ -12,14 +12,14 @@ class CreateVrayROP(plugin.HoudiniCreator):
 
     identifier = "io.openpype.creators.houdini.vray_rop"
     label = "VRay ROP"
-    family = "vray_rop"
+    product_type = "vray_rop"
     icon = "magic"
     ext = "exr"
 
     # Default to split export and render jobs
     export_job = True
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         instance_data.pop("active", None)
         instance_data.update({"node_type": "vray_renderer"})
@@ -29,7 +29,7 @@ class CreateVrayROP(plugin.HoudiniCreator):
         instance_data["farm"] = pre_create_data.get("farm")
 
         instance = super(CreateVrayROP, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)  # type: CreatedInstance
 
@@ -57,9 +57,9 @@ class CreateVrayROP(plugin.HoudiniCreator):
 
         if pre_create_data.get("export_job"):
             scene_filepath = \
-                "{export_dir}{subset_name}/{subset_name}.$F4.vrscene".format(
+                "{export_dir}{product_name}/{product_name}.$F4.vrscene".format(
                     export_dir=hou.text.expandString("$HIP/pyblish/vrscene/"),
-                    subset_name=subset_name,
+                    product_name=product_name,
                 )
             # Setting render_export_mode to "2" because that's for
             # "Export only" ("1" is for "Export & Render")
@@ -81,16 +81,16 @@ class CreateVrayROP(plugin.HoudiniCreator):
         instance_data["RenderElement"] = pre_create_data.get("render_element_enabled")         # noqa
         if pre_create_data.get("render_element_enabled", True):
             # Vray has its own tag for AOV file output
-            filepath = "{renders_dir}{subset_name}/{subset_name}.{fmt}".format(
+            filepath = "{renders_dir}{product_name}/{product_name}.{fmt}".format(
                 renders_dir=hou.text.expandString("$HIP/pyblish/renders/"),
-                subset_name=subset_name,
+                product_name=product_name,
                 fmt="${aov}.$F4.{ext}".format(aov="AOV",
                                               ext=ext)
             )
             filepath = "{}{}".format(
                 hou.text.expandString("$HIP/pyblish/renders/"),
-                "{}/{}.${}.$F4.{}".format(subset_name,
-                                          subset_name,
+                "{}/{}.${}.$F4.{}".format(product_name,
+                                          product_name,
                                           "AOV",
                                           ext)
             )
@@ -108,9 +108,9 @@ class CreateVrayROP(plugin.HoudiniCreator):
             })
 
         else:
-            filepath = "{renders_dir}{subset_name}/{subset_name}.{fmt}".format(
+            filepath = "{renders_dir}{product_name}/{product_name}.{fmt}".format(
                 renders_dir=hou.text.expandString("$HIP/pyblish/renders/"),
-                subset_name=subset_name,
+                product_name=product_name,
                 fmt="$F4.{ext}".format(ext=ext)
             )
             parms.update({
@@ -125,7 +125,7 @@ class CreateVrayROP(plugin.HoudiniCreator):
         instance_node.setParms(parms)
 
         # lock parameters from AVALON
-        to_lock = ["family", "id"]
+        to_lock = ["productType", "id"]
         self.lock_parameters(instance_node, to_lock)
 
     def remove_instances(self, instances):
diff --git a/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py b/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py
index 19631566df..631ef6ce77 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_workfile.py
@@ -12,7 +12,7 @@ class CreateWorkfile(plugin.HoudiniCreatorBase, AutoCreator):
     """Workfile auto-creator."""
     identifier = "io.openpype.creators.houdini.workfile"
     label = "Workfile"
-    family = "workfile"
+    product_type = "workfile"
     icon = "fa5.file"
 
     default_variant = "Main"
@@ -37,8 +37,12 @@ class CreateWorkfile(plugin.HoudiniCreatorBase, AutoCreator):
 
         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
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                variant,
+                host_name,
             )
             data = {
                 "folderPath": asset_name,
@@ -48,12 +52,16 @@ class CreateWorkfile(plugin.HoudiniCreatorBase, AutoCreator):
 
             data.update(
                 self.get_dynamic_data(
-                    variant, task_name, asset_doc,
-                    project_name, host_name, current_instance)
+                    project_name,
+                    asset_doc,
+                    task_name,
+                    variant,
+                    host_name,
+                    current_instance)
             )
             self.log.info("Auto-creating workfile instance...")
             current_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             self._add_instance_to_context(current_instance)
         elif (
@@ -62,12 +70,16 @@ class CreateWorkfile(plugin.HoudiniCreatorBase, AutoCreator):
         ):
             # 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
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                variant,
+                host_name,
             )
             current_instance["folderPath"] = asset_name
             current_instance["task"] = task_name
-            current_instance["subset"] = subset_name
+            current_instance["productName"] = product_name
 
         # write workfile information to context container.
         op_ctx = hou.node(CONTEXT_CONTAINER)
diff --git a/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py b/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py
index cc1a746d93..c750874719 100644
--- a/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py
+++ b/client/ayon_core/hosts/houdini/plugins/load/load_fbx.py
@@ -88,7 +88,7 @@ class FbxLoader(load.LoaderPlugin):
 
         return namespace, node_name
 
-    def create_load_node_tree(self, file_path, node_name, subset_name):
+    def create_load_node_tree(self, file_path, node_name, product_name):
         """Create Load network.
 
         you can start building your tree at any obj level.
@@ -118,14 +118,14 @@ class FbxLoader(load.LoaderPlugin):
         file_node.setParms({"file": file_path})
 
         # Create attribute delete
-        attribdelete_name = "attribdelete_{}".format(subset_name)
+        attribdelete_name = "attribdelete_{}".format(product_name)
         attribdelete = parent_node.createNode("attribdelete",
                                               node_name=attribdelete_name)
         attribdelete.setParms({"ptdel": "fbx_*"})
         attribdelete.setInput(0, file_node)
 
         # Create a Null node
-        null_name = "OUT_{}".format(subset_name)
+        null_name = "OUT_{}".format(product_name)
         null = parent_node.createNode("null", node_name=null_name)
         null.setInput(0, attribdelete)
 
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
index f91c253c25..040ad68a1a 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_cache_farm.py
@@ -44,7 +44,7 @@ class CollectDataforCache(pyblish.api.InstancePlugin):
         # because ???
         for family in instance.data["families"]:
             if family == "bgeo" or "abc":
-                instance.data["family"] = "pointcache"
+                instance.data["productType"] = "pointcache"
                 break
         instance.data.update({
             "plugin": "Houdini",
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 67e8f147d7..edfa78e4d9 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/collect_instances.py
@@ -17,7 +17,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
 
     Specific node:
         The specific node is important because it dictates in which way the
-        subset is being exported.
+        product is being exported.
 
         alembic: will export Alembic file which supports cascading attributes
                  like 'cbId' and 'path'
@@ -80,7 +80,9 @@ class CollectInstances(pyblish.api.ContextPlugin):
             instance = context.create_instance(label)
 
             # Include `families` using `family` data
-            instance.data["families"] = [instance.data["family"]]
+            product_type = data["family"]
+            data["productType"] = product_type
+            instance.data["families"] = [product_type]
 
             instance[:] = [node]
             instance.data["instance_node"] = node.path()
@@ -88,7 +90,9 @@ class CollectInstances(pyblish.api.ContextPlugin):
 
         def sort_by_family(instance):
             """Sort by family"""
-            return instance.data.get("families", instance.data.get("family"))
+            return instance.data.get(
+                "families", instance.data.get("productType")
+            )
 
         # Sort/grouped by family (preserving local index)
         context[:] = sorted(context, key=sort_by_family)
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 7a3087c268..38d6ec733d 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
@@ -15,10 +15,10 @@ class CollectInstancesUsdLayered(pyblish.api.ContextPlugin):
     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
+    Additionally this instance has no need for storing family, asset, product
     or name on the nodes. Instead all information is retrieved solely from
     the output filepath, which is an Avalon URI:
-        avalon://{asset}/{subset}.{representation}
+        avalon://{asset}/{product}.{representation}
 
     Each final ROP node is considered a dependency for any of the Configured
     Save Path layers it sets along the way. As such, the instances shown in
@@ -50,14 +50,19 @@ class CollectInstancesUsdLayered(pyblish.api.ContextPlugin):
             if node.evalParm("id") != "pyblish.avalon.usdlayered":
                 continue
 
-            has_family = node.evalParm("family")
-            assert has_family, "'%s' is missing 'family'" % node.name()
+            has_product_type = node.evalParm("productType")
+            assert has_product_type, (
+                "'%s' is missing 'productType'" % node.name()
+            )
 
             self.process_node(node, context)
 
         def sort_by_family(instance):
             """Sort by family"""
-            return instance.data.get("families", instance.data.get("family"))
+            return instance.data.get(
+                "families",
+                instance.data.get("productType")
+            )
 
         # Sort/grouped by family (preserving local index)
         context[:] = sorted(context, key=sort_by_family)
@@ -82,8 +87,8 @@ class CollectInstancesUsdLayered(pyblish.api.ContextPlugin):
         # instead use the "colorbleed.usd" family to integrate.
         data["publishFamilies"] = ["colorbleed.usd"]
 
-        # For now group ALL of them into USD Layer subset group
-        # Allow this subset to be grouped into a USD Layer on creation
+        # For now group ALL of them into USD Layer product group
+        # Allow this product to be grouped into a USD Layer on creation
         data["subsetGroup"] = "USD Layer"
 
         instances = list()
@@ -97,7 +102,7 @@ class CollectInstancesUsdLayered(pyblish.api.ContextPlugin):
             dependency.append(ropnode)
             dependency.data.update(data)
             dependency.data.update(dependency_save_data)
-            dependency.data["family"] = "colorbleed.usd.dependency"
+            dependency.data["productType"] = "colorbleed.usd.dependency"
             dependency.data["optional"] = False
             dependencies.append(dependency)
 
@@ -137,9 +142,9 @@ class CollectInstancesUsdLayered(pyblish.api.ContextPlugin):
             self.log.warning("Non Avalon URI Layer Path: %s" % save_path)
             return {}
 
-        # Collect asset + subset from URI
-        name = "{subset} ({asset})".format(**uri_data)
-        fname = "{asset}_{subset}.{ext}".format(**uri_data)
+        # Collect asset + product from URI
+        name = "{product[name]} ({asset})".format(**uri_data)
+        fname = "{asset}_{product[name]}.{ext}".format(**uri_data)
 
         data = dict(uri_data)
         data["usdSavePath"] = save_path
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 791b530eed..24ac9f22c3 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
@@ -11,7 +11,7 @@ from ayon_core.pipeline import usdlib
 class CollectUsdBootstrap(pyblish.api.InstancePlugin):
     """Collect special Asset/Shot bootstrap instances if those are needed.
 
-    Some specific subsets are intended to be part of the default structure
+    Some specific products are intended to be part of the default structure
     of an "Asset" or "Shot" in our USD pipeline. For example, for an Asset
     we layer a Model and Shade USD file over each other and expose that in
     a Asset USD file, ready to use.
@@ -30,13 +30,12 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
 
     def process(self, instance):
 
-        # Detect whether the current subset is a subset in a pipeline
+        # Detect whether the current product is a product in a pipeline
         def get_bootstrap(instance):
-            instance_subset = instance.data["subset"]
+            instance_product_name = instance.data["productName"]
             for name, layers in usdlib.PIPELINE.items():
-                if instance_subset in set(layers):
+                if instance_product_name in set(layers):
                     return name  # e.g. "asset"
-                    break
             else:
                 return
 
@@ -72,22 +71,24 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
                 required += list(layers)
 
         self.log.debug("Checking required bootstrap: %s" % required)
-        for subset_name in required:
-            if self._subset_exists(
-                project_name, instance, subset_name, asset_doc
+        for product_name in required:
+            if self._product_exists(
+                project_name, instance, product_name, asset_doc
             ):
                 continue
 
             self.log.debug(
                 "Creating {0} USD bootstrap: {1} {2}".format(
-                    bootstrap, asset_name, subset_name
+                    bootstrap, asset_name, product_name
                 )
             )
 
-            new = instance.context.create_instance(subset_name)
-            new.data["subset"] = subset_name
-            new.data["label"] = "{0} ({1})".format(subset_name, asset_name)
-            new.data["family"] = "usd.bootstrap"
+            product_type = "usd.bootstrap"
+            new = instance.context.create_instance(product_name)
+            new.data["productName"] = product_name
+            new.data["label"] = "{0} ({1})".format(product_name, asset_name)
+            new.data["productType"] = product_type
+            new.data["family"] = product_type
             new.data["comment"] = "Automated bootstrap USD file."
             new.data["publishFamilies"] = ["usd"]
 
@@ -98,15 +99,17 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
             for key in ["folderPath"]:
                 new.data[key] = instance.data[key]
 
-    def _subset_exists(self, project_name, instance, subset_name, asset_doc):
-        """Return whether subset exists in current context or in database."""
+    def _product_exists(
+        self, project_name, instance, product_name, asset_doc
+    ):
+        """Return whether product exists in current context or in database."""
         # Allow it to be created during this publish session
         context = instance.context
 
         asset_doc_name = get_asset_name_identifier(asset_doc)
         for inst in context:
             if (
-                inst.data["subset"] == subset_name
+                inst.data["productName"] == product_name
                 and inst.data["folderPath"] == asset_doc_name
             ):
                 return True
@@ -114,7 +117,7 @@ class CollectUsdBootstrap(pyblish.api.InstancePlugin):
         # Or, if they already exist in the database we can
         # skip them too.
         if get_subset_by_name(
-            project_name, subset_name, asset_doc["_id"], fields=["_id"]
+            project_name, product_name, asset_doc["_id"], fields=["_id"]
         ):
             return True
         return False
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 70dc28e925..f085b6ca41 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
@@ -45,15 +45,16 @@ class CollectUsdLayers(pyblish.api.InstancePlugin):
         # Create configured layer instances so User can disable updating
         # specific configured layers for publishing.
         context = instance.context
+        product_type = "usdlayer"
         for layer, save_path in save_layers:
             name = os.path.basename(save_path)
             label = "{0} -> {1}".format(instance.data["name"], name)
             layer_inst = context.create_instance(name)
 
-            family = "usdlayer"
-            layer_inst.data["family"] = family
-            layer_inst.data["families"] = [family]
-            layer_inst.data["subset"] = "__stub__"
+            layer_inst.data["productType"] = product_type
+            layer_inst.data["family"] = product_type
+            layer_inst.data["families"] = [product_type]
+            layer_inst.data["productName"] = "__stub__"
             layer_inst.data["label"] = label
             layer_inst.data["folderPath"] = instance.data["folderPath"]
             layer_inst.data["instance_node"] = instance.data["instance_node"]
@@ -62,5 +63,5 @@ class CollectUsdLayers(pyblish.api.InstancePlugin):
             # include layer data
             layer_inst.append((layer, save_path))
 
-            # Allow this subset to be grouped into a USD Layer on creation
+            # Allow this product to be grouped into a USD Layer on creation
             layer_inst.data["subsetGroup"] = "USD Layer"
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 56c335f50e..99c61803e6 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
@@ -284,29 +284,29 @@ class ExtractUSDLayered(publish.Extractor):
         # Compare this dependency with the latest published version
         # to detect whether we should make this into a new publish
         # version. If not, skip it.
-        asset = get_asset_by_name(
+        asset_doc = get_asset_by_name(
             project_name, dependency.data["folderPath"], fields=["_id"]
         )
-        subset = get_subset_by_name(
+        subset_doc = get_subset_by_name(
             project_name,
-            dependency.data["subset"],
-            asset["_id"],
+            dependency.data["productName"],
+            asset_doc["_id"],
             fields=["_id"]
         )
-        if not subset:
+        if not subset_doc:
             # Subset doesn't exist yet. Definitely new file
-            self.log.debug("No existing subset..")
+            self.log.debug("No existing product..")
             return False
 
-        version = get_last_version_by_subset_id(
-            project_name, subset["_id"], fields=["_id"]
+        version_doc = get_last_version_by_subset_id(
+            project_name, subset_doc["_id"], fields=["_id"]
         )
-        if not version:
+        if not version_doc:
             self.log.debug("No existing version..")
             return False
 
         representation = get_representation_by_name(
-            project_name, ext.lstrip("."), version["_id"]
+            project_name, ext.lstrip("."), version_doc["_id"]
         )
         if not representation:
             self.log.debug("No existing representation..")
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py
index 1134f8853a..e9a0397a58 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_file_extension.py
@@ -45,9 +45,9 @@ class ValidateFileExtension(pyblish.api.InstancePlugin):
 
         # Create lookup for current family in instance
         families = []
-        family = instance.data.get("family", None)
-        if family:
-            families.append(family)
+        product_type = instance.data.get("productType")
+        if product_type:
+            families.append(product_type)
         families = set(families)
 
         # Perform extension check
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py
index 0df858ca4b..9a68c34405 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_houdini_license_category.py
@@ -28,7 +28,7 @@ class ValidateHoudiniNotApprenticeLicense(pyblish.api.InstancePlugin):
 
         if hou.isApprentice():
             # Find which family was matched with the plug-in
-            families = {instance.data["family"]}
+            families = {instance.data["productType"]}
             families.update(instance.data.get("families", []))
             disallowed_families = families.intersection(self.families)
             families = " ".join(sorted(disallowed_families)).title()
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py
index 67807b5366..e94f09568d 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_subset_name.py
@@ -10,7 +10,7 @@ from ayon_core.pipeline.publish import (
     RepairAction,
 )
 from ayon_core.hosts.houdini.api.action import SelectInvalidAction
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.pipeline.create import get_product_name
 
 import hou
 
@@ -53,21 +53,23 @@ class ValidateSubsetName(pyblish.api.InstancePlugin,
 
         rop_node = hou.node(instance.data["instance_node"])
 
-        # Check subset name
+        # Check product name
         asset_doc = instance.data["assetEntity"]
-        subset_name = get_subset_name(
-            family=instance.data["family"],
+        product_name = get_product_name(
+            instance.context.data["projectName"],
+            asset_doc,
+            instance.data["task"],
+            instance.context.data["hostName"],
+            instance.data["productType"],
             variant=instance.data["variant"],
-            task_name=instance.data["task"],
-            asset_doc=asset_doc,
             dynamic_data={"asset": asset_doc["name"]}
         )
 
-        if instance.data.get("subset") != subset_name:
+        if instance.data.get("productName") != product_name:
             invalid.append(rop_node)
             cls.log.error(
-                "Invalid subset name on rop node '%s' should be '%s'.",
-                rop_node.path(), subset_name
+                "Invalid product name on rop node '%s' should be '%s'.",
+                rop_node.path(), product_name
             )
 
         return invalid
@@ -76,20 +78,22 @@ class ValidateSubsetName(pyblish.api.InstancePlugin,
     def repair(cls, instance):
         rop_node = hou.node(instance.data["instance_node"])
 
-        # Check subset name
+        # Check product name
         asset_doc = instance.data["assetEntity"]
-        subset_name = get_subset_name(
-            family=instance.data["family"],
+        product_name = get_product_name(
+            instance.context.data["projectName"],
+            asset_doc,
+            instance.data["task"],
+            instance.context.data["hostName"],
+            instance.data["productType"],
             variant=instance.data["variant"],
-            task_name=instance.data["task"],
-            asset_doc=asset_doc,
             dynamic_data={"asset": asset_doc["name"]}
         )
 
-        instance.data["subset"] = subset_name
-        rop_node.parm("subset").set(subset_name)
+        instance.data["productName"] = product_name
+        rop_node.parm("AYON_productName").set(product_name)
 
         cls.log.debug(
-            "Subset name on rop node '%s' has been set to '%s'.",
-            rop_node.path(), subset_name
+            "Product name on rop node '%s' has been set to '%s'.",
+            rop_node.path(), product_name
         )
diff --git a/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py b/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py
index dbee293074..33d0d42383 100644
--- a/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py
+++ b/client/ayon_core/hosts/houdini/plugins/publish/validate_unreal_staticmesh_naming.py
@@ -23,7 +23,7 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin,
             - USP
             - UCX
 
-    This validator also checks if subset name is correct
+    This validator also checks if product name is correct
             - {static mesh prefix}_{Asset-Name}{Variant}.
 
     """
@@ -39,7 +39,7 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin,
     static_mesh_prefix = ""
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
+    def apply_settings(cls, project_settings):
 
         settings = (
             project_settings["houdini"]["create"]["CreateStaticMesh"]
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 c8b9ed9bab..6d21b59a9c 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
@@ -19,22 +19,24 @@ class ValidateUSDShadeModelExists(pyblish.api.InstancePlugin):
     def process(self, instance):
         project_name = instance.context.data["projectName"]
         asset_name = instance.data["folderPath"]
-        subset = instance.data["subset"]
+        product_name = instance.data["productName"]
 
         # Assume shading variation starts after a dot separator
-        shade_subset = subset.split(".", 1)[0]
-        model_subset = re.sub("^usdShade", "usdModel", shade_subset)
+        shade_product_name = product_name.split(".", 1)[0]
+        model_product_name = re.sub(
+            "^usdShade", "usdModel", shade_product_name
+        )
 
         asset_doc = instance.data.get("assetEntity")
         if not asset_doc:
             raise RuntimeError("Asset document is not filled on instance.")
 
         subset_doc = get_subset_by_name(
-            project_name, model_subset, asset_doc["_id"], fields=["_id"]
+            project_name, model_product_name, asset_doc["_id"], fields=["_id"]
         )
         if not subset_doc:
             raise PublishValidationError(
-                ("USD Model subset not found: "
-                 "{} ({})").format(model_subset, asset_name),
+                ("USD Model product not found: "
+                 "{} ({})").format(model_product_name, asset_name),
                 title=self.label
             )
diff --git a/client/ayon_core/hosts/max/api/plugin.py b/client/ayon_core/hosts/max/api/plugin.py
index 18f752631d..4d5d18a42d 100644
--- a/client/ayon_core/hosts/max/api/plugin.py
+++ b/client/ayon_core/hosts/max/api/plugin.py
@@ -163,11 +163,11 @@ class OpenPypeCreatorError(CreatorError):
 class MaxCreatorBase(object):
 
     @staticmethod
-    def cache_subsets(shared_data):
-        if shared_data.get("max_cached_subsets") is not None:
+    def cache_instance_data(shared_data):
+        if shared_data.get("max_cached_instances") is not None:
             return shared_data
 
-        shared_data["max_cached_subsets"] = {}
+        shared_data["max_cached_instances"] = {}
 
         cached_instances = []
         for id_type in [AYON_INSTANCE_ID, AVALON_INSTANCE_ID]:
@@ -175,11 +175,11 @@ class MaxCreatorBase(object):
 
         for i in cached_instances:
             creator_id = rt.GetUserProp(i, "creator_identifier")
-            if creator_id not in shared_data["max_cached_subsets"]:
-                shared_data["max_cached_subsets"][creator_id] = [i.name]
+            if creator_id not in shared_data["max_cached_instances"]:
+                shared_data["max_cached_instances"][creator_id] = [i.name]
             else:
                 shared_data[
-                    "max_cached_subsets"][creator_id].append(i.name)
+                    "max_cached_instances"][creator_id].append(i.name)
         return shared_data
 
     @staticmethod
@@ -211,17 +211,17 @@ class MaxCreatorBase(object):
 class MaxCreator(Creator, MaxCreatorBase):
     selected_nodes = []
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         if pre_create_data.get("use_selection"):
             self.selected_nodes = rt.GetCurrentSelection()
-        if rt.getNodeByName(subset_name):
-            raise CreatorError(f"'{subset_name}' is already created..")
+        if rt.getNodeByName(product_name):
+            raise CreatorError(f"'{product_name}' is already created..")
 
-        instance_node = self.create_instance_node(subset_name)
+        instance_node = self.create_instance_node(product_name)
         instance_data["instance_node"] = instance_node.name
         instance = CreatedInstance(
-            self.family,
-            subset_name,
+            self.product_type,
+            product_name,
             instance_data,
             self
         )
@@ -248,8 +248,8 @@ class MaxCreator(Creator, MaxCreatorBase):
         return instance
 
     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
+        self.cache_instance_data(self.collection_shared_data)
+        for instance in self.collection_shared_data["max_cached_instances"].get(self.identifier, []):  # noqa
             created_instance = CreatedInstance.from_existing(
                 read(rt.GetNodeByName(instance)), self
             )
@@ -262,15 +262,15 @@ class MaxCreator(Creator, MaxCreatorBase):
                 key: changes[key].new_value
                 for key in changes.changed_keys
             }
-            subset = new_values.get("subset", "")
-            if subset and instance_node != subset:
+            product_name = new_values.get("productName", "")
+            if product_name and instance_node != product_name:
                 node = rt.getNodeByName(instance_node)
-                new_subset_name = new_values["subset"]
-                if rt.getNodeByName(new_subset_name):
+                new_product_name = new_values["productName"]
+                if rt.getNodeByName(new_product_name):
                     raise CreatorError(
-                        "The subset '{}' already exists.".format(
-                            new_subset_name))
-                instance_node = new_subset_name
+                        "The product '{}' already exists.".format(
+                            new_product_name))
+                instance_node = new_product_name
                 created_inst["instance_node"] = instance_node
                 node.name = instance_node
 
diff --git a/client/ayon_core/hosts/max/plugins/create/create_camera.py b/client/ayon_core/hosts/max/plugins/create/create_camera.py
index a35d5fc6b9..42f8cb716d 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_camera.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_camera.py
@@ -7,5 +7,5 @@ class CreateCamera(plugin.MaxCreator):
     """Creator plugin for Camera."""
     identifier = "io.openpype.creators.max.camera"
     label = "Camera"
-    family = "camera"
+    product_type = "camera"
     icon = "gear"
diff --git a/client/ayon_core/hosts/max/plugins/create/create_maxScene.py b/client/ayon_core/hosts/max/plugins/create/create_maxScene.py
index 4b8328d38f..0e5768b267 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_maxScene.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_maxScene.py
@@ -7,5 +7,5 @@ class CreateMaxScene(plugin.MaxCreator):
     """Creator plugin for 3ds max scenes."""
     identifier = "io.openpype.creators.max.maxScene"
     label = "Max Scene"
-    family = "maxScene"
+    product_type = "maxScene"
     icon = "gear"
diff --git a/client/ayon_core/hosts/max/plugins/create/create_model.py b/client/ayon_core/hosts/max/plugins/create/create_model.py
index 73f0260807..297c92067e 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_model.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_model.py
@@ -7,5 +7,5 @@ class CreateModel(plugin.MaxCreator):
     """Creator plugin for Model."""
     identifier = "io.openpype.creators.max.model"
     label = "Model"
-    family = "model"
+    product_type = "model"
     icon = "gear"
diff --git a/client/ayon_core/hosts/max/plugins/create/create_pointcache.py b/client/ayon_core/hosts/max/plugins/create/create_pointcache.py
index d28f5008e5..eb0686a0c0 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_pointcache.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_pointcache.py
@@ -7,5 +7,5 @@ class CreatePointCache(plugin.MaxCreator):
     """Creator plugin for Point caches."""
     identifier = "io.openpype.creators.max.pointcache"
     label = "Point Cache"
-    family = "pointcache"
+    product_type = "pointcache"
     icon = "gear"
diff --git a/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py b/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py
index aa6be04da4..9a58f4e624 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_pointcloud.py
@@ -7,5 +7,5 @@ class CreatePointCloud(plugin.MaxCreator):
     """Creator plugin for Point Clouds."""
     identifier = "io.openpype.creators.max.pointcloud"
     label = "Point Cloud"
-    family = "pointcloud"
+    product_type = "pointcloud"
     icon = "gear"
diff --git a/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py b/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py
index e524e85cf6..17f5349dc1 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_redshift_proxy.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 """Creator plugin for creating camera."""
 from ayon_core.hosts.max.api import plugin
-from ayon_core.pipeline import CreatedInstance
 
 
 class CreateRedshiftProxy(plugin.MaxCreator):
     identifier = "io.openpype.creators.max.redshiftproxy"
     label = "Redshift Proxy"
-    family = "redshiftproxy"
+    product_type = "redshiftproxy"
     icon = "gear"
diff --git a/client/ayon_core/hosts/max/plugins/create/create_render.py b/client/ayon_core/hosts/max/plugins/create/create_render.py
index 73c18bfb4b..60fe628a5e 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_render.py
@@ -10,10 +10,10 @@ class CreateRender(plugin.MaxCreator):
     """Creator plugin for Renders."""
     identifier = "io.openpype.creators.max.render"
     label = "Render"
-    family = "maxrender"
+    product_type = "maxrender"
     icon = "gear"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         from pymxs import runtime as rt
         file = rt.maxFileName
         filename, _ = os.path.splitext(file)
@@ -24,7 +24,7 @@ class CreateRender(plugin.MaxCreator):
             rt.batchRenderMgr.DeleteView(num_of_renderlayer)
 
         instance = super(CreateRender, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
diff --git a/client/ayon_core/hosts/max/plugins/create/create_review.py b/client/ayon_core/hosts/max/plugins/create/create_review.py
index a757b3b5bd..0a0ffd2e46 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_review.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_review.py
@@ -9,7 +9,7 @@ class CreateReview(plugin.MaxCreator):
 
     identifier = "io.openpype.creators.max.review"
     label = "Review"
-    family = "review"
+    product_type = "review"
     icon = "video-camera"
 
     review_width = 1920
@@ -38,7 +38,7 @@ class CreateReview(plugin.MaxCreator):
             "anti_aliasing", self.anti_aliasing)
         self.vp_texture = settings.get("vp_texture", self.vp_texture)
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         # Transfer settings from pre create to instance
         creator_attributes = instance_data.setdefault(
             "creator_attributes", dict())
@@ -55,7 +55,7 @@ class CreateReview(plugin.MaxCreator):
                 creator_attributes[key] = pre_create_data[key]
 
         super(CreateReview, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
diff --git a/client/ayon_core/hosts/max/plugins/create/create_tycache.py b/client/ayon_core/hosts/max/plugins/create/create_tycache.py
index 81ccd3607c..2b3893bf13 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_tycache.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_tycache.py
@@ -7,5 +7,5 @@ class CreateTyCache(plugin.MaxCreator):
     """Creator plugin for TyCache."""
     identifier = "io.openpype.creators.max.tycache"
     label = "TyCache"
-    family = "tycache"
+    product_type = "tycache"
     icon = "gear"
diff --git a/client/ayon_core/hosts/max/plugins/create/create_workfile.py b/client/ayon_core/hosts/max/plugins/create/create_workfile.py
index 27864c28d5..1552149413 100644
--- a/client/ayon_core/hosts/max/plugins/create/create_workfile.py
+++ b/client/ayon_core/hosts/max/plugins/create/create_workfile.py
@@ -11,7 +11,7 @@ class CreateWorkfile(plugin.MaxCreatorBase, AutoCreator):
     """Workfile auto-creator."""
     identifier = "io.ayon.creators.max.workfile"
     label = "Workfile"
-    family = "workfile"
+    product_type = "workfile"
     icon = "fa5.file"
 
     default_variant = "Main"
@@ -30,8 +30,12 @@ class CreateWorkfile(plugin.MaxCreatorBase, AutoCreator):
 
         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
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                variant,
+                host_name,
             )
             data = {
                 "folderPath": asset_name,
@@ -41,14 +45,18 @@ class CreateWorkfile(plugin.MaxCreatorBase, AutoCreator):
 
             data.update(
                 self.get_dynamic_data(
-                    variant, task_name, asset_doc,
-                    project_name, host_name, current_instance)
+                    project_name,
+                    asset_doc,
+                    task_name,
+                    variant,
+                    host_name,
+                    current_instance)
             )
             self.log.info("Auto-creating workfile instance...")
-            instance_node = self.create_node(subset_name)
+            instance_node = self.create_node(product_name)
             data["instance_node"] = instance_node.name
             current_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             self._add_instance_to_context(current_instance)
             imprint(instance_node.name, current_instance.data)
@@ -58,18 +66,23 @@ class CreateWorkfile(plugin.MaxCreatorBase, AutoCreator):
         ):
             # 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
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                variant,
+                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
+            current_instance["productName"] = product_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
+        self.cache_instance_data(self.collection_shared_data)
+        cached_instances = self.collection_shared_data["max_cached_instances"]
+        for instance in cached_instances.get(self.identifier, []):
             if not rt.getNodeByName(instance):
                 continue
             created_instance = CreatedInstance.from_existing(
@@ -100,10 +113,10 @@ class CreateWorkfile(plugin.MaxCreatorBase, AutoCreator):
 
             self._remove_instance_from_context(instance)
 
-    def create_node(self, subset_name):
-        if rt.getNodeByName(subset_name):
-            node = rt.getNodeByName(subset_name)
+    def create_node(self, product_name):
+        if rt.getNodeByName(product_name):
+            node = rt.getNodeByName(product_name)
             return node
-        node = rt.Container(name=subset_name)
+        node = rt.Container(name=product_name)
         node.isHidden = True
         return node
diff --git a/client/ayon_core/hosts/max/plugins/publish/collect_frame_range.py b/client/ayon_core/hosts/max/plugins/publish/collect_frame_range.py
index 86fb6e856c..6fc8de90d1 100644
--- a/client/ayon_core/hosts/max/plugins/publish/collect_frame_range.py
+++ b/client/ayon_core/hosts/max/plugins/publish/collect_frame_range.py
@@ -14,7 +14,7 @@ class CollectFrameRange(pyblish.api.InstancePlugin):
                 "review", "redshiftproxy"]
 
     def process(self, instance):
-        if instance.data["family"] == "maxrender":
+        if instance.data["productType"] == "maxrender":
             instance.data["frameStartHandle"] = int(rt.rendStart)
             instance.data["frameEndHandle"] = int(rt.rendEnd)
         else:
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 f3fde00fe0..010b3cd3e1 100644
--- a/client/ayon_core/hosts/max/plugins/publish/collect_members.py
+++ b/client/ayon_core/hosts/max/plugins/publish/collect_members.py
@@ -12,8 +12,10 @@ 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.")
+        if instance.data["productType"] == "workfile":
+            self.log.debug(
+                "Skipping Collecting Members for workfile product type."
+            )
             return
         if instance.data.get("instance_node"):
             container = rt.GetNodeByName(instance.data["instance_node"])
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 66226e24fa..4ad9dfb3a3 100644
--- a/client/ayon_core/hosts/max/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/max/plugins/publish/collect_render.py
@@ -92,15 +92,17 @@ class CollectRender(pyblish.api.InstancePlugin):
         instance.data["attachTo"] = []
         renderer_class = get_current_renderer()
         renderer = str(renderer_class).split(":")[0]
+        product_type = "maxrender"
         # also need to get the render dir for conversion
         data = {
             "folderPath": instance.data["folderPath"],
-            "subset": str(instance.name),
+            "productName": str(instance.name),
             "publish": True,
             "maxversion": str(get_max_version()),
             "imageFormat": img_format,
-            "family": 'maxrender',
-            "families": ['maxrender'],
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type],
             "renderer": renderer,
             "source": filepath,
             "plugin": "3dsmax",
diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py b/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py
index 75a83c2b05..22fda37e61 100644
--- a/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py
+++ b/client/ayon_core/hosts/max/plugins/publish/validate_frame_range.py
@@ -81,7 +81,7 @@ class ValidateFrameRange(pyblish.api.InstancePlugin,
         frame_start_handle = frame_range["frameStartHandle"]
         frame_end_handle = frame_range["frameEndHandle"]
 
-        if instance.data["family"] == "maxrender":
+        if instance.data["productType"] == "maxrender":
             rt.rendStart = frame_start_handle
             rt.rendEnd = frame_end_handle
         else:
diff --git a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py b/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py
index bf5ac26fef..e278041b6b 100644
--- a/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py
+++ b/client/ayon_core/hosts/max/plugins/publish/validate_loaded_plugin.py
@@ -42,7 +42,7 @@ class ValidateLoadedPlugin(OptionalPyblishPluginMixin,
 
         invalid = []
         # Find all plug-in requirements for current instance
-        instance_families = {instance.data["family"]}
+        instance_families = {instance.data["productType"]}
         instance_families.update(instance.data.get("families", []))
         cls.log.debug("Checking plug-in validation "
                       f"for instance families: {instance_families}")
diff --git a/client/ayon_core/hosts/maya/api/lib.py b/client/ayon_core/hosts/maya/api/lib.py
index 77b18fb394..1aa2244111 100644
--- a/client/ayon_core/hosts/maya/api/lib.py
+++ b/client/ayon_core/hosts/maya/api/lib.py
@@ -1868,14 +1868,14 @@ def get_container_members(container):
 
 # region LOOKDEV
 def list_looks(project_name, asset_id):
-    """Return all look subsets for the given asset
+    """Return all look products for the given asset
 
-    This assumes all look subsets start with "look*" in their names.
+    This assumes all look products start with "look*" in their names.
     """
-    # # get all subsets with look leading in
+    # # get all products with look leading in
     # the name associated with the asset
-    # TODO this should probably look for family 'look' instead of checking
-    #   subset name that can not start with family
+    # TODO this should probably look for product type 'look' instead of
+    #   checking product name that can not start with product type
     subset_docs = get_subsets(project_name, asset_ids=[asset_id])
     return [
         subset_doc
@@ -1942,15 +1942,15 @@ def assign_look_by_version(nodes, version_id):
     apply_shaders(relationships, shader_nodes, nodes)
 
 
-def assign_look(nodes, subset="lookDefault"):
+def assign_look(nodes, product_name="lookDefault"):
     """Assigns a look to a node.
 
     Optimizes the nodes by grouping by asset id and finding
-    related subset by name.
+    related product by name.
 
     Args:
         nodes (list): all nodes to assign the look to
-        subset (str): name of the subset to find
+        product_name (str): name of the product to find
     """
 
     # Group all nodes per asset id
@@ -1965,22 +1965,22 @@ def assign_look(nodes, subset="lookDefault"):
 
     project_name = get_current_project_name()
     subset_docs = get_subsets(
-        project_name, subset_names=[subset], asset_ids=grouped.keys()
+        project_name, subset_names=[product_name], asset_ids=grouped.keys()
     )
     subset_docs_by_asset_id = {
         str(subset_doc["parent"]): subset_doc
         for subset_doc in subset_docs
     }
-    subset_ids = {
+    product_ids = {
         subset_doc["_id"]
         for subset_doc in subset_docs_by_asset_id.values()
     }
     last_version_docs = get_last_versions(
         project_name,
-        subset_ids=subset_ids,
+        subset_ids=product_ids,
         fields=["_id", "name", "data.families"]
     )
-    last_version_docs_by_subset_id = {
+    last_version_docs_by_product_id = {
         last_version_doc["parent"]: last_version_doc
         for last_version_doc in last_version_docs
     }
@@ -1989,26 +1989,28 @@ def assign_look(nodes, subset="lookDefault"):
         # create objectId for database
         subset_doc = subset_docs_by_asset_id.get(asset_id)
         if not subset_doc:
-            log.warning("No subset '{}' found for {}".format(subset, asset_id))
+            log.warning((
+                "No product '{}' found for {}"
+            ).format(product_name, asset_id))
             continue
 
-        last_version = last_version_docs_by_subset_id.get(subset_doc["_id"])
+        last_version = last_version_docs_by_product_id.get(subset_doc["_id"])
         if not last_version:
             log.warning((
-                "Not found last version for subset '{}' on asset with id {}"
-            ).format(subset, asset_id))
+                "Not found last version for product '{}' on asset with id {}"
+            ).format(product_name, asset_id))
             continue
 
         families = last_version.get("data", {}).get("families") or []
         if "look" not in families:
             log.warning((
-                "Last version for subset '{}' on asset with id {}"
-                " does not have look family"
-            ).format(subset, asset_id))
+                "Last version for product '{}' on asset with id {}"
+                " does not have look product type"
+            ).format(product_name, asset_id))
             continue
 
         log.debug("Assigning look '{}' <v{:03d}>".format(
-            subset, last_version["name"]))
+            product_name, last_version["name"]))
 
         assign_look_by_version(asset_nodes, last_version["_id"])
 
@@ -3955,7 +3957,9 @@ def get_all_children(nodes):
     return list(traversed)
 
 
-def get_capture_preset(task_name, task_type, subset, project_settings, log):
+def get_capture_preset(
+    task_name, task_type, product_name, project_settings, log
+):
     """Get capture preset for playblasting.
 
     Logic for transitioning from old style capture preset to new capture preset
@@ -3964,17 +3968,15 @@ def get_capture_preset(task_name, task_type, subset, project_settings, log):
     Args:
         task_name (str): Task name.
         task_type (str): Task type.
-        subset (str): Subset name.
+        product_name (str): Subset name.
         project_settings (dict): Project settings.
         log (logging.Logger): Logging object.
     """
     capture_preset = None
     filtering_criteria = {
-        "hosts": "maya",
-        "families": "review",
         "task_names": task_name,
         "task_types": task_type,
-        "subset": subset
+        "product_names": product_name
     }
 
     plugin_settings = project_settings["maya"]["publish"]["ExtractPlayblast"]
@@ -4117,8 +4119,8 @@ def create_rig_animation_instance(
     )
     assert roots, "No root nodes in rig, this is a bug."
 
-    custom_subset = options.get("animationSubsetName")
-    if custom_subset:
+    custom_product_name = options.get("animationProductName")
+    if custom_product_name:
         formatting_data = {
             "asset": context["asset"],
             "subset": context['subset']['name'],
@@ -4128,13 +4130,11 @@ def create_rig_animation_instance(
             )
         }
         namespace = get_custom_namespace(
-            custom_subset.format(
-                **formatting_data
-            )
+            custom_product_name.format(**formatting_data)
         )
 
     if log:
-        log.info("Creating subset: {}".format(namespace))
+        log.info("Creating product: {}".format(namespace))
 
     # Fill creator identifier
     creator_identifier = "io.openpype.creators.maya.animation"
diff --git a/client/ayon_core/hosts/maya/api/plugin.py b/client/ayon_core/hosts/maya/api/plugin.py
index 7a01f1a174..1d72353116 100644
--- a/client/ayon_core/hosts/maya/api/plugin.py
+++ b/client/ayon_core/hosts/maya/api/plugin.py
@@ -29,7 +29,7 @@ from ayon_core.pipeline import (
 )
 from ayon_core.pipeline.load import LoadError
 from ayon_core.client import get_asset_by_name
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.pipeline.create import get_product_name
 
 from . import lib
 from .lib import imprint, read
@@ -89,25 +89,22 @@ class Creator(LegacyCreator):
 class MayaCreatorBase(object):
 
     @staticmethod
-    def cache_subsets(shared_data):
+    def cache_instance_data(shared_data):
         """Cache instances for Creators to shared data.
 
-        Create `maya_cached_subsets` key when needed in shared data and
+        Create `maya_cached_instance_data` key when needed in shared data and
         fill it with all collected instances from the scene under its
         respective creator identifiers.
 
         If legacy instances are detected in the scene, create
-        `maya_cached_legacy_subsets` there and fill it with
-        all legacy subsets under family as a key.
+        `maya_cached_legacy_instances` there and fill it with
+        all legacy products under product type as a key.
 
         Args:
             Dict[str, Any]: Shared data.
 
-        Return:
-            Dict[str, Any]: Shared data dictionary.
-
         """
-        if shared_data.get("maya_cached_subsets") is None:
+        if shared_data.get("maya_cached_instance_data") is None:
             cache = dict()
             cache_legacy = dict()
 
@@ -131,8 +128,8 @@ class MayaCreatorBase(object):
 
                     cache_legacy.setdefault(family, []).append(node)
 
-            shared_data["maya_cached_subsets"] = cache
-            shared_data["maya_cached_legacy_subsets"] = cache_legacy
+            shared_data["maya_cached_instance_data"] = cache
+            shared_data["maya_cached_legacy_instances"] = cache_legacy
         return shared_data
 
     def get_publish_families(self):
@@ -143,8 +140,7 @@ class MayaCreatorBase(object):
         specify `usd` but apply different extractors like `usdMultiverse`.
 
         There is no need to override this method if you only have the
-        primary family defined by the `family` property as that will always
-        be set.
+        'product_type' required for publish filtering.
 
         Returns:
             list: families for instances of this creator
@@ -165,7 +161,7 @@ class MayaCreatorBase(object):
         data.pop("families", None)
 
         # We store creator attributes at the root level and assume they
-        # will not clash in names with `subset`, `task`, etc. and other
+        # will not clash in names with `product`, `task`, etc. and other
         # default names. This is just so these attributes in many cases
         # are still editable in the maya UI by artists.
         # note: pop to move to end of dict to sort attributes last on the node
@@ -244,9 +240,11 @@ class MayaCreatorBase(object):
         return node_data
 
     def _default_collect_instances(self):
-        self.cache_subsets(self.collection_shared_data)
-        cached_subsets = self.collection_shared_data["maya_cached_subsets"]
-        for node in cached_subsets.get(self.identifier, []):
+        self.cache_instance_data(self.collection_shared_data)
+        cached_instances = (
+            self.collection_shared_data["maya_cached_instance_data"]
+        )
+        for node in cached_instances.get(self.identifier, []):
             node_data = self.read_instance_node(node)
 
             created_instance = CreatedInstance.from_existing(node_data, self)
@@ -279,7 +277,7 @@ class MayaCreator(NewCreator, MayaCreatorBase):
 
     settings_category = "maya"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         members = list()
         if pre_create_data.get("use_selection"):
@@ -294,11 +292,11 @@ class MayaCreator(NewCreator, MayaCreatorBase):
                     families.append(family)
 
         with lib.undo_chunk():
-            instance_node = cmds.sets(members, name=subset_name)
+            instance_node = cmds.sets(members, name=product_name)
             instance_data["instance_node"] = instance_node
             instance = CreatedInstance(
-                self.family,
-                subset_name,
+                self.product_type,
+                product_name,
                 instance_data,
                 self)
             self._add_instance_to_context(instance)
@@ -385,7 +383,7 @@ def ensure_namespace(namespace):
 class RenderlayerCreator(NewCreator, MayaCreatorBase):
     """Creator which creates an instance per renderlayer in the workfile.
 
-    Create and manages renderlayer subset per renderLayer in workfile.
+    Create and manages renderlayer product per renderLayer in workfile.
     This generates a singleton node in the scene which, if it exists, tells the
     Creator to collect Maya rendersetup renderlayers as individual instances.
     As such, triggering create doesn't actually create the instance node per
@@ -405,7 +403,7 @@ class RenderlayerCreator(NewCreator, MayaCreatorBase):
         if nodes:
             return nodes if return_all else nodes[0]
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         # A Renderlayer is never explicitly created using the create method.
         # Instead, renderlayers from the scene are collected. Thus "create"
         # would only ever be called to say, 'hey, please refresh collect'
@@ -443,6 +441,7 @@ class RenderlayerCreator(NewCreator, MayaCreatorBase):
         if not self._get_singleton_node():
             return
 
+        host_name = self.create_context.host_name
         rs = renderSetup.instance()
         layers = rs.getRenderLayers()
         for layer in layers:
@@ -462,15 +461,17 @@ class RenderlayerCreator(NewCreator, MayaCreatorBase):
                     "variant": layer.name(),
                 }
                 asset_doc = get_asset_by_name(project_name, asset_name)
-                subset_name = self.get_subset_name(
-                    layer.name(),
-                    instance_data["task"],
+                product_name = self.get_product_name(
+                    project_name,
                     asset_doc,
-                    project_name)
+                    instance_data["task"],
+                    layer.name(),
+                    host_name,
+                )
 
                 instance = CreatedInstance(
-                    family=self.family,
-                    subset_name=subset_name,
+                    product_type=self.product_type,
+                    product_name=product_name,
                     data=instance_data,
                     creator=self
                 )
@@ -574,28 +575,38 @@ class RenderlayerCreator(NewCreator, MayaCreatorBase):
                 if node and cmds.objExists(node):
                     cmds.delete(node)
 
-    def get_subset_name(
+    def get_product_name(
         self,
-        variant,
-        task_name,
-        asset_doc,
         project_name,
+        asset_doc,
+        task_name,
+        variant,
         host_name=None,
         instance=None
     ):
-        # creator.family != 'render' as expected
-        return get_subset_name(self.layer_instance_prefix,
-                               variant,
-                               task_name,
-                               asset_doc,
-                               project_name)
+        if host_name is None:
+            host_name = self.create_context.host_name
+        dynamic_data = self.get_dynamic_data(
+            project_name, asset_doc, task_name, variant, host_name, instance
+        )
+        # creator.product_type != 'render' as expected
+        return get_product_name(
+            project_name,
+            asset_doc,
+            task_name,
+            host_name,
+            self.layer_instance_prefix or self.product_type,
+            variant,
+            dynamic_data=dynamic_data,
+            project_settings=self.project_settings
+        )
 
 
-def get_load_color_for_family(family, settings=None):
-    """Get color for family from settings.
+def get_load_color_for_product_type(product_type, settings=None):
+    """Get color for product type from settings.
 
     Args:
-        family (str): Family name.
+        product_type (str): Family name.
         settings (Optional[dict]): Settings dictionary.
 
     Returns:
@@ -606,7 +617,7 @@ def get_load_color_for_family(family, settings=None):
         settings = get_project_settings(get_current_project_name())
 
     colors = settings["maya"]["load"]["colors"]
-    color = colors.get(family)
+    color = colors.get(product_type)
     if not color:
         return None
 
@@ -630,8 +641,8 @@ class Loader(LoaderPlugin):
     load_settings = {}  # defined in settings
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
-        super(Loader, cls).apply_settings(project_settings, system_settings)
+    def apply_settings(cls, project_settings):
+        super(Loader, cls).apply_settings(project_settings)
         cls.load_settings = project_settings['maya']['load']
 
     def get_custom_namespace_and_group(self, context, options, loader_key):
@@ -657,24 +668,24 @@ class Loader(LoaderPlugin):
             self.log.debug("No custom group_name, no group will be created.")
             options["attach_to_root"] = False
 
-        asset = context["asset"]
-        subset = context["subset"]
-        family = (
-            subset["data"].get("family")
-            or subset["data"]["families"][0]
+        asset_doc = context["asset"]
+        subset_doc = context["subset"]
+        product_type = (
+            subset_doc["data"].get("family")
+            or subset_doc["data"]["families"][0]
         )
         formatting_data = {
-            "asset_name": asset["name"],
-            "asset_type": asset["type"],
+            "asset_name": asset_doc["name"],
+            "asset_type": asset_doc["type"],
             "folder": {
-                "name": asset["name"],
+                "name": asset_doc["name"],
             },
-            "subset": subset["name"],
+            "subset": subset_doc["name"],
             "product": {
-                "name": subset["name"],
-                "type": family,
+                "name": subset_doc["name"],
+                "type": product_type,
             },
-            "family": family
+            "family": product_type
         }
 
         custom_namespace = custom_naming["namespace"].format(
@@ -745,7 +756,7 @@ class ReferenceLoader(Loader):
 
             options['group_name'] = group_name
 
-            # Offset loaded subset
+            # Offset loaded product
             if "offset" in options:
                 offset = [i * c for i in options["offset"]]
                 options["translate"] = offset
diff --git a/client/ayon_core/hosts/maya/api/setdress.py b/client/ayon_core/hosts/maya/api/setdress.py
index 7a1054cc49..8d09716bf6 100644
--- a/client/ayon_core/hosts/maya/api/setdress.py
+++ b/client/ayon_core/hosts/maya/api/setdress.py
@@ -480,7 +480,7 @@ def update_scene(set_container, containers, current_data, new_data, new_file):
                     continue
 
                 # Check whether the conversion can be done by the Loader.
-                # They *must* use the same asset, subset and Loader for
+                # They *must* use the same asset, product and Loader for
                 # `update_container` to make sense.
                 old = get_representation_by_id(
                     project_name, representation_current
@@ -559,13 +559,14 @@ def compare_representations(old, new):
     new_context = new["context"]
     old_context = old["context"]
 
+    # TODO add better validation e.g. based on parent ids
     if new_context["asset"] != old_context["asset"]:
         log.error("Changing assets between updates is "
                   "not supported.")
         return False
 
     if new_context["subset"] != old_context["subset"]:
-        log.error("Changing subsets between updates is "
+        log.error("Changing products between updates is "
                   "not supported.")
         return False
 
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 e9db8ffe79..6ae2a075e3 100644
--- a/client/ayon_core/hosts/maya/api/workfile_template_builder.py
+++ b/client/ayon_core/hosts/maya/api/workfile_template_builder.py
@@ -140,10 +140,12 @@ class MayaPlaceholderLoadPlugin(PlaceholderPlugin, PlaceholderLoadMixin):
         placeholder_name_parts = placeholder_data["builder_type"].split("_")
 
         pos = 1
-        # add family in any
-        placeholder_family = placeholder_data["family"]
-        if placeholder_family:
-            placeholder_name_parts.insert(pos, placeholder_family)
+        placeholder_product_type = placeholder_data.get("product_type")
+        if placeholder_product_type is None:
+            placeholder_product_type = placeholder_data.get("family")
+
+        if placeholder_product_type:
+            placeholder_name_parts.insert(pos, placeholder_product_type)
             pos += 1
 
         # add loader arguments if any
diff --git a/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py b/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py
index 029ea25b40..b23c56fc5b 100644
--- a/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py
+++ b/client/ayon_core/hosts/maya/plugins/create/convert_legacy.py
@@ -10,30 +10,32 @@ from maya.app.renderSetup.model import renderSetup
 
 class MayaLegacyConvertor(SubsetConvertorPlugin,
                           plugin.MayaCreatorBase):
-    """Find and convert any legacy subsets in the scene.
+    """Find and convert any legacy products in the scene.
 
-    This Convertor will find all legacy subsets in the scene and will
-    transform them to the current system. Since the old subsets doesn't
+    This Convertor will find all legacy products in the scene and will
+    transform them to the current system. Since the old products doesn't
     retain any information about their original creators, the only mapping
     we can do is based on their families.
 
-    Its limitation is that you can have multiple creators creating subset
-    of the same family and there is no way to handle it. This code should
+    Its limitation is that you can have multiple creators creating product
+    of the same type and there is no way to handle it. This code should
     nevertheless cover all creators that came with OpenPype.
 
     """
     identifier = "io.openpype.creators.maya.legacy"
 
-    # Cases where the identifier or new family doesn't correspond to the
+    # Cases where the identifier or new product type doesn't correspond to the
     # original family on the legacy instances
-    special_family_conversions = {
+    product_type_mapping = {
         "rendering": "io.openpype.creators.maya.renderlayer",
     }
 
     def find_instances(self):
 
-        self.cache_subsets(self.collection_shared_data)
-        legacy = self.collection_shared_data.get("maya_cached_legacy_subsets")
+        self.cache_instance_data(self.collection_shared_data)
+        legacy = self.collection_shared_data.get(
+            "maya_cached_legacy_instances"
+        )
         if not legacy:
             return
 
@@ -45,43 +47,43 @@ class MayaLegacyConvertor(SubsetConvertorPlugin,
         # We can't use the collected shared data cache here
         # we re-query it here directly to convert all found.
         cache = {}
-        self.cache_subsets(cache)
-        legacy = cache.get("maya_cached_legacy_subsets")
+        self.cache_instance_data(cache)
+        legacy = cache.get("maya_cached_legacy_instances")
         if not legacy:
             return
 
         # From all current new style manual creators find the mapping
-        # from family to identifier
-        family_to_id = {}
+        # from product type to identifier
+        product_type_to_id = {}
         for identifier, creator in self.create_context.creators.items():
-            family = getattr(creator, "family", None)
-            if not family:
+            product_type = getattr(creator, "product_type", None)
+            if not product_type:
                 continue
 
-            if family in family_to_id:
-                # We have a clash of family -> identifier. Multiple
-                # new style creators use the same family
-                self.log.warning("Clash on family->identifier: "
-                                 "{}".format(identifier))
-            family_to_id[family] = identifier
+            if product_type in product_type_to_id:
+                # We have a clash of product type -> identifier. Multiple
+                # new style creators use the same product type
+                self.log.warning(
+                    "Clash on product type->identifier: {}".format(identifier)
+                )
+            product_type_to_id[product_type] = identifier
 
-        family_to_id.update(self.special_family_conversions)
+        product_type_to_id.update(self.product_type_mapping)
 
         # We also embed the current 'task' into the instance since legacy
         # instances didn't store that data on the instances. The old style
         # logic was thus to be live to the current task to begin with.
         data = dict()
         data["task"] = self.create_context.get_current_task_name()
-        for family, instance_nodes in legacy.items():
-            if family not in family_to_id:
-                self.log.warning(
+        for product_type, instance_nodes in legacy.items():
+            if product_type not in product_type_to_id:
+                self.log.warning((
                     "Unable to convert legacy instance with family '{}'"
-                    " because there is no matching new creator's family"
-                    "".format(family)
-                )
+                    " because there is no matching new creator"
+                ).format(product_type))
                 continue
 
-            creator_id = family_to_id[family]
+            creator_id = product_type_to_id[family]
             creator = self.create_context.creators[creator_id]
             data["creator_identifier"] = creator_id
 
@@ -133,21 +135,22 @@ class MayaLegacyConvertor(SubsetConvertorPlugin,
             # Copy the attributes of the original instance to the new node
             original_data = read(instance_node)
 
-            # The family gets converted to the new family (this is due to
-            # "rendering" family being converted to "renderlayer" family)
-            original_data["family"] = creator.family
+            # The product type gets converted to the new product type (this
+            # is due to "rendering" being converted to "renderlayer")
+            original_data["productType"] = creator.product_type
 
-            # recreate subset name as without it would be
+            # recreate product name as without it would be
             # `renderingMain` vs correct `renderMain`
             project_name = self.create_context.get_current_project_name()
             asset_doc = get_asset_by_name(project_name,
                                           original_data["asset"])
-            subset_name = creator.get_subset_name(
-                original_data["variant"],
-                data["task"],
+            product_name = creator.get_product_name(
+                project_name,
                 asset_doc,
-                project_name)
-            original_data["subset"] = subset_name
+                data["task"],
+                original_data["variant"],
+            )
+            original_data["productName"] = product_name
 
             # Convert to creator attributes when relevant
             creator_attributes = {}
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_animation.py b/client/ayon_core/hosts/maya/plugins/create/create_animation.py
index e6849b4468..f30d9aba81 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_animation.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_animation.py
@@ -18,7 +18,7 @@ class CreateAnimation(plugin.MayaHiddenCreator):
     identifier = "io.openpype.creators.maya.animation"
     name = "animationDefault"
     label = "Animation"
-    family = "animation"
+    product_type = "animation"
     icon = "male"
 
     write_color_sets = False
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py b/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py
index a9455620b8..dc0ffb02c1 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_arnold_scene_source.py
@@ -13,7 +13,7 @@ class CreateArnoldSceneSource(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.ass"
     label = "Arnold Scene Source"
-    family = "ass"
+    product_type = "ass"
     icon = "cube"
     settings_name = "CreateAss"
 
@@ -87,12 +87,12 @@ class CreateArnoldSceneSource(plugin.MayaCreator):
 
         return defs
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         from maya import cmds
 
         instance = super(CreateArnoldSceneSource, self).create(
-            subset_name, instance_data, pre_create_data
+            product_name, instance_data, pre_create_data
         )
 
         instance_node = instance.get("instance_node")
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_assembly.py b/client/ayon_core/hosts/maya/plugins/create/create_assembly.py
index 2b78271a49..92df125748 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_assembly.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_assembly.py
@@ -6,5 +6,5 @@ class CreateAssembly(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.assembly"
     label = "Assembly"
-    family = "assembly"
+    product_type = "assembly"
     icon = "cubes"
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_camera.py b/client/ayon_core/hosts/maya/plugins/create/create_camera.py
index 37d5a817a5..4b1265bd3b 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_camera.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_camera.py
@@ -10,7 +10,7 @@ class CreateCamera(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.camera"
     label = "Camera"
-    family = "camera"
+    product_type = "camera"
     icon = "video-camera"
 
     def get_instance_attr_defs(self):
@@ -32,5 +32,5 @@ class CreateCameraRig(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.camerarig"
     label = "Camera Rig"
-    family = "camerarig"
+    product_type = "camerarig"
     icon = "video-camera"
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_layout.py b/client/ayon_core/hosts/maya/plugins/create/create_layout.py
index bd61fa44c6..6cbc697502 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_layout.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_layout.py
@@ -7,7 +7,7 @@ class CreateLayout(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.layout"
     label = "Layout"
-    family = "layout"
+    product_type = "layout"
     icon = "cubes"
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_look.py b/client/ayon_core/hosts/maya/plugins/create/create_look.py
index 4655ec1377..ac3625c38f 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_look.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_look.py
@@ -13,7 +13,7 @@ class CreateLook(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.look"
     label = "Look"
-    family = "look"
+    product_type = "look"
     icon = "paint-brush"
 
     make_tx = True
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py b/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py
index 00de553404..44443a8b9f 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_matchmove.py
@@ -15,7 +15,7 @@ class CreateMatchmove(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.matchmove"
     label = "Matchmove"
-    family = "matchmove"
+    product_type = "matchmove"
     icon = "video-camera"
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py b/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py
index f6c8a55e68..3f34a541b4 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_maya_usd.py
@@ -13,7 +13,7 @@ class CreateMayaUsd(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.mayausd"
     label = "Maya USD"
-    family = "usd"
+    product_type = "usd"
     icon = "cubes"
     description = "Create Maya USD Export"
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py b/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py
index c4024d3710..cfe46336a2 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_mayascene.py
@@ -7,5 +7,5 @@ class CreateMayaScene(plugin.MayaCreator):
     identifier = "io.openpype.creators.maya.mayascene"
     name = "mayaScene"
     label = "Maya Scene"
-    family = "mayaScene"
+    product_type = "mayaScene"
     icon = "file-archive-o"
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_model.py b/client/ayon_core/hosts/maya/plugins/create/create_model.py
index 67e6b87190..b47df421f3 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_model.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_model.py
@@ -10,7 +10,7 @@ class CreateModel(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.model"
     label = "Model"
-    family = "model"
+    product_type = "model"
     icon = "cube"
     default_variants = ["Main", "Proxy", "_MD", "_HD", "_LD"]
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py b/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py
index d05c5ae9a1..e7b903312f 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_multishot_layout.py
@@ -27,7 +27,7 @@ class CreateMultishotLayout(plugin.MayaCreator):
     """
     identifier = "io.openpype.creators.maya.multishotlayout"
     label = "Multi-shot Layout"
-    family = "layout"
+    product_type = "layout"
     icon = "project-diagram"
 
     def get_pre_create_attr_defs(self):
@@ -106,7 +106,7 @@ class CreateMultishotLayout(plugin.MayaCreator):
                     default="layout"),
         ]
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         shots = list(
             self.get_related_shots(folder_path=pre_create_data["shotParent"])
         )
@@ -164,11 +164,12 @@ class CreateMultishotLayout(plugin.MayaCreator):
                 instance_data["task"] = layout_task
 
             layout_creator.create(
-                subset_name=layout_creator.get_subset_name(
-                    layout_creator.get_default_variant(),
-                    self.create_context.get_current_task_name(),
+                product_name=layout_creator.get_product_name(
+                    self.project_name,
                     asset_doc,
-                    self.project_name),
+                    self.create_context.get_current_task_name(),
+                    layout_creator.get_default_variant(),
+                ),
                 instance_data=instance_data,
                 pre_create_data={
                     "groupLoadedAssets": pre_create_data["groupLoadedAssets"]
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py
index 11e13b2748..de604a33b3 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_look.py
@@ -10,7 +10,7 @@ class CreateMultiverseLook(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.mvlook"
     label = "Multiverse Look"
-    family = "mvLook"
+    product_type = "mvLook"
     icon = "cubes"
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py
index af0ffa9f23..668700995f 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd.py
@@ -12,7 +12,7 @@ class CreateMultiverseUsd(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.mvusdasset"
     label = "Multiverse USD Asset"
-    family = "usd"
+    product_type = "usd"
     icon = "cubes"
     description = "Create Multiverse USD Asset"
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py
index 202fbbcbc8..120e6ad920 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_comp.py
@@ -11,7 +11,7 @@ class CreateMultiverseUsdComp(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.mvusdcomposition"
     label = "Multiverse USD Composition"
-    family = "mvUsdComposition"
+    product_type = "mvUsdComposition"
     icon = "cubes"
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py
index cca2b54392..26208794e3 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_multiverse_usd_over.py
@@ -11,7 +11,7 @@ class CreateMultiverseUsdOver(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.mvusdoverride"
     label = "Multiverse USD Override"
-    family = "mvUsdOverride"
+    product_type = "mvUsdOverride"
     icon = "cubes"
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_pointcache.py b/client/ayon_core/hosts/maya/plugins/create/create_pointcache.py
index 832e0bfbc5..05e3a1a29f 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_pointcache.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_pointcache.py
@@ -15,7 +15,7 @@ class CreatePointCache(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.pointcache"
     label = "Pointcache"
-    family = "pointcache"
+    product_type = "pointcache"
     icon = "gears"
     write_color_sets = False
     write_face_sets = False
@@ -76,10 +76,10 @@ class CreatePointCache(plugin.MayaCreator):
 
         return defs
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         instance = super(CreatePointCache, self).create(
-            subset_name, instance_data, pre_create_data
+            product_name, instance_data, pre_create_data
         )
         instance_node = instance.get("instance_node")
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py b/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py
index 8b8cedd7ab..ecc031436c 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_proxy_abc.py
@@ -13,7 +13,7 @@ class CreateProxyAlembic(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.proxyabc"
     label = "Proxy Alembic"
-    family = "proxyAbc"
+    product_type = "proxyAbc"
     icon = "gears"
     write_color_sets = False
     write_face_sets = False
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py b/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py
index 72c86a0b74..d99fe5a787 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_redshift_proxy.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
-"""Creator of Redshift proxy subset types."""
+"""Creator of Redshift proxy product types."""
 
 from ayon_core.hosts.maya.api import plugin, lib
 from ayon_core.lib import BoolDef
 
 
 class CreateRedshiftProxy(plugin.MayaCreator):
-    """Create instance of Redshift Proxy subset."""
+    """Create instance of Redshift Proxy product."""
 
     identifier = "io.openpype.creators.maya.redshiftproxy"
     label = "Redshift Proxy"
-    family = "redshiftproxy"
+    product_type = "redshiftproxy"
     icon = "gears"
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_render.py b/client/ayon_core/hosts/maya/plugins/create/create_render.py
index 4481836c89..213d5b543e 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_render.py
@@ -13,7 +13,7 @@ from ayon_core.lib import (
 
 
 class CreateRenderlayer(plugin.RenderlayerCreator):
-    """Create and manages renderlayer subset per renderLayer in workfile.
+    """Create and manages renderlayer product per renderLayer in workfile.
 
     This generates a single node in the scene which tells the Creator to if
     it exists collect Maya rendersetup renderlayers as individual instances.
@@ -24,7 +24,7 @@ class CreateRenderlayer(plugin.RenderlayerCreator):
     """
 
     identifier = "io.openpype.creators.maya.renderlayer"
-    family = "renderlayer"
+    product_type = "renderlayer"
     label = "Render"
     icon = "eye"
 
@@ -37,7 +37,7 @@ class CreateRenderlayer(plugin.RenderlayerCreator):
     def apply_settings(cls, project_settings):
         cls.render_settings = project_settings["maya"]["render_settings"]
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         # Only allow a single render instance to exist
         if self._get_singleton_node():
             raise CreatorError("A Render instance already exists - only "
@@ -47,7 +47,7 @@ class CreateRenderlayer(plugin.RenderlayerCreator):
         if self.render_settings.get("apply_render_settings"):
             lib_rendersettings.RenderSettings().set_default_renderer_settings()
 
-        super(CreateRenderlayer, self).create(subset_name,
+        super(CreateRenderlayer, self).create(product_name,
                                               instance_data,
                                               pre_create_data)
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py b/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py
index dc47325a34..3d8d6a7309 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_rendersetup.py
@@ -7,18 +7,18 @@ class CreateRenderSetup(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.rendersetup"
     label = "Render Setup Preset"
-    family = "rendersetup"
+    product_type = "rendersetup"
     icon = "tablet"
 
     def get_pre_create_attr_defs(self):
         # Do not show the "use_selection" setting from parent class
         return []
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         existing_instance = None
         for instance in self.create_context.instances:
-            if instance.family == self.family:
+            if instance.product_type == self.product_type:
                 existing_instance = instance
                 break
 
@@ -26,6 +26,6 @@ class CreateRenderSetup(plugin.MayaCreator):
             raise CreatorError("A RenderSetup instance already exists - only "
                                "one can be configured.")
 
-        super(CreateRenderSetup, self).create(subset_name,
+        super(CreateRenderSetup, self).create(product_name,
                                               instance_data,
                                               pre_create_data)
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_review.py b/client/ayon_core/hosts/maya/plugins/create/create_review.py
index 3e75b52556..c4fa045427 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_review.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_review.py
@@ -29,14 +29,14 @@ class CreateReview(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.review"
     label = "Review"
-    family = "review"
+    product_type = "review"
     icon = "video-camera"
 
     useMayaTimeline = True
     panZoom = False
 
     # Overriding "create" method to prefill values from settings.
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         members = list()
         if pre_create_data.get("use_selection"):
@@ -49,7 +49,7 @@ class CreateReview(plugin.MayaCreator):
         preset = lib.get_capture_preset(
             task_name,
             asset_doc["data"]["tasks"][task_name]["type"],
-            subset_name,
+            product_name,
             self.project_settings,
             self.log
         )
@@ -60,11 +60,11 @@ class CreateReview(plugin.MayaCreator):
         )
 
         with lib.undo_chunk():
-            instance_node = cmds.sets(members, name=subset_name)
+            instance_node = cmds.sets(members, name=product_name)
             instance_data["instance_node"] = instance_node
             instance = CreatedInstance(
-                self.family,
-                subset_name,
+                self.product_type,
+                product_name,
                 instance_data,
                 self)
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_rig.py b/client/ayon_core/hosts/maya/plugins/create/create_rig.py
index e49e3040ba..54be50c169 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_rig.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_rig.py
@@ -8,12 +8,12 @@ class CreateRig(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.rig"
     label = "Rig"
-    family = "rig"
+    product_type = "rig"
     icon = "wheelchair"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
-        instance = super(CreateRig, self).create(subset_name,
+        instance = super(CreateRig, self).create(product_name,
                                                  instance_data,
                                                  pre_create_data)
 
@@ -21,12 +21,12 @@ class CreateRig(plugin.MayaCreator):
 
         self.log.info("Creating Rig instance set up ...")
         # TODO：change name (_controls_SET -> _rigs_SET)
-        controls = cmds.sets(name=subset_name + "_controls_SET", empty=True)
+        controls = cmds.sets(name=product_name + "_controls_SET", empty=True)
         # TODO：change name (_out_SET -> _geo_SET)
-        pointcache = cmds.sets(name=subset_name + "_out_SET", empty=True)
+        pointcache = cmds.sets(name=product_name + "_out_SET", empty=True)
         skeleton = cmds.sets(
-            name=subset_name + "_skeletonAnim_SET", empty=True)
+            name=product_name + "_skeletonAnim_SET", empty=True)
         skeleton_mesh = cmds.sets(
-            name=subset_name + "_skeletonMesh_SET", empty=True)
+            name=product_name + "_skeletonMesh_SET", empty=True)
         cmds.sets([controls, pointcache,
                    skeleton, skeleton_mesh], forceElement=instance_node)
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_setdress.py b/client/ayon_core/hosts/maya/plugins/create/create_setdress.py
index dfc38f5d76..0f72d4d184 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_setdress.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_setdress.py
@@ -7,7 +7,7 @@ class CreateSetDress(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.setdress"
     label = "Set Dress"
-    family = "setdress"
+    product_type = "setdress"
     icon = "cubes"
     default_variants = ["Main", "Anim"]
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py b/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py
index 550a9cdb0f..8815c4d23d 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_unreal_skeletalmesh.py
@@ -14,9 +14,8 @@ class CreateUnrealSkeletalMesh(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.unrealskeletalmesh"
     label = "Unreal - Skeletal Mesh"
-    family = "skeletalMesh"
+    product_type = "skeletalMesh"
     icon = "thumbs-up"
-    dynamic_subset_keys = ["asset"]
 
     # Defined in settings
     joint_hints = set()
@@ -29,23 +28,23 @@ class CreateUnrealSkeletalMesh(plugin.MayaCreator):
         self.joint_hints = set(settings.get("joint_hints", []))
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         """
-        The default subset name templates for Unreal include {asset} and thus
+        The default product name templates for Unreal include {asset} and thus
         we should pass that along as dynamic data.
         """
         dynamic_data = super(CreateUnrealSkeletalMesh, self).get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["asset"] = asset_doc["name"]
         return dynamic_data
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         with lib.undo_chunk():
             instance = super(CreateUnrealSkeletalMesh, self).create(
-                subset_name, instance_data, pre_create_data)
+                product_name, instance_data, pre_create_data)
             instance_node = instance.get("instance_node")
 
             # We reorganize the geometry that was originally added into the
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py b/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py
index d1fac03bdf..58ad1e4133 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_unreal_staticmesh.py
@@ -9,9 +9,8 @@ class CreateUnrealStaticMesh(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.unrealstaticmesh"
     label = "Unreal - Static Mesh"
-    family = "staticMesh"
+    product_type = "staticMesh"
     icon = "cube"
-    dynamic_subset_keys = ["asset"]
 
     # Defined in settings
     collision_prefixes = []
@@ -22,23 +21,23 @@ class CreateUnrealStaticMesh(plugin.MayaCreator):
         self.collision_prefixes = settings["collision_prefixes"]
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         """
-        The default subset name templates for Unreal include {asset} and thus
+        The default product name templates for Unreal include {asset} and thus
         we should pass that along as dynamic data.
         """
         dynamic_data = super(CreateUnrealStaticMesh, self).get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["asset"] = asset_doc["name"]
         return dynamic_data
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         with lib.undo_chunk():
             instance = super(CreateUnrealStaticMesh, self).create(
-                subset_name, instance_data, pre_create_data)
+                product_name, instance_data, pre_create_data)
             instance_node = instance.get("instance_node")
 
             # We reorganize the geometry that was originally added into the
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py b/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py
index 4cd7288cfc..1eac8a5ea9 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_unreal_yeticache.py
@@ -10,7 +10,7 @@ class CreateYetiCache(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.unrealyeticache"
     label = "Unreal - Yeti Cache"
-    family = "yeticacheUE"
+    product_type = "yeticacheUE"
     icon = "pagelines"
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py b/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py
index 7d16c5bc2c..d565ec37e0 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_vrayproxy.py
@@ -10,7 +10,7 @@ class CreateVrayProxy(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.vrayproxy"
     label = "VRay Proxy"
-    family = "vrayproxy"
+    product_type = "vrayproxy"
     icon = "gears"
 
     vrmesh = True
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py b/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py
index bc8110eff1..cf5e7b5364 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_vrayscene.py
@@ -14,7 +14,7 @@ class CreateVRayScene(plugin.RenderlayerCreator):
 
     identifier = "io.openpype.creators.maya.vrayscene"
 
-    family = "vrayscene"
+    product_type = "vrayscene"
     label = "VRay Scene"
     icon = "cubes"
 
@@ -25,13 +25,13 @@ class CreateVRayScene(plugin.RenderlayerCreator):
     def apply_settings(cls, project_settings):
         cls.render_settings = project_settings["maya"]["render_settings"]
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         # Only allow a single render instance to exist
         if self._get_singleton_node():
             raise CreatorError("A Render instance already exists - only "
                                "one can be configured.")
 
-        super(CreateVRayScene, self).create(subset_name,
+        super(CreateVRayScene, self).create(product_name,
                                             instance_data,
                                             pre_create_data)
 
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_workfile.py b/client/ayon_core/hosts/maya/plugins/create/create_workfile.py
index 396ad6ffbb..5eb32e1c90 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_workfile.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_workfile.py
@@ -10,7 +10,7 @@ class CreateWorkfile(plugin.MayaCreatorBase, AutoCreator):
     """Workfile auto-creator."""
     identifier = "io.openpype.creators.maya.workfile"
     label = "Workfile"
-    family = "workfile"
+    product_type = "workfile"
     icon = "fa5.file"
 
     default_variant = "Main"
@@ -36,8 +36,12 @@ class CreateWorkfile(plugin.MayaCreatorBase, AutoCreator):
 
         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
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                variant,
+                host_name,
             )
             data = {
                 "folderPath": asset_name,
@@ -46,12 +50,16 @@ class CreateWorkfile(plugin.MayaCreatorBase, AutoCreator):
             }
             data.update(
                 self.get_dynamic_data(
-                    variant, task_name, asset_doc,
-                    project_name, host_name, current_instance)
+                    project_name,
+                    asset_doc,
+                    task_name,
+                    variant,
+                    host_name,
+                    current_instance)
             )
             self.log.info("Auto-creating workfile instance...")
             current_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             self._add_instance_to_context(current_instance)
         elif (
@@ -60,19 +68,25 @@ class CreateWorkfile(plugin.MayaCreatorBase, AutoCreator):
         ):
             # 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
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                variant,
+                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
+            current_instance["productName"] = product_name
 
     def collect_instances(self):
-        self.cache_subsets(self.collection_shared_data)
-        cached_subsets = self.collection_shared_data["maya_cached_subsets"]
-        for node in cached_subsets.get(self.identifier, []):
+        self.cache_instance_data(self.collection_shared_data)
+        cached_instances = (
+            self.collection_shared_data["maya_cached_instance_data"]
+        )
+        for node in cached_instances.get(self.identifier, []):
             node_data = self.read_instance_node(node)
 
             created_instance = CreatedInstance.from_existing(node_data, self)
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_xgen.py b/client/ayon_core/hosts/maya/plugins/create/create_xgen.py
index 4e0d41b689..fec2f07456 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_xgen.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_xgen.py
@@ -6,5 +6,5 @@ class CreateXgen(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.xgen"
     label = "Xgen"
-    family = "xgen"
+    product_type = "xgen"
     icon = "pagelines"
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py b/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py
index 82b18f113a..bf20acaca8 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_yeti_cache.py
@@ -10,7 +10,7 @@ class CreateYetiCache(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.yeticache"
     label = "Yeti Cache"
-    family = "yeticache"
+    product_type = "yeticache"
     icon = "pagelines"
 
     def get_instance_attr_defs(self):
diff --git a/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py
index df3c89a64d..dfe224ceb1 100644
--- a/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py
+++ b/client/ayon_core/hosts/maya/plugins/create/create_yeti_rig.py
@@ -11,13 +11,13 @@ class CreateYetiRig(plugin.MayaCreator):
 
     identifier = "io.openpype.creators.maya.yetirig"
     label = "Yeti Rig"
-    family = "yetiRig"
+    product_type = "yetiRig"
     icon = "usb"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         with lib.undo_chunk():
-            instance = super(CreateYetiRig, self).create(subset_name,
+            instance = super(CreateYetiRig, self).create(product_name,
                                                          instance_data,
                                                          pre_create_data)
             instance_node = instance.get("instance_node")
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py b/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py
index 13c9de4693..054c84bea2 100644
--- a/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py
+++ b/client/ayon_core/hosts/maya/plugins/inventory/connect_geometry.py
@@ -9,7 +9,7 @@ class ConnectGeometry(InventoryAction):
 
     Source container will connect to the target containers, by searching for
     matching geometry IDs (cbid).
-    Source containers are of family; "animation" and "pointcache".
+    Source containers are of product type: "animation" and "pointcache".
     The connection with be done with a live world space blendshape.
     """
 
@@ -27,19 +27,19 @@ class ConnectGeometry(InventoryAction):
             return
 
         # Categorize containers by family.
-        containers_by_family = {}
+        containers_by_product_type = {}
         for container in containers:
-            family = get_representation_context(
+            product_type = get_representation_context(
                 container["representation"]
             )["subset"]["data"]["family"]
             try:
-                containers_by_family[family].append(container)
+                containers_by_product_type[product_type].append(container)
             except KeyError:
-                containers_by_family[family] = [container]
+                containers_by_product_type[product_type] = [container]
 
         # Validate to only 1 source container.
-        source_containers = containers_by_family.get("animation", [])
-        source_containers += containers_by_family.get("pointcache", [])
+        source_containers = containers_by_product_type.get("animation", [])
+        source_containers += containers_by_product_type.get("pointcache", [])
         source_container_namespaces = [
             x["namespace"] for x in source_containers
         ]
@@ -57,8 +57,8 @@ class ConnectGeometry(InventoryAction):
 
         # Collect matching geometry transforms based cbId attribute.
         target_containers = []
-        for family, containers in containers_by_family.items():
-            if family in ["animation", "pointcache"]:
+        for product_type, containers in containers_by_product_type.items():
+            if product_type in ["animation", "pointcache"]:
                 continue
 
             target_containers.extend(containers)
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py b/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py
index 2a198addf2..fa6440fc37 100644
--- a/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py
+++ b/client/ayon_core/hosts/maya/plugins/inventory/connect_xgen.py
@@ -23,20 +23,20 @@ class ConnectXgen(InventoryAction):
             self.display_warning(message)
             return
 
-        # Categorize containers by family.
-        containers_by_family = {}
+        # Categorize containers by product type.
+        containers_by_product_type = {}
         for container in containers:
-            family = get_representation_context(
+            product_type = get_representation_context(
                 container["representation"]
             )["subset"]["data"]["family"]
             try:
-                containers_by_family[family].append(container)
+                containers_by_product_type[product_type].append(container)
             except KeyError:
-                containers_by_family[family] = [container]
+                containers_by_product_type[product_type] = [container]
 
         # Validate to only 1 source container.
-        source_containers = containers_by_family.get("animation", [])
-        source_containers += containers_by_family.get("pointcache", [])
+        source_containers = containers_by_product_type.get("animation", [])
+        source_containers += containers_by_product_type.get("pointcache", [])
         source_container_namespaces = [
             x["namespace"] for x in source_containers
         ]
@@ -68,8 +68,8 @@ class ConnectXgen(InventoryAction):
 
         # Target containers.
         target_containers = []
-        for family, containers in containers_by_family.items():
-            if family in ["animation", "pointcache"]:
+        for product_type, containers in containers_by_product_type.items():
+            if product_type in ["animation", "pointcache"]:
                 continue
 
             target_containers.extend(containers)
diff --git a/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py
index 19498e5c1c..66807e9d5d 100644
--- a/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py
+++ b/client/ayon_core/hosts/maya/plugins/inventory/connect_yeti_rig.py
@@ -26,17 +26,17 @@ class ConnectYetiRig(InventoryAction):
             self.display_warning(message)
             return
 
-        # Categorize containers by family.
-        containers_by_family = defaultdict(list)
+        # Categorize containers by product type.
+        containers_by_product_type = defaultdict(list)
         for container in containers:
-            family = get_representation_context(
+            product_type = get_representation_context(
                 container["representation"]
             )["subset"]["data"]["family"]
-            containers_by_family[family].append(container)
+            containers_by_product_type[product_type].append(container)
 
         # Validate to only 1 source container.
-        source_containers = containers_by_family.get("animation", [])
-        source_containers += containers_by_family.get("pointcache", [])
+        source_containers = containers_by_product_type.get("animation", [])
+        source_containers += containers_by_product_type.get("pointcache", [])
         source_container_namespaces = [
             x["namespace"] for x in source_containers
         ]
@@ -57,7 +57,7 @@ class ConnectYetiRig(InventoryAction):
         target_ids = {}
         inputs = []
 
-        yeti_rig_containers = containers_by_family.get("yetiRig")
+        yeti_rig_containers = containers_by_product_type.get("yetiRig")
         if not yeti_rig_containers:
             self.display_warning(
                 "Select at least one yetiRig container"
diff --git a/client/ayon_core/hosts/maya/plugins/load/_load_animation.py b/client/ayon_core/hosts/maya/plugins/load/_load_animation.py
index bf7f3859e1..e6dc1e520a 100644
--- a/client/ayon_core/hosts/maya/plugins/load/_load_animation.py
+++ b/client/ayon_core/hosts/maya/plugins/load/_load_animation.py
@@ -7,7 +7,7 @@ def _process_reference(file_url, name, namespace, options):
 
     Args:
         file_url (str): fileapth of the objects to be loaded
-        name (str): subset name
+        name (str): product name
         namespace (str): namespace
         options (dict): dict of storing the param
 
@@ -16,7 +16,7 @@ def _process_reference(file_url, name, namespace, options):
     """
     from ayon_core.hosts.maya.api.lib import unique_namespace
     # Get name from asset being loaded
-    # Assuming name is subset name from the animation, we split the number
+    # Assuming name is product name from the animation, we split the number
     # suffix from the name to ensure the namespace is unique
     name = name.split("_")[0]
     ext = file_url.split(".")[-1]
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py b/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
index 16ac460cf7..312cc3bd6b 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_arnold_standin.py
@@ -15,7 +15,7 @@ from ayon_core.hosts.maya.api.lib import (
     convert_to_maya_fps
 )
 from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
 
 
 def is_sequence(files):
@@ -67,7 +67,7 @@ class ArnoldStandinLoader(load.LoaderPlugin):
 
         # Set color.
         settings = get_project_settings(context["project"]["name"])
-        color = get_load_color_for_family("ass", settings)
+        color = get_load_color_for_product_type("ass", settings)
         if color is not None:
             red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", True)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py b/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py
index cdaaeeae6a..38f9d1b7cb 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_gpucache.py
@@ -9,7 +9,7 @@ from ayon_core.pipeline import (
     get_representation_path
 )
 from ayon_core.settings import get_project_settings
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
 
 
 class GpuCacheLoader(load.LoaderPlugin):
@@ -40,7 +40,7 @@ class GpuCacheLoader(load.LoaderPlugin):
 
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        color = get_load_color_for_family("model", settings)
+        color = get_load_color_for_product_type("model", settings)
         if color is not None:
             red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", 1)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py b/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py
index fb27e6597a..a685a4a41c 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_image_plane.py
@@ -225,14 +225,14 @@ class ImagePlaneLoader(load.LoaderPlugin):
         version = get_version_by_id(
             project_name, representation["parent"], fields=["parent"]
         )
-        subset = get_subset_by_id(
+        subset_doc = get_subset_by_id(
             project_name, version["parent"], fields=["parent"]
         )
-        asset = get_asset_by_id(
-            project_name, subset["parent"], fields=["parent"]
+        asset_doc = get_asset_by_id(
+            project_name, subset_doc["parent"], fields=["parent"]
         )
-        start_frame = asset["data"]["frameStart"]
-        end_frame = asset["data"]["frameEnd"]
+        start_frame = asset_doc["data"]["frameStart"]
+        end_frame = asset_doc["data"]["frameEnd"]
 
         for attr, value in {
             "frameOffset": 0,
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py b/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py
index 8910d0fcd0..eb7e0957ac 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_redshift_proxy.py
@@ -16,7 +16,7 @@ from ayon_core.hosts.maya.api.lib import (
     unique_namespace
 )
 from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
 
 
 class RedshiftProxyLoader(load.LoaderPlugin):
@@ -33,9 +33,9 @@ class RedshiftProxyLoader(load.LoaderPlugin):
     def load(self, context, name=None, namespace=None, options=None):
         """Plugin entry point."""
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["representation"]["context"]["family"]
         except ValueError:
-            family = "redshiftproxy"
+            product_type = "redshiftproxy"
 
         asset_name = context['asset']["name"]
         namespace = namespace or unique_namespace(
@@ -60,7 +60,7 @@ class RedshiftProxyLoader(load.LoaderPlugin):
         # colour the group node
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        color = get_load_color_for_family(family, settings)
+        color = get_load_color_for_product_type(product_type, settings)
         if color is not None:
             red, green, blue = color
             cmds.setAttr("{0}.useOutlinerColor".format(group_node), 1)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_reference.py b/client/ayon_core/hosts/maya/plugins/load/load_reference.py
index 75f42a9fe6..eee3d92641 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_reference.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_reference.py
@@ -116,9 +116,9 @@ class ReferenceLoader(plugin.ReferenceLoader):
         import maya.cmds as cmds
 
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["representation"]["context"]["family"]
         except ValueError:
-            family = "model"
+            product_type = "model"
 
         project_name = context["project"]["name"]
         # True by default to keep legacy behaviours
@@ -169,8 +169,9 @@ class ReferenceLoader(plugin.ReferenceLoader):
                                            children=True,
                                            fullPath=True) or []
 
-                if family not in {"layout", "setdress",
-                                  "mayaAscii", "mayaScene"}:
+                if product_type not in {
+                    "layout", "setdress", "mayaAscii", "mayaScene"
+                }:
                     # QUESTION Why do we need to exclude these families?
                     with parent_nodes(roots, parent=None):
                         cmds.xform(group_name, zeroTransformPivots=True)
@@ -184,7 +185,9 @@ class ReferenceLoader(plugin.ReferenceLoader):
                     "{}.displayHandle".format(group_name), display_handle
                 )
 
-                color = plugin.get_load_color_for_family(family, settings)
+                color = plugin.get_load_color_for_product_type(
+                    product_type, settings
+                )
                 if color is not None:
                     red, green, blue = color
                     cmds.setAttr("{}.useOutlinerColor".format(group_name), 1)
@@ -215,7 +218,7 @@ class ReferenceLoader(plugin.ReferenceLoader):
                 cmds.setAttr("{}.selectHandleY".format(group_name), cy)
                 cmds.setAttr("{}.selectHandleZ".format(group_name), cz)
 
-            if family == "rig":
+            if product_type == "rig":
                 self._post_process_rig(namespace, context, options)
             else:
                 if "translate" in options:
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py
index c68fddc60a..80a7fa6006 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_arnold.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
 # TODO aiVolume doesn't automatically set velocity fps correctly, set manual?
 
 
@@ -26,9 +26,9 @@ class LoadVDBtoArnold(load.LoaderPlugin):
         from ayon_core.hosts.maya.api.lib import unique_namespace
 
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["representation"]["context"]["family"]
         except ValueError:
-            family = "vdbcache"
+            product_type = "vdbcache"
 
         # Check if the plugin for arnold is available on the pc
         try:
@@ -51,7 +51,7 @@ class LoadVDBtoArnold(load.LoaderPlugin):
 
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        color = get_load_color_for_family(family, settings)
+        color = get_load_color_for_product_type(product_type, settings)
         if color is not None:
             red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", 1)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py
index 1bc75ae4c6..65bef51ec6 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_redshift.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
 
 
 class LoadVDBtoRedShift(load.LoaderPlugin):
@@ -32,9 +32,9 @@ class LoadVDBtoRedShift(load.LoaderPlugin):
         from ayon_core.hosts.maya.api.lib import unique_namespace
 
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["representation"]["context"]["family"]
         except ValueError:
-            family = "vdbcache"
+            product_type = "vdbcache"
 
         # Check if the plugin for redshift is available on the pc
         try:
@@ -70,7 +70,7 @@ class LoadVDBtoRedShift(load.LoaderPlugin):
 
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        color = get_load_color_for_family(family, settings)
+        color = get_load_color_for_product_type(product_type, settings)
         if color is not None:
             red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", 1)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py
index 0c87162629..4b18e60c9d 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vdb_to_vray.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline import (
     load,
     get_representation_path
 )
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
 
 from maya import cmds
 
@@ -95,9 +95,9 @@ class LoadVDBtoVRay(load.LoaderPlugin):
         )
 
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["representation"]["context"]["family"]
         except ValueError:
-            family = "vdbcache"
+            product_type = "vdbcache"
 
         # Ensure V-ray is loaded with the vrayvolumegrid
         if not cmds.pluginInfo("vrayformaya", query=True, loaded=True):
@@ -130,7 +130,7 @@ class LoadVDBtoVRay(load.LoaderPlugin):
 
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        color = get_load_color_for_family(family, settings)
+        color = get_load_color_for_product_type(product_type, settings)
         if color is not None:
             red, green, blue = color
             cmds.setAttr(root + ".useOutlinerColor", 1)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py b/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py
index 50b63f4f11..d4aad10762 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vrayproxy.py
@@ -22,7 +22,7 @@ from ayon_core.hosts.maya.api.lib import (
     unique_namespace
 )
 from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
 
 
 class VRayProxyLoader(load.LoaderPlugin):
@@ -49,9 +49,9 @@ class VRayProxyLoader(load.LoaderPlugin):
         """
 
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["representation"]["context"]["family"]
         except ValueError:
-            family = "vrayproxy"
+            product_type = "vrayproxy"
 
         #  get all representations for this version
         filename = self._get_abc(context["version"]["_id"])
@@ -81,7 +81,7 @@ class VRayProxyLoader(load.LoaderPlugin):
         # colour the group node
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        color = get_load_color_for_family(family, settings)
+        color = get_load_color_for_product_type(product_type, settings)
         if color is not None:
             red, green, blue = color
             cmds.setAttr("{0}.useOutlinerColor".format(group_node), 1)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py b/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py
index 7b4edb0567..04ccf57808 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_vrayscene.py
@@ -11,7 +11,7 @@ from ayon_core.hosts.maya.api.lib import (
     unique_namespace
 )
 from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
 
 
 class VRaySceneLoader(load.LoaderPlugin):
@@ -26,12 +26,10 @@ class VRaySceneLoader(load.LoaderPlugin):
     color = "orange"
 
     def load(self, context, name, namespace, data):
-
-
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["representation"]["context"]["family"]
         except ValueError:
-            family = "vrayscene_layer"
+            product_type = "vrayscene_layer"
 
         asset_name = context['asset']["name"]
         namespace = namespace or unique_namespace(
@@ -58,7 +56,7 @@ class VRaySceneLoader(load.LoaderPlugin):
         # colour the group node
         project_name = context["project"]["name"]
         settings = get_project_settings(project_name)
-        color = get_load_color_for_family(family, settings)
+        color = get_load_color_for_product_type(product_type, settings)
         if color is not None:
             red, green, blue = color
             cmds.setAttr("{0}.useOutlinerColor".format(root_node), 1)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py b/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py
index afbb632d87..372727d400 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_yeti_cache.py
@@ -13,7 +13,7 @@ from ayon_core.pipeline import (
 )
 from ayon_core.hosts.maya.api import lib
 from ayon_core.hosts.maya.api.pipeline import containerise
-from ayon_core.hosts.maya.api.plugin import get_load_color_for_family
+from ayon_core.hosts.maya.api.plugin import get_load_color_for_product_type
 
 
 # Do not reset these values on update but only apply on first load
@@ -57,9 +57,9 @@ class YetiCacheLoader(load.LoaderPlugin):
         """
 
         try:
-            family = context["representation"]["context"]["family"]
+            product_type = context["representation"]["context"]["family"]
         except ValueError:
-            family = "yeticache"
+            product_type = "yeticache"
 
         # Build namespace
         asset = context["asset"]
@@ -82,7 +82,7 @@ class YetiCacheLoader(load.LoaderPlugin):
         project_name = context["project"]["name"]
 
         settings = get_project_settings(project_name)
-        color = get_load_color_for_family(family, settings)
+        color = get_load_color_for_product_type(product_type, settings)
         if color is not None:
             red, green, blue = color
             cmds.setAttr(group_node + ".useOutlinerColor", 1)
diff --git a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py b/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py
index e7178be38b..310c943198 100644
--- a/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py
+++ b/client/ayon_core/hosts/maya/plugins/load/load_yeti_rig.py
@@ -40,7 +40,7 @@ class YetiRigLoader(plugin.ReferenceLoader):
                 groupName=group_name
             )
 
-        color = plugin.get_load_color_for_family("yetiRig")
+        color = plugin.get_load_color_for_product_type("yetiRig")
         if color is not None:
             red, green, blue = color
             cmds.setAttr(group_name + ".useOutlinerColor", 1)
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_animation.py b/client/ayon_core/hosts/maya/plugins/publish/collect_animation.py
index 26a0a01c8b..2ab6511ece 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_animation.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_animation.py
@@ -25,13 +25,14 @@ class CollectAnimationOutputGeometry(pyblish.api.InstancePlugin):
     def process(self, instance):
         """Collect the hierarchy nodes"""
 
-        family = instance.data["family"]
+        product_type = instance.data["productType"]
         out_set = next((i for i in instance.data["setMembers"] if
                         i.endswith("out_SET")), None)
 
         if out_set is None:
-            warning = "Expecting out_SET for instance of family '%s'" % family
-            self.log.warning(warning)
+            self.log.warning((
+                "Expecting out_SET for instance of product type '{}'"
+            ).format(product_type))
             return
 
         members = cmds.ls(cmds.sets(out_set, query=True), long=True)
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_history.py b/client/ayon_core/hosts/maya/plugins/publish/collect_history.py
index d4e8c6298b..2da74991c0 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_history.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_history.py
@@ -10,7 +10,7 @@ class CollectMayaHistory(pyblish.api.InstancePlugin):
         This removes render layers collected in the history
 
     This is separate from Collect Instances so we can target it towards only
-    specific family types.
+    specific product types.
 
     """
 
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 2d745d0ca8..85be15bb7b 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_instances.py
@@ -28,7 +28,7 @@ class CollectNewInstances(pyblish.api.InstancePlugin):
     order = pyblish.api.CollectorOrder
     hosts = ["maya"]
 
-    valid_empty_families = {"workfile", "renderlayer"}
+    valid_empty_product_types = {"workfile", "renderlayer"}
 
     def process(self, instance):
 
@@ -60,7 +60,9 @@ class CollectNewInstances(pyblish.api.InstancePlugin):
 
             instance[:] = members_hierarchy
 
-        elif instance.data["family"] not in self.valid_empty_families:
+        elif (
+            instance.data["productType"] not in self.valid_empty_product_types
+        ):
             self.log.warning("Empty instance: \"%s\" " % objset)
         # Store the exact members of the object set
         instance.data["setMembers"] = members
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_model.py b/client/ayon_core/hosts/maya/plugins/publish/collect_model.py
index 557f96fe7a..9d45ed63bc 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_model.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_model.py
@@ -8,8 +8,11 @@ class CollectModelData(pyblish.api.InstancePlugin):
 
     Ensures always only a single frame is extracted (current frame).
 
+    Todo:
+        Validate if is this plugin still useful.
+
     Note:
-        This is a workaround so that the `pype.model` family can use the
+        This is a workaround so that the `model` product type can use the
         same pointcache extractor implementation as animation and pointcaches.
         This always enforces the "current" frame to be published.
 
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 f91cca1f38..19e0c133c4 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_render.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_render.py
@@ -8,7 +8,7 @@ publishing on farm.
 Requires:
     instance    -> families
     instance    -> setMembers
-    instance    -> asset
+    instance    -> folderPath
 
     context     -> currentFile
     context     -> workspaceDir
@@ -18,7 +18,7 @@ Optional:
 
 Provides:
     instance    -> label
-    instance    -> subset
+    instance    -> productName
     instance    -> attachTo
     instance    -> setMembers
     instance    -> publish
@@ -26,9 +26,6 @@ Provides:
     instance    -> frameEnd
     instance    -> byFrameStep
     instance    -> renderer
-    instance    -> family
-    instance    -> families
-    instance    -> asset
     instance    -> time
     instance    -> author
     instance    -> source
@@ -90,18 +87,18 @@ class CollectMayaRender(pyblish.api.InstancePlugin):
             )
             self.log.warning(msg)
 
-        # detect if there are sets (subsets) to attach render to
+        # detect if there are sets (products) to attach render to
         sets = cmds.sets(objset, query=True) or []
         attach_to = []
         for s in sets:
-            if not cmds.attributeQuery("family", node=s, exists=True):
+            if not cmds.attributeQuery("productType", node=s, exists=True):
                 continue
 
             attach_to.append(
                 {
                     "version": None,  # we need integrator for that
-                    "subset": s,
-                    "family": cmds.getAttr("{}.family".format(s)),
+                    "productName": s,
+                    "productType": cmds.getAttr("{}.productType".format(s)),
                 }
             )
             self.log.debug(" -> attach render to: {}".format(s))
@@ -145,13 +142,13 @@ class CollectMayaRender(pyblish.api.InstancePlugin):
             )
         )
 
-        # if we want to attach render to subset, check if we have AOV's
+        # if we want to attach render to product, check if we have AOV's
         # in expectedFiles. If so, raise error as we cannot attach AOV
-        # (considered to be subset on its own) to another subset
+        # (considered to be product on its own) to another product
         if attach_to:
             assert isinstance(expected_files, list), (
                 "attaching multiple AOVs or renderable cameras to "
-                "subset is not supported"
+                "product is not supported"
             )
 
         # append full path
@@ -293,7 +290,7 @@ class CollectMayaRender(pyblish.api.InstancePlugin):
             "colorspaceView": colorspace_data["view"],
         }
 
-        rr_settings = context.data["system_settings"]["royalrender"]
+        rr_settings = context.data["project_settings"]["royalrender"]
         if rr_settings["enabled"]:
             data["rrPathName"] = instance.data.get("rrPathName")
             self.log.debug(data["rrPathName"])
@@ -301,7 +298,7 @@ class CollectMayaRender(pyblish.api.InstancePlugin):
         if self.sync_workfile_version:
             data["version"] = context.data["version"]
             for _instance in context:
-                if _instance.data['family'] == "workfile":
+                if _instance.data["productType"] == "workfile":
                     _instance.data["version"] = context.data["version"]
 
         # Define nice label
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py b/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py
index 585eca5dce..1c83918155 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_render_layer_aovs.py
@@ -62,12 +62,12 @@ class CollectRenderLayerAOVS(pyblish.api.InstancePlugin):
                 continue
 
             pass_name = self.get_pass_name(renderer, element)
-            render_pass = "%s.%s" % (instance.data["subset"], pass_name)
+            render_pass = "%s.%s" % (instance.data["productName"], pass_name)
 
             result.append(render_pass)
 
         self.log.debug("Found {} render elements / AOVs for "
-                       "'{}'".format(len(result), instance.data["subset"]))
+                       "'{}'".format(len(result), instance.data["productName"]))
 
         instance.data["renderPasses"] = result
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py b/client/ayon_core/hosts/maya/plugins/publish/collect_review.py
index 205c871c93..58d02294c5 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_review.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_review.py
@@ -57,26 +57,26 @@ class CollectReview(pyblish.api.InstancePlugin):
             burninDataMembers["focalLength"] = focal_length
 
         # Account for nested instances like model.
-        reviewable_subsets = list(set(members) & objectset)
-        if reviewable_subsets:
-            if len(reviewable_subsets) > 1:
+        reviewable_products = list(set(members) & objectset)
+        if reviewable_products:
+            if len(reviewable_products) > 1:
                 raise KnownPublishError(
-                    "Multiple attached subsets for review are not supported. "
-                    "Attached: {}".format(", ".join(reviewable_subsets))
+                    "Multiple attached products for review are not supported. "
+                    "Attached: {}".format(", ".join(reviewable_products))
                 )
 
-            reviewable_subset = reviewable_subsets[0]
+            reviewable_product = reviewable_products[0]
             self.log.debug(
-                "Subset attached to review: {}".format(reviewable_subset)
+                "Subset attached to review: {}".format(reviewable_product)
             )
 
             # Find the relevant publishing instance in the current context
             reviewable_inst = next(inst for inst in context
-                                   if inst.name == reviewable_subset)
+                                   if inst.name == reviewable_product)
             data = reviewable_inst.data
 
             self.log.debug(
-                'Adding review family to {}'.format(reviewable_subset)
+                'Adding review family to {}'.format(reviewable_product)
             )
             if data.get('families'):
                 data['families'].append('review')
@@ -119,16 +119,16 @@ class CollectReview(pyblish.api.InstancePlugin):
             project_name = instance.context.data["projectName"]
             asset_doc = instance.context.data['assetEntity']
             task = instance.context.data["task"]
-            legacy_subset_name = task + 'Review'
+            legacy_product_name = task + 'Review'
             subset_doc = get_subset_by_name(
                 project_name,
-                legacy_subset_name,
+                legacy_product_name,
                 asset_doc["_id"],
                 fields=["_id"]
             )
             if subset_doc:
-                self.log.debug("Existing subsets found, keep legacy name.")
-                instance.data['subset'] = legacy_subset_name
+                self.log.debug("Existing products found, keep legacy name.")
+                instance.data["productName"] = legacy_product_name
 
             instance.data["cameras"] = cameras
             instance.data['review_camera'] = camera
diff --git a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayproxy.py b/client/ayon_core/hosts/maya/plugins/publish/collect_vrayproxy.py
index 24521a2f09..8630f56e58 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayproxy.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_vrayproxy.py
@@ -14,7 +14,7 @@ class CollectVrayProxy(pyblish.api.InstancePlugin):
 
     def process(self, instance):
         """Collector entry point."""
-        if not instance.data.get('families'):
+        if not instance.data.get("families"):
             instance.data["families"] = []
 
         if instance.data.get("vrmesh"):
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 979f49f7fe..9548cd9387 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/collect_vrayscene.py
@@ -56,8 +56,9 @@ class CollectVrayScene(pyblish.api.InstancePlugin):
             frame_end_handle = frame_end_render
 
         # Get layer specific settings, might be overrides
+        product_type = "vrayscene_layer"
         data = {
-            "subset": layer_name,
+            "productName": layer_name,
             "layer": layer_name,
             # TODO: This likely needs fixing now
             # Before refactor: cmds.sets(layer, q=True) or ["*"]
@@ -74,9 +75,10 @@ class CollectVrayScene(pyblish.api.InstancePlugin):
                 self.get_render_attribute("byFrameStep",
                                           layer=layer_name)),
             "renderer": renderer,
-            # instance subset
-            "family": "vrayscene_layer",
-            "families": ["vrayscene_layer"],
+            # instance product type
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type],
             "time": get_formatted_current_time(),
             "author": context.data["user"],
             # Add source to allow tracing back to the scene from
diff --git a/client/ayon_core/hosts/maya/plugins/publish/determine_future_version.py b/client/ayon_core/hosts/maya/plugins/publish/determine_future_version.py
index afa249aca2..47fb4f03fe 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/determine_future_version.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/determine_future_version.py
@@ -1,8 +1,9 @@
-import pyblish
+import pyblish.api
+
 
 class DetermineFutureVersion(pyblish.api.InstancePlugin):
     """
-    This will determine version of subset if we want render to be attached to.
+    This will determine version of product if we want render to be attached to.
     """
     label = "Determine Subset Version"
     order = pyblish.api.IntegratorOrder
@@ -11,18 +12,25 @@ class DetermineFutureVersion(pyblish.api.InstancePlugin):
 
     def process(self, instance):
         context = instance.context
-        attach_to_subsets = [s["subset"] for s in instance.data['attachTo']]
-
-        if not attach_to_subsets:
+        attatch_to_products = [
+            i["productName"]
+            for i in instance.data["attachTo"]
+        ]
+        if not attatch_to_products:
             return
 
         for i in context:
-            if i.data["subset"] in attach_to_subsets:
-                # # this will get corresponding subset in attachTo list
-                # # so we can set version there
-                sub = next(item for item in instance.data['attachTo'] if item["subset"] == i.data["subset"])  # noqa: E501
+            if i.data["productName"] not in attatch_to_products:
+                continue
+            # # this will get corresponding product in attachTo list
+            # # so we can set version there
+            sub = next(
+                item
+                for item in instance.data["attachTo"]
+                if item["productName"] == i.data["productName"]
+            )
 
-                sub["version"] = i.data.get("version", 1)
-                self.log.info("render will be attached to {} v{}".format(
-                        sub["subset"], sub["version"]
-                ))
+            sub["version"] = i.data.get("version", 1)
+            self.log.info("render will be attached to {} v{}".format(
+                    sub["productName"], sub["version"]
+            ))
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py
index 2be9cfec95..74abc8de75 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_alembic.py
@@ -14,8 +14,8 @@ class ExtractCameraAlembic(publish.Extractor,
     The camera gets baked to world space by default. Only when the instance's
     `bakeToWorldSpace` is set to False it will include its full hierarchy.
 
-    'camera' family expects only single camera, if multiple cameras are needed,
-    'matchmove' is better choice.
+    'camera'  product type expects only single camera, if multiple cameras
+    are needed, 'matchmove' is better choice.
 
     """
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py
index 689eed09f8..c4af2914cd 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_camera_mayaScene.py
@@ -93,8 +93,8 @@ class ExtractCameraMayaScene(publish.Extractor,
     The cameras gets baked to world space by default. Only when the instance's
     `bakeToWorldSpace` is set to False it will include its full hierarchy.
 
-    'camera' family expects only single camera, if multiple cameras are needed,
-    'matchmove' is better choice.
+    'camera' product type expects only single camera, if multiple cameras are
+    needed, 'matchmove' is better choice.
 
     Note:
         The extracted Maya ascii file gets "massaged" removing the uuid values
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py b/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py
index f6e663174a..441610b749 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_layout.py
@@ -67,10 +67,10 @@ class ExtractLayout(publish.Extractor):
             self.log.debug(representation)
 
             version_id = representation.get("parent")
-            family = representation.get("context").get("family")
+            product_type = representation.get("context").get("family")
 
             json_element = {
-                "family": family,
+                "product_type": product_type,
                 "instance_name": cmds.getAttr(
                     "{}.namespace".format(container)),
                 "representation": str(representation_id),
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py b/client/ayon_core/hosts/maya/plugins/publish/extract_look.py
index 29390e2c7d..469608100d 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_look.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_look.py
@@ -104,11 +104,10 @@ class TextureProcessor:
             log = logging.getLogger(self.__class__.__name__)
         self.log = log
 
-    def apply_settings(self, system_settings, project_settings):
+    def apply_settings(self, project_settings):
         """Apply OpenPype system/project settings to the TextureProcessor
 
         Args:
-            system_settings (dict): OpenPype system settings
             project_settings (dict): OpenPype project settings
 
         Returns:
@@ -250,7 +249,7 @@ class MakeTX(TextureProcessor):
         super(MakeTX, self).__init__(log=log)
         self.extra_args = []
 
-    def apply_settings(self, system_settings, project_settings):
+    def apply_settings(self, project_settings):
         # Allow extra maketx arguments from project settings
         args_settings = (
             project_settings["maya"]["publish"]
@@ -488,8 +487,7 @@ class ExtractLook(publish.Extractor):
         }.items():
             if instance.data.get(key, False):
                 processor = Processor(log=self.log)
-                processor.apply_settings(context.data["system_settings"],
-                                         context.data["project_settings"])
+                processor.apply_settings(context.data["project_settings"])
                 processors.append(processor)
 
         if processors:
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 135185fe5c..2fd4f44449 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
@@ -83,7 +83,7 @@ class ExtractMayaSceneRaw(publish.Extractor, AYONPyblishPluginMixin):
         selection = members
         if set(self.add_for_families).intersection(
                 set(instance.data.get("families", []))) or \
-                instance.data.get("family") in self.add_for_families:
+                instance.data.get("productType") in self.add_for_families:
             selection += self._get_loaded_containers(members)
 
         # Perform extraction
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py b/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py
index c019d43b36..a394d880ff 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_playblast.py
@@ -43,7 +43,7 @@ class ExtractPlayblast(publish.Extractor):
         capture_preset = lib.get_capture_preset(
             task_data.get("name"),
             task_data.get("type"),
-            instance.data["subset"],
+            instance.data["productName"],
             instance.context.data["project_settings"],
             self.log
         )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py b/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py
index 5600b980d9..9286869c60 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_redshift_proxy.py
@@ -28,7 +28,7 @@ class ExtractRedshiftProxy(publish.Extractor):
 
         if not anim_on:
             # Remove animation information because it is not required for
-            # non-animated subsets
+            # non-animated products
             keys = ["frameStart",
                     "frameEnd",
                     "handleStart",
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py b/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py
index db26422897..d3140487a6 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_thumbnail.py
@@ -27,7 +27,7 @@ class ExtractThumbnail(publish.Extractor):
         capture_preset = lib.get_capture_preset(
             task_data.get("name"),
             task_data.get("type"),
-            instance.data["subset"],
+            instance.data["productName"],
             instance.context.data["project_settings"],
             self.log
         )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py b/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py
index 28c6e98c33..d16f9e8701 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_vrayproxy.py
@@ -27,7 +27,7 @@ class ExtractVRayProxy(publish.Extractor):
         anim_on = instance.data["animation"]
         if not anim_on:
             # Remove animation information because it is not required for
-            # non-animated subsets
+            # non-animated products
             keys = ["frameStart", "frameEnd",
                     "handleStart", "handleEnd",
                     "frameStartHandle", "frameEndHandle"]
diff --git a/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py b/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py
index d8b352668a..9aaba532b2 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/extract_workfile_xgen.py
@@ -45,7 +45,7 @@ class ExtractWorkfileXgen(publish.Extractor):
 
             is_renderlayer = (
                 "renderlayer" in i.data.get("families", []) or
-                i.data["family"] == "renderlayer"
+                i.data["productType"] == "renderlayer"
             )
             return is_renderlayer
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py b/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py
index f33ee1a7e7..8cf5c4278e 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_animation_content.py
@@ -7,7 +7,7 @@ from ayon_core.pipeline.publish import (
 
 
 class ValidateAnimationContent(pyblish.api.InstancePlugin):
-    """Adheres to the content of 'animation' family
+    """Adheres to the content of 'animation' product type
 
     - Must have collected `out_hierarchy` data.
     - All nodes in `out_hierarchy` must be in the instance.
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py b/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py
index fc39756bf0..1514972159 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_attributes.py
@@ -62,7 +62,7 @@ class ValidateAttributes(pyblish.api.InstancePlugin,
 
         attributes_data = cls.get_attributes_data()
         # Filter families.
-        families = [instance.data["family"]]
+        families = [instance.data["productType"]]
         families += instance.data.get("families", [])
         families = set(families) & set(attributes_data.keys())
         if not families:
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py b/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py
index d5f99e5563..5c5b691f9d 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_frame_range.py
@@ -74,9 +74,9 @@ class ValidateFrameRange(pyblish.api.InstancePlugin,
         # compare with data on instance
         errors = []
         # QUESTION shouldn't this be just:
-        #   'if instance.data["family"] in self.exclude_product_types:'
+        #   'if instance.data["productType"] in self.exclude_product_types:'
         if [ef for ef in self.exclude_product_types
-                if instance.data["family"] in ef]:
+                if instance.data["productType"] in ef]:
             return
         if (inst_start != frame_start_handle):
             errors.append("Instance start frame [ {} ] doesn't "
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py
index 5a530236db..16e04af446 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_has_members.py
@@ -26,7 +26,7 @@ class ValidateInstanceHasMembers(pyblish.api.InstancePlugin):
     def process(self, instance):
         # Allow renderlayer, rendersetup and workfile to be empty
         skip_families = {"workfile", "renderlayer", "rendersetup"}
-        if instance.data.get("family") in skip_families:
+        if instance.data.get("productType") in skip_families:
             return
 
         invalid = self.get_invalid(instance)
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py
index 4229cfeb55..da3a194e58 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_instance_subset.py
@@ -14,36 +14,40 @@ allowed = set(string.ascii_lowercase +
               '_')
 
 
-def validate_name(subset):
-    return all(x in allowed for x in subset)
+def validate_name(product_name):
+    return all(x in allowed for x in product_name)
 
 
 class ValidateSubsetName(pyblish.api.InstancePlugin):
-    """Validates subset name has only valid characters"""
+    """Validates product name has only valid characters"""
 
     order = ValidateContentsOrder
     families = ["*"]
-    label = "Subset Name"
+    label = "Product Name"
 
     def process(self, instance):
 
-        subset = instance.data.get("subset", None)
+        product_name = instance.data.get("productName", None)
 
-        # Ensure subset data
-        if subset is None:
-            raise PublishValidationError("Instance is missing subset "
-                               "name: {0}".format(subset))
+        # Ensure product data
+        if product_name is None:
+            raise PublishValidationError(
+                "Instance is missing product name: {0}".format(product_name)
+            )
 
-        if not isinstance(subset, six.string_types):
-            raise TypeError("Instance subset name must be string, "
-                            "got: {0} ({1})".format(subset, type(subset)))
+        if not isinstance(product_name, six.string_types):
+            raise TypeError((
+                "Instance product name must be string, got: {0} ({1})"
+            ).format(product_name, type(product_name)))
 
-        # Ensure is not empty subset
-        if not subset:
-            raise ValueError("Instance subset name is "
-                             "empty: {0}".format(subset))
+        # Ensure is not empty product
+        if not product_name:
+            raise ValueError(
+                "Instance product name is empty: {0}".format(product_name)
+            )
 
-        # Validate subset characters
-        if not validate_name(subset):
-            raise ValueError("Instance subset name contains invalid "
-                             "characters: {0}".format(subset))
+        # Validate product characters
+        if not validate_name(product_name):
+            raise ValueError((
+                "Instance product name contains invalid characters: {0}"
+            ).format(product_name))
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py b/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py
index 8cc2675dc7..b0db5e435a 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_model_content.py
@@ -10,7 +10,7 @@ from ayon_core.pipeline.publish import (
 
 
 class ValidateModelContent(pyblish.api.InstancePlugin):
-    """Adheres to the content of 'model' family
+    """Adheres to the content of 'model' product type
 
     - Must have one top group. (configurable)
     - Must only contain: transforms, meshes and groups
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py b/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py
index b5bfdcc9ec..900e5444a9 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_renderlayer_aovs.py
@@ -8,7 +8,7 @@ from ayon_core.pipeline.publish import PublishValidationError
 class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin):
     """Validate created AOVs / RenderElement is registered in the database
 
-    Each render element is registered as a subset which is formatted based on
+    Each render element is registered as a product which is formatted based on
     the render layer and the render element, example:
 
         <render layer>.<render element>
@@ -31,7 +31,7 @@ class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin):
         invalid = self.get_invalid(instance)
         if invalid:
             raise PublishValidationError(
-                "Found unregistered subsets: {}".format(invalid))
+                "Found unregistered products: {}".format(invalid))
 
     def get_invalid(self, instance):
         invalid = []
@@ -40,7 +40,7 @@ class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin):
         asset_doc = instance.data["assetEntity"]
         render_passes = instance.data.get("renderPasses", [])
         for render_pass in render_passes:
-            is_valid = self.validate_subset_registered(
+            is_valid = self.validate_product_registered(
                 project_name, asset_doc, render_pass
             )
             if not is_valid:
@@ -48,9 +48,11 @@ class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin):
 
         return invalid
 
-    def validate_subset_registered(self, project_name, asset_doc, subset_name):
-        """Check if subset is registered in the database under the asset"""
+    def validate_product_registered(
+        self, project_name, asset_doc, product_name
+    ):
+        """Check if product is registered in the database under the asset"""
 
         return get_subset_by_name(
-            project_name, subset_name, asset_doc["_id"], fields=["_id"]
+            project_name, product_name, asset_doc["_id"], fields=["_id"]
         )
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
index 21ea827f68..c9860d27a0 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
@@ -81,7 +81,7 @@ class ValidateUnrealStaticMeshName(pyblish.api.InstancePlugin,
                 ("_" + cls.static_mesh_prefix) or "", cls.regex_mesh
             )
             sm_r = re.compile(regex_mesh)
-            if not sm_r.match(instance.data.get("subset")):
+            if not sm_r.match(instance.data.get("productName")):
                 cls.log.error("Mesh doesn't comply with name validation.")
                 return True
 
diff --git a/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py b/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py
index f9e4c9212a..29cf9420a3 100644
--- a/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py
+++ b/client/ayon_core/hosts/maya/plugins/publish/validate_visible_only.py
@@ -36,7 +36,7 @@ class ValidateAlembicVisibleOnly(pyblish.api.InstancePlugin):
     @classmethod
     def get_invalid(cls, instance):
 
-        if instance.data["family"] == "animation":
+        if instance.data["productType"] == "animation":
             # Special behavior to use the nodes in out_SET
             nodes = instance.data["out_hierarchy"]
         else:
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py
index d73c5e318f..0969666484 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py
+++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/app.py
@@ -211,7 +211,7 @@ class MayaLookAssignerWindow(QtWidgets.QWidget):
 
         # Collect the looks we want to apply (by name)
         look_items = self.look_outliner.get_selected_items()
-        looks = {look["subset"] for look in look_items}
+        looks = {look["product"] for look in look_items}
 
         selection = self.assign_selected.isChecked()
         asset_nodes = self.asset_outliner.get_nodes(selection=selection)
@@ -225,22 +225,28 @@ class MayaLookAssignerWindow(QtWidgets.QWidget):
 
             # Assign the first matching look relevant for this asset
             # (since assigning multiple to the same nodes makes no sense)
-            assign_look = next((subset for subset in item["looks"]
-                                if subset["name"] in looks), None)
+            assign_look = next(
+                (
+                    subset_doc
+                    for subset_doc in item["looks"]
+                    if subset_doc["name"] in looks
+                ),
+                None
+            )
             if not assign_look:
                 self.echo(
                     "{} No matching selected look for {}".format(prefix, asset)
                 )
                 continue
 
-            # Get the latest version of this asset's look subset
+            # Get the latest version of this asset's look product
             version = get_last_version_by_subset_id(
                 project_name, assign_look["_id"], fields=["_id"]
             )
 
-            subset_name = assign_look["name"]
+            product_name = assign_look["name"]
             self.echo("{} Assigning {} to {}\t".format(
-                prefix, subset_name, asset
+                prefix, product_name, asset
             ))
             nodes = item["nodes"]
 
@@ -251,7 +257,7 @@ class MayaLookAssignerWindow(QtWidgets.QWidget):
 
                 for vp in vray_proxies:
                     if vp in nodes:
-                        vrayproxy_assign_look(vp, subset_name)
+                        vrayproxy_assign_look(vp, product_name)
 
                 nodes = list(set(nodes).difference(vray_proxies))
             else:
@@ -266,7 +272,7 @@ class MayaLookAssignerWindow(QtWidgets.QWidget):
 
                 for standin in arnold_standins:
                     if standin in nodes:
-                        arnold_standin.assign_look(standin, subset_name)
+                        arnold_standin.assign_look(standin, product_name)
 
                 nodes = list(set(nodes).difference(arnold_standins))
             else:
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py
index 9c6877fed8..810e1fc88c 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py
+++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/arnold_standin.py
@@ -131,8 +131,8 @@ def shading_engine_assignments(shading_engine, attribute, nodes, assignments):
         assignments[node].append(assignment)
 
 
-def assign_look(standin, subset):
-    log.info("Assigning {} to {}.".format(subset, standin))
+def assign_look(standin, product_name):
+    log.info("Assigning {} to {}.".format(product_name, standin))
 
     nodes_by_id = get_nodes_by_id(standin)
 
@@ -148,13 +148,13 @@ def assign_look(standin, subset):
         # Get latest look version
         version = get_last_version_by_subset_name(
             project_name,
-            subset_name=subset,
+            subset_name=product_name,
             asset_id=asset_id,
             fields=["_id"]
         )
         if not version:
-            log.info("Didn't find last version for subset name {}".format(
-                subset
+            log.info("Didn't find last version for product name {}".format(
+                product_name
             ))
             continue
 
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py
index 4d2f1a8443..4375d38316 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py
+++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/commands.py
@@ -148,7 +148,7 @@ def create_items_from_nodes(nodes):
             )
             continue
 
-        # Collect available look subsets for this asset
+        # Collect available look products for this asset
         looks = lib.list_looks(project_name, asset_doc["_id"])
 
         # Collect namespaces the asset is found in
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py
index a252f103ec..4892125954 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py
+++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/models.py
@@ -88,7 +88,7 @@ class LookModel(models.TreeModel):
 
         An item exists of:
             {
-                "subset": 'name of subset',
+                "product": 'name of product',
                 "asset": asset_document
             }
 
@@ -102,26 +102,30 @@ class LookModel(models.TreeModel):
         self.beginResetModel()
 
         # Collect the assets per look name (from the items of the AssetModel)
-        look_subsets = defaultdict(list)
+        look_products = defaultdict(list)
         for asset_item in items:
             asset = asset_item["asset"]
             for look in asset_item["looks"]:
-                look_subsets[look["name"]].append(asset)
+                look_products[look["name"]].append(asset)
 
-        for subset in sorted(look_subsets.keys()):
-            assets = look_subsets[subset]
+        for product_name in sorted(look_products.keys()):
+            assets = look_products[product_name]
 
             # Define nice label without "look" prefix for readability
-            label = subset if not subset.startswith("look") else subset[4:]
+            label = (
+                product_name
+                if not product_name.startswith("look")
+                else product_name[4:]
+            )
 
             item_node = models.Item()
             item_node["label"] = label
-            item_node["subset"] = subset
+            item_node["product"] = product_name
 
             # Amount of matching assets for this look
             item_node["match"] = len(assets)
 
-            # Store the assets that have this subset available
+            # Store the assets that have this product available
             item_node["assets"] = assets
 
             self.add_child(item_node)
diff --git a/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py b/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py
index cbd5f7fd5c..df74dcd217 100644
--- a/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py
+++ b/client/ayon_core/hosts/maya/tools/mayalookassigner/vray_proxies.py
@@ -51,13 +51,13 @@ def assign_vrayproxy_shaders(vrayproxy, assignments):
             index += 1
 
 
-def vrayproxy_assign_look(vrayproxy, subset="lookDefault"):
+def vrayproxy_assign_look(vrayproxy, product_name="lookDefault"):
     # type: (str, str) -> None
     """Assign look to vray proxy.
 
     Args:
         vrayproxy (str): Name of vrayproxy to apply look to.
-        subset (str): Name of look subset.
+        product_name (str): Name of look product.
 
     Returns:
         None
@@ -82,13 +82,13 @@ def vrayproxy_assign_look(vrayproxy, subset="lookDefault"):
         # Get latest look version
         version = get_last_version_by_subset_name(
             project_name,
-            subset_name=subset,
+            subset_name=product_name,
             asset_id=asset_id,
             fields=["_id"]
         )
         if not version:
-            print("Didn't find last version for subset name {}".format(
-                subset
+            print("Didn't find last version for product name {}".format(
+                product_name
             ))
             continue
 
diff --git a/client/ayon_core/hosts/nuke/api/__init__.py b/client/ayon_core/hosts/nuke/api/__init__.py
index 2536230637..caefba766f 100644
--- a/client/ayon_core/hosts/nuke/api/__init__.py
+++ b/client/ayon_core/hosts/nuke/api/__init__.py
@@ -13,7 +13,6 @@ from .plugin import (
     NukeCreator,
     NukeWriteCreator,
     NukeCreatorError,
-    OpenPypeCreator,
     get_instance_group_node_childs,
     get_colorspace_from_node
 )
@@ -69,7 +68,6 @@ __all__ = (
     "NukeCreator",
     "NukeWriteCreator",
     "NukeCreatorError",
-    "OpenPypeCreator",
     "NukeHost",
     "get_instance_group_node_childs",
     "get_colorspace_from_node",
diff --git a/client/ayon_core/hosts/nuke/api/lib.py b/client/ayon_core/hosts/nuke/api/lib.py
index 006fd8c139..e304b33dc7 100644
--- a/client/ayon_core/hosts/nuke/api/lib.py
+++ b/client/ayon_core/hosts/nuke/api/lib.py
@@ -436,16 +436,16 @@ def set_avalon_knob_data(node, data=None, prefix="avalon:"):
 
     Examples:
         data = {
-            'asset': 'sq020sh0280',
-            'family': 'render',
-            'subset': 'subsetMain'
+            'folderPath': 'sq020sh0280',
+            'productType': 'render',
+            'productName': 'productMain'
         }
     """
     data = data or dict()
     create = OrderedDict()
 
     tab_name = NODE_TAB_NAME
-    editable = ["asset", "subset", "name", "namespace"]
+    editable = ["folderPath", "productName", "name", "namespace"]
 
     existed_knobs = node.knobs()
 
@@ -531,55 +531,6 @@ def get_avalon_knob_data(node, prefix="avalon:", create=True):
     return data
 
 
-@deprecated
-def fix_data_for_node_create(data):
-    """[DEPRECATED] Fixing data to be used for nuke knobs
-    """
-    for k, v in data.items():
-        if isinstance(v, six.text_type):
-            data[k] = str(v)
-        if str(v).startswith("0x"):
-            data[k] = int(v, 16)
-    return data
-
-
-@deprecated
-def add_write_node_legacy(name, **kwarg):
-    """[DEPRECATED] Adding nuke write node
-    Arguments:
-        name (str): nuke node name
-        kwarg (attrs): data for nuke knobs
-    Returns:
-        node (obj): nuke write node
-    """
-    use_range_limit = kwarg.get("use_range_limit", None)
-
-    w = nuke.createNode(
-        "Write",
-        "name {}".format(name),
-        inpanel=False
-    )
-
-    w["file"].setValue(kwarg["file"])
-
-    for k, v in kwarg.items():
-        if "frame_range" in k:
-            continue
-        log.info([k, v])
-        try:
-            w[k].setValue(v)
-        except KeyError as e:
-            log.debug(e)
-            continue
-
-    if use_range_limit:
-        w["use_limit"].setValue(True)
-        w["first"].setValue(kwarg["frame_range"][0])
-        w["last"].setValue(kwarg["frame_range"][1])
-
-    return w
-
-
 def add_write_node(name, file_path, knobs, **kwarg):
     """Adding nuke write node
 
@@ -711,94 +662,7 @@ def get_nuke_imageio_settings():
     return get_project_settings(Context.project_name)["nuke"]["imageio"]
 
 
-@deprecated("ayon_core.hosts.nuke.api.lib.get_nuke_imageio_settings")
-def get_created_node_imageio_setting_legacy(nodeclass, creator, subset):
-    '''[DEPRECATED]  Get preset data for dataflow (fileType, compression, bitDepth)
-    '''
-
-    assert any([creator, nodeclass]), nuke.message(
-        "`{}`: Missing mandatory kwargs `host`, `cls`".format(__file__))
-
-    imageio_nodes = get_nuke_imageio_settings()["nodes"]
-    required_nodes = imageio_nodes["required_nodes"]
-
-    # HACK: for backward compatibility this needs to be optional
-    override_nodes = imageio_nodes.get("override_nodes", [])
-
-    imageio_node = None
-    for node in required_nodes:
-        log.info(node)
-        if (
-            nodeclass in node["nuke_node_class"]
-            and creator in node["plugins"]
-        ):
-            imageio_node = node
-            break
-
-    log.debug("__ imageio_node: {}".format(imageio_node))
-
-    # find matching override node
-    override_imageio_node = None
-    for onode in override_nodes:
-        log.info(onode)
-        if nodeclass not in onode["nuke_node_class"]:
-            continue
-
-        if creator not in onode["plugins"]:
-            continue
-
-        if (
-            onode["subsets"]
-            and not any(
-                re.search(s.lower(), subset.lower())
-                for s in onode["subsets"]
-            )
-        ):
-            continue
-
-        override_imageio_node = onode
-        break
-
-    log.debug("__ override_imageio_node: {}".format(override_imageio_node))
-    # add overrides to imageio_node
-    if override_imageio_node:
-        # get all knob names in imageio_node
-        knob_names = [k["name"] for k in imageio_node["knobs"]]
-
-        for oknob in override_imageio_node["knobs"]:
-            oknob_name = oknob["name"]
-            oknob_type = oknob["type"]
-            oknob_value = oknob[oknob_type]
-            for knob in imageio_node["knobs"]:
-                knob_name = knob["name"]
-                # add missing knobs into imageio_node
-                if oknob_name not in knob_names:
-                    log.debug(
-                        "_ adding knob: `{}`".format(oknob))
-                    imageio_node["knobs"].append(oknob)
-                    knob_names.append(oknob_name)
-                    continue
-
-                # override matching knob name
-                if oknob_name != knob_name:
-                    continue
-
-                knob_type = knob["type"]
-                log.debug(
-                    "_ overriding knob: `{}` > `{}`".format(knob, oknob)
-                )
-                if not oknob_value:
-                    # remove original knob if no value found in oknob
-                    imageio_node["knobs"].remove(knob)
-                else:
-                    # override knob value with oknob's
-                    knob[knob_type] = oknob_value
-
-    log.info("ImageIO node: {}".format(imageio_node))
-    return imageio_node
-
-
-def get_imageio_node_setting(node_class, plugin_name, subset):
+def get_imageio_node_setting(node_class, plugin_name, product_name):
     ''' Get preset data for dataflow (fileType, compression, bitDepth)
     '''
     imageio_nodes = get_nuke_imageio_settings()["nodes"]
@@ -823,7 +687,7 @@ def get_imageio_node_setting(node_class, plugin_name, subset):
     get_imageio_node_override_setting(
         node_class,
         plugin_name,
-        subset,
+        product_name,
         imageio_node["knobs"]
     )
 
@@ -832,7 +696,7 @@ def get_imageio_node_setting(node_class, plugin_name, subset):
 
 
 def get_imageio_node_override_setting(
-    node_class, plugin_name, subset, knobs_settings
+    node_class, plugin_name, product_name, knobs_settings
 ):
     ''' Get imageio node overrides from settings
     '''
@@ -843,17 +707,18 @@ def get_imageio_node_override_setting(
     override_imageio_node = None
     for onode in override_nodes:
         log.debug("__ onode: {}".format(onode))
-        log.debug("__ subset: {}".format(subset))
+        log.debug("__ productName: {}".format(product_name))
         if node_class not in onode["nuke_node_class"]:
             continue
 
         if plugin_name not in onode["plugins"]:
             continue
 
+        # TODO change 'subsets' to 'product_names' in settings
         if (
             onode["subsets"]
             and not any(
-                re.search(s.lower(), subset.lower())
+                re.search(s.lower(), product_name.lower())
                 for s in onode["subsets"]
             )
         ):
@@ -1004,16 +869,16 @@ def check_inventory_versions():
     version_docs = get_versions(
         project_name, version_ids, fields=["_id", "name", "parent"]
     )
-    # Store versions by id and collect subset ids
+    # Store versions by id and collect product ids
     version_docs_by_id = {}
-    subset_ids = set()
+    product_ids = set()
     for version_doc in version_docs:
         version_docs_by_id[version_doc["_id"]] = version_doc
-        subset_ids.add(version_doc["parent"])
+        product_ids.add(version_doc["parent"])
 
-    # Query last versions based on subset ids
-    last_versions_by_subset_id = get_last_versions(
-        project_name, subset_ids=subset_ids, fields=["_id", "parent"]
+    # Query last versions based on product ids
+    last_versions_by_product_id = get_last_versions(
+        project_name, subset_ids=product_ids, fields=["_id", "parent"]
     )
 
     # Loop through collected container nodes and their representation ids
@@ -1036,9 +901,9 @@ def check_inventory_versions():
             ).format(node.name()))
             continue
 
-        # Get last version based on subset id
-        subset_id = version_doc["parent"]
-        last_version = last_versions_by_subset_id[subset_id]
+        # Get last version based on product id
+        product_id = version_doc["parent"]
+        last_version = last_versions_by_product_id[product_id]
         # Check if last version is same as current version
         if last_version["_id"] == version_doc["_id"]:
             color_value = "0x4ecd25ff"
@@ -1095,19 +960,19 @@ def version_up_script():
     nukescripts.script_and_write_nodes_version_up()
 
 
-def check_subsetname_exists(nodes, subset_name):
+def check_product_name_exists(nodes, product_name):
     """
     Checking if node is not already created to secure there is no duplicity
 
     Arguments:
         nodes (list): list of nuke.Node objects
-        subset_name (str): name we try to find
+        product_name (str): name we try to find
 
     Returns:
         bool: True of False
     """
     return next((True for n in nodes
-                 if subset_name in read_avalon_data(n).get("subset", "")),
+                 if product_name in read_avalon_data(n).get("productName", "")),
                 False)
 
 
@@ -1148,8 +1013,12 @@ def format_anatomy(data):
     )
     data.update(context_data)
     data.update({
-        "subset": data["subset"],
-        "family": data["family"],
+        "subset": data["productName"],
+        "family": data["productType"],
+        "product": {
+            "name": data["productName"],
+            "type": data["productType"],
+        },
         "frame": "#" * padding,
     })
     return anatomy.format(data)
@@ -1184,7 +1053,7 @@ def create_prenodes(
     prev_node,
     nodes_setting,
     plugin_name=None,
-    subset=None,
+    product_name=None,
     **kwargs
 ):
     last_node = None
@@ -1208,12 +1077,12 @@ def create_prenodes(
             "dependent": node["dependent"]
         }
 
-        if all([plugin_name, subset]):
+        if all([plugin_name, product_name]):
             # find imageio overrides
             get_imageio_node_override_setting(
                 now_node.Class(),
                 plugin_name,
-                subset,
+                product_name,
                 knobs
             )
 
@@ -1287,13 +1156,13 @@ def create_write_node(
 
     # filtering variables
     plugin_name = data["creator"]
-    subset = data["subset"]
+    product_name = data["productName"]
 
     # get knob settings for write node
     imageio_writes = get_imageio_node_setting(
         node_class="Write",
         plugin_name=plugin_name,
-        subset=subset
+        product_name=product_name
     )
 
     for knob in imageio_writes["knobs"]:
@@ -1342,7 +1211,7 @@ def create_write_node(
             prev_node,
             prenodes,
             plugin_name,
-            subset,
+            product_name,
             **kwargs
         )
         if last_prenode:
@@ -1429,285 +1298,6 @@ def create_write_node(
     return GN
 
 
-@deprecated("ayon_core.hosts.nuke.api.lib.create_write_node")
-def create_write_node_legacy(
-    name, data, input=None, prenodes=None,
-    review=True, linked_knobs=None, farm=True
-):
-    ''' Creating write node which is group node
-
-    Arguments:
-        name (str): name of node
-        data (dict): data to be imprinted
-        input (node): selected node to connect to
-        prenodes (list, optional): list of lists, definitions for nodes
-                                to be created before write
-        review (bool): adding review knob
-
-    Example:
-        prenodes = [
-            {
-                "nodeName": {
-                    "class": ""  # string
-                    "knobs": [
-                        ("knobName": value),
-                        ...
-                    ],
-                    "dependent": [
-                        following_node_01,
-                        ...
-                    ]
-                }
-            },
-            ...
-        ]
-
-    Return:
-        node (obj): group node with avalon data as Knobs
-    '''
-    knob_overrides = data.get("knobs", [])
-    nodeclass = data["nodeclass"]
-    creator = data["creator"]
-    subset = data["subset"]
-
-    imageio_writes = get_created_node_imageio_setting_legacy(
-        nodeclass, creator, subset
-    )
-    for knob in imageio_writes["knobs"]:
-        if knob["name"] == "file_type":
-            representation = knob["value"]
-
-    host_name = get_current_host_name()
-    try:
-        data.update({
-            "app": host_name,
-            "imageio_writes": imageio_writes,
-            "representation": representation,
-        })
-        anatomy_filled = format_anatomy(data)
-
-    except Exception as e:
-        msg = "problem with resolving anatomy template: {}".format(e)
-        log.error(msg)
-        nuke.message(msg)
-
-    # build file path to workfiles
-    fdir = str(anatomy_filled["work"]["folder"]).replace("\\", "/")
-    fpath = data["fpath_template"].format(
-        work=fdir, version=data["version"], subset=data["subset"],
-        frame=data["frame"],
-        ext=representation
-    )
-
-    # create directory
-    if not os.path.isdir(os.path.dirname(fpath)):
-        log.warning("Path does not exist! I am creating it.")
-        os.makedirs(os.path.dirname(fpath))
-
-    _data = OrderedDict({
-        "file": fpath
-    })
-
-    # adding dataflow template
-    log.debug("imageio_writes: `{}`".format(imageio_writes))
-    for knob in imageio_writes["knobs"]:
-        _data[knob["name"]] = knob["value"]
-
-    _data = fix_data_for_node_create(_data)
-
-    log.debug("_data: `{}`".format(_data))
-
-    if "frame_range" in data.keys():
-        _data["frame_range"] = data.get("frame_range", None)
-        log.debug("_data[frame_range]: `{}`".format(_data["frame_range"]))
-
-    GN = nuke.createNode("Group", "name {}".format(name))
-
-    prev_node = None
-    with GN:
-        if input:
-            input_name = str(input.name()).replace(" ", "")
-            # if connected input node was defined
-            prev_node = nuke.createNode(
-                "Input", "name {}".format(input_name))
-        else:
-            # generic input node connected to nothing
-            prev_node = nuke.createNode(
-                "Input",
-                "name {}".format("rgba"),
-                inpanel=False
-            )
-        # creating pre-write nodes `prenodes`
-        if prenodes:
-            for node in prenodes:
-                # get attributes
-                pre_node_name = node["name"]
-                klass = node["class"]
-                knobs = node["knobs"]
-                dependent = node["dependent"]
-
-                # create node
-                now_node = nuke.createNode(
-                    klass,
-                    "name {}".format(pre_node_name),
-                    inpanel=False
-                )
-
-                # add data to knob
-                for _knob in knobs:
-                    knob, value = _knob
-                    try:
-                        now_node[knob].value()
-                    except NameError:
-                        log.warning(
-                            "knob `{}` does not exist on node `{}`".format(
-                                knob, now_node["name"].value()
-                            ))
-                        continue
-
-                    if not knob and not value:
-                        continue
-
-                    log.info((knob, value))
-
-                    if isinstance(value, str):
-                        if "[" in value:
-                            now_node[knob].setExpression(value)
-                    else:
-                        now_node[knob].setValue(value)
-
-                # connect to previous node
-                if dependent:
-                    if isinstance(dependent, (tuple or list)):
-                        for i, node_name in enumerate(dependent):
-                            input_node = nuke.createNode(
-                                "Input",
-                                "name {}".format(node_name),
-                                inpanel=False
-                            )
-                            now_node.setInput(1, input_node)
-
-                    elif isinstance(dependent, str):
-                        input_node = nuke.createNode(
-                            "Input",
-                            "name {}".format(node_name),
-                            inpanel=False
-                        )
-                        now_node.setInput(0, input_node)
-
-                else:
-                    now_node.setInput(0, prev_node)
-
-                # switch actual node to previous
-                prev_node = now_node
-
-        # creating write node
-
-        write_node = now_node = add_write_node_legacy(
-            "inside_{}".format(name),
-            **_data
-        )
-        # connect to previous node
-        now_node.setInput(0, prev_node)
-
-        # switch actual node to previous
-        prev_node = now_node
-
-        now_node = nuke.createNode("Output", "name Output1", inpanel=False)
-
-        # connect to previous node
-        now_node.setInput(0, prev_node)
-
-    # imprinting group node
-    set_avalon_knob_data(GN, data["avalon"])
-    add_publish_knob(GN)
-    add_rendering_knobs(GN, farm)
-
-    if review:
-        add_review_knob(GN)
-
-    # add divider
-    GN.addKnob(nuke.Text_Knob('', 'Rendering'))
-
-    # Add linked knobs.
-    linked_knob_names = []
-
-    # add input linked knobs and create group only if any input
-    if linked_knobs:
-        linked_knob_names.append("_grp-start_")
-        linked_knob_names.extend(linked_knobs)
-        linked_knob_names.append("_grp-end_")
-
-    linked_knob_names.append("Render")
-
-    for _k_name in linked_knob_names:
-        if "_grp-start_" in _k_name:
-            knob = nuke.Tab_Knob(
-                "rnd_attr", "Rendering attributes", nuke.TABBEGINCLOSEDGROUP)
-            GN.addKnob(knob)
-        elif "_grp-end_" in _k_name:
-            knob = nuke.Tab_Knob(
-                "rnd_attr_end", "Rendering attributes", nuke.TABENDGROUP)
-            GN.addKnob(knob)
-        else:
-            if "___" in _k_name:
-                # add divider
-                GN.addKnob(nuke.Text_Knob(""))
-            else:
-                # add linked knob by _k_name
-                link = nuke.Link_Knob("")
-                link.makeLink(write_node.name(), _k_name)
-                link.setName(_k_name)
-
-                # make render
-                if "Render" in _k_name:
-                    link.setLabel("Render Local")
-                link.setFlag(0x1000)
-                GN.addKnob(link)
-
-    # adding write to read button
-    add_button_write_to_read(GN)
-
-    # adding write to read button
-    add_button_clear_rendered(GN, os.path.dirname(fpath))
-
-    # Deadline tab.
-    add_deadline_tab(GN)
-
-    # open the our Tab as default
-    GN[_NODE_TAB_NAME].setFlag(0)
-
-    # set tile color
-    tile_color = _data.get("tile_color", "0xff0000ff")
-    GN["tile_color"].setValue(tile_color)
-
-    # override knob values from settings
-    for knob in knob_overrides:
-        knob_type = knob["type"]
-        knob_name = knob["name"]
-        knob_value = knob["value"]
-        if knob_name not in GN.knobs():
-            continue
-        if not knob_value:
-            continue
-
-        # set correctly knob types
-        if knob_type == "string":
-            knob_value = str(knob_value)
-        if knob_type == "number":
-            knob_value = int(knob_value)
-        if knob_type == "decimal_number":
-            knob_value = float(knob_value)
-        if knob_type == "bool":
-            knob_value = bool(knob_value)
-        if knob_type in ["2d_vector", "3d_vector", "color", "box"]:
-            knob_value = list(knob_value)
-
-        GN[knob_name].setValue(knob_value)
-
-    return GN
-
-
 def set_node_knobs_from_settings(node, knob_settings, **kwargs):
     """ Overriding knob values from settings
 
@@ -1801,84 +1391,6 @@ def color_gui_to_int(color_gui):
     return int(hex_value, 16)
 
 
-@deprecated
-def add_rendering_knobs(node, farm=True):
-    ''' Adds additional rendering knobs to given node
-
-    Arguments:
-        node (obj): nuke node object to be fixed
-
-    Return:
-        node (obj): with added knobs
-    '''
-    knob_options = ["Use existing frames", "Local"]
-    if farm:
-        knob_options.append("On farm")
-
-    if "render" not in node.knobs():
-        knob = nuke.Enumeration_Knob("render", "", knob_options)
-        knob.clearFlag(nuke.STARTLINE)
-        node.addKnob(knob)
-    return node
-
-
-@deprecated
-def add_review_knob(node):
-    ''' Adds additional review knob to given node
-
-    Arguments:
-        node (obj): nuke node object to be fixed
-
-    Return:
-        node (obj): with added knob
-    '''
-    if "review" not in node.knobs():
-        knob = nuke.Boolean_Knob("review", "Review")
-        knob.setValue(True)
-        node.addKnob(knob)
-    return node
-
-
-@deprecated
-def add_deadline_tab(node):
-    # TODO: remove this as it is only linked to legacy create
-    node.addKnob(nuke.Tab_Knob("Deadline"))
-
-    knob = nuke.Int_Knob("deadlinePriority", "Priority")
-    knob.setValue(50)
-    node.addKnob(knob)
-
-    knob = nuke.Int_Knob("deadlineChunkSize", "Chunk Size")
-    knob.setValue(0)
-    node.addKnob(knob)
-
-    knob = nuke.Int_Knob("deadlineConcurrentTasks", "Concurrent tasks")
-    # zero as default will get value from Settings during collection
-    # instead of being an explicit user override, see precollect_write.py
-    knob.setValue(0)
-    node.addKnob(knob)
-
-    knob = nuke.Text_Knob("divd", '')
-    knob.setValue('')
-    node.addKnob(knob)
-
-    knob = nuke.Boolean_Knob("suspend_publish", "Suspend publish")
-    knob.setValue(False)
-    node.addKnob(knob)
-
-
-@deprecated
-def get_deadline_knob_names():
-    # TODO: remove this as it is only linked to legacy
-    # validate_write_deadline_tab
-    return [
-        "Deadline",
-        "deadlineChunkSize",
-        "deadlinePriority",
-        "deadlineConcurrentTasks"
-    ]
-
-
 def create_backdrop(label="", color=None, layer=0,
                     nodes=None):
     """
@@ -2329,14 +1841,17 @@ Reopening Nuke should synchronize these paths and resolve any discrepancies.
             nuke_imageio_writes = None
             if avalon_knob_data:
                 # establish families
-                families = [avalon_knob_data["family"]]
+                product_type = avalon_knob_data.get("productType")
+                if product_type is None:
+                    product_type = avalon_knob_data["family"]
+                families = [product_type]
                 if avalon_knob_data.get("families"):
                     families.append(avalon_knob_data.get("families"))
 
                 nuke_imageio_writes = get_imageio_node_setting(
                     node_class=avalon_knob_data["families"],
                     plugin_name=avalon_knob_data["creator"],
-                    subset=avalon_knob_data["subset"]
+                    product_name=avalon_knob_data["productName"]
                 )
             elif node_data:
                 nuke_imageio_writes = get_write_node_template_attr(node)
@@ -2635,10 +2150,13 @@ def get_write_node_template_attr(node):
     identifier = node_data["creator_identifier"]
 
     # return template data
+    product_name = node_data.get("productName")
+    if product_name is None:
+        product_name = node_data["subset"]
     return get_imageio_node_setting(
         node_class="Write",
         plugin_name=plugin_names_mapping[identifier],
-        subset=node_data["subset"]
+        product_name=product_name
     )
 
 
@@ -2993,72 +2511,6 @@ def start_workfile_template_builder():
         log.warning("Template profile not found. Skipping...")
 
 
-@deprecated
-def recreate_instance(origin_node, avalon_data=None):
-    """Recreate input instance to different data
-
-    Args:
-        origin_node (nuke.Node): Nuke node to be recreating from
-        avalon_data (dict, optional): data to be used in new node avalon_data
-
-    Returns:
-        nuke.Node: newly created node
-    """
-    knobs_wl = ["render", "publish", "review", "ypos",
-                "use_limit", "first", "last"]
-    # get data from avalon knobs
-    data = get_avalon_knob_data(
-        origin_node)
-
-    # add input data to avalon data
-    if avalon_data:
-        data.update(avalon_data)
-
-    # capture all node knobs allowed in op_knobs
-    knobs_data = {k: origin_node[k].value()
-                  for k in origin_node.knobs()
-                  for key in knobs_wl
-                  if key in k}
-
-    # get node dependencies
-    inputs = origin_node.dependencies()
-    outputs = origin_node.dependent()
-
-    # remove the node
-    nuke.delete(origin_node)
-
-    # create new node
-    # get appropriate plugin class
-    creator_plugin = None
-    for Creator in discover_legacy_creator_plugins():
-        if Creator.__name__ == data["creator"]:
-            creator_plugin = Creator
-            break
-
-    # create write node with creator
-    new_node_name = data["subset"]
-    new_node = creator_plugin(new_node_name, data["asset"]).process()
-
-    # white listed knobs to the new node
-    for _k, _v in knobs_data.items():
-        try:
-            print(_k, _v)
-            new_node[_k].setValue(_v)
-        except Exception as e:
-            print(e)
-
-    # connect to original inputs
-    for i, n in enumerate(inputs):
-        new_node.setInput(i, n)
-
-    # connect to outputs
-    if len(outputs) > 0:
-        for dn in outputs:
-            dn.setInput(0, new_node)
-
-    return new_node
-
-
 def add_scripts_menu():
     try:
         from scriptsmenu import launchfornuke
diff --git a/client/ayon_core/hosts/nuke/api/pipeline.py b/client/ayon_core/hosts/nuke/api/pipeline.py
index c747996d9d..582df952d3 100644
--- a/client/ayon_core/hosts/nuke/api/pipeline.py
+++ b/client/ayon_core/hosts/nuke/api/pipeline.py
@@ -530,7 +530,7 @@ def list_instances(creator_id=None):
         (list) of dictionaries matching instances format
     """
     instances_by_order = defaultdict(list)
-    subset_instances = []
+    product_instances = []
     instance_ids = set()
 
     for node in nuke.allNodes(recurseGroups=True):
@@ -568,51 +568,59 @@ def list_instances(creator_id=None):
         else:
             instance_ids.add(instance_id)
 
-        # node name could change, so update subset name data
-        _update_subset_name_data(instance_data, node)
+        # node name could change, so update product name data
+        _update_product_name_data(instance_data, node)
 
         if "render_order" not in node.knobs():
-            subset_instances.append((node, instance_data))
+            product_instances.append((node, instance_data))
             continue
 
         order = int(node["render_order"].value())
         instances_by_order[order].append((node, instance_data))
 
-    # Sort instances based on order attribute or subset name.
+    # Sort instances based on order attribute or product name.
     # TODO: remove in future Publisher enhanced with sorting
     ordered_instances = []
     for key in sorted(instances_by_order.keys()):
-        instances_by_subset = defaultdict(list)
+        instances_by_product = defaultdict(list)
         for node, data_ in instances_by_order[key]:
-            instances_by_subset[data_["subset"]].append((node, data_))
-        for subkey in sorted(instances_by_subset.keys()):
-            ordered_instances.extend(instances_by_subset[subkey])
+            product_name = data_.get("productName")
+            if product_name is None:
+                product_name = data_.get("subset")
+            instances_by_product[product_name].append((node, data_))
+        for subkey in sorted(instances_by_product.keys()):
+            ordered_instances.extend(instances_by_product[subkey])
 
-    instances_by_subset = defaultdict(list)
-    for node, data_ in subset_instances:
-        instances_by_subset[data_["subset"]].append((node, data_))
-    for key in sorted(instances_by_subset.keys()):
-        ordered_instances.extend(instances_by_subset[key])
+    instances_by_product = defaultdict(list)
+    for node, data_ in product_instances:
+        product_name = data_.get("productName")
+        if product_name is None:
+            product_name = data_.get("subset")
+        instances_by_product[product_name].append((node, data_))
+    for key in sorted(instances_by_product.keys()):
+        ordered_instances.extend(instances_by_product[key])
 
     return ordered_instances
 
 
-def _update_subset_name_data(instance_data, node):
-    """Update subset name data in instance data.
+def _update_product_name_data(instance_data, node):
+    """Update product name data in instance data.
 
     Args:
         instance_data (dict): instance creator data
         node (nuke.Node): nuke node
     """
-    # make sure node name is subset name
-    old_subset_name = instance_data["subset"]
+    # make sure node name is product name
+    old_product_name = instance_data.get("productName")
+    if old_product_name is None:
+        old_product_name = instance_data.get("subset")
     old_variant = instance_data["variant"]
-    subset_name_root = old_subset_name.replace(old_variant, "")
+    product_name_root = old_product_name.replace(old_variant, "")
 
-    new_subset_name = node.name()
-    new_variant = new_subset_name.replace(subset_name_root, "")
+    new_product_name = node.name()
+    new_variant = new_product_name.replace(product_name_root, "")
 
-    instance_data["subset"] = new_subset_name
+    instance_data["productName"] = new_product_name
     instance_data["variant"] = new_variant
 
 
diff --git a/client/ayon_core/hosts/nuke/api/plugin.py b/client/ayon_core/hosts/nuke/api/plugin.py
index bf338a3010..b36dfc56e6 100644
--- a/client/ayon_core/hosts/nuke/api/plugin.py
+++ b/client/ayon_core/hosts/nuke/api/plugin.py
@@ -34,7 +34,7 @@ from ayon_core.lib.transcoding import (
 from .lib import (
     INSTANCE_DATA_KNOB,
     Knobby,
-    check_subsetname_exists,
+    check_product_name_exists,
     maintained_selection,
     get_avalon_knob_data,
     set_avalon_knob_data,
@@ -87,15 +87,15 @@ class NukeCreator(NewCreator):
         for pass_key in keys:
             creator_attrs[pass_key] = pre_create_data[pass_key]
 
-    def check_existing_subset(self, subset_name):
-        """Make sure subset name is unique.
+    def check_existing_product(self, product_name):
+        """Make sure product name is unique.
 
         It search within all nodes recursively
-        and checks if subset name is found in
+        and checks if product name is found in
         any node having instance data knob.
 
         Arguments:
-            subset_name (str): Subset name
+            product_name (str): Subset name
         """
 
         for node in nuke.allNodes(recurseGroups=True):
@@ -108,14 +108,14 @@ class NukeCreator(NewCreator):
                 # a node has no instance data
                 continue
 
-            # test if subset name is matching
-            if node_data.get("subset") == subset_name:
+            # test if product name is matching
+            if node_data.get("productType") == product_name:
                 raise NukeCreatorError(
                     (
                         "A publish instance for '{}' already exists "
                         "in nodes! Please change the variant "
                         "name to ensure unique output."
-                    ).format(subset_name)
+                    ).format(product_name)
                 )
 
     def create_instance_node(
@@ -167,22 +167,22 @@ class NukeCreator(NewCreator):
         else:
             self.selected_nodes = []
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         # make sure selected nodes are added
         self.set_selected_nodes(pre_create_data)
 
-        # make sure subset name is unique
-        self.check_existing_subset(subset_name)
+        # make sure product name is unique
+        self.check_existing_product(product_name)
 
         try:
             instance_node = self.create_instance_node(
-                subset_name,
+                product_name,
                 node_type=instance_data.pop("node_type", None)
             )
             instance = CreatedInstance(
-                self.family,
-                subset_name,
+                self.product_type,
+                product_name,
                 instance_data,
                 self
             )
@@ -227,10 +227,10 @@ class NukeCreator(NewCreator):
         for created_inst, changes in update_list:
             instance_node = created_inst.transient_data["node"]
 
-            # update instance node name if subset name changed
-            if "subset" in changes.changed_keys:
+            # update instance node name if product name changed
+            if "productName" in changes.changed_keys:
                 instance_node["name"].setValue(
-                    changes["subset"].new_value
+                    changes["productName"].new_value
                 )
 
             # in case node is not existing anymore (user erased it manually)
@@ -271,7 +271,7 @@ class NukeWriteCreator(NukeCreator):
 
     identifier = "create_write"
     label = "Create Write"
-    family = "write"
+    product_type = "write"
     icon = "sign-out"
 
     def get_linked_knobs(self):
@@ -355,22 +355,22 @@ class NukeWriteCreator(NukeCreator):
             label="Review"
         )
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         # make sure selected nodes are added
         self.set_selected_nodes(pre_create_data)
 
-        # make sure subset name is unique
-        self.check_existing_subset(subset_name)
+        # make sure product name is unique
+        self.check_existing_product(product_name)
 
         instance_node = self.create_instance_node(
-            subset_name,
+            product_name,
             instance_data
         )
 
         try:
             instance = CreatedInstance(
-                self.family,
-                subset_name,
+                self.product_type,
+                product_name,
                 instance_data,
                 self
             )
@@ -417,54 +417,6 @@ class NukeWriteCreator(NukeCreator):
         self.temp_rendering_path_template = temp_rendering_path_template
 
 
-class OpenPypeCreator(LegacyCreator):
-    """Pype Nuke Creator class wrapper"""
-    node_color = "0xdfea5dff"
-
-    def __init__(self, *args, **kwargs):
-        super(OpenPypeCreator, self).__init__(*args, **kwargs)
-        if check_subsetname_exists(
-                nuke.allNodes(),
-                self.data["subset"]):
-            msg = ("The subset name `{0}` is already used on a node in"
-                   "this workfile.".format(self.data["subset"]))
-            self.log.error(msg + "\n\nPlease use other subset name!")
-            raise NameError("`{0}: {1}".format(__name__, msg))
-        return
-
-    def process(self):
-        from nukescripts import autoBackdrop
-
-        instance = None
-
-        if (self.options or {}).get("useSelection"):
-
-            nodes = nuke.selectedNodes()
-            if not nodes:
-                nuke.message("Please select nodes that you "
-                             "wish to add to a container")
-                return
-
-            elif len(nodes) == 1:
-                # only one node is selected
-                instance = nodes[0]
-
-        if not instance:
-            # Not using selection or multiple nodes selected
-            bckd_node = autoBackdrop()
-            bckd_node["tile_color"].setValue(int(self.node_color, 16))
-            bckd_node["note_font_size"].setValue(24)
-            bckd_node["label"].setValue("[{}]".format(self.name))
-
-            instance = bckd_node
-
-        # add avalon knobs
-        set_avalon_knob_data(instance, self.data)
-        add_publish_knob(instance)
-
-        return instance
-
-
 def get_instance_group_node_childs(instance):
     """Return list of instance group node children
 
@@ -919,8 +871,8 @@ class ExporterReviewMov(ExporterReview):
         self.log.info(
             "__ add_custom_tags: `{0}`".format(add_custom_tags))
 
-        subset = self.instance.data["subset"]
-        self._temp_nodes[subset] = []
+        product_name = self.instance.data["productName"]
+        self._temp_nodes[product_name] = []
 
         # Read node
         r_node = nuke.createNode("Read")
@@ -940,7 +892,9 @@ class ExporterReviewMov(ExporterReview):
             r_node["raw"].setValue(1)
 
         # connect to Read node
-        self._shift_to_previous_node_and_temp(subset, r_node, "Read...   `{}`")
+        self._shift_to_previous_node_and_temp(
+            product_name, r_node, "Read...   `{}`"
+        )
 
         # add reformat node
         reformat_nodes_config = kwargs["reformat_nodes_config"]
@@ -954,7 +908,7 @@ class ExporterReviewMov(ExporterReview):
 
                 # connect in order
                 self._connect_to_above_nodes(
-                    node, subset, "Reposition node...   `{}`"
+                    node, product_name, "Reposition node...   `{}`"
                 )
             # append reformated tag
             add_tags.append("reformated")
@@ -966,7 +920,9 @@ class ExporterReviewMov(ExporterReview):
                 ipn = get_view_process_node()
                 if ipn is not None:
                     # connect to ViewProcess node
-                    self._connect_to_above_nodes(ipn, subset, "ViewProcess...   `{}`")
+                    self._connect_to_above_nodes(
+                        ipn, product_name, "ViewProcess...   `{}`"
+                    )
 
             if not self.viewer_lut_raw:
                 # OCIODisplay
@@ -990,7 +946,9 @@ class ExporterReviewMov(ExporterReview):
                         view=viewer
                     )
 
-                self._connect_to_above_nodes(dag_node, subset, "OCIODisplay...   `{}`")
+                self._connect_to_above_nodes(
+                    dag_node, product_name, "OCIODisplay...   `{}`"
+                )
         # Write node
         write_node = nuke.createNode("Write")
         self.log.debug("Path: {}".format(self.path))
@@ -1017,8 +975,10 @@ class ExporterReviewMov(ExporterReview):
         write_node["raw"].setValue(1)
         # connect
         write_node.setInput(0, self.previous_node)
-        self._temp_nodes[subset].append(write_node)
-        self.log.debug("Write...   `{}`".format(self._temp_nodes[subset]))
+        self._temp_nodes[product_name].append(write_node)
+        self.log.debug("Write...   `{}`".format(
+            self._temp_nodes[product_name])
+        )
         # ---------- end nodes creation
 
         # ---------- render or save to nk
@@ -1043,172 +1003,19 @@ class ExporterReviewMov(ExporterReview):
 
         self.log.debug("Representation...   `{}`".format(self.data))
 
-        self.clean_nodes(subset)
+        self.clean_nodes(product_name)
         nuke.scriptSave()
 
         return self.data
 
-    def _shift_to_previous_node_and_temp(self, subset, node, message):
-        self._temp_nodes[subset].append(node)
+    def _shift_to_previous_node_and_temp(self, product_name, node, message):
+        self._temp_nodes[product_name].append(node)
         self.previous_node = node
-        self.log.debug(message.format(self._temp_nodes[subset]))
+        self.log.debug(message.format(self._temp_nodes[product_name]))
 
-    def _connect_to_above_nodes(self, node, subset, message):
+    def _connect_to_above_nodes(self, node, product_name, message):
         node.setInput(0, self.previous_node)
-        self._shift_to_previous_node_and_temp(subset, node, message)
-
-
-@deprecated("ayon_core.hosts.nuke.api.plugin.NukeWriteCreator")
-class AbstractWriteRender(OpenPypeCreator):
-    """Abstract creator to gather similar implementation for Write creators"""
-    name = ""
-    label = ""
-    hosts = ["nuke"]
-    n_class = "Write"
-    family = "render"
-    icon = "sign-out"
-    defaults = ["Main", "Mask"]
-    knobs = []
-    prenodes = []
-
-    def __init__(self, *args, **kwargs):
-        super(AbstractWriteRender, self).__init__(*args, **kwargs)
-
-        data = OrderedDict()
-
-        data["family"] = self.family
-        data["families"] = self.n_class
-
-        for k, v in self.data.items():
-            if k not in data.keys():
-                data.update({k: v})
-
-        self.data = data
-        self.nodes = nuke.selectedNodes()
-
-    def process(self):
-
-        inputs = []
-        outputs = []
-        instance = nuke.toNode(self.data["subset"])
-        selected_node = None
-
-        # use selection
-        if (self.options or {}).get("useSelection"):
-            nodes = self.nodes
-
-            if not (len(nodes) < 2):
-                msg = ("Select only one node. "
-                       "The node you want to connect to, "
-                       "or tick off `Use selection`")
-                self.log.error(msg)
-                nuke.message(msg)
-                return
-
-            if len(nodes) == 0:
-                msg = (
-                    "No nodes selected. Please select a single node to connect"
-                    " to or tick off `Use selection`"
-                )
-                self.log.error(msg)
-                nuke.message(msg)
-                return
-
-            selected_node = nodes[0]
-            inputs = [selected_node]
-            outputs = selected_node.dependent()
-
-            if instance:
-                if (instance.name() in selected_node.name()):
-                    selected_node = instance.dependencies()[0]
-
-        # if node already exist
-        if instance:
-            # collect input / outputs
-            inputs = instance.dependencies()
-            outputs = instance.dependent()
-            selected_node = inputs[0]
-            # remove old one
-            nuke.delete(instance)
-
-        # recreate new
-        write_data = {
-            "nodeclass": self.n_class,
-            "families": [self.family],
-            "avalon": self.data,
-            "subset": self.data["subset"],
-            "knobs": self.knobs
-        }
-
-        # add creator data
-        creator_data = {"creator": self.__class__.__name__}
-        self.data.update(creator_data)
-        write_data.update(creator_data)
-
-        write_node = self._create_write_node(
-            selected_node,
-            inputs,
-            outputs,
-            write_data
-        )
-
-        # relinking to collected connections
-        for i, input in enumerate(inputs):
-            write_node.setInput(i, input)
-
-        write_node.autoplace()
-
-        for output in outputs:
-            output.setInput(0, write_node)
-
-        write_node = self._modify_write_node(write_node)
-
-        return write_node
-
-    def is_legacy(self):
-        """Check if it needs to run legacy code
-
-        In case where `type` key is missing in single
-        knob it is legacy project anatomy.
-
-        Returns:
-            bool: True if legacy
-        """
-        imageio_nodes = get_nuke_imageio_settings()["nodes"]
-        node = imageio_nodes["required_nodes"][0]
-        if "type" not in node["knobs"][0]:
-            # if type is not yet in project anatomy
-            return True
-        elif next(iter(
-            _k for _k in node["knobs"]
-            if _k.get("type") == "__legacy__"
-        ), None):
-            # in case someone re-saved anatomy
-            # with old configuration
-            return True
-
-    @abstractmethod
-    def _create_write_node(self, selected_node, inputs, outputs, write_data):
-        """Family dependent implementation of Write node creation
-
-        Args:
-            selected_node (nuke.Node)
-            inputs (list of nuke.Node) - input dependencies (what is connected)
-            outputs (list of nuke.Node) - output dependencies
-            write_data (dict) - values used to fill Knobs
-        Returns:
-            node (nuke.Node): group node with  data as Knobs
-        """
-        pass
-
-    @abstractmethod
-    def _modify_write_node(self, write_node):
-        """Family dependent modification of created 'write_node'
-
-        Returns:
-            node (nuke.Node): group node with data as Knobs
-        """
-        pass
+        self._shift_to_previous_node_and_temp(product_name, node, message)
 
 
 def convert_to_valid_instaces():
@@ -1216,7 +1023,7 @@ def convert_to_valid_instaces():
 
     Also save as new minor version of workfile.
     """
-    def family_to_identifier(family):
+    def product_type_to_identifier(product_type):
         mapping = {
             "render": "create_write_render",
             "prerender": "create_write_prerender",
@@ -1228,7 +1035,7 @@ def convert_to_valid_instaces():
             "source": "create_source"
 
         }
-        return mapping[family]
+        return mapping[product_type]
 
     from ayon_core.hosts.nuke.api import workio
 
@@ -1287,7 +1094,10 @@ def convert_to_valid_instaces():
 
         transfer_data["task"] = task_name
 
-        family = avalon_knob_data["family"]
+        product_type = avalon_knob_data.get("productType")
+        if product_type is None:
+            product_type = avalon_knob_data["family"]
+
         # establish families
         families_ak = avalon_knob_data.get("families", [])
 
@@ -1305,11 +1115,13 @@ def convert_to_valid_instaces():
                 node["publish"].value())
 
         # add idetifier
-        transfer_data["creator_identifier"] = family_to_identifier(family)
+        transfer_data["creator_identifier"] = product_type_to_identifier(
+            product_type
+        )
 
         # Add all nodes in group instances.
         if node.Class() == "Group":
-            # only alter families for render family
+            # only alter families for render product type
             if families_ak and "write" in families_ak.lower():
                 target = node["render"].value()
                 if target == "Use existing frames":
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py b/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py
index 530392c635..cefd9501ec 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/create_backdrop.py
@@ -12,7 +12,7 @@ class CreateBackdrop(NukeCreator):
 
     identifier = "create_backdrop"
     label = "Nukenodes (backdrop)"
-    family = "nukenodes"
+    product_type = "nukenodes"
     icon = "file-archive-o"
     maintain_selection = True
 
@@ -38,12 +38,12 @@ class CreateBackdrop(NukeCreator):
 
             return created_node
 
-    def create(self, subset_name, instance_data, pre_create_data):
-        # make sure subset name is unique
-        self.check_existing_subset(subset_name)
+    def create(self, product_name, instance_data, pre_create_data):
+        # make sure product name is unique
+        self.check_existing_product(product_name)
 
         instance = super(CreateBackdrop, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data
         )
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_camera.py b/client/ayon_core/hosts/nuke/plugins/create/create_camera.py
index 7ade19d846..764de84dcf 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_camera.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/create_camera.py
@@ -14,7 +14,7 @@ class CreateCamera(NukeCreator):
 
     identifier = "create_camera"
     label = "Camera (3d)"
-    family = "camera"
+    product_type = "camera"
     icon = "camera"
 
     # plugin attributes
@@ -44,12 +44,12 @@ class CreateCamera(NukeCreator):
 
             return created_node
 
-    def create(self, subset_name, instance_data, pre_create_data):
-        # make sure subset name is unique
-        self.check_existing_subset(subset_name)
+    def create(self, product_name, instance_data, pre_create_data):
+        # make sure product name is unique
+        self.check_existing_product(product_name)
 
         instance = super(CreateCamera, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data
         )
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py b/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py
index 51c5b1931b..ccc6aa13bd 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/create_gizmo.py
@@ -11,7 +11,7 @@ class CreateGizmo(NukeCreator):
 
     identifier = "create_gizmo"
     label = "Gizmo (group)"
-    family = "gizmo"
+    product_type = "gizmo"
     icon = "file-archive-o"
     default_variants = ["ViewerInput", "Lut", "Effect"]
 
@@ -42,12 +42,12 @@ class CreateGizmo(NukeCreator):
 
             return created_node
 
-    def create(self, subset_name, instance_data, pre_create_data):
-        # make sure subset name is unique
-        self.check_existing_subset(subset_name)
+    def create(self, product_name, instance_data, pre_create_data):
+        # make sure product name is unique
+        self.check_existing_product(product_name)
 
         instance = super(CreateGizmo, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data
         )
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_model.py b/client/ayon_core/hosts/nuke/plugins/create/create_model.py
index db927171cd..507b7a1b57 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_model.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/create_model.py
@@ -11,7 +11,7 @@ class CreateModel(NukeCreator):
 
     identifier = "create_model"
     label = "Model (3d)"
-    family = "model"
+    product_type = "model"
     icon = "cube"
     default_variants = ["Main"]
 
@@ -42,12 +42,12 @@ class CreateModel(NukeCreator):
 
             return created_node
 
-    def create(self, subset_name, instance_data, pre_create_data):
-        # make sure subset name is unique
-        self.check_existing_subset(subset_name)
+    def create(self, product_name, instance_data, pre_create_data):
+        # make sure product name is unique
+        self.check_existing_product(product_name)
 
         instance = super(CreateModel, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data
         )
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_source.py b/client/ayon_core/hosts/nuke/plugins/create/create_source.py
index be9fa44929..ac6b8f694b 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_source.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/create_source.py
@@ -17,7 +17,7 @@ class CreateSource(NukeCreator):
 
     identifier = "create_source"
     label = "Source (read)"
-    family = "source"
+    product_type = "source"
     icon = "film"
     default_variants = ["Effect", "Backplate", "Fire", "Smoke"]
 
@@ -35,7 +35,7 @@ class CreateSource(NukeCreator):
 
         return read_node
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         # make sure selected nodes are added
         self.set_selected_nodes(pre_create_data)
@@ -46,18 +46,18 @@ class CreateSource(NukeCreator):
                     continue
 
                 node_name = read_node.name()
-                _subset_name = subset_name + node_name
+                _product_name = product_name + node_name
 
-                # make sure subset name is unique
-                self.check_existing_subset(_subset_name)
+                # make sure product name is unique
+                self.check_existing_product(_product_name)
 
                 instance_node = self.create_instance_node(
-                    _subset_name,
+                    _product_name,
                     read_node
                 )
                 instance = CreatedInstance(
-                    self.family,
-                    _subset_name,
+                    self.product_type,
+                    _product_name,
                     instance_data,
                     self
                 )
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py b/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py
index 125cf057f8..770726e34f 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/create_write_image.py
@@ -18,7 +18,7 @@ from ayon_core.hosts.nuke.api.plugin import exposed_write_knobs
 class CreateWriteImage(napi.NukeWriteCreator):
     identifier = "create_write_image"
     label = "Image (write)"
-    family = "image"
+    product_type = "image"
     icon = "sign-out"
 
     instance_attributes = [
@@ -64,18 +64,18 @@ class CreateWriteImage(napi.NukeWriteCreator):
             default=nuke.frame()
         )
 
-    def create_instance_node(self, subset_name, instance_data):
+    def create_instance_node(self, product_name, instance_data):
 
         # add fpath_template
         write_data = {
             "creator": self.__class__.__name__,
-            "subset": subset_name,
+            "productName": product_name,
             "fpath_template": self.temp_rendering_path_template
         }
         write_data.update(instance_data)
 
         created_node = napi.create_write_node(
-            subset_name,
+            product_name,
             write_data,
             input=self.selected_node,
             prenodes=self.prenodes,
@@ -91,8 +91,8 @@ class CreateWriteImage(napi.NukeWriteCreator):
 
         return created_node
 
-    def create(self, subset_name, instance_data, pre_create_data):
-        subset_name = subset_name.format(**pre_create_data)
+    def create(self, product_name, instance_data, pre_create_data):
+        product_name = product_name.format(**pre_create_data)
 
         # pass values from precreate to instance
         self.pass_pre_attributes_to_instance(
@@ -107,18 +107,18 @@ class CreateWriteImage(napi.NukeWriteCreator):
         # make sure selected nodes are added
         self.set_selected_nodes(pre_create_data)
 
-        # make sure subset name is unique
-        self.check_existing_subset(subset_name)
+        # make sure product name is unique
+        self.check_existing_product(product_name)
 
         instance_node = self.create_instance_node(
-            subset_name,
+            product_name,
             instance_data,
         )
 
         try:
             instance = CreatedInstance(
-                self.family,
-                subset_name,
+                self.product_type,
+                product_name,
                 instance_data,
                 self
             )
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py b/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py
index 371ef85a15..96ac2fac9c 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/create_write_prerender.py
@@ -15,7 +15,7 @@ from ayon_core.hosts.nuke.api.plugin import exposed_write_knobs
 class CreateWritePrerender(napi.NukeWriteCreator):
     identifier = "create_write_prerender"
     label = "Prerender (write)"
-    family = "prerender"
+    product_type = "prerender"
     icon = "sign-out"
 
     instance_attributes = [
@@ -45,11 +45,11 @@ class CreateWritePrerender(napi.NukeWriteCreator):
         ]
         return attr_defs
 
-    def create_instance_node(self, subset_name, instance_data):
+    def create_instance_node(self, product_name, instance_data):
         # add fpath_template
         write_data = {
             "creator": self.__class__.__name__,
-            "subset": subset_name,
+            "productName": product_name,
             "fpath_template": self.temp_rendering_path_template
         }
 
@@ -64,7 +64,7 @@ class CreateWritePrerender(napi.NukeWriteCreator):
             width, height = (actual_format.width(), actual_format.height())
 
         created_node = napi.create_write_node(
-            subset_name,
+            product_name,
             write_data,
             input=self.selected_node,
             prenodes=self.prenodes,
@@ -81,7 +81,7 @@ class CreateWritePrerender(napi.NukeWriteCreator):
 
         return created_node
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         # pass values from precreate to instance
         self.pass_pre_attributes_to_instance(
             instance_data,
@@ -94,18 +94,18 @@ class CreateWritePrerender(napi.NukeWriteCreator):
         # make sure selected nodes are added
         self.set_selected_nodes(pre_create_data)
 
-        # make sure subset name is unique
-        self.check_existing_subset(subset_name)
+        # make sure product name is unique
+        self.check_existing_product(product_name)
 
         instance_node = self.create_instance_node(
-            subset_name,
+            product_name,
             instance_data
         )
 
         try:
             instance = CreatedInstance(
-                self.family,
-                subset_name,
+                self.product_type,
+                product_name,
                 instance_data,
                 self
             )
diff --git a/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py b/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py
index c5f4d5003a..24bddb3d26 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/create_write_render.py
@@ -15,7 +15,7 @@ from ayon_core.hosts.nuke.api.plugin import exposed_write_knobs
 class CreateWriteRender(napi.NukeWriteCreator):
     identifier = "create_write_render"
     label = "Render (write)"
-    family = "render"
+    product_type = "render"
     icon = "sign-out"
 
     instance_attributes = [
@@ -39,11 +39,11 @@ class CreateWriteRender(napi.NukeWriteCreator):
         ]
         return attr_defs
 
-    def create_instance_node(self, subset_name, instance_data):
+    def create_instance_node(self, product_name, instance_data):
         # add fpath_template
         write_data = {
             "creator": self.__class__.__name__,
-            "subset": subset_name,
+            "productName": product_name,
             "fpath_template": self.temp_rendering_path_template
         }
 
@@ -61,7 +61,7 @@ class CreateWriteRender(napi.NukeWriteCreator):
         self.log.debug(">>>>>>> : {}".format(self.get_linked_knobs()))
 
         created_node = napi.create_write_node(
-            subset_name,
+            product_name,
             write_data,
             input=self.selected_node,
             prenodes=self.prenodes,
@@ -76,7 +76,7 @@ class CreateWriteRender(napi.NukeWriteCreator):
 
         return created_node
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         # pass values from precreate to instance
         self.pass_pre_attributes_to_instance(
             instance_data,
@@ -88,18 +88,18 @@ class CreateWriteRender(napi.NukeWriteCreator):
         # make sure selected nodes are added
         self.set_selected_nodes(pre_create_data)
 
-        # make sure subset name is unique
-        self.check_existing_subset(subset_name)
+        # make sure product name is unique
+        self.check_existing_product(product_name)
 
         instance_node = self.create_instance_node(
-            subset_name,
+            product_name,
             instance_data
         )
 
         try:
             instance = CreatedInstance(
-                self.family,
-                subset_name,
+                self.product_type,
+                product_name,
                 instance_data,
                 self
             )
diff --git a/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py b/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py
index 87f62b011e..0a0467787a 100644
--- a/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py
+++ b/client/ayon_core/hosts/nuke/plugins/create/workfile_creator.py
@@ -13,7 +13,7 @@ import nuke
 
 class WorkfileCreator(AutoCreator):
     identifier = "workfile"
-    family = "workfile"
+    product_type = "workfile"
 
     default_variant = "Main"
 
@@ -32,9 +32,12 @@ class WorkfileCreator(AutoCreator):
         host_name = self.create_context.host_name
 
         asset_doc = get_asset_by_name(project_name, asset_name)
-        subset_name = self.get_subset_name(
-            self.default_variant, task_name, asset_doc,
-            project_name, host_name
+        product_name = self.get_product_name(
+            project_name,
+            asset_doc,
+            task_name,
+            self.default_variant,
+            host_name,
         )
         instance_data.update({
             "asset": asset_name,
@@ -42,12 +45,16 @@ class WorkfileCreator(AutoCreator):
             "variant": self.default_variant
         })
         instance_data.update(self.get_dynamic_data(
-            self.default_variant, task_name, asset_doc,
-            project_name, host_name, instance_data
+            project_name,
+            asset_doc,
+            task_name,
+            self.default_variant,
+            host_name,
+            instance_data
         ))
 
         instance = CreatedInstance(
-            self.family, subset_name, instance_data, self
+            self.product_type, product_name, instance_data, self
         )
         instance.transient_data["node"] = root_node
         self._add_instance_to_context(instance)
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_gizmo.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_gizmo.py
index c410de7c32..fda1c7ac31 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_gizmo.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_gizmo.py
@@ -15,8 +15,8 @@ class CollectGizmo(pyblish.api.InstancePlugin):
 
         gizmo_node = instance.data["transientData"]["node"]
 
-        # add family to familiess
-        instance.data["families"].insert(0, instance.data["family"])
+        # add product type to familiess
+        instance.data["families"].insert(0, instance.data["productType"])
         # make label nicer
         instance.data["label"] = gizmo_node.name()
 
@@ -25,6 +25,7 @@ class CollectGizmo(pyblish.api.InstancePlugin):
         handle_end = instance.context.data["handleEnd"]
         first_frame = int(nuke.root()["first_frame"].getValue())
         last_frame = int(nuke.root()["last_frame"].getValue())
+        families = [instance.data["productType"]] + instance.data["families"]
 
         # Add version data to instance
         version_data = {
@@ -33,8 +34,8 @@ class CollectGizmo(pyblish.api.InstancePlugin):
             "frameStart": first_frame + handle_start,
             "frameEnd": last_frame - handle_end,
             "colorspace": nuke.root().knob('workingSpaceLUT').value(),
-            "families": [instance.data["family"]] + instance.data["families"],
-            "subset": instance.data["subset"],
+            "families": families,
+            "productName": instance.data["productName"],
             "fps": instance.context.data["fps"]
         }
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_model.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_model.py
index a099f06be0..1a2bc9c019 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_model.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_model.py
@@ -15,8 +15,8 @@ class CollectModel(pyblish.api.InstancePlugin):
 
         geo_node = instance.data["transientData"]["node"]
 
-        # add family to familiess
-        instance.data["families"].insert(0, instance.data["family"])
+        # add product type to familiess
+        instance.data["families"].insert(0, instance.data["productType"])
         # make label nicer
         instance.data["label"] = geo_node.name()
 
@@ -25,7 +25,7 @@ class CollectModel(pyblish.api.InstancePlugin):
         handle_end = instance.context.data["handleEnd"]
         first_frame = int(nuke.root()["first_frame"].getValue())
         last_frame = int(nuke.root()["last_frame"].getValue())
-
+        families = [instance.data["productType"]] + instance.data["families"]
         # Add version data to instance
         version_data = {
             "handleStart": handle_start,
@@ -33,8 +33,8 @@ class CollectModel(pyblish.api.InstancePlugin):
             "frameStart": first_frame + handle_start,
             "frameEnd": last_frame - handle_end,
             "colorspace": nuke.root().knob('workingSpaceLUT').value(),
-            "families": [instance.data["family"]] + instance.data["families"],
-            "subset": instance.data["subset"],
+            "families": families,
+            "productName": instance.data["productName"],
             "fps": instance.context.data["fps"]
         }
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_nuke_instance_data.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
index 75380bf409..951072ff3f 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_nuke_instance_data.py
@@ -12,10 +12,10 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
     hosts = ["nuke", "nukeassist"]
 
     # presets
-    sync_workfile_version_on_product_types = []
+    sync_workfile_version_on_families = []
 
     def process(self, instance):
-        family = instance.data["family"]
+        product_type = instance.data["productType"]
 
         # Get format
         root = nuke.root()
@@ -25,10 +25,10 @@ class CollectInstanceData(pyblish.api.InstancePlugin):
         pixel_aspect = format_.pixelAspect()
 
         # sync workfile version
-        if family in self.sync_workfile_version_on_product_types:
+        if product_type in self.sync_workfile_version_on_families:
             self.log.debug(
                 "Syncing version with workfile for '{}'".format(
-                    family
+                    product_type
                 )
             )
             # get version to instance for integration
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_reads.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_reads.py
index 38938a3dda..af17933eb1 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_reads.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_reads.py
@@ -99,8 +99,8 @@ class CollectNukeReads(pyblish.api.InstancePlugin):
             "frameStart": first_frame + handle_start,
             "frameEnd": last_frame - handle_end,
             "colorspace": colorspace,
-            "families": [instance.data["family"]],
-            "subset": instance.data["subset"],
+            "families": [instance.data["productType"]],
+            "productName": instance.data["productName"],
             "fps": instance.context.data["fps"]
         }
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py b/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py
index 84dc7992a5..58afb2cd1f 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/collect_writes.py
@@ -138,14 +138,14 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
             render_target (str): render target
             colorspace (str): colorspace
         """
-        family = instance.data["family"]
+        product_type = instance.data["productType"]
 
         # add targeted family to families
         instance.data["families"].append(
-            "{}.{}".format(family, render_target)
+            "{}.{}".format(product_type, render_target)
         )
         self.log.debug("Appending render target to families: {}.{}".format(
-            family, render_target)
+            product_type, render_target)
         )
 
         write_node = self._write_node_helper(instance)
@@ -175,7 +175,7 @@ class CollectNukeWrites(pyblish.api.InstancePlugin,
             "colorspace": colorspace
         })
 
-        if family == "render":
+        if product_type == "render":
             instance.data.update({
                 "handleStart": handle_start,
                 "handleEnd": handle_end,
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py
index 810a2e0a76..1f5a8c73e1 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_camera.py
@@ -38,7 +38,7 @@ class ExtractCamera(publish.Extractor):
 
         rm_nodes = []
         self.log.debug("Creating additional nodes for 3D Camera Extractor")
-        subset = instance.data["subset"]
+        product_name = instance.data["productName"]
         staging_dir = self.staging_dir(instance)
 
         # get extension form preset
@@ -50,7 +50,7 @@ class ExtractCamera(publish.Extractor):
                 "Talk to your supervisor or pipeline admin")
 
         # create file name and path
-        filename = subset + ".{}".format(extension)
+        filename = product_name + ".{}".format(extension)
         file_path = os.path.join(staging_dir, filename).replace("\\", "/")
 
         with maintained_selection():
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py
index 6f35e95630..36896fe595 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_model.py
@@ -40,7 +40,7 @@ class ExtractModel(publish.Extractor):
         model_node = instance.data["transientData"]["node"]
 
         self.log.debug("Creating additional nodes for Extract Model")
-        subset = instance.data["subset"]
+        product_name = instance.data["productName"]
         staging_dir = self.staging_dir(instance)
 
         extension = next((k[1] for k in self.write_geo_knobs
@@ -51,7 +51,7 @@ class ExtractModel(publish.Extractor):
                 "Talk to your supervisor or pipeline admin")
 
         # create file name and path
-        filename = subset + ".{}".format(extension)
+        filename = product_name + ".{}".format(extension)
         file_path = os.path.join(staging_dir, filename).replace("\\", "/")
 
         with maintained_selection():
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py
index 45514ede5e..c8be2a5564 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_render_local.py
@@ -38,7 +38,7 @@ class NukeRenderLocal(publish.Extractor,
 
         self.log.debug("instance collected: {}".format(instance.data))
 
-        node_subset_name = instance.data.get("name", None)
+        node_product_name = instance.data.get("name", None)
 
         first_frame = instance.data.get("frameStartHandle", None)
         last_frame = instance.data.get("frameEndHandle", None)
@@ -80,7 +80,7 @@ class NukeRenderLocal(publish.Extractor,
 
             # Render frames
             nuke.execute(
-                str(node_subset_name),
+                str(node_product_name),
                 int(render_first_frame),
                 int(render_last_frame)
             )
@@ -125,21 +125,28 @@ class NukeRenderLocal(publish.Extractor,
         ))
 
         families = instance.data["families"]
+        anatomy_data = instance.data["anatomyData"]
         # redefinition of families
         if "render.local" in families:
-            instance.data['family'] = 'render'
-            families.remove('render.local')
+            instance.data["family"] = "render"
+            instance.data["productType"] = "render"
+            families.remove("render.local")
             families.insert(0, "render2d")
-            instance.data["anatomyData"]["family"] = "render"
+            anatomy_data["family"] = "render"
+            anatomy_data["product"]["type"] = "render"
         elif "prerender.local" in families:
-            instance.data['family'] = 'prerender'
-            families.remove('prerender.local')
+            instance.data["family"] = "prerender"
+            instance.data["productType"] = "prerender"
+            families.remove("prerender.local")
             families.insert(0, "prerender")
-            instance.data["anatomyData"]["family"] = "prerender"
+            anatomy_data["family"] = "prerender"
+            anatomy_data["product"]["type"] = "prerender"
         elif "image.local" in families:
-            instance.data['family'] = 'image'
-            families.remove('image.local')
-            instance.data["anatomyData"]["family"] = "image"
+            instance.data["family"] = "image"
+            instance.data["productType"] = "image"
+            families.remove("image.local")
+            anatomy_data["family"] = "image"
+            anatomy_data["product"]["type"] = "image"
         instance.data["families"] = families
 
         collections, remainder = clique.assemble(filenames)
@@ -160,7 +167,7 @@ class NukeRenderLocal(publish.Extractor,
         These are base of files which will be extended/fixed for specific
         frames.
         Renames published file to expected file name based on frame, eg.
-        test_project_test_asset_subset_v005.1001.exr > new_render.1001.exr
+        test_project_test_asset_product_v005.1001.exr > new_render.1001.exr
         """
         last_published = instance.data["last_version_published_files"]
         last_published_and_frames = collect_frames(last_published)
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py
index 1f4410d347..8ac07c641c 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_review_intermediates.py
@@ -53,11 +53,11 @@ class ExtractReviewIntermediates(publish.Extractor):
         # TODO 'families' should not be included for filtering of outputs
         families = set(instance.data["families"])
 
-        # add main family to make sure all families are compared
-        families.add(instance.data["family"])
+        # Add product type to families
+        families.add(instance.data["productType"])
 
         task_type = instance.context.data["taskType"]
-        subset = instance.data["subset"]
+        product_name = instance.data["productName"]
         self.log.debug("Creating staging dir...")
 
         if "representations" not in instance.data:
@@ -93,8 +93,8 @@ class ExtractReviewIntermediates(publish.Extractor):
                         f_task_types, task_type))
 
                 self.log.debug(
-                    "product_names `{}` > subset: {}".format(
-                        product_names, subset))
+                    "product_names `{}` > product: {}".format(
+                        product_names, product_name))
 
                 # test if family found in context
                 # using intersection to make sure all defined
@@ -111,7 +111,7 @@ class ExtractReviewIntermediates(publish.Extractor):
 
                 # test subsets from filter
                 if product_names and not any(
-                    re.search(p, subset) for p in product_names
+                    re.search(p, product_name) for p in product_names
                 ):
                     continue
 
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py b/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py
index 6918e4f50f..c013da84d2 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/extract_slate_frame.py
@@ -115,7 +115,7 @@ class ExtractSlateFrame(publish.Extractor):
         """Slate frame renderer
 
         Args:
-            instance (PyblishInstance): Pyblish instance with subset data
+            instance (PyblishInstance): Pyblish instance with product data
             output_name (str, optional):
                 Slate variation name. Defaults to None.
             bake_viewer_process (bool, optional):
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 c047347481..217fe6fb85 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
@@ -29,7 +29,8 @@ class RepairExposedKnobs(pyblish.api.Action):
                 if x.Class() == "Write":
                     write_node = x
 
-            plugin_name = plugin.families_mapping[instance.data["family"]]
+            product_type = instance.data["productType"]
+            plugin_name = plugin.product_types_mapping[product_type]
             nuke_settings = instance.context.data["project_settings"]["nuke"]
             create_settings = nuke_settings["create"][plugin_name]
             exposed_knobs = create_settings["exposed_knobs"]
@@ -51,7 +52,7 @@ class ValidateExposedKnobs(
     label = "Validate Exposed Knobs"
     actions = [RepairExposedKnobs]
     hosts = ["nuke"]
-    families_mapping = {
+    product_types_mapping = {
         "render": "CreateWriteRender",
         "prerender": "CreateWritePrerender",
         "image": "CreateWriteImage"
@@ -61,7 +62,8 @@ class ValidateExposedKnobs(
         if not self.is_active(instance.data):
             return
 
-        plugin = self.families_mapping[instance.data["family"]]
+        product_type = instance.data["productType"]
+        plugin = self.product_types_mapping[product_type]
         group_node = instance.data["transientData"]["node"]
         nuke_settings = instance.context.data["project_settings"]["nuke"]
         create_settings = nuke_settings["create"][plugin]
diff --git a/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py b/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py
index bede67dabe..281e172788 100644
--- a/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py
+++ b/client/ayon_core/hosts/nuke/plugins/publish/validate_knobs.py
@@ -67,7 +67,7 @@ class ValidateKnobs(pyblish.api.ContextPlugin):
             settings_knobs = json.loads(cls.knobs)
 
             # Filter families.
-            families = [instance.data["family"]]
+            families = [instance.data["productType"]]
             families += instance.data.get("families", [])
 
             # Get all knobs to validate.
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 5eb58a3679..84e99f34c4 100644
--- a/client/ayon_core/hosts/nuke/startup/custom_write_node.py
+++ b/client/ayon_core/hosts/nuke/startup/custom_write_node.py
@@ -111,9 +111,14 @@ class WriteNodeKnobSettingPanel(nukescripts.PythonPanel):
         )
         for write_node in write_selected_nodes:
             # data for mapping the path
+            # TODO add more fill data
+            product_name = write_node["name"].value()
             data = {
                 "work": os.getenv("AYON_WORKDIR"),
-                "subset": write_node["name"].value(),
+                "subset": product_name,
+                "product": {
+                    "name": product_name,
+                },
                 "frame": "#" * frame_padding,
                 "ext": ext
             }
@@ -139,6 +144,7 @@ class WriteNodeKnobSettingPanel(nukescripts.PythonPanel):
                 knobs_nodes = settings[i]["knobs"]
 
         for setting in settings:
+            # TODO change 'subsets' to 'product_names' in settings
             for subset in setting["subsets"]:
                 preset_name.append(subset)
 
diff --git a/client/ayon_core/hosts/photoshop/api/README.md b/client/ayon_core/hosts/photoshop/api/README.md
index 02868753d1..51a9b9ad5e 100644
--- a/client/ayon_core/hosts/photoshop/api/README.md
+++ b/client/ayon_core/hosts/photoshop/api/README.md
@@ -55,7 +55,7 @@ class CreateImage(photoshop.Creator):
 
     name = "imageDefault"
     label = "Image"
-    family = "image"
+    product_type = "image"
 
     def __init__(self, *args, **kwargs):
         super(CreateImage, self).__init__(*args, **kwargs)
@@ -114,7 +114,7 @@ class CollectInstances(pyblish.api.ContextPlugin):
             instance.append(layer)
             instance.data.update(layer_data)
             instance.data["families"] = self.families_mapping[
-                layer_data["family"]
+                layer_data["productType"]
             ]
             instance.data["publish"] = layer.visible
 
diff --git a/client/ayon_core/hosts/photoshop/api/plugin.py b/client/ayon_core/hosts/photoshop/api/plugin.py
index 22645a1f9b..d4eb38300f 100644
--- a/client/ayon_core/hosts/photoshop/api/plugin.py
+++ b/client/ayon_core/hosts/photoshop/api/plugin.py
@@ -4,19 +4,21 @@ from ayon_core.pipeline import LoaderPlugin
 from .launch_logic import stub
 
 
-def get_unique_layer_name(layers, asset_name, subset_name):
-    """
-        Gets all layer names and if 'asset_name_subset_name' is present, it
-        increases suffix by 1 (eg. creates unique layer name - for Loader)
+def get_unique_layer_name(layers, asset_name, product_name):
+    """Prepare unique layer name.
+
+    Gets all layer names and if '<asset_name>_<product_name>' is present,
+    it adds suffix '1', or increases the suffix by 1.
+
     Args:
         layers (list) of dict with layers info (name, id etc.)
-        asset_name (string):
-        subset_name (string):
+        asset_name (str):
+        product_name (str):
 
     Returns:
-        (string): name_00X (without version)
+        str: name_00X (without version)
     """
-    name = "{}_{}".format(asset_name, subset_name)
+    name = "{}_{}".format(asset_name, product_name)
     names = {}
     for layer in layers:
         layer_name = re.sub(r'_\d{3}$', '', layer.name)
diff --git a/client/ayon_core/hosts/photoshop/api/ws_stub.py b/client/ayon_core/hosts/photoshop/api/ws_stub.py
index 78cb5fac5d..36fe0af2f8 100644
--- a/client/ayon_core/hosts/photoshop/api/ws_stub.py
+++ b/client/ayon_core/hosts/photoshop/api/ws_stub.py
@@ -117,8 +117,8 @@ class PhotoshopServerStub:
         Stores metadata in format:
         [{
             "active":true,
-            "subset":"imageBG",
-            "family":"image",
+            "productName":"imageBG",
+            "productType":"image",
             "id":"ayon.create.instance",
             "folderPath":"Town",
             "uuid": "8"
@@ -419,8 +419,8 @@ class PhotoshopServerStub:
         Returns:
             (list)
             example:
-                {"8":{"active":true,"subset":"imageBG",
-                      "family":"image","id":"ayon.create.instance",
+                {"8":{"active":true,"productName":"imageBG",
+                      "productType":"image","id":"ayon.create.instance",
                       "folderPath":"/Town"}}
                 8 is layer(group) id - used for deletion, update etc.
         """
diff --git a/client/ayon_core/hosts/photoshop/lib.py b/client/ayon_core/hosts/photoshop/lib.py
index b905caf1bd..6d5be48bc2 100644
--- a/client/ayon_core/hosts/photoshop/lib.py
+++ b/client/ayon_core/hosts/photoshop/lib.py
@@ -34,7 +34,7 @@ class PSAutoCreator(AutoCreator):
     def create(self, options=None):
         existing_instance = None
         for instance in self.create_context.instances:
-            if instance.family == self.family:
+            if instance.product_type == self.product_type:
                 existing_instance = instance
                 break
 
@@ -51,9 +51,12 @@ class PSAutoCreator(AutoCreator):
 
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
             )
             data = {
                 "folderPath": asset_name,
@@ -61,15 +64,19 @@ class PSAutoCreator(AutoCreator):
                 "variant": self.default_variant
             }
             data.update(self.get_dynamic_data(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name, None
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
+                None
             ))
 
             if not self.active_on_create:
                 data["active"] = False
 
             new_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             self._add_instance_to_context(new_instance)
             api.stub().imprint(new_instance.get("instance_id"),
@@ -80,24 +87,30 @@ class PSAutoCreator(AutoCreator):
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
             )
             existing_instance["folderPath"] = asset_name
             existing_instance["task"] = task_name
-            existing_instance["subset"] = subset_name
+            existing_instance["productName"] = product_name
 
 
-def clean_subset_name(subset_name):
-    """Clean all variants leftover {layer} from subset name."""
+def clean_product_name(product_name):
+    """Clean all variants leftover {layer} from product name."""
     dynamic_data = prepare_template_data({"layer": "{layer}"})
     for value in dynamic_data.values():
-        if value in subset_name:
-            subset_name = (subset_name.replace(value, "")
-                                      .replace("__", "_")
-                                      .replace("..", "."))
+        if value in product_name:
+            product_name = (
+                product_name
+                .replace(value, "")
+                .replace("__", "_")
+                .replace("..", ".")
+            )
     # clean trailing separator as Main_
     pattern = r'[\W_]+$'
     replacement = ''
-    return re.sub(pattern, replacement, subset_name)
+    return re.sub(pattern, replacement, product_name)
diff --git a/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py b/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py
index 666fd52f78..11bf92d5fb 100644
--- a/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py
+++ b/client/ayon_core/hosts/photoshop/plugins/create/create_flatten_image.py
@@ -2,8 +2,8 @@ from ayon_core.pipeline import CreatedInstance
 
 from ayon_core.lib import BoolDef
 import ayon_core.hosts.photoshop.api as api
-from ayon_core.hosts.photoshop.lib import PSAutoCreator, clean_subset_name
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.hosts.photoshop.lib import PSAutoCreator, clean_product_name
+from ayon_core.pipeline.create import get_product_name
 from ayon_core.lib import prepare_template_data
 from ayon_core.client import get_asset_by_name
 
@@ -12,10 +12,10 @@ class AutoImageCreator(PSAutoCreator):
     """Creates flatten image from all visible layers.
 
     Used in simplified publishing as auto created instance.
-    Must be enabled in Setting and template for subset name provided
+    Must be enabled in Setting and template for product name provided
     """
     identifier = "auto_image"
-    family = "image"
+    product_type = "image"
 
     # Settings
     default_variant = ""
@@ -43,9 +43,12 @@ class AutoImageCreator(PSAutoCreator):
             existing_instance_asset = existing_instance["folderPath"]
 
         if existing_instance is None:
-            subset_name = self.get_subset_name(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
             )
 
             data = {
@@ -60,7 +63,7 @@ class AutoImageCreator(PSAutoCreator):
             data.update({"creator_attributes": creator_attributes})
 
             new_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             self._add_instance_to_context(new_instance)
             api.stub().imprint(new_instance.get("instance_id"),
@@ -70,13 +73,16 @@ class AutoImageCreator(PSAutoCreator):
             existing_instance_asset != asset_name
             or existing_instance["task"] != task_name
         ):
-            subset_name = self.get_subset_name(
-                self.default_variant, task_name, asset_doc,
-                project_name, host_name
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
+                host_name,
             )
             existing_instance["folderPath"] = asset_name
             existing_instance["task"] = task_name
-            existing_instance["subset"] = subset_name
+            existing_instance["productName"] = product_name
 
             api.stub().imprint(existing_instance.get("instance_id"),
                                existing_instance.data_to_store())
@@ -119,18 +125,25 @@ class AutoImageCreator(PSAutoCreator):
         review for it though.
         """
 
-    def get_subset_name(
-            self,
-            variant,
-            task_name,
-            asset_doc,
-            project_name,
-            host_name=None,
-            instance=None
+    def get_product_name(
+        self,
+        project_name,
+        asset_doc,
+        task_name,
+        variant,
+        host_name=None,
+        instance=None
     ):
+        if host_name is None:
+            host_name = self.create_context.host_name
         dynamic_data = prepare_template_data({"layer": "{layer}"})
-        subset_name = get_subset_name(
-            self.family, variant, task_name, asset_doc,
-            project_name, host_name, dynamic_data=dynamic_data
+        product_name = get_product_name(
+            project_name,
+            asset_doc,
+            task_name,
+            host_name,
+            self.product_type,
+            variant,
+            dynamic_data=dynamic_data
         )
-        return clean_subset_name(subset_name)
+        return clean_product_name(product_name)
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 2ef746fc94..8806aad33c 100644
--- a/client/ayon_core/hosts/photoshop/plugins/create/create_image.py
+++ b/client/ayon_core/hosts/photoshop/plugins/create/create_image.py
@@ -8,9 +8,9 @@ from ayon_core.pipeline import (
     CreatorError
 )
 from ayon_core.lib import prepare_template_data
-from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
+from ayon_core.pipeline.create import PRODUCT_NAME_ALLOWED_SYMBOLS
 from ayon_core.hosts.photoshop.api.pipeline import cache_and_get_instances
-from ayon_core.hosts.photoshop.lib import clean_subset_name
+from ayon_core.hosts.photoshop.lib import clean_product_name
 
 
 class ImageCreator(Creator):
@@ -21,7 +21,7 @@ class ImageCreator(Creator):
     """
     identifier = "image"
     label = "Image"
-    family = "image"
+    product_type = "image"
     description = "Image creator"
 
     # Settings
@@ -29,7 +29,7 @@ class ImageCreator(Creator):
     mark_for_review = False
     active_on_create = True
 
-    def create(self, subset_name_from_ui, data, pre_create_data):
+    def create(self, product_name_from_ui, data, pre_create_data):
         groups_to_create = []
         top_layers_to_wrap = []
         create_empty_group = False
@@ -47,19 +47,19 @@ class ImageCreator(Creator):
                     else:
                         top_layers_to_wrap.append(selected_item)
             else:
-                group = stub.group_selected_layers(subset_name_from_ui)
+                group = stub.group_selected_layers(product_name_from_ui)
                 groups_to_create.append(group)
         else:
             stub.select_layers(stub.get_layers())
             try:
-                group = stub.group_selected_layers(subset_name_from_ui)
+                group = stub.group_selected_layers(product_name_from_ui)
             except:
                 raise CreatorError("Cannot group locked Background layer!")
             groups_to_create.append(group)
 
         # create empty group if nothing selected
         if not groups_to_create and not top_layers_to_wrap:
-            group = stub.create_group(subset_name_from_ui)
+            group = stub.create_group(product_name_from_ui)
             groups_to_create.append(group)
 
         # wrap each top level layer into separate new group
@@ -69,27 +69,27 @@ class ImageCreator(Creator):
             groups_to_create.append(group)
 
         layer_name = ''
-        # use artist chosen option OR force layer if more subsets are created
+        # use artist chosen option OR force layer if more products are created
         # to differentiate them
         use_layer_name = (pre_create_data.get("use_layer_name") or
                           len(groups_to_create) > 1)
         for group in groups_to_create:
-            subset_name = subset_name_from_ui  # reset to name from creator UI
+            product_name = product_name_from_ui  # reset to name from creator UI
             layer_names_in_hierarchy = []
             created_group_name = self._clean_highlights(stub, group.name)
 
             if use_layer_name:
                 layer_name = re.sub(
-                    "[^{}]+".format(SUBSET_NAME_ALLOWED_SYMBOLS),
+                    "[^{}]+".format(PRODUCT_NAME_ALLOWED_SYMBOLS),
                     "",
                     group.name
                 )
-                if "{layer}" not in subset_name.lower():
-                    subset_name += "{Layer}"
+                if "{layer}" not in product_name.lower():
+                    product_name += "{Layer}"
 
             layer_fill = prepare_template_data({"layer": layer_name})
-            subset_name = subset_name.format(**layer_fill)
-            subset_name = clean_subset_name(subset_name)
+            product_name = product_name.format(**layer_fill)
+            product_name = clean_product_name(product_name)
 
             if group.long_name:
                 for directory in group.long_name[::-1]:
@@ -97,7 +97,7 @@ class ImageCreator(Creator):
                     layer_names_in_hierarchy.append(name)
 
             data_update = {
-                "subset": subset_name,
+                "productName": product_name,
                 "members": [str(group.id)],
                 "layer_name": layer_name,
                 "long_name": "_".join(layer_names_in_hierarchy)
@@ -112,8 +112,9 @@ class ImageCreator(Creator):
             if not self.active_on_create:
                 data["active"] = False
 
-            new_instance = CreatedInstance(self.family, subset_name, data,
-                                           self)
+            new_instance = CreatedInstance(
+                self.product_type, product_name, data, self
+            )
 
             stub.imprint(new_instance.get("instance_id"),
                          new_instance.data_to_store())
@@ -159,7 +160,7 @@ class ImageCreator(Creator):
                     label="Create separate instance for each selected"),
             BoolDef("use_layer_name",
                     default=False,
-                    label="Use layer name in subset"),
+                    label="Use layer name in product"),
             BoolDef(
                 "mark_for_review",
                 label="Create separate review",
@@ -189,9 +190,9 @@ class ImageCreator(Creator):
     def get_detail_description(self):
         return """Creator for Image instances
 
-        Main publishable item in Photoshop will be of `image` family. Result of
-        this item (instance) is picture that could be loaded and used
-        in another DCCs (for example as single layer in composition in
+        Main publishable item in Photoshop will be of `image` product type.
+        Result of this item (instance) is picture that could be loaded and
+        used in another DCCs (for example as single layer in composition in
         AfterEffects, reference in Maya etc).
 
         There are couple of options what to publish:
@@ -207,13 +208,13 @@ class ImageCreator(Creator):
         Use 'Create separate instance for each selected' to create separate
         images per selected layer (group of layers).
 
-        'Use layer name in subset' will explicitly add layer name into subset
-        name. Position of this name is configurable in
+        'Use layer name in product' will explicitly add layer name into
+        product name. Position of this name is configurable in
         `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.
+        as a suffix to product name.
 
         Each image could have its separate review created if necessary via
         `Create separate review` toggle.
@@ -243,8 +244,15 @@ class ImageCreator(Creator):
         return item.replace(stub.PUBLISH_ICON, '').replace(stub.LOADED_ICON,
                                                            '')
 
-    def get_dynamic_data(self, variant, task_name, asset_doc,
-                         project_name, host_name, instance):
+    def get_dynamic_data(
+        self,
+        project_name,
+        asset_doc,
+        task_name,
+        variant,
+        host_name,
+        instance
+    ):
         if instance is not None:
             layer_name = instance.get("layer_name")
             if layer_name:
diff --git a/client/ayon_core/hosts/photoshop/plugins/create/create_review.py b/client/ayon_core/hosts/photoshop/plugins/create/create_review.py
index 888b294248..229b736801 100644
--- a/client/ayon_core/hosts/photoshop/plugins/create/create_review.py
+++ b/client/ayon_core/hosts/photoshop/plugins/create/create_review.py
@@ -4,7 +4,7 @@ from ayon_core.hosts.photoshop.lib import PSAutoCreator
 class ReviewCreator(PSAutoCreator):
     """Creates review instance which might be disabled from publishing."""
     identifier = "review"
-    family = "review"
+    product_type = "review"
 
     default_variant = "Main"
 
diff --git a/client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py b/client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py
index 3485027215..da0c9d1d12 100644
--- a/client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py
+++ b/client/ayon_core/hosts/photoshop/plugins/create/create_workfile.py
@@ -3,7 +3,7 @@ from ayon_core.hosts.photoshop.lib import PSAutoCreator
 
 class WorkfileCreator(PSAutoCreator):
     identifier = "workfile"
-    family = "workfile"
+    product_type = "workfile"
 
     default_variant = "Main"
 
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 479d9139af..7773b444d2 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
@@ -2,7 +2,7 @@ import pyblish.api
 
 from ayon_core.client import get_asset_name_identifier
 from ayon_core.hosts.photoshop import api as photoshop
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.pipeline.create import get_product_name
 
 
 class CollectAutoImage(pyblish.api.ContextPlugin):
@@ -67,7 +67,7 @@ class CollectAutoImage(pyblish.api.ContextPlugin):
 
             # active might not be in legacy meta
             if layer_meta_data.get("active", True) and layer_item.visible:
-                instance_names.append(layer_meta_data["subset"])
+                instance_names.append(layer_meta_data["productName"])
 
         if len(instance_names) == 0:
             variants = proj_settings.get(
@@ -75,25 +75,31 @@ class CollectAutoImage(pyblish.api.ContextPlugin):
                 "create", {}).get(
                 "CreateImage", {}).get(
                 "default_variants", [''])
-            family = "image"
+            product_type = "image"
 
             variant = context.data.get("variant") or variants[0]
 
-            subset_name = get_subset_name(
-                family, variant, task_name, asset_doc,
-                project_name, host_name
+            product_name = get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                host_name,
+                product_type,
+                variant,
             )
 
-            instance = context.create_instance(subset_name)
-            instance.data["family"] = family
+            instance = context.create_instance(product_name)
             instance.data["folderPath"] = folder_path
-            instance.data["subset"] = subset_name
+            instance.data["productType"] = product_type
+            instance.data["productName"] = product_name
             instance.data["ids"] = publishable_ids
             instance.data["publish"] = True
             instance.data["creator_identifier"] = "auto_image"
+            instance.data["family"] = product_type
+            instance.data["families"] = [product_type]
 
             if auto_creator["mark_for_review"]:
                 instance.data["creator_attributes"] = {"mark_for_review": True}
-                instance.data["families"] = ["review"]
+                instance.data["families"].append("review")
 
             self.log.info("auto image instance: {} ".format(instance.data))
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 e31508e641..14f2f23985 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
@@ -3,13 +3,13 @@ Requires:
     None
 
 Provides:
-    instance     -> family ("review")
+    instance     -> productType ("review")
 """
 import pyblish.api
 
 from ayon_core.client import get_asset_name_identifier
 from ayon_core.hosts.photoshop import api as photoshop
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.pipeline.create import get_product_name
 
 
 class CollectAutoReview(pyblish.api.ContextPlugin):
@@ -26,10 +26,10 @@ class CollectAutoReview(pyblish.api.ContextPlugin):
     publish = True
 
     def process(self, context):
-        family = "review"
+        product_type = "review"
         has_review = False
         for instance in context:
-            if instance.data["family"] == family:
+            if instance.data["productType"] == product_type:
                 self.log.debug("Review instance found, won't create new")
                 has_review = True
 
@@ -44,7 +44,7 @@ class CollectAutoReview(pyblish.api.ContextPlugin):
         stub = photoshop.stub()
         stored_items = stub.get_layers_metadata()
         for item in stored_items:
-            if item.get("creator_identifier") == family:
+            if item.get("creator_identifier") == product_type:
                 if not item.get("active"):
                     self.log.debug("Review instance disabled")
                     return
@@ -69,23 +69,24 @@ class CollectAutoReview(pyblish.api.ContextPlugin):
 
         folder_path = get_asset_name_identifier(asset_doc)
 
-        subset_name = get_subset_name(
-            family,
-            variant,
-            task_name,
-            asset_doc,
+        product_name = get_product_name(
             project_name,
-            host_name=host_name,
+            asset_doc,
+            task_name,
+            host_name,
+            product_type,
+            variant,
             project_settings=proj_settings
         )
 
-        instance = context.create_instance(subset_name)
+        instance = context.create_instance(product_name)
         instance.data.update({
-            "subset": subset_name,
-            "label": subset_name,
-            "name": subset_name,
-            "family": family,
-            "families": [],
+            "label": product_name,
+            "name": product_name,
+            "productName": product_name,
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type],
             "representations": [],
             "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 12fc31a2f2..0b12195603 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
@@ -3,7 +3,7 @@ import pyblish.api
 
 from ayon_core.client import get_asset_name_identifier
 from ayon_core.hosts.photoshop import api as photoshop
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.pipeline.create import get_product_name
 
 
 class CollectAutoWorkfile(pyblish.api.ContextPlugin):
@@ -16,7 +16,7 @@ class CollectAutoWorkfile(pyblish.api.ContextPlugin):
     targets = ["automated"]
 
     def process(self, context):
-        family = "workfile"
+        product_type = "workfile"
         file_path = context.data["currentFile"]
         _, ext = os.path.splitext(file_path)
         staging_dir = os.path.dirname(file_path)
@@ -29,7 +29,7 @@ class CollectAutoWorkfile(pyblish.api.ContextPlugin):
         }
 
         for instance in context:
-            if instance.data["family"] == family:
+            if instance.data["productType"] == product_type:
                 self.log.debug("Workfile instance found, won't create new")
                 instance.data.update({
                     "label": base_name,
@@ -47,7 +47,7 @@ class CollectAutoWorkfile(pyblish.api.ContextPlugin):
         stub = photoshop.stub()
         stored_items = stub.get_layers_metadata()
         for item in stored_items:
-            if item.get("creator_identifier") == family:
+            if item.get("creator_identifier") == product_type:
                 if not item.get("active"):
                     self.log.debug("Workfile instance disabled")
                     return
@@ -72,24 +72,25 @@ class CollectAutoWorkfile(pyblish.api.ContextPlugin):
         asset_doc = context.data["assetEntity"]
 
         folder_path = get_asset_name_identifier(asset_doc)
-        subset_name = get_subset_name(
-            family,
-            variant,
-            task_name,
-            asset_doc,
+        product_name = get_product_name(
             project_name,
-            host_name=host_name,
+            asset_doc,
+            task_name,
+            host_name,
+            product_type,
+            variant,
             project_settings=proj_settings
         )
 
         # Create instance
-        instance = context.create_instance(subset_name)
+        instance = context.create_instance(product_name)
         instance.data.update({
-            "subset": subset_name,
             "label": base_name,
             "name": base_name,
-            "family": family,
-            "families": [],
+            "productName": product_name,
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type],
             "representations": [],
             "folderPath": folder_path
         })
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 2d3a9f4848..f11ba4383a 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
@@ -13,17 +13,17 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
 
     Used in remote publishing when artists marks publishable layers by color-
     coding. Top level layers (group) must be marked by specific color to be
-    published as an instance of 'image' family.
+    published as an instance of 'image' product type.
 
     Can add group for all publishable layers to allow creation of flattened
     image. (Cannot contain special background layer as it cannot be grouped!)
 
     Based on value `create_flatten_image` from Settings:
-    - "yes": create flattened 'image' subset of all publishable layers + create
-        'image' subset per publishable layer
-    - "only": create ONLY flattened 'image' subset of all publishable layers
-    - "no": do not create flattened 'image' subset at all,
-        only separate subsets per marked layer.
+    - "yes": create flattened 'image' product of all publishable layers + create
+        'image' product per publishable layer
+    - "only": create ONLY flattened 'image' product of all publishable layers
+    - "no": do not create flattened 'image' product at all,
+        only separate products per marked layer.
 
     Identifier:
         id (str): "ayon.create.instance"
@@ -36,9 +36,6 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
 
     # configurable by Settings
     color_code_mapping = []
-    # TODO check if could be set globally, probably doesn't make sense when
-    # flattened template cannot
-    subset_template_name = ""
     create_flatten_image = "no"
     flatten_product_name_template = ""
 
@@ -48,12 +45,16 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
             os.environ.get("AYON_PUBLISH_DATA")
             or os.environ.get("OPENPYPE_PUBLISH_DATA")
         )
-        if (is_in_tests() and
-                (not batch_dir or not os.path.exists(batch_dir))):
+        if (
+            is_in_tests()
+            and (
+                not batch_dir or not os.path.exists(batch_dir)
+            )
+        ):
             self.log.debug("Automatic testing, no batch data, skipping")
             return
 
-        existing_subset_names = self._get_existing_subset_names(context)
+        existing_product_names = self._get_existing_product_names(context)
 
         # from CollectBatchData
         asset_name = context.data["folderPath"]
@@ -71,7 +72,7 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
 
         publishable_layers = []
         created_instances = []
-        family_from_settings = None
+        product_type_from_settings = None
         for layer in layers:
             self.log.debug("Layer:: {}".format(layer))
             if layer.parents:
@@ -82,42 +83,50 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
                 self.log.debug("Not visible, skip")
                 continue
 
-            resolved_family, resolved_subset_template = self._resolve_mapping(
-                layer
+            resolved_product_type, resolved_product_template = (
+                self._resolve_mapping(layer)
             )
 
-            if not resolved_subset_template or not resolved_family:
-                self.log.debug("!!! Not found family or template, skip")
+            if not resolved_product_template or not resolved_product_type:
+                self.log.debug("!!! Not found product type or template, skip")
                 continue
 
-            if not family_from_settings:
-                family_from_settings = resolved_family
+            if not product_type_from_settings:
+                product_type_from_settings = resolved_product_type
 
             fill_pairs = {
                 "variant": variant,
-                "family": resolved_family,
+                "family": resolved_product_type,
+                "product": {"type": resolved_product_type},
                 "task": task_name,
                 "layer": layer.clean_name
             }
 
-            subset = resolved_subset_template.format(
+            product_name = resolved_product_template.format(
                 **prepare_template_data(fill_pairs))
 
-            subset = self._clean_subset_name(stub, naming_conventions,
-                                             subset, layer)
+            product_name = self._clean_product_name(
+                stub, naming_conventions, product_name, layer
+            )
 
-            if subset in existing_subset_names:
-                self.log.info(
-                    "Subset {} already created, skipping.".format(subset))
+            if product_name in existing_product_names:
+                self.log.info((
+                    "Product {} already created, skipping."
+                ).format(product_name))
                 continue
 
             if self.create_flatten_image != "flatten_only":
-                instance = self._create_instance(context, layer,
-                                                 resolved_family,
-                                                 asset_name, subset, task_name)
+                instance = self._create_instance(
+                    context,
+                    layer,
+                    resolved_product_type,
+                    asset_name,
+                    product_name,
+                    task_name
+                )
                 created_instances.append(instance)
 
-            existing_subset_names.append(subset)
+            existing_product_names.append(product_name)
             publishable_layers.append(layer)
 
         if self.create_flatten_image != "no" and publishable_layers:
@@ -127,15 +136,20 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
                 return
 
             fill_pairs.pop("layer")
-            subset = self.flatten_product_name_template.format(
+            product_name = self.flatten_product_name_template.format(
                 **prepare_template_data(fill_pairs))
 
             first_layer = publishable_layers[0]  # dummy layer
-            first_layer.name = subset
-            family = family_from_settings  # inherit family
-            instance = self._create_instance(context, first_layer,
-                                             family,
-                                             asset_name, subset, task_name)
+            first_layer.name = product_name
+            product_type = product_type_from_settings  # inherit product type
+            instance = self._create_instance(
+                context,
+                first_layer,
+                product_type,
+                asset_name,
+                product_name,
+                task_name
+            )
             instance.data["ids"] = [layer.id for layer in publishable_layers]
             created_instances.append(instance)
 
@@ -145,29 +159,37 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
             self.log.info("Found: \"%s\" " % instance.data["name"])
             self.log.info("instance: {} ".format(instance.data))
 
-    def _get_existing_subset_names(self, context):
+    def _get_existing_product_names(self, context):
         """Collect manually created instances from workfile.
 
         Shouldn't be any as Webpublisher bypass publishing via Openpype, but
         might be some if workfile published through OP is reused.
         """
-        existing_subset_names = []
+        existing_product_names = []
         for instance in context:
-            if instance.data.get('publish'):
-                existing_subset_names.append(instance.data.get('subset'))
+            if instance.data.get("publish") is not False:
+                existing_product_names.append(instance.data.get("productName"))
 
-        return existing_subset_names
+        return existing_product_names
 
-    def _create_instance(self, context, layer, family,
-                         asset, subset, task_name):
+    def _create_instance(
+        self,
+        context,
+        layer,
+        product_type,
+        folder_path,
+        product_name,
+        task_name
+    ):
         instance = context.create_instance(layer.name)
-        instance.data["family"] = family
         instance.data["publish"] = True
-        instance.data["folderPath"] = asset
+        instance.data["productType"] = product_type
+        instance.data["productName"] = product_name
+        instance.data["folderPath"] = folder_path
         instance.data["task"] = task_name
-        instance.data["subset"] = subset
         instance.data["layer"] = layer
-        instance.data["families"] = []
+        instance.data["family"] = product_type
+        instance.data["families"] = [product_type]
 
         return instance
 
@@ -177,50 +199,63 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
             If both color code AND name regex is configured, BOTH must be valid
             If layer matches to multiple mappings, only first is used!
         """
-        family_list = []
-        family = None
-        subset_name_list = []
-        resolved_subset_template = None
+        product_type_list = []
+        product_name_list = []
         for mapping in self.color_code_mapping:
-            if mapping["color_code"] and \
-                    layer.color_code not in mapping["color_code"]:
+            if (
+                mapping["color_code"]
+                and layer.color_code not in mapping["color_code"]
+            ):
                 continue
 
-            if mapping["layer_name_regex"] and \
-                    not any(re.search(pattern, layer.name)
-               for pattern in mapping["layer_name_regex"]):
+            if (
+                mapping["layer_name_regex"]
+                and not any(
+                    re.search(pattern, layer.name)
+                    for pattern in mapping["layer_name_regex"]
+                )
+            ):
                 continue
 
-            family_list.append(mapping["family"])
-            subset_name_list.append(mapping["subset_template_name"])
-        if len(subset_name_list) > 1:
-            self.log.warning("Multiple mappings found for '{}'".
-                             format(layer.name))
-            self.log.warning("Only first subset name template used!")
-            subset_name_list[:] = subset_name_list[0]
+            product_type_list.append(mapping["product_type"])
+            product_name_list.append(mapping["product_name_template"])
 
-        if len(family_list) > 1:
-            self.log.warning("Multiple mappings found for '{}'".
-                             format(layer.name))
-            self.log.warning("Only first family used!")
-            family_list[:] = family_list[0]
-        if subset_name_list:
-            resolved_subset_template = subset_name_list.pop()
-        if family_list:
-            family = family_list.pop()
+        if len(product_name_list) > 1:
+            self.log.warning(
+                "Multiple mappings found for '{}'".format(layer.name)
+            )
+            self.log.warning("Only first product name template used!")
+            product_name_list[:] = product_name_list[0]
 
-        self.log.debug("resolved_family {}".format(family))
-        self.log.debug("resolved_subset_template {}".format(
-            resolved_subset_template))
-        return family, resolved_subset_template
+        if len(product_type_list) > 1:
+            self.log.warning(
+                "Multiple mappings found for '{}'".format(layer.name)
+            )
+            self.log.warning("Only first product type used!")
+            product_type_list[:] = product_type_list[0]
 
-    def _clean_subset_name(self, stub, naming_conventions, subset, layer):
-        """Cleans invalid characters from subset name and layer name."""
-        if re.search(naming_conventions["invalid_chars"], subset):
-            subset = re.sub(
+        resolved_product_template = None
+        if product_name_list:
+            resolved_product_template = product_name_list.pop()
+
+        product_type = None
+        if product_type_list:
+            product_type = product_type_list.pop()
+
+        self.log.debug("resolved_product_type {}".format(product_type))
+        self.log.debug("resolved_product_template {}".format(
+            resolved_product_template))
+        return product_type, resolved_product_template
+
+    def _clean_product_name(
+        self, stub, naming_conventions, product_name, layer
+    ):
+        """Cleans invalid characters from product name and layer name."""
+        if re.search(naming_conventions["invalid_chars"], product_name):
+            product_name = re.sub(
                 naming_conventions["invalid_chars"],
                 naming_conventions["replace_char"],
-                subset
+                product_name
             )
             layer_name = re.sub(
                 naming_conventions["invalid_chars"],
@@ -230,4 +265,4 @@ class CollectColorCodedInstances(pyblish.api.ContextPlugin):
             layer.name = layer_name
             stub.rename_layer(layer.id, layer_name)
 
-        return subset
+        return product_name
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py
index e330b04a1f..53b2503ba2 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_published_version.py
@@ -4,7 +4,7 @@ For synchronization of published image and workfile version it is required
 to store workfile version from workfile file name in context.data["version"].
 In remote publishing this name is unreliable (artist might not follow naming
 convention etc.), last published workfile version for particular workfile
-subset is used instead.
+product is used instead.
 
 This plugin runs only in remote publishing (eg. Webpublisher).
 
@@ -30,13 +30,13 @@ class CollectPublishedVersion(pyblish.api.ContextPlugin):
     targets = ["automated"]
 
     def process(self, context):
-        workfile_subset_name = None
+        workfile_product_name = None
         for instance in context:
-            if instance.data["family"] == "workfile":
-                workfile_subset_name = instance.data["subset"]
+            if instance.data["productType"] == "workfile":
+                workfile_product_name = instance.data["productName"]
                 break
 
-        if not workfile_subset_name:
+        if not workfile_product_name:
             self.log.warning("No workfile instance found, "
                              "synchronization of version will not work.")
             return
@@ -45,9 +45,9 @@ class CollectPublishedVersion(pyblish.api.ContextPlugin):
         asset_doc = context.data["assetEntity"]
         asset_id = asset_doc["_id"]
 
-        version_doc = get_last_version_by_subset_name(project_name,
-                                                      workfile_subset_name,
-                                                      asset_id)
+        version_doc = get_last_version_by_subset_name(
+            project_name, workfile_product_name, asset_id
+        )
 
         if version_doc:
             version_int = int(version_doc["name"]) + 1
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py b/client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py
index 6740a6c82a..b9080a12ff 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/collect_workfile.py
@@ -1,8 +1,6 @@
 import os
 import pyblish.api
 
-from ayon_core.pipeline.create import get_subset_name
-
 
 class CollectWorkfile(pyblish.api.ContextPlugin):
     """Collect current script for publish."""
@@ -15,7 +13,7 @@ class CollectWorkfile(pyblish.api.ContextPlugin):
 
     def process(self, context):
         for instance in context:
-            if instance.data["family"] == "workfile":
+            if instance.data["productType"] == "workfile":
                 file_path = context.data["currentFile"]
                 _, ext = os.path.splitext(file_path)
                 staging_dir = os.path.dirname(file_path)
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py b/client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py
index 71605b53d9..7290a1437e 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/extract_image.py
@@ -36,7 +36,7 @@ class ExtractImage(pyblish.api.ContextPlugin):
         with photoshop.maintained_selection():
             with photoshop.maintained_visibility(layers=all_layers):
                 for instance in context:
-                    if instance.data["family"] not in self.families:
+                    if instance.data["productType"] not in self.families:
                         continue
 
                     staging_dir = self.staging_dir(instance)
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py b/client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py
index 732a53f194..3497e7ad75 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/extract_review.py
@@ -22,7 +22,8 @@ class ExtractReview(publish.Extractor):
         'review' family could be used in other steps as a reference, as it
         contains flattened image by default. (Eg. artist could load this
         review as a single item and see full image. In most cases 'image'
-        family is separated by layers to better usage in animation or comp.)
+        product type is separated by layers to better usage in animation
+        or comp.)
     """
 
     label = "Extract Review"
@@ -55,18 +56,21 @@ class ExtractReview(publish.Extractor):
             "tags": self.jpg_options['tags'],
         }
 
-        if instance.data["family"] != "review":
-            self.log.debug("Existing extracted file from image family used.")
+        if instance.data["productType"] != "review":
+            self.log.debug(
+                "Existing extracted file from image product type used."
+            )
             # enable creation of review, without this jpg review would clash
-            # with jpg of the image family
+            # with jpg of the image product type
             output_name = repre_name
             repre_name = "{}_{}".format(repre_name, output_name)
             repre_skeleton.update({"name": repre_name,
                                    "outputName": output_name})
 
             img_file = self.output_seq_filename % 0
-            self._prepare_file_for_image_family(img_file, instance,
-                                                staging_dir)
+            self._prepare_file_for_image_product_type(
+                img_file, instance, staging_dir
+            )
             repre_skeleton.update({
                 "files": img_file,
             })
@@ -120,8 +124,10 @@ class ExtractReview(publish.Extractor):
 
         self.log.info(f"Extracted {instance} to {staging_dir}")
 
-    def _prepare_file_for_image_family(self, img_file, instance, staging_dir):
-        """Converts existing file for image family to .jpg
+    def _prepare_file_for_image_product_type(
+        self, img_file, instance, staging_dir
+    ):
+        """Converts existing file for image product type to .jpg
 
         Image instance could have its own separate review (instance per layer
         for example). This uses extracted file instead of extracting again.
@@ -261,12 +267,15 @@ class ExtractReview(publish.Extractor):
         """
         layers = []
         # creating review for existing 'image' instance
-        if instance.data["family"] == "image" and instance.data.get("layer"):
+        if (
+            instance.data["productType"] == "image"
+            and instance.data.get("layer")
+        ):
             layers.append(instance.data["layer"])
             return layers
 
         for image_instance in instance.context:
-            if image_instance.data["family"] != "image":
+            if image_instance.data["productType"] != "image":
                 continue
             if not image_instance.data.get("layer"):
                 # dummy instance for flatten image
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/help/validate_naming.xml b/client/ayon_core/hosts/photoshop/plugins/publish/help/validate_naming.xml
index 023bbf26fa..28c2c2c773 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/help/validate_naming.xml
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/help/validate_naming.xml
@@ -3,9 +3,9 @@
 <error id="main">
 <title>Subset name</title>
 <description>
-## Invalid subset or layer name
+## Invalid product or layer name
 
-Subset or layer name cannot contain specific characters (spaces etc) which could cause issue when subset name is used in a published file name.
+Subset or layer name cannot contain specific characters (spaces etc) which could cause issue when product name is used in a published file name.
     {msg}
 
 ### How to repair?
diff --git a/client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py b/client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py
index 89018a1cff..ce940c47ce 100644
--- a/client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py
+++ b/client/ayon_core/hosts/photoshop/plugins/publish/validate_naming.py
@@ -3,7 +3,7 @@ import re
 import pyblish.api
 
 from ayon_core.hosts.photoshop import api as photoshop
-from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
+from ayon_core.pipeline.create import PRODUCT_NAME_ALLOWED_SYMBOLS
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishXmlValidationError,
@@ -51,17 +51,17 @@ class ValidateNamingRepair(pyblish.api.Action):
 
             stub.rename_layer(current_layer_state.id, layer_name)
 
-            subset_name = re.sub(invalid_chars, replace_char,
-                                 instance.data["subset"])
+            product_name = re.sub(invalid_chars, replace_char,
+                                 instance.data["productName"])
 
             # format from Tool Creator
-            subset_name = re.sub(
-                "[^{}]+".format(SUBSET_NAME_ALLOWED_SYMBOLS),
+            product_name = re.sub(
+                "[^{}]+".format(PRODUCT_NAME_ALLOWED_SYMBOLS),
                 "",
-                subset_name
+                product_name
             )
 
-            layer_meta["subset"] = subset_name
+            layer_meta["productName"] = product_name
             stub.imprint(instance_id, layer_meta)
 
         return True
@@ -88,21 +88,24 @@ class ValidateNaming(pyblish.api.InstancePlugin):
 
         layer = instance.data.get("layer")
         if layer:
-            msg = "Name \"{}\" is not allowed.{}".format(layer.clean_name,
-                                                         help_msg)
-
+            msg = "Name \"{}\" is not allowed.{}".format(
+                layer.clean_name, help_msg
+            )
             formatting_data = {"msg": msg}
             if re.search(self.invalid_chars, layer.clean_name):
-                raise PublishXmlValidationError(self, msg,
-                                                formatting_data=formatting_data
-                                                )
+                raise PublishXmlValidationError(
+                    self, msg, formatting_data=formatting_data
+                )
 
-        msg = "Subset \"{}\" is not allowed.{}".format(instance.data["subset"],
-                                                       help_msg)
+        product_name = instance.data["productName"]
+        msg = "Product \"{}\" is not allowed.{}".format(
+            product_name, help_msg
+        )
         formatting_data = {"msg": msg}
-        if re.search(self.invalid_chars, instance.data["subset"]):
-            raise PublishXmlValidationError(self, msg,
-                                            formatting_data=formatting_data)
+        if re.search(self.invalid_chars, product_name):
+            raise PublishXmlValidationError(
+                self, msg, formatting_data=formatting_data
+            )
 
     @classmethod
     def get_replace_chars(cls):
diff --git a/client/ayon_core/hosts/resolve/api/lib.py b/client/ayon_core/hosts/resolve/api/lib.py
index 5eb88afdcb..6e4e17811f 100644
--- a/client/ayon_core/hosts/resolve/api/lib.py
+++ b/client/ayon_core/hosts/resolve/api/lib.py
@@ -520,8 +520,8 @@ def imprint(timeline_item, data=None):
     Examples:
         data = {
             'folderPath': 'sq020sh0280',
-            'family': 'render',
-            'subset': 'subsetMain'
+            'productType': 'render',
+            'productName': 'productMain'
         }
     """
     data = data or {}
diff --git a/client/ayon_core/hosts/resolve/api/pipeline.py b/client/ayon_core/hosts/resolve/api/pipeline.py
index 2c5e0daf4b..19d33971dc 100644
--- a/client/ayon_core/hosts/resolve/api/pipeline.py
+++ b/client/ayon_core/hosts/resolve/api/pipeline.py
@@ -296,8 +296,8 @@ def list_instances():
 
         if tag_data:
             asset = tag_data.get("asset")
-            subset = tag_data.get("subset")
-            tag_data["label"] = f"{ti_name} [{asset}-{subset}]"
+            product_name = tag_data.get("productName")
+            tag_data["label"] = f"{ti_name} [{asset}-{product_name}]"
             listed_instances.append(tag_data)
 
     return listed_instances
diff --git a/client/ayon_core/hosts/resolve/api/plugin.py b/client/ayon_core/hosts/resolve/api/plugin.py
index ccb20f712f..0c63dead32 100644
--- a/client/ayon_core/hosts/resolve/api/plugin.py
+++ b/client/ayon_core/hosts/resolve/api/plugin.py
@@ -350,7 +350,7 @@ class ClipLoader:
         """ Gets context and convert it to self.data
         data structure:
             {
-                "name": "assetName_subsetName_representationName"
+                "name": "assetName_productName_representationName"
                 "binPath": "projectBinPath",
             }
         """
@@ -358,17 +358,17 @@ class ClipLoader:
         representation = self.context["representation"]
         representation_context = representation["context"]
         asset = str(representation_context["asset"])
-        subset = str(representation_context["subset"])
+        product_name = str(representation_context["subset"])
         representation_name = str(representation_context["representation"])
         self.data["clip_name"] = "_".join([
             asset,
-            subset,
+            product_name,
             representation_name
         ])
         self.data["versionData"] = self.context["version"]["data"]
 
         self.data["timeline_basename"] = "timeline_{}_{}".format(
-            subset, representation_name)
+            product_name, representation_name)
 
         # solve project bin structure path
         hierarchy = str("/".join((
@@ -603,9 +603,9 @@ class PublishClip:
     rename_default = False
     hierarchy_default = "{_folder_}/{_sequence_}/{_track_}"
     clip_name_default = "shot_{_trackIndex_:0>3}_{_clipIndex_:0>4}"
-    subset_name_default = "<track_name>"
+    base_product_name_default = "<track_name>"
     review_track_default = "< none >"
-    subset_family_default = "plate"
+    product_type_default = "plate"
     count_from_default = 10
     count_steps_default = 10
     vertical_sync_default = False
@@ -630,7 +630,6 @@ class PublishClip:
         self.track_name = str(track_name).replace(" ", "_")
         self.track_index = int(timeline_item_data["track"]["index"])
 
-        # adding tag.family into tag
         if kwargs.get("avalon"):
             self.tag_data.update(kwargs["avalon"])
 
@@ -728,10 +727,10 @@ class PublishClip:
             "countFrom", {}).get("value") or self.count_from_default
         self.count_steps = self.ui_inputs.get(
             "countSteps", {}).get("value") or self.count_steps_default
-        self.subset_name = self.ui_inputs.get(
-            "subsetName", {}).get("value") or self.subset_name_default
-        self.subset_family = self.ui_inputs.get(
-            "subsetFamily", {}).get("value") or self.subset_family_default
+        self.base_product_name = self.ui_inputs.get(
+            "productName", {}).get("value") or self.base_product_name_default
+        self.product_type = self.ui_inputs.get(
+            "productType", {}).get("value") or self.product_type_default
         self.vertical_sync = self.ui_inputs.get(
             "vSyncOn", {}).get("value") or self.vertical_sync_default
         self.driving_layer = self.ui_inputs.get(
@@ -739,12 +738,14 @@ class PublishClip:
         self.review_track = self.ui_inputs.get(
             "reviewTrack", {}).get("value") or self.review_track_default
 
-        # build subset name from layer name
-        if self.subset_name == "<track_name>":
-            self.subset_name = self.track_name
+        # build product name from layer name
+        if self.base_product_name == "<track_name>":
+            self.base_product_name = self.track_name
 
-        # create subset for publishing
-        self.subset = self.subset_family + self.subset_name.capitalize()
+        # create product name for publishing
+        self.product_name = (
+            self.product_type + self.base_product_name.capitalize()
+        )
 
     def _replace_hash_to_expression(self, name, text):
         """ Replace hash with number in correct padding. """
@@ -824,17 +825,19 @@ class PublishClip:
             # driving layer is set as negative match
             for (_in, _out), hero_data in self.vertical_clip_match.items():
                 hero_data.update({"heroTrack": False})
-                if _in == self.clip_in and _out == self.clip_out:
-                    data_subset = hero_data["subset"]
-                    # add track index in case duplicity of names in hero data
-                    if self.subset in data_subset:
-                        hero_data["subset"] = self.subset + str(
-                            self.track_index)
-                    # in case track name and subset name is the same then add
-                    if self.subset_name == self.track_name:
-                        hero_data["subset"] = self.subset
-                    # assign data to return hierarchy data to tag
-                    tag_hierarchy_data = hero_data
+                if _in != self.clip_in or _out != self.clip_out:
+                    continue
+
+                data_product_name = hero_data["productName"]
+                # add track index in case duplicity of names in hero data
+                if self.product_name in data_product_name:
+                    hero_data["productName"] = self.product_name + str(
+                        self.track_index)
+                # in case track name and product name is the same then add
+                if self.base_product_name == self.track_name:
+                    hero_data["productName"] = self.product_name
+                # assign data to return hierarchy data to tag
+                tag_hierarchy_data = hero_data
 
         # add data to return data dict
         self.tag_data.update(tag_hierarchy_data)
@@ -859,8 +862,8 @@ class PublishClip:
             "hierarchy": hierarchy_filled,
             "parents": self.parents,
             "hierarchyData": hierarchy_formatting_data,
-            "subset": self.subset,
-            "family": self.subset_family
+            "productName": self.product_name,
+            "productType": self.product_type
         }
 
     def _convert_to_entity(self, key):
diff --git a/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py b/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py
index 65bc9fed9d..3a2a0345ea 100644
--- a/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py
+++ b/client/ayon_core/hosts/resolve/plugins/create/create_shot_clip.py
@@ -10,12 +10,12 @@ class CreateShotClip(plugin.Creator):
     """Publishable clip"""
 
     label = "Create Publishable Clip"
-    family = "clip"
+    product_type = "clip"
     icon = "film"
     defaults = ["Main"]
 
     gui_tracks = get_video_track_names()
-    gui_name = "OpenPype publish attributes creator"
+    gui_name = "AYON publish attributes creator"
     gui_info = "Define sequential rename and fill hierarchy data."
     gui_inputs = {
         "renameHierarchy": {
@@ -133,19 +133,19 @@ class CreateShotClip(plugin.Creator):
             "target": "ui",
             "order": 3,
             "value": {
-                "subsetName": {
+                "productName": {
                     "value": ["<track_name>", "main", "bg", "fg", "bg",
                               "animatic"],
                     "type": "QComboBox",
-                    "label": "Subset Name",
+                    "label": "Product Name",
                     "target": "ui",
-                    "toolTip": "chose subset name pattern, if <track_name> is selected, name of track layer will be used",  # noqa
+                    "toolTip": "chose product name pattern, if <track_name> is selected, name of track layer will be used",  # noqa
                     "order": 0},
-                "subsetFamily": {
+                "productType": {
                     "value": ["plate", "take"],
                     "type": "QComboBox",
-                    "label": "Subset Family",
-                    "target": "ui", "toolTip": "What use of this subset is for",  # noqa
+                    "label": "Product type",
+                    "target": "ui", "toolTip": "What use of this product is for",  # noqa
                     "order": 1},
                 "reviewTrack": {
                     "value": ["< none >"] + gui_tracks,
@@ -159,7 +159,7 @@ class CreateShotClip(plugin.Creator):
                     "type": "QCheckBox",
                     "label": "Include audio",
                     "target": "tag",
-                    "toolTip": "Process subsets with corresponding audio",  # noqa
+                    "toolTip": "Process products with corresponding audio",  # noqa
                     "order": 3},
                 "sourceResolution": {
                     "value": False,
diff --git a/client/ayon_core/hosts/resolve/plugins/load/load_clip.py b/client/ayon_core/hosts/resolve/plugins/load/load_clip.py
index 47aeac213b..4d1f8f1f7c 100644
--- a/client/ayon_core/hosts/resolve/plugins/load/load_clip.py
+++ b/client/ayon_core/hosts/resolve/plugins/load/load_clip.py
@@ -15,7 +15,7 @@ from ayon_core.lib.transcoding import (
 
 
 class LoadClip(plugin.TimelineItemLoader):
-    """Load a subset to timeline as clip
+    """Load a product to timeline as clip
 
     Place clip to timeline on its asset origin timings collected
     during conforming to project
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 78c5fbbbf7..b1374859e3 100644
--- a/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py
+++ b/client/ayon_core/hosts/resolve/plugins/publish/precollect_instances.py
@@ -64,11 +64,32 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             })
 
             asset = tag_data["folder_path"]
-            subset = tag_data["subset"]
+
+            # TODO: remove backward compatibility
+            product_name = tag_data.get("productName")
+            if product_name is None:
+                # backward compatibility: subset -> productName
+                product_name = tag_data.get("subset")
+
+            # backward compatibility: product_name should not be missing
+            if not product_name:
+                self.log.error(
+                    "Product name is not defined for: {}".format(asset))
+
+            # TODO: remove backward compatibility
+            product_type = tag_data.get("productType")
+            if product_type is None:
+                # backward compatibility: family -> productType
+                product_type = tag_data.get("family")
+
+            # backward compatibility: product_type should not be missing
+            if not product_type:
+                self.log.error(
+                    "Product type is not defined for: {}".format(asset))
 
             data.update({
-                "name": "{}_{}".format(asset, subset),
-                "label": "{} {}".format(asset, subset),
+                "name": "{}_{}".format(asset, product_name),
+                "label": "{} {}".format(asset, product_name),
                 "folderPath": asset,
                 "item": timeline_item,
                 "publish": get_publish_attribute(timeline_item),
@@ -77,6 +98,9 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
                 "handleEnd": handle_end,
                 "newAssetPublishing": True,
                 "families": ["clip"],
+                "productType": product_type,
+                "productName": product_name,
+                "family": product_type
             })
 
             # otio clip data
@@ -128,18 +152,19 @@ class PrecollectInstances(pyblish.api.ContextPlugin):
             return
 
         asset = data["folderPath"]
-        subset = "shotMain"
+        product_name = "shotMain"
 
         # insert family into families
-        family = "shot"
+        product_type = "shot"
 
         data.update({
-            "name": "{}_{}".format(asset, subset),
-            "label": "{} {}".format(asset, subset),
-            "subset": subset,
+            "name": "{}_{}".format(asset, product_name),
+            "label": "{} {}".format(asset, product_name),
             "folderPath": asset,
-            "family": family,
-            "families": [],
+            "productName": product_name,
+            "productType": product_type,
+            "family": product_type,
+            "families": [product_type],
             "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 814b1e159f..a147c9a905 100644
--- a/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py
+++ b/client/ayon_core/hosts/resolve/plugins/publish/precollect_workfile.py
@@ -17,7 +17,7 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
         current_asset_name = get_current_asset_name()
         asset_name = current_asset_name.split("/")[-1]
 
-        subset = "workfileMain"
+        product_name = "workfileMain"
         project = rapi.get_current_project()
         fps = project.GetSetting("timelineFrameRate")
         video_tracks = rapi.get_video_track_names()
@@ -26,11 +26,12 @@ class PrecollectWorkfile(pyblish.api.ContextPlugin):
         otio_timeline = davinci_export.create_otio_timeline(project)
 
         instance_data = {
-            "name": "{}_{}".format(asset_name, subset),
-            "label": "{} {}".format(current_asset_name, subset),
-            "folderPath": current_asset_name,
-            "subset": subset,
+            "name": "{}_{}".format(asset_name, product_name),
+            "label": "{} {}".format(current_asset_name, product_name),
             "item": project,
+            "folderPath": current_asset_name,
+            "productName": product_name,
+            "productType": "workfile",
             "family": "workfile",
             "families": []
         }
diff --git a/client/ayon_core/hosts/substancepainter/api/pipeline.py b/client/ayon_core/hosts/substancepainter/api/pipeline.py
index 03cb22136c..843c120d8e 100644
--- a/client/ayon_core/hosts/substancepainter/api/pipeline.py
+++ b/client/ayon_core/hosts/substancepainter/api/pipeline.py
@@ -14,7 +14,7 @@ import pyblish.api
 from ayon_core.host import HostBase, IWorkfileHost, ILoadHost, IPublishHost
 from ayon_core.settings import (
     get_current_project_settings,
-    get_system_settings
+    get_project_settings,
 )
 
 from ayon_core.pipeline.template_data import get_template_data_with_names
@@ -252,9 +252,9 @@ class SubstanceHost(HostBase, IWorkfileHost, ILoadHost, IPublishHost):
             project_name = self.get_current_project_name()
             asset_name = self.get_current_asset_name()
             task_name = self.get_current_asset_name()
-            system_settings = get_system_settings()
+            project_settings = get_project_settings(project_name)
             formatting_data = get_template_data_with_names(
-                project_name, asset_name, task_name, system_settings
+                project_name, asset_name, task_name, project_settings
             )
             anatomy = Anatomy(project_name)
             formatting_data["root"] = anatomy.roots
diff --git a/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py b/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py
index 831ab6bb23..f204ff7728 100644
--- a/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py
+++ b/client/ayon_core/hosts/substancepainter/plugins/create/create_textures.py
@@ -24,12 +24,12 @@ class CreateTextures(Creator):
     """Create a texture set."""
     identifier = "io.openpype.creators.substancepainter.textureset"
     label = "Textures"
-    family = "textureSet"
+    product_type = "textureSet"
     icon = "picture-o"
 
     default_variant = "Main"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
 
         if not substance_painter.project.is_open():
             raise CreatorError("Can't create a Texture Set instance without "
@@ -47,7 +47,7 @@ class CreateTextures(Creator):
             if key in pre_create_data:
                 creator_attributes[key] = pre_create_data[key]
 
-        instance = self.create_instance_in_context(subset_name,
+        instance = self.create_instance_in_context(product_name,
                                                    instance_data)
         set_instance(
             instance_id=instance["instance_id"],
@@ -57,7 +57,7 @@ class CreateTextures(Creator):
     def collect_instances(self):
         for instance in get_instances():
             if (instance.get("creator_identifier") == self.identifier or
-                    instance.get("family") == self.family):
+                    instance.get("productType") == self.product_type):
                 self.create_instance_in_context_from_existing(instance)
 
     def update_instances(self, update_list):
@@ -75,9 +75,9 @@ class CreateTextures(Creator):
             self._remove_instance_from_context(instance)
 
     # Helper methods (this might get moved into Creator class)
-    def create_instance_in_context(self, subset_name, data):
+    def create_instance_in_context(self, product_name, data):
         instance = CreatedInstance(
-            self.family, subset_name, data, self
+            self.product_type, product_name, data, self
         )
         self.create_context.creator_adds_instance(instance)
         return instance
diff --git a/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py b/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py
index a51b7d859b..23811dfd29 100644
--- a/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py
+++ b/client/ayon_core/hosts/substancepainter/plugins/create/create_workfile.py
@@ -17,7 +17,7 @@ class CreateWorkfile(AutoCreator):
     """Workfile auto-creator."""
     identifier = "io.openpype.creators.substancepainter.workfile"
     label = "Workfile"
-    family = "workfile"
+    product_type = "workfile"
     icon = "document"
 
     default_variant = "Main"
@@ -49,15 +49,19 @@ class CreateWorkfile(AutoCreator):
         if current_instance is None:
             self.log.info("Auto-creating workfile instance...")
             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
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                variant,
+                host_name,
             )
             data = {
                 "folderPath": asset_name,
                 "task": task_name,
                 "variant": variant
             }
-            current_instance = self.create_instance_in_context(subset_name,
+            current_instance = self.create_instance_in_context(product_name,
                                                                data)
         elif (
             current_instance_asset != asset_name
@@ -65,12 +69,16 @@ class CreateWorkfile(AutoCreator):
         ):
             # 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
+            product_name = self.get_product_name(
+                project_name,
+                asset_doc,
+                task_name,
+                variant,
+                host_name,
             )
             current_instance["folderPath"] = asset_name
             current_instance["task"] = task_name
-            current_instance["subset"] = subset_name
+            current_instance["productName"] = product_name
 
         set_instance(
             instance_id=current_instance.get("instance_id"),
@@ -80,7 +88,7 @@ class CreateWorkfile(AutoCreator):
     def collect_instances(self):
         for instance in get_instances():
             if (instance.get("creator_identifier") == self.identifier or
-                    instance.get("family") == self.family):
+                    instance.get("productType") == self.product_type):
                 self.create_instance_in_context_from_existing(instance)
 
     def update_instances(self, update_list):
@@ -93,9 +101,9 @@ class CreateWorkfile(AutoCreator):
         set_instances(instance_data_by_id, update=True)
 
     # Helper methods (this might get moved into Creator class)
-    def create_instance_in_context(self, subset_name, data):
+    def create_instance_in_context(self, product_name, data):
         instance = CreatedInstance(
-            self.family, subset_name, data, self
+            self.product_type, product_name, data, self
         )
         self.create_context.creator_adds_instance(instance)
         return instance
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 03e17192d2..9cd77e8f90 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
@@ -9,7 +9,7 @@ from ayon_core.hosts.substancepainter.api.lib import (
     get_parsed_export_maps,
     strip_template
 )
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.pipeline.create import get_product_name
 from ayon_core.client import get_asset_by_name
 
 
@@ -35,7 +35,7 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
         maps = get_parsed_export_maps(config)
 
         # Let's break the instance into multiple instances to integrate
-        # a subset per generated texture or texture UDIM sequence
+        # a product per generated texture or texture UDIM sequence
         for (texture_set_name, stack_name), template_maps in maps.items():
             self.log.info(f"Processing {texture_set_name}/{stack_name}")
             for template, outputs in template_maps.items():
@@ -49,7 +49,7 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
                               asset_doc, texture_set_name, stack_name):
         """Create a new instance per image or UDIM sequence.
 
-        The new instances will be of family `image`.
+        The new instances will be of product type `image`.
 
         """
 
@@ -66,7 +66,7 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
         )
 
         # Define the suffix we want to give this particular texture
-        # set and set up a remapped subset naming for it.
+        # set and set up a remapped product naming for it.
         suffix = ""
         if always_include_texture_set_name or len(all_texture_sets) > 1:
             # More than one texture set, include texture set name
@@ -79,15 +79,16 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
         map_identifier = strip_template(template)
         suffix += f".{map_identifier}"
 
-        image_subset = get_subset_name(
-            # TODO: The family actually isn't 'texture' currently but for now
-            #       this is only done so the subset name starts with 'texture'
-            family="texture",
-            variant=instance.data["variant"] + suffix,
-            task_name=instance.data.get("task"),
-            asset_doc=asset_doc,
+        image_product_name = get_product_name(
+            # TODO: The product type actually isn't 'texture' currently but
+            #   for now this is only done so the product name starts with
+            #   'texture'
             project_name=context.data["projectName"],
+            asset_doc=asset_doc,
+            task_name=instance.data.get("task"),
             host_name=context.data["hostName"],
+            product_type="texture",
+            variant=instance.data["variant"] + suffix,
             project_settings=context.data["project_settings"]
         )
 
@@ -112,18 +113,20 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
         representation["stagingDir"] = staging_dir
 
         # Clone the instance
-        image_instance = context.create_instance(image_subset)
+        product_type = "image"
+        image_instance = context.create_instance(image_product_name)
         image_instance[:] = instance[:]
         image_instance.data.update(copy.deepcopy(dict(instance.data)))
-        image_instance.data["name"] = image_subset
-        image_instance.data["label"] = image_subset
-        image_instance.data["subset"] = image_subset
-        image_instance.data["family"] = "image"
-        image_instance.data["families"] = ["image", "textures"]
+        image_instance.data["name"] = image_product_name
+        image_instance.data["label"] = image_product_name
+        image_instance.data["productName"] = image_product_name
+        image_instance.data["productType"] = product_type
+        image_instance.data["family"] = product_type
+        image_instance.data["families"] = [product_type, "textures"]
         image_instance.data["representations"] = [representation]
 
         # Group the textures together in the loader
-        image_instance.data["subsetGroup"] = instance.data["subset"]
+        image_instance.data["subsetGroup"] = image_product_name
 
         # Store the texture set name and stack name on the instance
         image_instance.data["textureSetName"] = texture_set_name
@@ -133,7 +136,7 @@ class CollectTextureSet(pyblish.api.InstancePlugin):
         # Note: The extractor will assign it to the representation
         colorspace = outputs[0].get("colorSpace")
         if colorspace:
-            self.log.debug(f"{image_subset} colorspace: {colorspace}")
+            self.log.debug(f"{image_product_name} colorspace: {colorspace}")
             image_instance.data["colorspace"] = colorspace
 
         # Store the instance in the original instance as a member
diff --git a/client/ayon_core/hosts/traypublisher/api/plugin.py b/client/ayon_core/hosts/traypublisher/api/plugin.py
index d3d7f80e89..be50383510 100644
--- a/client/ayon_core/hosts/traypublisher/api/plugin.py
+++ b/client/ayon_core/hosts/traypublisher/api/plugin.py
@@ -111,7 +111,7 @@ class SettingsCreator(TrayPublishCreator):
 
     extensions = []
 
-    def create(self, subset_name, data, pre_create_data):
+    def create(self, product_name, data, pre_create_data):
         # Pass precreate data to creator attributes
         thumbnail_path = pre_create_data.pop(PRE_CREATE_THUMBNAIL_KEY, None)
 
@@ -119,8 +119,8 @@ class SettingsCreator(TrayPublishCreator):
         if self.allow_version_control:
             asset_name = data["folderPath"]
             subset_docs_by_asset_id = self._prepare_next_versions(
-                [asset_name], [subset_name])
-            version = subset_docs_by_asset_id[asset_name].get(subset_name)
+                [asset_name], [product_name])
+            version = subset_docs_by_asset_id[asset_name].get(product_name)
             pre_create_data["version_to_use"] = version
             data["_previous_last_version"] = version
 
@@ -128,38 +128,41 @@ class SettingsCreator(TrayPublishCreator):
         data["settings_creator"] = True
 
         # Create new instance
-        new_instance = CreatedInstance(self.family, subset_name, data, self)
+        new_instance = CreatedInstance(
+            self.product_type, product_name, data, self
+        )
 
         self._store_new_instance(new_instance)
 
         if thumbnail_path:
             self.set_instance_thumbnail_path(new_instance.id, thumbnail_path)
 
-    def _prepare_next_versions(self, asset_names, subset_names):
-        """Prepare next versions for given asset and subset names.
+    def _prepare_next_versions(self, asset_names, product_names):
+        """Prepare next versions for given asset and product names.
 
         Todos:
-            Expect combination of subset names by asset name to avoid
-                unnecessary server calls for unused subsets.
+            Expect combination of product names by asset name to avoid
+                unnecessary server calls for unused products.
 
         Args:
             asset_names (Iterable[str]): Asset names.
-            subset_names (Iterable[str]): Subset names.
+            product_names (Iterable[str]): Subset names.
 
         Returns:
             dict[str, dict[str, int]]: Last versions by asset
-                and subset names.
+                and product names.
         """
 
         # Prepare all versions for all combinations to '1'
+        # TODO use 'ayon_core.pipeline.version_start' logic
         subset_docs_by_asset_id = {
             asset_name: {
-                subset_name: 1
-                for subset_name in subset_names
+                product_name: 1
+                for product_name in product_names
             }
             for asset_name in asset_names
         }
-        if not asset_names or not subset_names:
+        if not asset_names or not product_names:
             return subset_docs_by_asset_id
 
         asset_docs = get_assets(
@@ -174,26 +177,26 @@ class SettingsCreator(TrayPublishCreator):
         subset_docs = list(get_subsets(
             self.project_name,
             asset_ids=asset_names_by_id.keys(),
-            subset_names=subset_names,
+            subset_names=product_names,
             fields=["_id", "name", "parent"]
         ))
 
-        subset_ids = {subset_doc["_id"] for subset_doc in subset_docs}
+        product_ids = {subset_doc["_id"] for subset_doc in subset_docs}
         last_versions = get_last_versions(
             self.project_name,
-            subset_ids,
+            product_ids,
             fields=["name", "parent"])
 
         for subset_doc in subset_docs:
             asset_id = subset_doc["parent"]
             asset_name = asset_names_by_id[asset_id]
-            subset_name = subset_doc["name"]
-            subset_id = subset_doc["_id"]
-            last_version = last_versions.get(subset_id)
+            product_name = subset_doc["name"]
+            product_id = subset_doc["_id"]
+            last_version = last_versions.get(product_id)
             version = 0
             if last_version is not None:
                 version = last_version["name"]
-            subset_docs_by_asset_id[asset_name][subset_name] += version
+            subset_docs_by_asset_id[asset_name][product_name] += version
         return subset_docs_by_asset_id
 
     def _fill_next_versions(self, instances_data):
@@ -223,16 +226,16 @@ class SettingsCreator(TrayPublishCreator):
             instance["folderPath"]
             for instance in filtered_instance_data
         }
-        subset_names = {
-            instance["subset"]
+        product_names = {
+            instance["productName"]
             for instance in filtered_instance_data}
         subset_docs_by_asset_id = self._prepare_next_versions(
-            asset_names, subset_names
+            asset_names, product_names
         )
         for instance in filtered_instance_data:
             asset_name = instance["folderPath"]
-            subset_name = instance["subset"]
-            version = subset_docs_by_asset_id[asset_name][subset_name]
+            product_name = instance["productName"]
+            version = subset_docs_by_asset_id[asset_name][product_name]
             instance["creator_attributes"]["version_to_use"] = version
             instance["_previous_last_version"] = version
 
@@ -311,14 +314,14 @@ class SettingsCreator(TrayPublishCreator):
     @classmethod
     def from_settings(cls, item_data):
         identifier = item_data["identifier"]
-        family = item_data["product_type"]
+        product_type = item_data["product_type"]
         if not identifier:
-            identifier = "settings_{}".format(family)
+            identifier = "settings_{}".format(product_type)
         return type(
             "{}{}".format(cls.__name__, identifier),
             (cls, ),
             {
-                "family": family,
+                "product_type": product_type,
                 "identifier": identifier,
                 "label": item_data["label"].strip(),
                 "icon": item_data["icon"],
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py
index 3969294f1e..5c913b3289 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_colorspace_look.py
@@ -23,7 +23,7 @@ class CreateColorspaceLook(TrayPublishCreator):
 
     identifier = "io.openpype.creators.traypublisher.colorspace_look"
     label = "Colorspace Look"
-    family = "ociolook"
+    product_type = "ociolook"
     description = "Publishes color space look file."
     extensions = [".cc", ".cube", ".3dl", ".spi1d", ".spi3d", ".csp", ".lut"]
     enabled = False
@@ -44,7 +44,7 @@ This creator publishes color space look file (LUT).
     def get_icon(self):
         return "mdi.format-color-fill"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         repr_file = pre_create_data.get("luts_file")
         if not repr_file:
             raise CreatorError("No files specified")
@@ -58,11 +58,11 @@ This creator publishes color space look file (LUT).
         asset_doc = get_asset_by_name(
             self.project_name, asset_name)
 
-        subset_name = self.get_subset_name(
-            variant=instance_data["variant"],
-            task_name=instance_data["task"] or "Not set",
+        product_name = self.get_product_name(
             project_name=self.project_name,
             asset_doc=asset_doc,
+            task_name=instance_data["task"] or "Not set",
+            variant=instance_data["variant"],
         )
 
         instance_data["creator_attributes"] = {
@@ -71,7 +71,7 @@ This creator publishes color space look file (LUT).
         }
 
         # Create new instance
-        new_instance = CreatedInstance(self.family, subset_name,
+        new_instance = CreatedInstance(self.product_type, product_name,
                                        instance_data, self)
         new_instance.transient_data["config_items"] = self.config_items
         new_instance.transient_data["config_data"] = self.config_data
@@ -148,7 +148,7 @@ This creator publishes color space look file (LUT).
             )
         ]
 
-    def apply_settings(self, project_settings, system_settings):
+    def apply_settings(self, project_settings):
         host = self.create_context.host
         host_name = host.name
         project_name = host.get_current_project_name()
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py
index d6501e65a2..a7abd3e6db 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_editorial.py
@@ -60,19 +60,15 @@ CLIP_ATTR_DEFS = [
 
 
 class EditorialClipInstanceCreatorBase(HiddenTrayPublishCreator):
-    """ Wrapper class for clip family creators
-
-    Args:
-        HiddenTrayPublishCreator (BaseCreator): hidden supporting class
-    """
+    """Wrapper class for clip product type creators."""
     host_name = "traypublisher"
 
     def create(self, instance_data, source_data=None):
-        subset_name = instance_data["subset"]
+        product_name = instance_data["productName"]
 
         # Create new instance
         new_instance = CreatedInstance(
-            self.family, subset_name, instance_data, self
+            self.product_type, product_name, instance_data, self
         )
 
         self._store_new_instance(new_instance)
@@ -90,15 +86,12 @@ class EditorialClipInstanceCreatorBase(HiddenTrayPublishCreator):
 
 
 class EditorialShotInstanceCreator(EditorialClipInstanceCreatorBase):
-    """ Shot family class
+    """Shot product type class
 
     The shot metadata instance carrier.
-
-    Args:
-        EditorialClipInstanceCreatorBase (BaseCreator): hidden supporting class
     """
     identifier = "editorial_shot"
-    family = "shot"
+    product_type = "shot"
     label = "Editorial Shot"
 
     def get_instance_attr_defs(self):
@@ -113,57 +106,48 @@ class EditorialShotInstanceCreator(EditorialClipInstanceCreatorBase):
 
 
 class EditorialPlateInstanceCreator(EditorialClipInstanceCreatorBase):
-    """ Plate family class
+    """Plate product type class
 
     Plate representation instance.
-
-    Args:
-        EditorialClipInstanceCreatorBase (BaseCreator): hidden supporting class
     """
     identifier = "editorial_plate"
-    family = "plate"
+    product_type = "plate"
     label = "Editorial Plate"
 
 
 class EditorialAudioInstanceCreator(EditorialClipInstanceCreatorBase):
-    """ Audio family class
+    """Audio product type class
 
     Audio representation instance.
-
-    Args:
-        EditorialClipInstanceCreatorBase (BaseCreator): hidden supporting class
     """
     identifier = "editorial_audio"
-    family = "audio"
+    product_type = "audio"
     label = "Editorial Audio"
 
 
 class EditorialReviewInstanceCreator(EditorialClipInstanceCreatorBase):
-    """ Review family class
+    """Review product type class
 
     Review representation instance.
-
-    Args:
-        EditorialClipInstanceCreatorBase (BaseCreator): hidden supporting class
     """
     identifier = "editorial_review"
-    family = "review"
+    product_type = "review"
     label = "Editorial Review"
 
 
 class EditorialSimpleCreator(TrayPublishCreator):
-    """ Editorial creator class
+    """Editorial creator class
 
     Simple workflow creator. This creator only disecting input
     video file into clip chunks and then converts each to
-    defined format defined Settings for each subset preset.
+    defined format defined Settings for each product preset.
 
     Args:
         TrayPublishCreator (Creator): Tray publisher plugin class
     """
 
     label = "Editorial Simple"
-    family = "editorial"
+    product_type = "editorial"
     identifier = "editorial_simple"
     default_variants = [
         "main"
@@ -197,7 +181,7 @@ or updating already created. Publishing will create OTIO file.
         if default_variants:
             self.default_variants = default_variants
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         allowed_product_type_presets = self._get_allowed_product_type_presets(
             pre_create_data)
 
@@ -262,7 +246,7 @@ or updating already created. Publishing will create OTIO file.
 
         # create otio editorial instance
         self._create_otio_instance(
-            subset_name,
+            product_name,
             instance_data,
             seq_path, media_path,
             first_otio_timeline
@@ -270,7 +254,7 @@ or updating already created. Publishing will create OTIO file.
 
     def _create_otio_instance(
         self,
-        subset_name,
+        product_name,
         data,
         sequence_path,
         media_path,
@@ -279,7 +263,7 @@ or updating already created. Publishing will create OTIO file.
         """Otio instance creating function
 
         Args:
-            subset_name (str): name of subset
+            product_name (str): Product name.
             data (dict): instance data
             sequence_path (str): path to sequence file
             media_path (str): path to media file
@@ -292,7 +276,7 @@ or updating already created. Publishing will create OTIO file.
             "otioTimeline": otio.adapters.write_to_string(otio_timeline)
         })
         new_instance = CreatedInstance(
-            self.family, subset_name, data, self
+            self.product_type, product_name, data, self
         )
         self._store_new_instance(new_instance)
 
@@ -361,7 +345,7 @@ or updating already created. Publishing will create OTIO file.
             otio_timeline (otio.Timeline): otio timeline object
             media_path (str): media file path string
             instance_data (dict): clip instance data
-            product_type_presets (list): list of dict settings subset presets
+            product_type_presets (list): list of dict settings product presets
         """
 
         tracks = [
@@ -408,14 +392,14 @@ or updating already created. Publishing will create OTIO file.
                 }
 
                 for product_type_preset in product_type_presets:
-                    # exclude audio family if no audio stream
+                    # exclude audio product type if no audio stream
                     if (
                         product_type_preset["product_type"] == "audio"
                         and not media_data.get("audio")
                     ):
                         continue
 
-                    instance = self._make_subset_instance(
+                    instance = self._make_product_instance(
                         otio_clip,
                         product_type_preset,
                         deepcopy(base_instance_data),
@@ -526,33 +510,33 @@ or updating already created. Publishing will create OTIO file.
 
         return return_data
 
-    def _make_subset_instance(
+    def _make_product_instance(
         self,
         otio_clip,
         product_type_preset,
         instance_data,
         parenting_data
     ):
-        """Making subset instance from input preset
+        """Making product instance from input preset
 
         Args:
             otio_clip (otio.Clip): otio clip object
-            product_type_preset (dict): single family preset
+            product_type_preset (dict): single product type preset
             instance_data (dict): instance data
             parenting_data (dict): shot instance parent data
 
         Returns:
             CreatedInstance: creator instance object
         """
-        family = product_type_preset["product_type"]
-        label = self._make_subset_naming(
+        product_type = product_type_preset["product_type"]
+        label = self._make_product_naming(
             product_type_preset,
             instance_data
         )
         instance_data["label"] = label
 
-        # add file extension filter only if it is not shot family
-        if family == "shot":
+        # add file extension filter only if it is not shot product type
+        if product_type == "shot":
             instance_data["otioClip"] = (
                 otio.adapters.write_to_string(otio_clip))
             c_instance = self.create_context.creators[
@@ -573,7 +557,7 @@ or updating already created. Publishing will create OTIO file.
                 }
             })
 
-            creator_identifier = f"editorial_{family}"
+            creator_identifier = f"editorial_{product_type}"
             editorial_clip_creator = self.create_context.creators[
                 creator_identifier]
             c_instance = editorial_clip_creator.create(
@@ -581,8 +565,8 @@ or updating already created. Publishing will create OTIO file.
 
         return c_instance
 
-    def _make_subset_naming(self, product_type_preset, instance_data):
-        """ Subset name maker
+    def _make_product_naming(self, product_type_preset, instance_data):
+        """Subset name maker
 
         Args:
             product_type_preset (dict): single preset item
@@ -594,25 +578,25 @@ or updating already created. Publishing will create OTIO file.
         asset_name = instance_data["creator_attributes"]["folderPath"]
 
         variant_name = instance_data["variant"]
-        family = product_type_preset["product_type"]
+        product_type = product_type_preset["product_type"]
 
         # get variant name from preset or from inheritance
         _variant_name = product_type_preset.get("variant") or variant_name
 
-        # subset name
-        subset_name = "{}{}".format(
-            family, _variant_name.capitalize()
+        # product name
+        product_name = "{}{}".format(
+            product_type, _variant_name.capitalize()
         )
         label = "{} {}".format(
             asset_name,
-            subset_name
+            product_name
         )
 
         instance_data.update({
-            "family": family,
             "label": label,
             "variant": _variant_name,
-            "subset": subset_name,
+            "productType": product_type,
+            "productName": product_name,
         })
 
         return label
@@ -623,7 +607,7 @@ or updating already created. Publishing will create OTIO file.
         instance_data,
         track_start_frame,
     ):
-        """ Factoring basic set of instance data.
+        """Factoring basic set of instance data.
 
         Args:
             otio_clip (otio.Clip): otio clip object
@@ -756,7 +740,7 @@ or updating already created. Publishing will create OTIO file.
         }
 
     def _get_allowed_product_type_presets(self, pre_create_data):
-        """ Filter out allowed family presets.
+        """Filter out allowed product type presets.
 
         Args:
             pre_create_data (dict): precreate attributes inputs
@@ -802,7 +786,7 @@ or updating already created. Publishing will create OTIO file.
         return True
 
     def get_pre_create_attr_defs(self):
-        """ Creating pre-create attributes at creator plugin.
+        """Creating pre-create attributes at creator plugin.
 
         Returns:
             list: list of attribute object instances
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 cc1429901d..fe7ba4c4a4 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
@@ -15,7 +15,6 @@ def initialize():
 
     global_variables = globals()
     for item in simple_creators:
-
         dynamic_plugin = SettingsCreator.from_settings(item)
         global_variables[dynamic_plugin.__name__] = dynamic_plugin
 
diff --git a/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py b/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py
index 274495855b..9b3dfdd334 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_movie_batch.py
@@ -11,7 +11,7 @@ from ayon_core.pipeline import (
     CreatedInstance,
 )
 from ayon_core.pipeline.create import (
-    get_subset_name,
+    get_product_name,
     TaskNotSetError,
 )
 
@@ -29,7 +29,7 @@ class BatchMovieCreator(TrayPublishCreator):
     """
     identifier = "render_movie_batch"
     label = "Batch Movies"
-    family = "render"
+    product_type = "render"
     description = "Publish batch of video files"
 
     create_allow_context_change = False
@@ -48,7 +48,7 @@ class BatchMovieCreator(TrayPublishCreator):
     def get_icon(self):
         return "fa.file"
 
-    def create(self, subset_name, data, pre_create_data):
+    def create(self, product_name, data, pre_create_data):
         file_paths = pre_create_data.get("filepath")
         if not file_paths:
             return
@@ -62,7 +62,7 @@ class BatchMovieCreator(TrayPublishCreator):
             asset_doc, version = get_asset_doc_from_file_name(
                 file_name, self.project_name, self.version_regex)
 
-            subset_name, task_name = self._get_subset_and_task(
+            product_name, task_name = self._get_product_and_task(
                 asset_doc, data["variant"], self.project_name)
 
             asset_name = get_asset_name_identifier(asset_doc)
@@ -71,21 +71,22 @@ class BatchMovieCreator(TrayPublishCreator):
             instance_data["task"] = task_name
 
             # Create new instance
-            new_instance = CreatedInstance(self.family, subset_name,
+            new_instance = CreatedInstance(self.product_type, product_name,
                                            instance_data, self)
             self._store_new_instance(new_instance)
 
-    def _get_subset_and_task(self, asset_doc, variant, project_name):
-        """Create subset name according to standard template process"""
+    def _get_product_and_task(self, asset_doc, variant, project_name):
+        """Create product name according to standard template process"""
         task_name = self._get_task_name(asset_doc)
-
+        host_name = self.create_context.host_name
         try:
-            subset_name = get_subset_name(
-                self.family,
-                variant,
-                task_name,
+            product_name = get_product_name(
+                project_name,
                 asset_doc,
-                project_name
+                task_name,
+                host_name,
+                self.product_type,
+                variant,
             )
         except TaskNotSetError:
             # Create instance with fake task
@@ -93,15 +94,16 @@ class BatchMovieCreator(TrayPublishCreator):
             #   but user have ability to change it
             # NOTE: This expect that there is not task 'Undefined' on asset
             task_name = "Undefined"
-            subset_name = get_subset_name(
-                self.family,
-                variant,
-                task_name,
+            product_name = get_product_name(
+                project_name,
                 asset_doc,
-                project_name
+                task_name,
+                host_name,
+                self.product_type,
+                variant,
             )
 
-        return subset_name, task_name
+        return product_name, task_name
 
     def _get_task_name(self, asset_doc):
         """Get applicable task from 'asset_doc' """
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 36d2fba976..a25da0bf34 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/create/create_online.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 """Creator of online files.
 
-Online file retain their original name and use it as subset name. To
-avoid conflicts, this creator checks if subset with this name already
+Online file retain their original name and use it as product name. To
+avoid conflicts, this creator checks if product with this name already
 exists under selected asset.
 """
 from pathlib import Path
@@ -21,7 +21,7 @@ class OnlineCreator(TrayPublishCreator):
 
     identifier = "io.openpype.creators.traypublisher.online"
     label = "Online"
-    family = "online"
+    product_type = "online"
     description = "Publish file retaining its original file name"
     extensions = [".mov", ".mp4", ".mxf", ".m4v", ".mpg", ".exr",
                   ".dpx", ".tif", ".png", ".jpg"]
@@ -30,7 +30,7 @@ class OnlineCreator(TrayPublishCreator):
         return """# Create file retaining its original file name.
 
         This will publish files using template helping to retain original
-        file name and that file name is used as subset name.
+        file name and that file name is used as product name.
 
         Bz default it tries to guard against multiple publishes of the same
         file."""
@@ -38,7 +38,7 @@ class OnlineCreator(TrayPublishCreator):
     def get_icon(self):
         return "fa.file"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         repr_file = pre_create_data.get("representation_file")
         if not repr_file:
             raise CreatorError("No files specified")
@@ -50,7 +50,7 @@ class OnlineCreator(TrayPublishCreator):
 
         origin_basename = Path(files[0]).stem
 
-        # disable check for existing subset with the same name
+        # disable check for existing product with the same name
         """
         asset = get_asset_by_name(
             self.project_name, instance_data["folderPath"], fields=["_id"])
@@ -58,19 +58,19 @@ class OnlineCreator(TrayPublishCreator):
         if get_subset_by_name(
                 self.project_name, origin_basename, asset["_id"],
                 fields=["_id"]):
-            raise CreatorError(f"subset with {origin_basename} already "
+            raise CreatorError(f"product with {origin_basename} already "
                                "exists in selected asset")
         """
 
         instance_data["originalBasename"] = origin_basename
-        subset_name = origin_basename
+        product_name = origin_basename
 
         instance_data["creator_attributes"] = {
             "path": (Path(repr_file["directory"]) / files[0]).as_posix()
         }
 
         # Create new instance
-        new_instance = CreatedInstance(self.family, subset_name,
+        new_instance = CreatedInstance(self.product_type, product_name,
                                        instance_data, self)
         self._store_new_instance(new_instance)
 
@@ -100,16 +100,16 @@ class OnlineCreator(TrayPublishCreator):
             )
         ]
 
-    def get_subset_name(
+    def get_product_name(
         self,
-        variant,
-        task_name,
-        asset_doc,
         project_name,
+        asset_doc,
+        task_name,
+        variant,
         host_name=None,
         instance=None
     ):
         if instance is None:
             return "{originalBasename}"
 
-        return instance.data["subset"]
+        return instance.data["productName"]
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml b/client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml
index 8a3b8f4d7d..726ccdffe3 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/help/validate_existing_version.xml
@@ -5,7 +5,7 @@
 <description>
 ## Version already exists
 
-Version {version} you have set on instance '{subset_name}' under '{asset_name}' already exists. This validation is enabled by default to prevent accidental override of existing versions.
+Version {version} you have set on instance '{product_name}' under '{asset_name}' already exists. This validation is enabled by default to prevent accidental override of existing versions.
 
 ### How to repair?
 - Click on 'Repair' action -> this will change version to next available.
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 b75ae674e8..ddfe8904fa 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
@@ -34,12 +34,12 @@ class ValidateExistingVersion(
         if last_version is None or last_version < version:
             return
 
-        subset_name = instance.data["subset"]
-        msg = "Version {} already exists for subset {}.".format(
-            version, subset_name)
+        product_name = instance.data["productName"]
+        msg = "Version {} already exists for product {}.".format(
+            version, product_name)
 
         formatting_data = {
-            "subset_name": subset_name,
+            "product_name": product_name,
             "asset_name": instance.data["folderPath"],
             "version": version
         }
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py
index 4a4f3dae69..c673b1977b 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_filepaths.py
@@ -28,14 +28,14 @@ class ValidateFilePath(pyblish.api.InstancePlugin):
             ))
             return
 
-        family = instance.data["family"]
+        product_type = instance.data["productType"]
         label = instance.data["name"]
         filepaths = instance.data["sourceFilepaths"]
         if not filepaths:
             raise PublishValidationError(
                 (
                     "Source filepaths of '{}' instance \"{}\" are not filled"
-                ).format(family, label),
+                ).format(product_type, label),
                 "File not filled",
                 (
                     "## Files were not filled"
@@ -59,7 +59,7 @@ class ValidateFilePath(pyblish.api.InstancePlugin):
             raise PublishValidationError(
                 (
                     "Filepath of '{}' instance \"{}\" does not exist:\n{}"
-                ).format(family, label, joined_paths),
+                ).format(product_type, label, joined_paths),
                 "File not found",
                 (
                     "## Files were not found\nFiles\n{}"
diff --git a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py
index e655578095..3bd55342af 100644
--- a/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py
+++ b/client/ayon_core/hosts/traypublisher/plugins/publish/validate_online_file.py
@@ -11,7 +11,7 @@ from ayon_core.client import get_subset_by_name
 
 class ValidateOnlineFile(OptionalPyblishPluginMixin,
                          pyblish.api.InstancePlugin):
-    """Validate that subset doesn't exist yet."""
+    """Validate that product doesn't exist yet."""
     label = "Validate Existing Online Files"
     hosts = ["traypublisher"]
     families = ["online"]
@@ -24,10 +24,10 @@ class ValidateOnlineFile(OptionalPyblishPluginMixin,
             return
         project_name = instance.context.data["projectName"]
         asset_id = instance.data["assetEntity"]["_id"]
-        subset = get_subset_by_name(
-            project_name, instance.data["subset"], asset_id)
+        subset_doc = get_subset_by_name(
+            project_name, instance.data["productName"], asset_id)
 
-        if subset:
+        if subset_doc:
             raise PublishValidationError(
                 "Subset to be published already exists.",
                 title=self.label
diff --git a/client/ayon_core/hosts/tvpaint/api/plugin.py b/client/ayon_core/hosts/tvpaint/api/plugin.py
index 88a0e74528..ef9f82b783 100644
--- a/client/ayon_core/hosts/tvpaint/api/plugin.py
+++ b/client/ayon_core/hosts/tvpaint/api/plugin.py
@@ -3,7 +3,7 @@ import re
 from ayon_core.pipeline import LoaderPlugin
 from ayon_core.pipeline.create import (
     CreatedInstance,
-    get_subset_name,
+    get_product_name,
     AutoCreator,
     Creator,
 )
@@ -17,8 +17,8 @@ SHARED_DATA_KEY = "openpype.tvpaint.instances"
 
 class TVPaintCreatorCommon:
     @property
-    def subset_template_family_filter(self):
-        return self.family
+    def product_template_product_type(self):
+        return self.product_type
 
     def _cache_and_get_instances(self):
         return cache_and_get_instances(
@@ -53,29 +53,29 @@ class TVPaintCreatorCommon:
             cur_instance_data.update(instance_data)
         self.host.write_instances(cur_instances)
 
-    def _custom_get_subset_name(
+    def _custom_get_product_name(
         self,
-        variant,
-        task_name,
-        asset_doc,
         project_name,
+        asset_doc,
+        task_name,
+        variant,
         host_name=None,
         instance=None
     ):
         dynamic_data = self.get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
 
-        return get_subset_name(
-            self.family,
-            variant,
-            task_name,
-            asset_doc,
+        return get_product_name(
             project_name,
+            asset_doc,
+            task_name,
             host_name,
+            self.product_type,
+            variant,
             dynamic_data=dynamic_data,
             project_settings=self.project_settings,
-            family_filter=self.subset_template_family_filter
+            product_type_filter=self.product_template_product_type
         )
 
 
@@ -118,8 +118,8 @@ class TVPaintCreator(Creator, TVPaintCreatorCommon):
                 output["task"] = task_name
         return output
 
-    def get_subset_name(self, *args, **kwargs):
-        return self._custom_get_subset_name(*args, **kwargs)
+    def get_product_name(self, *args, **kwargs):
+        return self._custom_get_product_name(*args, **kwargs)
 
     def _store_new_instance(self, new_instance):
         instances_data = self.host.list_instances()
@@ -135,8 +135,8 @@ class TVPaintAutoCreator(AutoCreator, TVPaintCreatorCommon):
     def update_instances(self, update_list):
         self._update_create_instances(update_list)
 
-    def get_subset_name(self, *args, **kwargs):
-        return self._custom_get_subset_name(*args, **kwargs)
+    def get_product_name(self, *args, **kwargs):
+        return self._custom_get_product_name(*args, **kwargs)
 
 
 class Loader(LoaderPlugin):
@@ -161,8 +161,8 @@ class Loader(LoaderPlugin):
         `0` is used ase base.
 
         Args:
-            asset_name (str): Name of subset's parent asset document.
-            name (str): Name of loaded subset.
+            asset_name (str): Name of product's parent asset document.
+            name (str): Name of loaded product.
 
         Returns:
             (str): `{asset_name}_{name}_{higher suffix + 1}`
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py b/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py
index d3c6c06c8a..1415adac2b 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/create/convert_legacy.py
@@ -101,7 +101,7 @@ class TVPaintLegacyConverted(SubsetConvertorPlugin):
             render_layer["creator_attributes"] = {
                 "group_id": group_id
             }
-            render_layer["family"] = "render"
+            render_layer["productType"] = "render"
             group = groups_by_id[group_id]
             # Use group name for variant
             group["variant"] = group["name"]
@@ -128,7 +128,7 @@ class TVPaintLegacyConverted(SubsetConvertorPlugin):
 
             render_pass["creator_identifier"] = "render.pass"
             render_pass["instance_id"] = render_pass.pop("uuid")
-            render_pass["family"] = "render"
+            render_pass["productType"] = "render"
 
             render_pass["creator_attributes"] = {
                 "render_layer_instance_id": render_layer["instance_id"]
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py b/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py
index 7d908e8018..dc53ccb9ca 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/create/create_render.py
@@ -118,8 +118,8 @@ class CreateRenderlayer(TVPaintCreator):
     """
 
     label = "Render Layer"
-    family = "render"
-    subset_template_family_filter = "renderLayer"
+    product_type = "render"
+    product_template_product_type = "renderLayer"
     identifier = "render.layer"
     icon = "fa5.images"
 
@@ -149,10 +149,10 @@ class CreateRenderlayer(TVPaintCreator):
         self.mark_for_review = plugin_settings["mark_for_review"]
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         dynamic_data = super().get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["renderpass"] = self.default_pass_name
         dynamic_data["renderlayer"] = variant
@@ -165,7 +165,7 @@ class CreateRenderlayer(TVPaintCreator):
             if layer["selected"]
         }
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         self.log.debug("Query data from workfile.")
 
         group_name = instance_data["variant"]
@@ -195,7 +195,7 @@ class CreateRenderlayer(TVPaintCreator):
             ):
                 raise CreatorError((
                     f"Group \"{group_item.get('name')}\" is already used"
-                    f" by another render layer \"{instance['subset']}\""
+                    f" by another render layer \"{instance['productName']}\""
                 ))
 
         self.log.debug(f"Selected group id is \"{group_id}\".")
@@ -208,10 +208,10 @@ class CreateRenderlayer(TVPaintCreator):
         creator_attributes["group_id"] = group_id
         creator_attributes["mark_for_review"] = mark_for_review
 
-        self.log.info(f"Subset name is {subset_name}")
+        self.log.info(f"Subset name is {product_name}")
         new_instance = CreatedInstance(
-            self.family,
-            subset_name,
+            self.product_type,
+            product_name,
             instance_data,
             self
         )
@@ -374,8 +374,8 @@ class CreateRenderlayer(TVPaintCreator):
 
 
 class CreateRenderPass(TVPaintCreator):
-    family = "render"
-    subset_template_family_filter = "renderPass"
+    product_type = "render"
+    product_template_product_type = "renderPass"
     identifier = "render.pass"
     label = "Render Pass"
     icon = "fa5.image"
@@ -425,10 +425,10 @@ class CreateRenderPass(TVPaintCreator):
             self._add_instance_to_context(instance)
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self, project_name, asset_doc, task_name, variant, host_name, instance
     ):
         dynamic_data = super().get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name, asset_doc, task_name, variant, host_name, instance
         )
         dynamic_data["renderpass"] = variant
         dynamic_data["renderlayer"] = "{renderlayer}"
@@ -447,7 +447,7 @@ class CreateRenderPass(TVPaintCreator):
                     "renderlayer": render_layer_variant
                 })
             try:
-                new_label = instance["subset"].format(**render_layer_data)
+                new_label = instance["productName"].format(**render_layer_data)
             except (KeyError, ValueError):
                 pass
 
@@ -457,7 +457,7 @@ class CreateRenderPass(TVPaintCreator):
         instance["group"] = new_group
         return old_group != new_group or old_label != new_label
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         render_layer_instance_id = pre_create_data.get(
             "render_layer_instance_id"
         )
@@ -523,18 +523,18 @@ class CreateRenderPass(TVPaintCreator):
                 instances_to_remove.append(instance)
 
         render_layer = render_layer_instance["variant"]
-        subset_name_fill_data = {"renderlayer": render_layer}
+        product_name_fill_data = {"renderlayer": render_layer}
 
-        # Format dynamic keys in subset name
-        label = subset_name
+        # Format dynamic keys in product name
+        label = product_name
         try:
             label = label.format(
-                **prepare_template_data(subset_name_fill_data)
+                **prepare_template_data(product_name_fill_data)
             )
         except (KeyError, ValueError):
             pass
 
-        self.log.info(f"New subset name is \"{label}\".")
+        self.log.info(f"New product name is \"{label}\".")
         instance_data["label"] = label
         instance_data["group"] = f"{self.get_group_label()} ({render_layer})"
         instance_data["layer_names"] = list(marked_layer_names)
@@ -551,8 +551,8 @@ class CreateRenderPass(TVPaintCreator):
         )
 
         new_instance = CreatedInstance(
-            self.family,
-            subset_name,
+            self.product_type,
+            product_name,
             instance_data,
             self
         )
@@ -608,7 +608,7 @@ class CreateRenderPass(TVPaintCreator):
         render_layers = [
             {
                 "value": inst["instance_id"],
-                "label": inst["subset"]
+                "label": inst["productName"]
             }
             for inst in current_instances
             if inst.get("creator_identifier") == CreateRenderlayer.identifier
@@ -674,7 +674,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
     Never will have any instances, all instances belong to different creators.
     """
 
-    family = "render"
+    product_type = "render"
     label = "Render Layer/Passes"
     identifier = "render.auto.detect.creator"
     order = CreateRenderPass.order + 10
@@ -777,31 +777,31 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
             self.create_context.creators[CreateRenderlayer.identifier]
         )
 
-        subset_name: str = creator.get_subset_name(
-            variant,
-            task_name,
-            asset_doc,
+        product_name: str = creator.get_product_name(
             project_name,
+            asset_doc,
+            task_name,
+            variant,
             host_name=self.create_context.host_name,
         )
         asset_name = get_asset_name_identifier(asset_doc)
         if existing_instance is not None:
             existing_instance["folderPath"] = asset_name
             existing_instance["task"] = task_name
-            existing_instance["subset"] = subset_name
+            existing_instance["productName"] = product_name
             return existing_instance
 
         instance_data: dict[str, str] = {
             "folderPath": asset_name,
             "task": task_name,
-            "family": creator.family,
+            "productType": creator.product_type,
             "variant": variant,
         }
         pre_create_data: dict[str, str] = {
             "group_id": group_id,
             "mark_for_review": mark_for_review
         }
-        return creator.create(subset_name, instance_data, pre_create_data)
+        return creator.create(product_name, instance_data, pre_create_data)
 
     def _prepare_render_passes(
         self,
@@ -831,11 +831,11 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
                 if (render_pass["layer_names"]) > 1:
                     variant = render_pass["variant"]
 
-            subset_name = creator.get_subset_name(
-                variant,
-                task_name,
-                asset_doc,
+            product_name = creator.get_product_name(
                 project_name,
+                asset_doc,
+                task_name,
+                variant,
                 host_name=self.create_context.host_name,
                 instance=render_pass
             )
@@ -843,13 +843,13 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
             if render_pass is not None:
                 render_pass["folderPath"] = asset_name
                 render_pass["task"] = task_name
-                render_pass["subset"] = subset_name
+                render_pass["productName"] = product_name
                 continue
 
             instance_data: dict[str, str] = {
                 "folderPath": asset_name,
                 "task": task_name,
-                "family": creator.family,
+                "productType": creator.product_type,
                 "variant": variant
             }
 
@@ -858,7 +858,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
                 "layer_names": [layer_name],
                 "mark_for_review": mark_for_review
             }
-            creator.create(subset_name, instance_data, pre_create_data)
+            creator.create(product_name, instance_data, pre_create_data)
 
     def _filter_groups(
         self,
@@ -884,7 +884,7 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
             new_groups_order.append(group_id)
         return new_groups_order
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         project_name: str = self.create_context.get_current_project_name()
         asset_name: str = instance_data["folderPath"]
         task_name: str = instance_data["task"]
@@ -1023,8 +1023,8 @@ class TVPaintAutoDetectRenderCreator(TVPaintCreator):
 
 
 class TVPaintSceneRenderCreator(TVPaintAutoCreator):
-    family = "render"
-    subset_template_family_filter = "renderScene"
+    product_type = "render"
+    product_template_product_type = "renderScene"
     identifier = "render.scene"
     label = "Scene Render"
     icon = "fa.file-image-o"
@@ -1044,8 +1044,23 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
         self.active_on_create = plugin_settings["active_on_create"]
         self.default_pass_name = plugin_settings["default_pass_name"]
 
-    def get_dynamic_data(self, variant, *args, **kwargs):
-        dynamic_data = super().get_dynamic_data(variant, *args, **kwargs)
+    def get_dynamic_data(
+        self,
+        project_name,
+        asset_doc,
+        task_name,
+        variant,
+        host_name,
+        instance
+    ):
+        dynamic_data = super().get_dynamic_data(
+            project_name,
+            asset_doc,
+            task_name,
+            variant,
+            host_name,
+            instance
+        )
         dynamic_data["renderpass"] = "{renderpass}"
         dynamic_data["renderlayer"] = variant
         return dynamic_data
@@ -1058,12 +1073,12 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
         task_name = create_context.get_current_task_name()
 
         asset_doc = get_asset_by_name(project_name, asset_name)
-        subset_name = self.get_subset_name(
-            self.default_variant,
-            task_name,
-            asset_doc,
+        product_name = self.get_product_name(
             project_name,
-            host_name
+            asset_doc,
+            task_name,
+            self.default_variant,
+            host_name,
         )
         data = {
             "folderPath": asset_name,
@@ -1074,7 +1089,7 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
                 "mark_for_review": True
             },
             "label": self._get_label(
-                subset_name,
+                product_name,
                 self.default_pass_name
             )
         }
@@ -1082,7 +1097,7 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
             data["active"] = False
 
         new_instance = CreatedInstance(
-            self.family, subset_name, data, self
+            self.product_type, product_name, data, self
         )
         instances_data = self.host.list_instances()
         instances_data.append(new_instance.data_to_store())
@@ -1112,32 +1127,32 @@ class TVPaintSceneRenderCreator(TVPaintAutoCreator):
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                existing_instance["variant"],
-                task_name,
-                asset_doc,
+            product_name = self.get_product_name(
                 project_name,
+                asset_doc,
+                task_name,
+                existing_instance["variant"],
                 host_name,
                 existing_instance
             )
             existing_instance["folderPath"] = asset_name
             existing_instance["task"] = task_name
-            existing_instance["subset"] = subset_name
+            existing_instance["productName"] = product_name
 
         existing_instance["label"] = self._get_label(
-            existing_instance["subset"],
+            existing_instance["productName"],
             existing_instance["creator_attributes"]["render_pass_name"]
         )
 
-    def _get_label(self, subset_name, render_pass_name):
+    def _get_label(self, product_name, render_pass_name):
         try:
-            subset_name = subset_name.format(**prepare_template_data({
+            product_name = product_name.format(**prepare_template_data({
                 "renderpass": render_pass_name
             }))
         except (KeyError, ValueError):
             pass
 
-        return subset_name
+        return product_name
 
     def get_instance_attr_defs(self):
         return [
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py b/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py
index 773b85c1f5..1837726cab 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/create/create_review.py
@@ -4,7 +4,7 @@ from ayon_core.hosts.tvpaint.api.plugin import TVPaintAutoCreator
 
 
 class TVPaintReviewCreator(TVPaintAutoCreator):
-    family = "review"
+    product_type = "review"
     identifier = "scene.review"
     label = "Review"
     icon = "ei.video"
@@ -40,11 +40,11 @@ class TVPaintReviewCreator(TVPaintAutoCreator):
 
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                self.default_variant,
-                task_name,
-                asset_doc,
+            product_name = self.get_product_name(
                 project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
                 host_name
             )
             data = {
@@ -57,7 +57,7 @@ class TVPaintReviewCreator(TVPaintAutoCreator):
                 data["active"] = False
 
             new_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             instances_data = self.host.list_instances()
             instances_data.append(new_instance.data_to_store())
@@ -69,14 +69,14 @@ class TVPaintReviewCreator(TVPaintAutoCreator):
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                existing_instance["variant"],
-                task_name,
-                asset_doc,
+            product_name = self.get_product_name(
                 project_name,
+                asset_doc,
+                task_name,
+                existing_instance["variant"],
                 host_name,
                 existing_instance
             )
             existing_instance["folderPath"] = asset_name
             existing_instance["task"] = task_name
-            existing_instance["subset"] = subset_name
+            existing_instance["productName"] = product_name
diff --git a/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py b/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py
index f0d1c7bae6..14a11750a5 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/create/create_workfile.py
@@ -4,7 +4,7 @@ from ayon_core.hosts.tvpaint.api.plugin import TVPaintAutoCreator
 
 
 class TVPaintWorkfileCreator(TVPaintAutoCreator):
-    family = "workfile"
+    product_type = "workfile"
     identifier = "workfile"
     label = "Workfile"
     icon = "fa.file-o"
@@ -36,11 +36,11 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator):
 
         if existing_instance is None:
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                self.default_variant,
-                task_name,
-                asset_doc,
+            product_name = self.get_product_name(
                 project_name,
+                asset_doc,
+                task_name,
+                self.default_variant,
                 host_name
             )
             data = {
@@ -50,7 +50,7 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator):
             }
 
             new_instance = CreatedInstance(
-                self.family, subset_name, data, self
+                self.product_type, product_name, data, self
             )
             instances_data = self.host.list_instances()
             instances_data.append(new_instance.data_to_store())
@@ -62,14 +62,14 @@ class TVPaintWorkfileCreator(TVPaintAutoCreator):
             or existing_instance["task"] != task_name
         ):
             asset_doc = get_asset_by_name(project_name, asset_name)
-            subset_name = self.get_subset_name(
-                existing_instance["variant"],
-                task_name,
-                asset_doc,
+            product_name = self.get_product_name(
                 project_name,
+                asset_doc,
+                task_name,
+                existing_instance["variant"],
                 host_name,
                 existing_instance
             )
             existing_instance["folderPath"] = asset_name
             existing_instance["task"] = task_name
-            existing_instance["subset"] = subset_name
+            existing_instance["productName"] = product_name
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py b/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py
index 0a12e93f44..856bf69845 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/load/load_reference_image.py
@@ -83,8 +83,8 @@ class LoadImage(plugin.Loader):
 
         # Prepare layer name
         asset_name = context["asset"]["name"]
-        subset_name = context["subset"]["name"]
-        layer_name = self.get_unique_layer_name(asset_name, subset_name)
+        product_name = context["subset"]["name"]
+        layer_name = self.get_unique_layer_name(asset_name, product_name)
 
         path = self.filepath_from_context(context)
 
diff --git a/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py b/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py
index c652b379ab..49ef9fc37b 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/load/load_workfile.py
@@ -101,7 +101,7 @@ class LoadWorkfile(plugin.Loader):
                 "tvpaint",
                 task_name=task_name,
                 task_type=data["task"]["type"],
-                family="workfile"
+                product_type="workfile"
             )
         else:
             version += 1
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_instance_frames.py b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_instance_frames.py
index 63f04cf3ce..e7b7b2cad1 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_instance_frames.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_instance_frames.py
@@ -31,6 +31,6 @@ class CollectOutputFrameRange(pyblish.api.InstancePlugin):
         instance.data["frameEnd"] = frame_end
         self.log.info(
             "Set frames {}-{} on instance {} ".format(
-                frame_start, frame_end, instance.data["subset"]
+                frame_start, frame_end, instance.data["productName"]
             )
         )
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py
index 029c4b7e18..596d257f22 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_render_instances.py
@@ -28,10 +28,10 @@ class CollectRenderInstances(pyblish.api.InstancePlugin):
                 self._collect_data_for_review(instance)
             return
 
-        subset_name = instance.data["subset"]
-        instance.data["name"] = subset_name
+        product_name = instance.data["productName"]
+        instance.data["name"] = product_name
         instance.data["label"] = "{} [{}-{}]".format(
-            subset_name,
+            product_name,
             context.data["sceneMarkIn"] + 1,
             context.data["sceneMarkOut"] + 1
         )
@@ -84,8 +84,8 @@ class CollectRenderInstances(pyblish.api.InstancePlugin):
         if render_layer_data is None:
             return
         render_layer_name = render_layer_data["variant"]
-        subset_name = instance.data["subset"]
-        instance.data["subset"] = subset_name.format(
+        product_name = instance.data["productName"]
+        instance.data["productName"] = product_name.format(
             **prepare_template_data({"renderlayer": render_layer_name})
         )
 
@@ -103,8 +103,8 @@ class CollectRenderInstances(pyblish.api.InstancePlugin):
         render_pass_name = (
             instance.data["creator_attributes"]["render_pass_name"]
         )
-        subset_name = instance.data["subset"]
-        instance.data["subset"] = subset_name.format(
+        product_name = instance.data["productName"]
+        instance.data["productName"] = product_name.format(
             **prepare_template_data({"renderpass": render_pass_name})
         )
 
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile.py b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile.py
index a3449663f8..a9e9db3872 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/collect_workfile.py
@@ -14,7 +14,7 @@ class CollectWorkfile(pyblish.api.InstancePlugin):
         current_file = context.data["currentFile"]
 
         self.log.info(
-            "Workfile path used for workfile family: {}".format(current_file)
+            "Workfile path used for workfile product: {}".format(current_file)
         )
 
         dirpath, filename = os.path.split(current_file)
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 0ab9fbd038..ab30e3dc10 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/extract_sequence.py
@@ -111,7 +111,7 @@ class ExtractSequence(pyblish.api.Extractor):
             "Files will be rendered to folder: {}".format(output_dir)
         )
 
-        if instance.data["family"] == "review":
+        if instance.data["productType"] == "review":
             result = self.render_review(
                 output_dir, mark_in, mark_out, scene_bg_color
             )
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_asset_name.xml b/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_asset_name.xml
index 33a9ca4247..83753b3410 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_asset_name.xml
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_asset_name.xml
@@ -2,9 +2,9 @@
 <root>
 <error id="main">
 <title>Subset context</title>
-<description>## Invalid subset context
+<description>## Invalid product context
 
-Context of the given subset doesn't match your current scene.
+Context of the given product doesn't match your current scene.
 
 ### How to repair?
 
@@ -15,7 +15,7 @@ After that restart publishing with Reload button.
 <detail>
 ### How could this happen?
 
-The subset was created in different scene with different context
+The product was created in different scene with different context
 or the scene file was copy pasted from different context.
 </detail>
 </error>
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml b/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
index 5d798544c0..23c899cfc6 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_duplicated_layer_names.xml
@@ -10,13 +10,13 @@ Can't determine which layers should be published because there are duplicated la
 
 {layer_names}
 
-*Check layer names for all subsets in list on left side.*
+*Check layer names for all products in list on left side.*
 
 ### How to repair?
 
 Hide/rename/remove layers that should not be published.
 
-If all of them should be published then you have duplicated subset names in the scene. In that case you have to recrete them and use different variant name.
+If all of them should be published then you have duplicated product names in the scene. In that case you have to recrete them and use different variant name.
 </description>
 </error>
 </root>
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_layers_visibility.xml b/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_layers_visibility.xml
index 5832c74350..5013f38eca 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_layers_visibility.xml
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_layers_visibility.xml
@@ -4,13 +4,13 @@
 <title>Layers visibility</title>
 <description>## All layers are not visible
 
-Layers visibility was changed during publishing which caused that all layers for subset "{instance_name}" are hidden.
+Layers visibility was changed during publishing which caused that all layers for product "{instance_name}" are hidden.
 
 ### Layer names for **{instance_name}**
 
 {layer_names}
 
-*Check layer names for all subsets in the list on the left side.*
+*Check layer names for all products in the list on the left side.*
 
 ### How to repair?
 
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_missing_layer_names.xml b/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_missing_layer_names.xml
index e96e7c5044..000fe84844 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_missing_layer_names.xml
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/help/validate_missing_layer_names.xml
@@ -4,7 +4,7 @@
 <title>Missing layers</title>
 <description>## Missing layers for render pass
 
-Render pass subset "{instance_name}" has stored layer names that belong to it's rendering scope but layers were not found in scene.
+Render pass product "{instance_name}" has stored layer names that belong to it's rendering scope but layers were not found in scene.
 
 ### Missing layer names
 
@@ -12,7 +12,7 @@ Render pass subset "{instance_name}" has stored layer names that belong to it's
 
 ### How to repair?
 
-Find layers that belong to subset {instance_name} and rename them back to expected layer names or remove the subset and create new with right layers.
+Find layers that belong to product {instance_name} and rename them back to expected layer names or remove the product and create new with right layers.
 </description>
 </error>
 </root>
diff --git a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py
index 66793cbc7f..0e97a01de2 100644
--- a/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py
+++ b/client/ayon_core/hosts/tvpaint/plugins/publish/validate_render_layer_group.py
@@ -4,7 +4,7 @@ from ayon_core.pipeline import PublishXmlValidationError
 
 
 class ValidateRenderLayerGroups(pyblish.api.ContextPlugin):
-    """Validate group ids of renderLayer subsets.
+    """Validate group ids of renderLayer products.
 
     Validate that there are not 2 render layers using the same group.
     """
@@ -46,19 +46,21 @@ class ValidateRenderLayerGroups(pyblish.api.ContextPlugin):
                 group["name"],
                 group["group_id"],
             )
-            line_join_subset_names = "\n".join([
-                f"    - {instance['subset']}"
+            line_join_product_names = "\n".join([
+                f"    - {instance['productName']}"
                 for instance in instances
             ])
-            joined_subset_names = ", ".join([
-                f"\"{instance['subset']}\""
+            joined_product_names = ", ".join([
+                f"\"{instance['productName']}\""
                 for instance in instances
             ])
             per_group_msgs.append(
-                "{} < {} >".format(group_label, joined_subset_names)
+                "{} < {} >".format(group_label, joined_product_names)
             )
             groups_information_lines.append(
-                "<b>{}</b>\n{}".format(group_label, line_join_subset_names)
+                "<b>{}</b>\n{}".format(
+                    group_label, line_join_product_names
+                )
             )
 
         # Raise an error
diff --git a/client/ayon_core/hosts/unreal/api/plugin.py b/client/ayon_core/hosts/unreal/api/plugin.py
index ddf54f6c79..f31c7c46b9 100644
--- a/client/ayon_core/hosts/unreal/api/plugin.py
+++ b/client/ayon_core/hosts/unreal/api/plugin.py
@@ -35,52 +35,50 @@ class UnrealBaseCreator(Creator):
     suffix = "_INS"
 
     @staticmethod
-    def cache_subsets(shared_data):
+    def cache_instance_data(shared_data):
         """Cache instances for Creators to shared data.
 
-        Create `unreal_cached_subsets` key when needed in shared data and
+        Create `unreal_cached_instances` key when needed in shared data and
         fill it with all collected instances from the scene under its
         respective creator identifiers.
 
         If legacy instances are detected in the scene, create
-        `unreal_cached_legacy_subsets` there and fill it with
-        all legacy subsets under family as a key.
+        `unreal_cached_legacy_instances` there and fill it with
+        all legacy products under family as a key.
 
         Args:
             Dict[str, Any]: Shared data.
 
-        Return:
-            Dict[str, Any]: Shared data dictionary.
-
         """
-        if shared_data.get("unreal_cached_subsets") is None:
-            unreal_cached_subsets = collections.defaultdict(list)
-            unreal_cached_legacy_subsets = collections.defaultdict(list)
-            for instance in ls_inst():
-                creator_id = instance.get("creator_identifier")
-                if creator_id:
-                    unreal_cached_subsets[creator_id].append(instance)
-                else:
-                    family = instance.get("family")
-                    unreal_cached_legacy_subsets[family].append(instance)
+        if "unreal_cached_instances" in shared_data:
+            return
 
-            shared_data["unreal_cached_subsets"] = unreal_cached_subsets
-            shared_data["unreal_cached_legacy_subsets"] = (
-                unreal_cached_legacy_subsets
-            )
-        return shared_data
+        unreal_cached_instances = collections.defaultdict(list)
+        unreal_cached_legacy_instances = collections.defaultdict(list)
+        for instance in ls_inst():
+            creator_id = instance.get("creator_identifier")
+            if creator_id:
+                unreal_cached_instances[creator_id].append(instance)
+            else:
+                family = instance.get("family")
+                unreal_cached_legacy_instances[family].append(instance)
 
-    def create(self, subset_name, instance_data, pre_create_data):
+        shared_data["unreal_cached_instances"] = unreal_cached_instances
+        shared_data["unreal_cached_legacy_instances"] = (
+            unreal_cached_legacy_instances
+        )
+
+    def create(self, product_name, instance_data, pre_create_data):
         try:
-            instance_name = f"{subset_name}{self.suffix}"
+            instance_name = f"{product_name}{self.suffix}"
             pub_instance = create_publish_instance(instance_name, self.root)
 
-            instance_data["subset"] = subset_name
+            instance_data["productName"] = product_name
             instance_data["instance_path"] = f"{self.root}/{instance_name}"
 
             instance = CreatedInstance(
-                self.family,
-                subset_name,
+                self.product_type,
+                product_name,
                 instance_data,
                 self)
             self._add_instance_to_context(instance)
@@ -106,9 +104,9 @@ class UnrealBaseCreator(Creator):
 
     def collect_instances(self):
         # cache instances if missing
-        self.cache_subsets(self.collection_shared_data)
+        self.cache_instance_data(self.collection_shared_data)
         for instance in self.collection_shared_data[
-                "unreal_cached_subsets"].get(self.identifier, []):
+                "unreal_cached_instances"].get(self.identifier, []):
             # Unreal saves metadata as string, so we need to convert it back
             instance['creator_attributes'] = ast.literal_eval(
                 instance.get('creator_attributes', '{}'))
@@ -148,11 +146,11 @@ class UnrealBaseCreator(Creator):
 class UnrealAssetCreator(UnrealBaseCreator):
     """Base class for Unreal creator plugins based on assets."""
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         """Create instance of the asset.
 
         Args:
-            subset_name (str): Name of the subset.
+            product_name (str): Name of the product.
             instance_data (dict): Data for the instance.
             pre_create_data (dict): Data for the instance.
 
@@ -172,7 +170,7 @@ class UnrealAssetCreator(UnrealBaseCreator):
                         a.get_path_name() for a in sel_objects]
 
             super(UnrealAssetCreator, self).create(
-                subset_name,
+                product_name,
                 instance_data,
                 pre_create_data)
 
@@ -192,11 +190,11 @@ class UnrealAssetCreator(UnrealBaseCreator):
 class UnrealActorCreator(UnrealBaseCreator):
     """Base class for Unreal creator plugins based on actors."""
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         """Create instance of the asset.
 
         Args:
-            subset_name (str): Name of the subset.
+            product_name (str): Name of the product.
             instance_data (dict): Data for the instance.
             pre_create_data (dict): Data for the instance.
 
@@ -226,7 +224,7 @@ class UnrealActorCreator(UnrealBaseCreator):
             instance_data["level"] = world.get_path_name()
 
             super(UnrealActorCreator, self).create(
-                subset_name,
+                product_name,
                 instance_data,
                 pre_create_data)
 
diff --git a/client/ayon_core/hosts/unreal/api/rendering.py b/client/ayon_core/hosts/unreal/api/rendering.py
index 4a15ceb89a..395513aefa 100644
--- a/client/ayon_core/hosts/unreal/api/rendering.py
+++ b/client/ayon_core/hosts/unreal/api/rendering.py
@@ -56,7 +56,7 @@ def start_rendering():
 
     for i in instances:
         data = pipeline.parse_container(i.get_path_name())
-        if data["family"] == "render":
+        if data["productType"] == "render":
             inst_data.append(data)
 
     try:
diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_camera.py b/client/ayon_core/hosts/unreal/plugins/create/create_camera.py
index f78de00f44..3ffb9dd70b 100644
--- a/client/ayon_core/hosts/unreal/plugins/create/create_camera.py
+++ b/client/ayon_core/hosts/unreal/plugins/create/create_camera.py
@@ -13,10 +13,10 @@ class CreateCamera(UnrealAssetCreator):
 
     identifier = "io.ayon.creators.unreal.camera"
     label = "Camera"
-    family = "camera"
+    product_type = "camera"
     icon = "fa.camera"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         if pre_create_data.get("use_selection"):
             sel_objects = unreal.EditorUtilityLibrary.get_selected_assets()
             selection = [a.get_path_name() for a in sel_objects]
@@ -33,6 +33,6 @@ class CreateCamera(UnrealAssetCreator):
         instance_data["level"] = world.get_path_name()
 
         super(CreateCamera, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_layout.py b/client/ayon_core/hosts/unreal/plugins/create/create_layout.py
index 0ec8a8d445..9bcddfe507 100644
--- a/client/ayon_core/hosts/unreal/plugins/create/create_layout.py
+++ b/client/ayon_core/hosts/unreal/plugins/create/create_layout.py
@@ -9,5 +9,5 @@ class CreateLayout(UnrealActorCreator):
 
     identifier = "io.ayon.creators.unreal.layout"
     label = "Layout"
-    family = "layout"
+    product_type = "layout"
     icon = "cubes"
diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_look.py b/client/ayon_core/hosts/unreal/plugins/create/create_look.py
index ecc0783c35..edc6d45f2f 100644
--- a/client/ayon_core/hosts/unreal/plugins/create/create_look.py
+++ b/client/ayon_core/hosts/unreal/plugins/create/create_look.py
@@ -16,10 +16,10 @@ class CreateLook(UnrealAssetCreator):
 
     identifier = "io.ayon.creators.unreal.look"
     label = "Look"
-    family = "look"
+    product_type = "look"
     icon = "paint-brush"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         # We need to set this to True for the parent class to work
         pre_create_data["use_selection"] = True
         sel_objects = unreal.EditorUtilityLibrary.get_selected_assets()
@@ -33,7 +33,7 @@ class CreateLook(UnrealAssetCreator):
         look_directory = "/Game/Ayon/Looks"
 
         # Create the folder
-        folder_name = create_folder(look_directory, subset_name)
+        folder_name = create_folder(look_directory, product_name)
         path = f"{look_directory}/{folder_name}"
 
         instance_data["look"] = path
@@ -67,7 +67,7 @@ class CreateLook(UnrealAssetCreator):
             unreal.EditorAssetLibrary.save_asset(object_path)
 
         super(CreateLook, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_render.py b/client/ayon_core/hosts/unreal/plugins/create/create_render.py
index 5bb782e7ea..cbec84c543 100644
--- a/client/ayon_core/hosts/unreal/plugins/create/create_render.py
+++ b/client/ayon_core/hosts/unreal/plugins/create/create_render.py
@@ -24,11 +24,11 @@ class CreateRender(UnrealAssetCreator):
 
     identifier = "io.ayon.creators.unreal.render"
     label = "Render"
-    family = "render"
+    product_type = "render"
     icon = "eye"
 
     def create_instance(
-            self, instance_data, subset_name, pre_create_data,
+            self, instance_data, product_name, pre_create_data,
             selected_asset_path, master_seq, master_lvl, seq_data
     ):
         instance_data["members"] = [selected_asset_path]
@@ -40,12 +40,12 @@ class CreateRender(UnrealAssetCreator):
         instance_data["frameEnd"] = seq_data.get('frame_range')[1]
 
         super(CreateRender, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
     def create_with_new_sequence(
-            self, subset_name, instance_data, pre_create_data
+            self, product_name, instance_data, pre_create_data
     ):
         # If the option to create a new level sequence is selected,
         # create a new level sequence and a master level.
@@ -53,7 +53,7 @@ class CreateRender(UnrealAssetCreator):
         root = f"/Game/Ayon/Sequences"
 
         # Create a new folder for the sequence in root
-        sequence_dir_name = create_folder(root, subset_name)
+        sequence_dir_name = create_folder(root, product_name)
         sequence_dir = f"{root}/{sequence_dir_name}"
 
         unreal.log_warning(f"sequence_dir: {sequence_dir}")
@@ -61,7 +61,7 @@ class CreateRender(UnrealAssetCreator):
         # Create the level sequence
         asset_tools = unreal.AssetToolsHelpers.get_asset_tools()
         seq = asset_tools.create_asset(
-            asset_name=subset_name,
+            asset_name=product_name,
             package_path=sequence_dir,
             asset_class=unreal.LevelSequence,
             factory=unreal.LevelSequenceFactoryNew())
@@ -92,7 +92,7 @@ class CreateRender(UnrealAssetCreator):
             else:
                 unreal.EditorLevelLibrary.save_current_level()
 
-        ml_path = f"{sequence_dir}/{subset_name}_MasterLevel"
+        ml_path = f"{sequence_dir}/{product_name}_MasterLevel"
 
         if UNREAL_VERSION.major >= 5:
             unreal.LevelEditorSubsystem().new_level(ml_path)
@@ -107,11 +107,11 @@ class CreateRender(UnrealAssetCreator):
                 seq.get_playback_end())}
 
         self.create_instance(
-            instance_data, subset_name, pre_create_data,
+            instance_data, product_name, pre_create_data,
             seq.get_path_name(), seq.get_path_name(), ml_path, seq_data)
 
     def create_from_existing_sequence(
-            self, subset_name, instance_data, pre_create_data
+            self, product_name, instance_data, pre_create_data
     ):
         ar = unreal.AssetRegistryHelpers.get_asset_registry()
 
@@ -224,16 +224,16 @@ class CreateRender(UnrealAssetCreator):
                 continue
 
             self.create_instance(
-                instance_data, subset_name, pre_create_data,
+                instance_data, product_name, pre_create_data,
                 selected_asset_path, master_seq, master_lvl, seq_data)
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         if pre_create_data.get("create_seq"):
             self.create_with_new_sequence(
-                subset_name, instance_data, pre_create_data)
+                product_name, instance_data, pre_create_data)
         else:
             self.create_from_existing_sequence(
-                subset_name, instance_data, pre_create_data)
+                product_name, instance_data, pre_create_data)
 
     def get_pre_create_attr_defs(self):
         return [
diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_staticmeshfbx.py b/client/ayon_core/hosts/unreal/plugins/create/create_staticmeshfbx.py
index 7fcd6f165a..603b852873 100644
--- a/client/ayon_core/hosts/unreal/plugins/create/create_staticmeshfbx.py
+++ b/client/ayon_core/hosts/unreal/plugins/create/create_staticmeshfbx.py
@@ -9,5 +9,5 @@ class CreateStaticMeshFBX(UnrealAssetCreator):
 
     identifier = "io.ayon.creators.unreal.staticmeshfbx"
     label = "Static Mesh (FBX)"
-    family = "unrealStaticMesh"
+    product_type = "unrealStaticMesh"
     icon = "cube"
diff --git a/client/ayon_core/hosts/unreal/plugins/create/create_uasset.py b/client/ayon_core/hosts/unreal/plugins/create/create_uasset.py
index 500726497d..1cd532c63d 100644
--- a/client/ayon_core/hosts/unreal/plugins/create/create_uasset.py
+++ b/client/ayon_core/hosts/unreal/plugins/create/create_uasset.py
@@ -14,12 +14,12 @@ class CreateUAsset(UnrealAssetCreator):
 
     identifier = "io.ayon.creators.unreal.uasset"
     label = "UAsset"
-    family = "uasset"
+    product_type = "uasset"
     icon = "cube"
 
     extension = ".uasset"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         if pre_create_data.get("use_selection"):
             ar = unreal.AssetRegistryHelpers.get_asset_registry()
 
@@ -44,7 +44,7 @@ class CreateUAsset(UnrealAssetCreator):
                     f"{Path(sys_path).name} is not a {self.label}.")
 
         super(CreateUAsset, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
 
@@ -54,13 +54,13 @@ class CreateUMap(CreateUAsset):
 
     identifier = "io.ayon.creators.unreal.umap"
     label = "Level"
-    family = "uasset"
+    product_type = "uasset"
     extension = ".umap"
 
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         instance_data["families"] = ["umap"]
 
         super(CreateUMap, self).create(
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data)
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_alembic_animation.py b/client/ayon_core/hosts/unreal/plugins/load/load_alembic_animation.py
index 4d7760e385..fe13e5989b 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_alembic_animation.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_alembic_animation.py
@@ -56,7 +56,7 @@ class AnimationAlembicLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_animation.py b/client/ayon_core/hosts/unreal/plugins/load/load_animation.py
index 4d44b6c0c2..ee5b8d9244 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_animation.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_animation.py
@@ -128,7 +128,7 @@ class AnimationFBXLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_camera.py b/client/ayon_core/hosts/unreal/plugins/load/load_camera.py
index faba561085..257cc2c720 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_camera.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_camera.py
@@ -70,7 +70,7 @@ class CameraLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_geometrycache_abc.py b/client/ayon_core/hosts/unreal/plugins/load/load_geometrycache_abc.py
index 360737cbc5..d7a4df1b03 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_geometrycache_abc.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_geometrycache_abc.py
@@ -108,7 +108,7 @@ class PointCacheAlembicLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_layout.py b/client/ayon_core/hosts/unreal/plugins/load/load_layout.py
index a1cc2e785a..1a17268d1c 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_layout.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_layout.py
@@ -369,16 +369,18 @@ class LayoutLoader(plugin.Loader):
             if representation not in repr_loaded:
                 repr_loaded.append(representation)
 
-                family = element.get('family')
+                product_type = element.get("product_type")
+                if product_type is None:
+                    product_type = element.get("family")
                 loaders = loaders_from_representation(
                     all_loaders, representation)
 
                 loader = None
 
                 if repr_format == 'fbx':
-                    loader = self._get_fbx_loader(loaders, family)
+                    loader = self._get_fbx_loader(loaders, product_type)
                 elif repr_format == 'abc':
-                    loader = self._get_abc_loader(loaders, family)
+                    loader = self._get_abc_loader(loaders, product_type)
 
                 if not loader:
                     self.log.error(
@@ -422,12 +424,12 @@ class LayoutLoader(plugin.Loader):
 
                     actors = []
 
-                    if family == 'model':
+                    if product_type == 'model':
                         actors, _ = self._process_family(
                             assets, 'StaticMesh', transform, basis,
                             sequence, inst
                         )
-                    elif family == 'rig':
+                    elif product_type == 'rig':
                         actors, bindings = self._process_family(
                             assets, 'SkeletalMesh', transform, basis,
                             sequence, inst
@@ -481,7 +483,7 @@ class LayoutLoader(plugin.Loader):
         for asset_container in asset_containers:
             package_path = asset_container.get_editor_property('package_path')
             family = EditorAssetLibrary.get_metadata_tag(
-                asset_container.get_asset(), 'family')
+                asset_container.get_asset(), "family")
             assets = EditorAssetLibrary.list_assets(
                 str(package_path), recursive=False)
             if family == 'model':
@@ -501,7 +503,7 @@ class LayoutLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_layout_existing.py b/client/ayon_core/hosts/unreal/plugins/load/load_layout_existing.py
index 6f390b4920..94686e2a5b 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_layout_existing.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_layout_existing.py
@@ -33,9 +33,9 @@ class ExistingLayoutLoader(plugin.Loader):
     delete_unmatched_assets = True
 
     @classmethod
-    def apply_settings(cls, project_settings, *args, **kwargs):
+    def apply_settings(cls, project_settings):
         super(ExistingLayoutLoader, cls).apply_settings(
-            project_settings, *args, **kwargs
+            project_settings
         )
         cls.delete_unmatched_assets = (
             project_settings["unreal"]["delete_unmatched_assets"]
@@ -284,9 +284,9 @@ class ExistingLayoutLoader(plugin.Loader):
 
                 # Create the container for the asset.
                 asset = repr_data.get('context').get('asset')
-                subset = repr_data.get('context').get('subset')
+                product_name = repr_data.get('context').get('subset')
                 container = self._create_container(
-                    f"{asset}_{subset}", mesh_path, asset,
+                    f"{asset}_{product_name}", mesh_path, asset,
                     repr_data.get('_id'), repr_data.get('parent'),
                     repr_data.get('context').get('family')
                 )
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_abc.py b/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_abc.py
index 225df3b440..3ab6ea8ebd 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_abc.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_abc.py
@@ -94,7 +94,7 @@ class SkeletalMeshAlembicLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_fbx.py b/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_fbx.py
index 1c45c58d02..cbdb4901f8 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_fbx.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_skeletalmesh_fbx.py
@@ -99,7 +99,7 @@ class SkeletalMeshFBXLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_abc.py b/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_abc.py
index a0814b5b07..c60ad8814c 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_abc.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_abc.py
@@ -95,7 +95,7 @@ class StaticMeshAlembicLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_fbx.py b/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_fbx.py
index a78b1bc959..c9271159c4 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_fbx.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_staticmesh_fbx.py
@@ -87,7 +87,7 @@ class StaticMeshFBXLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_uasset.py b/client/ayon_core/hosts/unreal/plugins/load/load_uasset.py
index 048ec8eaba..0898035985 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_uasset.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_uasset.py
@@ -28,7 +28,7 @@ class UAssetLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
diff --git a/client/ayon_core/hosts/unreal/plugins/load/load_yeticache.py b/client/ayon_core/hosts/unreal/plugins/load/load_yeticache.py
index b643f352b7..d21c6205fc 100644
--- a/client/ayon_core/hosts/unreal/plugins/load/load_yeticache.py
+++ b/client/ayon_core/hosts/unreal/plugins/load/load_yeticache.py
@@ -69,7 +69,7 @@ class YetiLoader(plugin.Loader):
 
         Args:
             context (dict): application context
-            name (str): subset name
+            name (str): Product name
             namespace (str): in Unreal this is basically path to container.
                              This is not passed here, so namespace is set
                              by `containerise()` because only then we know
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 48c1fe6673..ea53f221ea 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
@@ -57,19 +57,22 @@ class CollectRenderInstances(pyblish.api.InstancePlugin):
                     seq = s.get('sequence')
                     seq_name = seq.get_name()
 
+                    product_type = "render"
+                    new_product_name = f"{data.get('productName')}_{seq_name}"
                     new_instance = context.create_instance(
-                        f"{data.get('subset')}_"
-                        f"{seq_name}")
+                        new_product_name
+                    )
                     new_instance[:] = seq_name
 
                     new_data = new_instance.data
 
                     new_data["folderPath"] = f"/{s.get('output')}"
                     new_data["setMembers"] = seq_name
-                    new_data["family"] = "render"
-                    new_data["families"] = ["render", "review"]
+                    new_data["productName"] = new_product_name
+                    new_data["productType"] = product_type
+                    new_data["family"] = product_type
+                    new_data["families"] = [product_type, "review"]
                     new_data["parent"] = data.get("parent")
-                    new_data["subset"] = f"{data.get('subset')}_{seq_name}"
                     new_data["level"] = data.get("level")
                     new_data["output"] = s.get('output')
                     new_data["fps"] = seq.get_display_rate().numerator
diff --git a/client/ayon_core/hosts/unreal/plugins/publish/extract_layout.py b/client/ayon_core/hosts/unreal/plugins/publish/extract_layout.py
index a508f79f18..de8cf0be2a 100644
--- a/client/ayon_core/hosts/unreal/plugins/publish/extract_layout.py
+++ b/client/ayon_core/hosts/unreal/plugins/publish/extract_layout.py
@@ -68,6 +68,7 @@ class ExtractLayout(publish.Extractor):
                 json_element = {}
                 json_element["reference"] = str(blend_id)
                 json_element["family"] = family
+                json_element["product_type"] = family
                 json_element["instance_name"] = actor.get_name()
                 json_element["asset_name"] = mesh.get_name()
                 import_data = mesh.get_editor_property("asset_import_data")
diff --git a/client/ayon_core/lib/applications.py b/client/ayon_core/lib/applications.py
index 5d06e74e16..8f1a1d10ea 100644
--- a/client/ayon_core/lib/applications.py
+++ b/client/ayon_core/lib/applications.py
@@ -13,10 +13,7 @@ import six
 
 from ayon_core import AYON_CORE_ROOT
 from ayon_core.client import get_asset_name_identifier
-from ayon_core.settings import (
-    get_system_settings,
-    get_project_settings,
-)
+from ayon_core.settings import get_project_settings, get_studio_settings
 from .log import Logger
 from .profiles_filtering import filter_profiles
 from .local_settings import get_ayon_username
@@ -405,7 +402,7 @@ class ApplicationManager:
         if self._studio_settings is not None:
             settings = copy.deepcopy(self._studio_settings)
         else:
-            settings = get_system_settings(
+            settings = get_studio_settings(
                 clear_metadata=False, exclude_locals=False
             )
 
@@ -1398,8 +1395,9 @@ class EnvironmentPrepData(dict):
         if data.get("env") is None:
             data["env"] = os.environ.copy()
 
-        if "system_settings" not in data:
-            data["system_settings"] = get_system_settings()
+        project_name = data["project_doc"]["name"]
+        if "project_settings" not in data:
+            data["project_settings"] = get_project_settings(project_name)
 
         super(EnvironmentPrepData, self).__init__(data)
 
@@ -1524,8 +1522,8 @@ def prepare_app_environments(
     # Use environments from local settings
     filtered_local_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")
+    # project_settings = data["project_settings"]
+    # whitelist_envs = project_settings["general"].get("local_env_white_list")
     # if whitelist_envs:
     #     local_settings = get_local_settings()
     #     local_envs = local_settings.get("environments") or {}
@@ -1689,9 +1687,7 @@ def prepare_context_environments(data, env_group=None, addons_manager=None):
     # Load project specific environments
     project_name = project_doc["name"]
     project_settings = get_project_settings(project_name)
-    system_settings = get_system_settings()
     data["project_settings"] = project_settings
-    data["system_settings"] = system_settings
 
     app = data["app"]
     context_env = {
@@ -1731,7 +1727,7 @@ def prepare_context_environments(data, env_group=None, addons_manager=None):
         )
 
     workdir_data = get_template_data(
-        project_doc, asset_doc, task_name, app.host_name, system_settings
+        project_doc, asset_doc, task_name, app.host_name, project_settings
     )
     data["workdir_data"] = workdir_data
 
diff --git a/client/ayon_core/lib/execute.py b/client/ayon_core/lib/execute.py
index 4e3257c3a0..e89c8f22ee 100644
--- a/client/ayon_core/lib/execute.py
+++ b/client/ayon_core/lib/execute.py
@@ -240,7 +240,7 @@ def run_detached_process(args, **kwargs):
 
 
     Args:
-        *args (tuple): AYON cli arguments.
+        args (Iterable[str]): AYON cli arguments.
         **kwargs (dict): Keyword arguments for subprocess.Popen.
 
     Returns:
diff --git a/client/ayon_core/lib/plugin_tools.py b/client/ayon_core/lib/plugin_tools.py
index d204fc2c8f..5ad4da88b9 100644
--- a/client/ayon_core/lib/plugin_tools.py
+++ b/client/ayon_core/lib/plugin_tools.py
@@ -1,54 +1,131 @@
 # -*- coding: utf-8 -*-
-"""Avalon/Pyblish plugin tools."""
+"""AYON plugin tools."""
 import os
 import logging
 import re
+import collections
 
 log = logging.getLogger(__name__)
 
+CAPITALIZE_REGEX = re.compile(r"[a-zA-Z0-9]")
+
+
+def _capitalize_value(value):
+    """Capitalize first char of value.
+
+    Function finds first available character or number in passed string
+        and uppers the character.
+
+    Example:
+        >>> _capitalize_value("host")
+        'Host'
+        >>> _capitalize_value("01_shot")
+        '01_shot'
+        >>> _capitalize_value("_shot")
+        '_Shot'
+
+    Args:
+        value (str): Value where to capitalize first character.
+    """
+
+    # - conditions are because of possible index errors
+    # - regex is to skip symbols that are not chars or numbers
+    #   - e.g. "{key}" which starts with curly bracket
+    capitalized = ""
+    for idx in range(len(value or "")):
+        char = value[idx]
+        if not CAPITALIZE_REGEX.match(char):
+            capitalized += char
+        else:
+            capitalized += char.upper()
+            capitalized += value[idx + 1:]
+            break
+    return capitalized
+
+
+def _separate_keys_and_value(data):
+    valid_items = []
+    hierachy_queue = collections.deque()
+    hierachy_queue.append((data, []))
+    while hierachy_queue:
+        item = hierachy_queue.popleft()
+        src_data, keys = item
+        if src_data is None:
+            continue
+
+        if isinstance(src_data, (list, tuple, set)):
+            for idx, item in enumerate(src_data):
+                hierachy_queue.append((item, keys + [idx]))
+            continue
+
+        if isinstance(src_data, dict):
+            for key, value in src_data.items():
+                hierachy_queue.append((value, keys + [key]))
+            continue
+
+        if keys:
+            valid_items.append((keys, src_data))
+    return valid_items
+
 
 def prepare_template_data(fill_pairs):
+    """Prepares formatted data for filling template.
+
+    It produces multiple variants of keys (key, Key, KEY) to control
+    format of filled template.
+
+    Example:
+        >>> src_data = {
+        ...    "host": "maya",
+        ... }
+        >>> output = prepare_template_data(src_data)
+        >>> sorted(list(output.items())) # sort & list conversion for tests
+        [('HOST', 'MAYA'), ('Host', 'Maya'), ('host', 'maya')]
+
+    Args:
+        fill_pairs (Union[dict[str, Any], Iterable[Tuple[str, Any]]]): The
+            value that are prepared for template.
+
+    Returns:
+        dict[str, str]: Prepared values for template.
     """
-        Prepares formatted data for filling template.
 
-        It produces multiple variants of keys (key, Key, KEY) to control
-        format of filled template.
+    valid_items = _separate_keys_and_value(fill_pairs)
+    output = {}
+    for item in valid_items:
+        keys, value = item
+        upper_value = value.upper()
+        capitalized_value = _capitalize_value(value)
 
-        Args:
-            fill_pairs (iterable) of tuples (key, value)
-        Returns:
-            (dict)
-            ('host', 'maya') > {'host':'maya', 'Host': 'Maya', 'HOST': 'MAYA'}
-
-    """
-    fill_data = {}
-    regex = re.compile(r"[a-zA-Z0-9]")
-    for key, value in dict(fill_pairs).items():
-        # Handle cases when value is `None` (standalone publisher)
-        if value is None:
+        first_key = keys.pop(0)
+        if not keys:
+            output[first_key] = value
+            output[first_key.upper()] = upper_value
+            output[first_key.capitalize()] = capitalized_value
             continue
-        # Keep value as it is
-        fill_data[key] = value
-        # Both key and value are with upper case
-        fill_data[key.upper()] = value.upper()
 
-        # Capitalize only first char of value
-        # - conditions are because of possible index errors
-        # - regex is to skip symbols that are not chars or numbers
-        #   - e.g. "{key}" which starts with curly bracket
-        capitalized = ""
-        for idx in range(len(value or "")):
-            char = value[idx]
-            if not regex.match(char):
-                capitalized += char
+        # Prepare 'normal', 'upper' and 'capitalized' variables
+        normal = output.setdefault(first_key, {})
+        capitalized = output.setdefault(first_key.capitalize(), {})
+        upper = output.setdefault(first_key.upper(), {})
+
+        keys_deque = collections.deque(keys)
+        while keys_deque:
+            key = keys_deque.popleft()
+            upper_key = key
+            if isinstance(key, str):
+                upper_key = key.upper()
+
+            if not keys_deque:
+                # Fill value on last key
+                upper[upper_key] = upper_value
+                capitalized[key] = capitalized_value
+                normal[key] = value
             else:
-                capitalized += char.upper()
-                capitalized += value[idx + 1:]
-                break
-
-        fill_data[key.capitalize()] = capitalized
-
-    return fill_data
+                normal = normal.setdefault(key, {})
+                capitalized = capitalized.setdefault(key, {})
+                upper = upper.setdefault(upper_key, {})
+    return output
 
 
 def source_hash(filepath, *args):
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 445971f2b0..ea4b7a213e 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
@@ -46,7 +46,7 @@ class CollectDeadlineServerFromInstance(pyblish.api.InstancePlugin):
         from maya import cmds
         deadline_settings = (
             render_instance.context.data
-            ["system_settings"]
+            ["project_settings"]
             ["deadline"]
         )
 
diff --git a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py b/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py
index 6c35012173..25951a56b6 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/collect_pools.py
@@ -44,7 +44,7 @@ class CollectDeadlinePools(pyblish.api.InstancePlugin,
     secondary_pool = None
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
+    def apply_settings(cls, project_settings):
         # deadline.publish.CollectDeadlinePools
         settings = project_settings["deadline"]["publish"]["CollectDeadlinePools"]  # noqa
         cls.primary_pool = settings.get("primary_pool", None)
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 3537c3099d..a284464009 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
@@ -112,7 +112,7 @@ class AfterEffectsSubmitDeadline(
         file_name, frame = list(collect_frames([render_path]).items())[0]
         if frame:
             # replace frame ('000001') with Deadline's required '[#######]'
-            # expects filename in format project_asset_subset_version.FRAME.ext
+            # expects filename in format project_folder_product_version.FRAME.ext
             render_dir = os.path.dirname(render_path)
             file_name = os.path.basename(render_path)
             hashed = '[{}]'.format(len(frame) * "#")
diff --git a/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py b/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py
index 47a0a25755..bc3636da63 100644
--- a/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py
+++ b/client/ayon_core/modules/deadline/plugins/publish/submit_celaction_deadline.py
@@ -75,7 +75,7 @@ class CelactionSubmitDeadline(pyblish.api.InstancePlugin):
         script_name = os.path.basename(script_path)
 
         for item in instance.context:
-            if "workfile" in item.data["family"]:
+            if "workfile" in item.data["productType"]:
                 msg = "Workfile (scene) must be published along"
                 assert item.data["publish"] is True, msg
 
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 9c125db174..837ed91c60 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
@@ -104,7 +104,7 @@ class FusionSubmitDeadline(
         # Collect all saver instances in context that are to be rendered
         saver_instances = []
         for instance in context:
-            if instance.data["family"] != "render":
+            if instance.data["productType"] != "render":
                 # Allow only saver family instances
                 continue
 
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 45c252dd56..486fdfd634 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
@@ -145,7 +145,9 @@ class HoudiniSubmitDeadline(
         if split_render_job and not is_export_job:
             # Convert from family to Deadline plugin name
             # i.e., arnold_rop -> Arnold
-            plugin = instance.data["family"].replace("_rop", "").capitalize()
+            plugin = (
+                instance.data["productType"].replace("_rop", "").capitalize()
+            )
         else:
             plugin = "Houdini"
             if split_render_job:
@@ -252,21 +254,21 @@ class HoudiniSubmitDeadline(
 
         # Output driver to render
         if job_type == "render":
-            family = instance.data.get("family")
-            if family == "arnold_rop":
+            product_type = instance.data.get("productType")
+            if product_type == "arnold_rop":
                 plugin_info = ArnoldRenderDeadlinePluginInfo(
                     InputFile=instance.data["ifdFile"]
                 )
-            elif family == "mantra_rop":
+            elif product_type == "mantra_rop":
                 plugin_info = MantraRenderDeadlinePluginInfo(
                     SceneFile=instance.data["ifdFile"],
                     Version=hou_major_minor,
                 )
-            elif family == "vray_rop":
+            elif product_type == "vray_rop":
                 plugin_info = VrayRenderPluginInfo(
                     InputFilename=instance.data["ifdFile"],
                 )
-            elif family == "redshift_rop":
+            elif product_type == "redshift_rop":
                 plugin_info = RedshiftRenderPluginInfo(
                     SceneFile=instance.data["ifdFile"]
                 )
@@ -287,8 +289,8 @@ class HoudiniSubmitDeadline(
 
             else:
                 self.log.error(
-                    "Family '%s' not supported yet to split render job",
-                    family
+                    "Product type '%s' not supported yet to split render job",
+                    product_type
                 )
                 return
         else:
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 4eaaedac34..1abefa515a 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
@@ -48,7 +48,7 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
     group = None
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
+    def apply_settings(cls, project_settings):
         settings = project_settings["deadline"]["publish"]["MaxSubmitDeadline"]  # noqa
 
         # Take some defaults from settings
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 afa3a3dd14..0e871eb90e 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
@@ -116,7 +116,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
     strict_error_checking = True
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
+    def apply_settings(cls, project_settings):
         settings = project_settings["deadline"]["publish"]["MayaSubmitDeadline"]  # noqa
 
         # Take some defaults from settings
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 b314232a42..a3111454b3 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
@@ -183,11 +183,13 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
                     b_job_response.json()["_id"])
 
         # redefinition of families
-        if "render" in instance.data["family"]:
-            instance.data['family'] = 'write'
+        if "render" in instance.data["productType"]:
+            instance.data["family"] = "write"
+            instance.data["productType"] = "write"
             families.insert(0, "render2d")
-        elif "prerender" in instance.data["family"]:
-            instance.data['family'] = 'write'
+        elif "prerender" in instance.data["productType"]:
+            instance.data["family"] = "write"
+            instance.data["productType"] = "write"
             families.insert(0, "prerender")
         instance.data["families"] = families
 
@@ -196,7 +198,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin,
         AbstractSubmitDeadline"""
         for instance in context:
             if (
-                instance.data["family"] != "workfile"
+                instance.data["productType"] != "workfile"
                 # Disabled instances won't be integrated
                 or instance.data("publish") is False
             ):
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 0b0e293943..3e95049e56 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
@@ -18,7 +18,7 @@ from ayon_core.pipeline.version_start import get_versioning_start
 from ayon_core.pipeline.farm.pyblish_functions import (
     create_skeleton_instance_cache,
     create_instances_for_cache,
-    attach_instances_to_subset,
+    attach_instances_to_product,
     prepare_cache_representations,
     create_metadata_path
 )
@@ -97,12 +97,12 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
             (str): deadline_publish_job_id
         """
         data = instance.data.copy()
-        subset = data["subset"]
-        job_name = "Publish - {subset}".format(subset=subset)
+        product_name = data["productName"]
+        job_name = "Publish - {}".format(product_name)
 
         anatomy = instance.context.data['anatomy']
 
-        # instance.data.get("subset") != instances[0]["subset"]
+        # instance.data.get("productName") != instances[0]["productName"]
         # 'Main' vs 'renderMain'
         override_version = None
         instance_version = instance.data.get("version")  # take this if exists
@@ -113,9 +113,9 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
             anatomy,
             deepcopy(instance.data["anatomyData"]),
             instance.data.get("folderPath"),
-            instance.data["subset"],
+            instance.data["productName"],
             instance.context,
-            instance.data["family"],
+            instance.data["productType"],
             override_version
         )
 
@@ -259,7 +259,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
             }
         ]
 
-        This will create instances for `beauty` and `Z` subset
+        This will create instances for `beauty` and `Z` product
         adding those files to their respective representations.
 
         If we have only list of files, we collect all file sequences.
@@ -297,9 +297,9 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
             instance_skeleton_data["representations"] += representations
             instances = [instance_skeleton_data]
 
-        # attach instances to subset
+        # attach instances to product
         if instance.data.get("attachTo"):
-            instances = attach_instances_to_subset(
+            instances = attach_instances_to_product(
                 instance.data.get("attachTo"), instances
             )
 
@@ -382,23 +382,24 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
             json.dump(publish_job, f, indent=4, sort_keys=True)
 
     def _get_publish_folder(self, anatomy, template_data,
-                            asset, subset, context,
-                            family, version=None):
+                            asset, product_name, context,
+                            product_type, version=None):
         """
             Extracted logic to pre-calculate real publish folder, which is
             calculated in IntegrateNew inside of Deadline process.
             This should match logic in:
                 'collect_anatomy_instance_data' - to
-                    get correct anatomy, family, version for subset and
+                    get correct anatomy, family, version for product and
                 'collect_resources_path'
                     get publish_path
 
         Args:
             anatomy (ayon_core.pipeline.anatomy.Anatomy):
             template_data (dict): pre-calculated collected data for process
-            asset (string): asset name
-            subset (string): subset name (actually group name of subset)
-            family (string): for current deadline process it's always 'render'
+            asset (str): asset name
+            product_name (str): Product name (actually group name of product).
+            product_type (str): for current deadline process it's always
+                'render'
                 TODO - for generic use family needs to be dynamically
                     calculated like IntegrateNew does
             version (int): override version from instance if exists
@@ -413,7 +414,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
         if not version:
             version = get_last_version_by_subset_name(
                 project_name,
-                subset,
+                product_name,
                 asset_name=asset
             )
             if version:
@@ -424,8 +425,8 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
                     template_data["app"],
                     task_name=template_data["task"]["name"],
                     task_type=template_data["task"]["type"],
-                    family="render",
-                    subset=subset,
+                    product_type="render",
+                    product_name=product_name,
                     project_settings=context.data["project_settings"]
                 )
 
@@ -435,14 +436,18 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
         template_name = publish.get_publish_template_name(
             project_name,
             host_name,
-            family,
+            product_type,
             task_info.get("name"),
             task_info.get("type"),
         )
 
-        template_data["subset"] = subset
-        template_data["family"] = family
+        template_data["subset"] = product_name
+        template_data["family"] = product_type
         template_data["version"] = version
+        template_data["product"] = {
+            "name": product_name,
+            "type": product_type,
+        }
 
         render_templates = anatomy.templates_obj[template_name]
         if "folder" in render_templates:
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 77094fd8bd..7bc13ae4b6 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
@@ -19,7 +19,7 @@ from ayon_core.pipeline.version_start import get_versioning_start
 from ayon_core.pipeline.farm.pyblish_functions import (
     create_skeleton_instance,
     create_instances_for_aov,
-    attach_instances_to_subset,
+    attach_instances_to_product,
     prepare_representations,
     create_metadata_path
 )
@@ -174,12 +174,12 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             (str): deadline_publish_job_id
         """
         data = instance.data.copy()
-        subset = data["subset"]
-        job_name = "Publish - {subset}".format(subset=subset)
+        product_name = data["productName"]
+        job_name = "Publish - {}".format(product_name)
 
         anatomy = instance.context.data['anatomy']
 
-        # instance.data.get("subset") != instances[0]["subset"]
+        # instance.data.get("productName") != instances[0]["productName"]
         # 'Main' vs 'renderMain'
         override_version = None
         instance_version = instance.data.get("version")  # take this if exists
@@ -190,9 +190,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             anatomy,
             deepcopy(instance.data["anatomyData"]),
             instance.data.get("folderPath"),
-            instances[0]["subset"],
+            instances[0]["productName"],
             instance.context,
-            instances[0]["family"],
+            instances[0]["productType"],
             override_version
         )
 
@@ -356,7 +356,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             }
         ]
 
-        This will create instances for `beauty` and `Z` subset
+        This will create instances for `beauty` and `Z` product
         adding those files to their respective representations.
 
         If we have only list of files, we collect all file sequences.
@@ -411,9 +411,9 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             instance_skeleton_data["representations"] += representations
             instances = [instance_skeleton_data]
 
-        # attach instances to subset
+        # attach instances to product
         if instance.data.get("attachTo"):
-            instances = attach_instances_to_subset(
+            instances = attach_instances_to_product(
                 instance.data.get("attachTo"), instances
             )
 
@@ -503,14 +503,14 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             json.dump(publish_job, f, indent=4, sort_keys=True)
 
     def _get_publish_folder(self, anatomy, template_data,
-                            asset, subset, context,
-                            family, version=None):
+                            asset, product_name, context,
+                            product_type, version=None):
         """
             Extracted logic to pre-calculate real publish folder, which is
             calculated in IntegrateNew inside of Deadline process.
             This should match logic in:
                 'collect_anatomy_instance_data' - to
-                    get correct anatomy, family, version for subset and
+                    get correct anatomy, family, version for product name and
                 'collect_resources_path'
                     get publish_path
 
@@ -518,8 +518,10 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
             anatomy (ayon_core.pipeline.anatomy.Anatomy):
             template_data (dict): pre-calculated collected data for process
             asset (string): asset name
-            subset (string): subset name (actually group name of subset)
-            family (string): for current deadline process it's always 'render'
+            product_name (string): Product name (actually group name
+                of product)
+            product_type (string): for current deadline process it's always
+                'render'
                 TODO - for generic use family needs to be dynamically
                     calculated like IntegrateNew does
             version (int): override version from instance if exists
@@ -535,7 +537,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         if not version:
             version = get_last_version_by_subset_name(
                 project_name,
-                subset,
+                product_name,
                 asset_name=asset
             )
             if version:
@@ -546,8 +548,8 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
                     host_name,
                     task_name=template_data["task"]["name"],
                     task_type=template_data["task"]["type"],
-                    family="render",
-                    subset=subset,
+                    product_type="render",
+                    product_name=product_name,
                     project_settings=context.data["project_settings"]
                 )
 
@@ -557,14 +559,18 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
         template_name = publish.get_publish_template_name(
             project_name,
             host_name,
-            family,
+            product_type,
             task_info.get("name"),
             task_info.get("type"),
         )
 
-        template_data["subset"] = subset
-        template_data["family"] = family
         template_data["version"] = version
+        template_data["subset"] = product_name
+        template_data["family"] = product_type
+        template_data["product"] = {
+            "name": product_name,
+            "type": product_type,
+        }
 
         render_templates = anatomy.templates_obj[template_name]
         if "folder" in render_templates:
diff --git a/client/ayon_core/modules/job_queue/addon.py b/client/ayon_core/modules/job_queue/addon.py
index b28e915ac0..32d06d0040 100644
--- a/client/ayon_core/modules/job_queue/addon.py
+++ b/client/ayon_core/modules/job_queue/addon.py
@@ -42,7 +42,7 @@ import copy
 import platform
 
 from ayon_core.addon import AYONAddon, click_wrap
-from ayon_core.settings import get_system_settings
+from ayon_core.settings import get_studio_settings
 
 
 class JobQueueAddon(AYONAddon):
@@ -122,7 +122,7 @@ class JobQueueAddon(AYONAddon):
 
     @classmethod
     def get_jobs_root_from_settings(cls):
-        studio_settings = get_system_settings()
+        studio_settings = get_studio_settings()
         jobs_root_mapping = studio_settings.get(cls.name, {}).get("jobs_root")
         converted_mapping = cls._roots_mapping_conversion(jobs_root_mapping)
 
@@ -152,7 +152,7 @@ class JobQueueAddon(AYONAddon):
 
     @classmethod
     def get_server_url_from_settings(cls):
-        studio_settings = get_system_settings()
+        studio_settings = get_studio_settings()
         return cls.url_conversion(
             studio_settings
             .get(cls.name, {})
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 4460e11004..7f7b89590c 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
@@ -150,8 +150,8 @@ class CollectSequencesFromJob(pyblish.api.ContextPlugin):
 
             self.log.info("Found collections: {}".format(collections))
 
-            if data.get("subset") and len(collections) > 1:
-                self.log.error("Forced subset can only work with a single "
+            if data.get("productName") and len(collections) > 1:
+                self.log.error("Forced produce can only work with a single "
                                "found sequence")
                 raise RuntimeError("Invalid sequence")
 
@@ -174,8 +174,10 @@ class CollectSequencesFromJob(pyblish.api.ContextPlugin):
                 # Ensure each instance gets a unique reference to the data
                 data = copy.deepcopy(data)
 
-                # If no subset provided, get it from collection's head
-                subset = data.get("subset", collection.head.rstrip("_. "))
+                # If no product provided, get it from collection's head
+                product_name = (
+                    data.get("productName", collection.head.rstrip("_. "))
+                )
 
                 # If no start or end frame provided, get it from collection
                 indices = list(collection.indexes)
@@ -186,9 +188,10 @@ class CollectSequencesFromJob(pyblish.api.ContextPlugin):
 
                 instance.data.update({
                     "name": str(collection),
-                    "family": families[0],  # backwards compatibility / pyblish
+                    "productType": families[0],
+                    "family": families[0],
                     "families": list(families),
-                    "subset": subset,
+                    "productName": product_name,
                     "folderPath": data.get(
                         "folderPath", context.data["folderPath"]
                     ),
diff --git a/client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py b/client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py
index 4234535b23..9a3bf3624b 100644
--- a/client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py
+++ b/client/ayon_core/modules/royalrender/plugins/publish/create_nuke_royalrender_job.py
@@ -15,10 +15,12 @@ class CreateNukeRoyalRenderJob(lib.BaseCreateRoyalRenderJob):
         super(CreateNukeRoyalRenderJob, self).process(instance)
 
         # redefinition of families
-        if "render" in instance.data["family"]:
+        if "render" in instance.data["productType"]:
+            instance.data["productType"] = "write"
             instance.data["family"] = "write"
             instance.data["families"].insert(0, "render2d")
-        elif "prerender" in instance.data["family"]:
+        elif "prerender" in instance.data["productType"]:
+            instance.data["productType"] = "write"
             instance.data["family"] = "write"
             instance.data["families"].insert(0, "prerender")
 
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 256c8b7a83..5d177fec07 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
@@ -16,7 +16,7 @@ from ayon_core.pipeline.publish import KnownPublishError
 from ayon_core.pipeline.farm.pyblish_functions import (
     create_skeleton_instance,
     create_instances_for_aov,
-    attach_instances_to_subset,
+    attach_instances_to_product,
     prepare_representations,
     create_metadata_path
 )
@@ -113,9 +113,9 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
             instance_skeleton_data["representations"] += representations
             instances = [instance_skeleton_data]
 
-        # attach instances to subset
+        # attach instances to product
         if instance.data.get("attachTo"):
-            instances = attach_instances_to_subset(
+            instances = attach_instances_to_product(
                 instance.data.get("attachTo"), instances
             )
 
@@ -168,8 +168,8 @@ class CreatePublishRoyalRenderJob(pyblish.api.InstancePlugin,
 
         """
         data = instance.data.copy()
-        subset = data["subset"]
-        jobname = "Publish - {subset}".format(subset=subset)
+        product_name = data["productName"]
+        jobname = "Publish - {}".format(product_name)
 
         # Transfer the environment from the original job to this dependent
         # job, so they use the same environment
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 b551c01815..182efbc4ae 100644
--- a/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py
+++ b/client/ayon_core/modules/timers_manager/plugins/publish/start_timer.py
@@ -1,6 +1,6 @@
 """
 Requires:
-    context -> system_settings
+    context -> project_settings
     context -> ayonAddonsManager
 """
 
@@ -18,8 +18,8 @@ class StartTimer(pyblish.api.ContextPlugin):
             self.log.debug("TimersManager is disabled")
             return
 
-        studio_settings = context.data["system_settings"]
-        if not studio_settings["timers_manager"]["disregard_publishing"]:
+        project_settings = context.data["project_settings"]
+        if not project_settings["timers_manager"]["disregard_publishing"]:
             self.log.debug("Publish is not affecting running timers.")
             return
 
diff --git a/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py b/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py
index 9c3a63e78e..eafd8cb450 100644
--- a/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py
+++ b/client/ayon_core/modules/timers_manager/plugins/publish/stop_timer.py
@@ -1,6 +1,6 @@
 """
 Requires:
-    context -> system_settings
+    context -> project_settings
     context -> ayonAddonsManager
 """
 
@@ -19,8 +19,8 @@ class StopTimer(pyblish.api.ContextPlugin):
             self.log.debug("TimersManager is disabled")
             return
 
-        studio_settings = context.data["system_settings"]
-        if not studio_settings["timers_manager"]["disregard_publishing"]:
+        project_settings = context.data["project_settings"]
+        if not project_settings["timers_manager"]["disregard_publishing"]:
             self.log.debug("Publish is not affecting running timers.")
             return
 
diff --git a/client/ayon_core/pipeline/context_tools.py b/client/ayon_core/pipeline/context_tools.py
index e8aa480105..86b3d770b4 100644
--- a/client/ayon_core/pipeline/context_tools.py
+++ b/client/ayon_core/pipeline/context_tools.py
@@ -460,14 +460,14 @@ def is_representation_from_latest(representation):
     return version_is_latest(project_name, representation["parent"])
 
 
-def get_template_data_from_session(session=None, system_settings=None):
+def get_template_data_from_session(session=None, settings=None):
     """Template data for template fill from session keys.
 
     Args:
         session (Union[Dict[str, str], None]): The Session to use. If not
             provided use the currently active global Session.
-        system_settings (Union[Dict[str, Any], Any]): Prepared system settings.
-            Optional are auto received if not passed.
+        settings (Optional[Dict[str, Any]]): Prepared studio or project
+            settings.
 
     Returns:
         Dict[str, Any]: All available data from session.
@@ -486,15 +486,16 @@ def get_template_data_from_session(session=None, system_settings=None):
         host_name = get_current_host_name()
 
     return get_template_data_with_names(
-        project_name, asset_name, task_name, host_name, system_settings
+        project_name, asset_name, task_name, host_name, settings
     )
 
 
-def get_current_context_template_data(system_settings=None):
+def get_current_context_template_data(settings=None):
     """Prepare template data for current context.
 
     Args:
-        system_settings (Optional[Dict[str, Any]]): Prepared system settings.
+        settings (Optional[Dict[str, Any]]): Prepared studio or
+            project settings.
 
     Returns:
         Dict[str, Any] Template data for current context.
@@ -507,7 +508,7 @@ def get_current_context_template_data(system_settings=None):
     host_name = get_current_host_name()
 
     return get_template_data_with_names(
-        project_name, asset_name, task_name, host_name, system_settings
+        project_name, asset_name, task_name, host_name, settings
     )
 
 
diff --git a/client/ayon_core/pipeline/create/README.md b/client/ayon_core/pipeline/create/README.md
index 5e3bd7dc1a..bbfd1bfa0f 100644
--- a/client/ayon_core/pipeline/create/README.md
+++ b/client/ayon_core/pipeline/create/README.md
@@ -6,7 +6,7 @@ Entry point of creation. All data and metadata are handled through create contex
 
 Discovers Creator plugins to be able create new instances and convert existing instances. Creators may have defined attributes that are specific for their instances. Attributes definition can enhance behavior of instance during publishing.
 
-Publish plugins are loaded because they can also define attributes definitions. These are less family specific To be able define attributes Publish plugin must inherit from `AYONPyblishPluginMixin` and must override `get_attribute_defs` class method which must return list of attribute definitions. Values of publish plugin definitions are stored per plugin name under `publish_attributes`. Also can override `convert_attribute_values` class method which gives ability to modify values on instance before are used in CreatedInstance. Method `convert_attribute_values` can be also used without `get_attribute_defs` to modify values when changing compatibility (remove metadata from instance because are irrelevant).
+Publish plugins are loaded because they can also define attributes definitions. These are less product type specific To be able define attributes Publish plugin must inherit from `AYONPyblishPluginMixin` and must override `get_attribute_defs` class method which must return list of attribute definitions. Values of publish plugin definitions are stored per plugin name under `publish_attributes`. Also can override `convert_attribute_values` class method which gives ability to modify values on instance before are used in CreatedInstance. Method `convert_attribute_values` can be also used without `get_attribute_defs` to modify values when changing compatibility (remove metadata from instance because are irrelevant).
 
 Possible attribute definitions can be found in `openpype/pipeline/lib/attribute_definitions.py`.
 
@@ -14,9 +14,9 @@ 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 `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.
+Product of creation is "instance" which holds basic data defying it. Core data are `creator_identifier`, `productType` and `productName`. Other data can be keys used to fill product 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.
+Product type tells how should be instance processed and product name what name will published item have.
+- There are cases when product name 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.
 
 `CreatedInstance` is entity holding the data which are stored and used.
 
@@ -27,12 +27,12 @@ Family tells how should be instance processed and subset what name will publishe
     "id": "ayon.create.instance",
     ## Identifier of this specific instance (automatically assigned)
     "instance_id": <uuid4>,
-    ## Instance family (used from Creator)
-    "family": <family>,
+    ## Instance product type (used from Creator)
+    "productType": <product type>,
 
     # Mutable data
-    ## Subset name based on subset name template - may change overtime (on context change)
-    "subset": <subset>,
+    ## Product name based on product name template - may change overtime (on context change)
+    "productName": <product name>,
     ## Instance is active and will be published
     "active": True,
     ## Version of instance
@@ -54,7 +54,7 @@ Family tells how should be instance processed and subset what name will publishe
 ```
 
 ## Creator
-To be able create, update, remove or collect existing instances there must be defined a creator. Creator must have unique identifier and can represents a family. There can be multiple Creators for single family. Identifier of creator should contain family (advise).
+To be able create, update, remove or collect existing instances there must be defined a creator. Creator must have unique identifier and can represent a product type. There can be multiple Creators for single product type. Identifier of creator should contain product type (advise).
 
 Creator has abstract methods to handle instances. For new instance creation is used `create` which should create metadata in host context and add new instance object to `CreateContext`. To collect existing instances is used `collect_instances` which should find all existing instances related to creator and add them to `CreateContext`. To update data of instance is used `update_instances` which is called from `CreateContext` on `save_changes`. To remove instance use `remove_instances` which should remove metadata from host context and remove instance from `CreateContext`.
 
diff --git a/client/ayon_core/pipeline/create/__init__.py b/client/ayon_core/pipeline/create/__init__.py
index 94d575a776..da9cafad5a 100644
--- a/client/ayon_core/pipeline/create/__init__.py
+++ b/client/ayon_core/pipeline/create/__init__.py
@@ -1,6 +1,6 @@
 from .constants import (
-    SUBSET_NAME_ALLOWED_SYMBOLS,
-    DEFAULT_SUBSET_TEMPLATE,
+    PRODUCT_NAME_ALLOWED_SYMBOLS,
+    DEFAULT_PRODUCT_TEMPLATE,
     PRE_CREATE_THUMBNAIL_KEY,
     DEFAULT_VARIANT_VALUE,
 )
@@ -10,10 +10,10 @@ from .utils import (
     get_next_versions_for_instances,
 )
 
-from .subset_name import (
+from .product_name import (
     TaskNotSetError,
-    get_subset_name_template,
-    get_subset_name,
+    get_product_name,
+    get_product_name_template,
 )
 
 from .creator_plugins import (
@@ -48,8 +48,8 @@ from .legacy_create import (
 
 
 __all__ = (
-    "SUBSET_NAME_ALLOWED_SYMBOLS",
-    "DEFAULT_SUBSET_TEMPLATE",
+    "PRODUCT_NAME_ALLOWED_SYMBOLS",
+    "DEFAULT_PRODUCT_TEMPLATE",
     "PRE_CREATE_THUMBNAIL_KEY",
     "DEFAULT_VARIANT_VALUE",
 
@@ -57,8 +57,8 @@ __all__ = (
     "get_next_versions_for_instances",
 
     "TaskNotSetError",
-    "get_subset_name_template",
-    "get_subset_name",
+    "get_product_name",
+    "get_product_name_template",
 
     "CreatorError",
 
diff --git a/client/ayon_core/pipeline/create/constants.py b/client/ayon_core/pipeline/create/constants.py
index 7d1d0154e9..a0bcea55ff 100644
--- a/client/ayon_core/pipeline/create/constants.py
+++ b/client/ayon_core/pipeline/create/constants.py
@@ -1,12 +1,12 @@
-SUBSET_NAME_ALLOWED_SYMBOLS = "a-zA-Z0-9_."
-DEFAULT_SUBSET_TEMPLATE = "{family}{Variant}"
+PRODUCT_NAME_ALLOWED_SYMBOLS = "a-zA-Z0-9_."
+DEFAULT_PRODUCT_TEMPLATE = "{family}{Variant}"
 PRE_CREATE_THUMBNAIL_KEY = "thumbnail_source"
 DEFAULT_VARIANT_VALUE = "Main"
 
 
 __all__ = (
-    "SUBSET_NAME_ALLOWED_SYMBOLS",
-    "DEFAULT_SUBSET_TEMPLATE",
+    "PRODUCT_NAME_ALLOWED_SYMBOLS",
+    "DEFAULT_PRODUCT_TEMPLATE",
     "PRE_CREATE_THUMBNAIL_KEY",
     "DEFAULT_VARIANT_VALUE",
 )
diff --git a/client/ayon_core/pipeline/create/context.py b/client/ayon_core/pipeline/create/context.py
index 75b9f38219..425de4305f 100644
--- a/client/ayon_core/pipeline/create/context.py
+++ b/client/ayon_core/pipeline/create/context.py
@@ -16,10 +16,7 @@ from ayon_core.client import (
     get_asset_by_name,
     get_asset_name_identifier,
 )
-from ayon_core.settings import (
-    get_system_settings,
-    get_project_settings
-)
+from ayon_core.settings import get_project_settings
 from ayon_core.lib.attribute_definitions import (
     UnknownDef,
     serialize_attr_defs,
@@ -94,7 +91,7 @@ class ConvertorsOperationFailed(Exception):
 
 class ConvertorsFindFailed(ConvertorsOperationFailed):
     def __init__(self, failed_info):
-        msg = "Failed to find incompatible subsets"
+        msg = "Failed to find incompatible products"
         super(ConvertorsFindFailed, self).__init__(
             msg, failed_info
         )
@@ -102,7 +99,7 @@ class ConvertorsFindFailed(ConvertorsOperationFailed):
 
 class ConvertorsConversionFailed(ConvertorsOperationFailed):
     def __init__(self, failed_info):
-        msg = "Failed to convert incompatible subsets"
+        msg = "Failed to convert incompatible products"
         super(ConvertorsConversionFailed, self).__init__(
             msg, failed_info
         )
@@ -857,8 +854,8 @@ class CreatedInstance:
     """Instance entity with data that will be stored to workfile.
 
     I think `data` must be required argument containing all minimum information
-    about instance like "asset" and "task" and all data used for filling subset
-    name as creators may have custom data for subset name filling.
+    about instance like "asset" and "task" and all data used for filling
+    product name as creators may have custom data for product name filling.
 
     Notes:
         Object have 2 possible initialization. One using 'creator' object which
@@ -866,9 +863,9 @@ class CreatedInstance:
             creator.
 
     Args:
-        family (str): Name of family that will be created.
-        subset_name (str): Name of subset that will be created.
-        data (Dict[str, Any]): Data used for filling subset name or override
+        product_type (str): Product type that will be created.
+        product_name (str): Name of product that will be created.
+        data (Dict[str, Any]): Data used for filling product name or override
             data from already existing instance.
         creator (Union[BaseCreator, None]): Creator responsible for instance.
         creator_identifier (str): Identifier of creator plugin.
@@ -885,7 +882,7 @@ class CreatedInstance:
     __immutable_keys = (
         "id",
         "instance_id",
-        "family",
+        "product_type",
         "creator_identifier",
         "creator_attributes",
         "publish_attributes"
@@ -893,8 +890,8 @@ class CreatedInstance:
 
     def __init__(
         self,
-        family,
-        subset_name,
+        product_type,
+        product_name,
         data,
         creator=None,
         creator_identifier=None,
@@ -929,8 +926,10 @@ class CreatedInstance:
         # Store original value of passed data
         self._orig_data = copy.deepcopy(data)
 
-        # Pop family and subset to prevent unexpected changes
-        # TODO change to 'productType' and 'productName' in AYON
+        # Pop 'productType' and 'productName' to prevent unexpected changes
+        data.pop("productType", None)
+        data.pop("productName", None)
+        # Backwards compatibility with OpenPype instances
         data.pop("family", None)
         data.pop("subset", None)
 
@@ -946,8 +945,8 @@ class CreatedInstance:
         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["productType"] = product_type
+        self._data["productName"] = product_name
         self._data["active"] = data.get("active", True)
         self._data["creator_identifier"] = creator_identifier
 
@@ -988,12 +987,11 @@ class CreatedInstance:
 
     def __str__(self):
         return (
-            "<CreatedInstance {subset} ({family}[{creator_identifier}])>"
-            " {data}"
+            "<CreatedInstance {product[name]}"
+            " ({product[type]}[{creator_identifier}])> {data}"
         ).format(
-            subset=str(self._data),
             creator_identifier=self.creator_identifier,
-            family=self.family,
+            product={"name": self.product_name, "type": self.product_type},
             data=str(self._data)
         )
 
@@ -1034,18 +1032,18 @@ class CreatedInstance:
     # ------
 
     @property
-    def family(self):
-        return self._data["family"]
+    def product_type(self):
+        return self._data["productType"]
 
     @property
-    def subset_name(self):
-        return self._data["subset"]
+    def product_name(self):
+        return self._data["productName"]
 
     @property
     def label(self):
         label = self._data.get("label")
         if not label:
-            label = self.subset_name
+            label = self.product_name
         return label
 
     @property
@@ -1192,13 +1190,17 @@ class CreatedInstance:
 
         instance_data = copy.deepcopy(instance_data)
 
-        family = instance_data.get("family", None)
-        if family is None:
-            family = creator.family
-        subset_name = instance_data.get("subset", None)
+        product_type = instance_data.get("productType")
+        if product_type is None:
+            product_type = instance_data.get("family")
+            if product_type is None:
+                product_type = creator.product_type
+        product_name = instance_data.get("productName")
+        if product_name is None:
+            product_name = instance_data.get("subset")
 
         return cls(
-            family, subset_name, instance_data, creator
+            product_type, product_name, instance_data, creator
         )
 
     def set_publish_plugins(self, attr_plugins):
@@ -1255,8 +1257,8 @@ class CreatedInstance:
         instance_data = copy.deepcopy(serialized_data["data"])
         creator_identifier = instance_data["creator_identifier"]
 
-        family = instance_data["family"]
-        subset_name = instance_data.get("subset", None)
+        product_type = instance_data["productType"]
+        product_name = instance_data.get("productName", None)
 
         creator_label = serialized_data["creator_label"]
         group_label = serialized_data["group_label"]
@@ -1266,8 +1268,8 @@ class CreatedInstance:
         publish_attributes = serialized_data["publish_attributes"]
 
         obj = cls(
-            family,
-            subset_name,
+            product_type,
+            product_name,
             instance_data,
             creator_identifier=creator_identifier,
             creator_label=creator_label,
@@ -1431,7 +1433,7 @@ class CreateContext:
         self.publish_plugins_mismatch_targets = []
         self.publish_plugins = []
         self.plugins_with_defs = []
-        self._attr_plugins_by_family = {}
+        self._attr_plugins_by_product_type = {}
 
         # Helpers for validating context of collected instances
         #   - they can be validation for multiple instances at one time
@@ -1740,7 +1742,7 @@ class CreateContext:
         )
 
         # Reset publish plugins
-        self._attr_plugins_by_family = {}
+        self._attr_plugins_by_product_type = {}
 
         discover_result = DiscoverResult(pyblish.api.Plugin)
         plugins_with_defs = []
@@ -1774,7 +1776,6 @@ class CreateContext:
 
     def _reset_creator_plugins(self):
         # Prepare settings
-        system_settings = get_system_settings()
         project_settings = get_project_settings(self.project_name)
 
         # Discover and prepare creators
@@ -1812,7 +1813,6 @@ class CreateContext:
 
             creator = creator_class(
                 project_settings,
-                system_settings,
                 self,
                 self.headless
             )
@@ -1912,8 +1912,8 @@ class CreateContext:
 
         self._instances_by_id[instance.id] = instance
         # Prepare publish plugin attributes and set it on instance
-        attr_plugins = self._get_publish_plugins_with_attr_for_family(
-            instance.family
+        attr_plugins = self._get_publish_plugins_with_attr_for_product_type(
+            instance.product_type
         )
         instance.set_publish_plugins(attr_plugins)
 
@@ -1960,11 +1960,11 @@ class CreateContext:
         values. If only 'task_name' is provided it will be overriden by
         task name from current context. If 'task_name' is not provided
         when 'asset_doc' is, it is considered that task name is not specified,
-        which can lead to error if subset name template requires task name.
+        which can lead to error if product name template requires task name.
 
         Args:
             creator_identifier (str): Identifier of creator plugin.
-            variant (str): Variant used for subset name.
+            variant (str): Variant used for product name.
             asset_doc (Dict[str, Any]): Asset document which define context of
                 creation (possible context of created instance/s).
             task_name (str): Name of task to which is context related.
@@ -2003,23 +2003,23 @@ class CreateContext:
         # TODO validate types
         _pre_create_data.update(pre_create_data)
 
-        subset_name = creator.get_subset_name(
-            variant,
-            task_name,
-            asset_doc,
+        product_name = creator.get_product_name(
             project_name,
-            self.host_name
+            asset_doc,
+            task_name,
+            variant,
+            self.host_name,
         )
         asset_name = get_asset_name_identifier(asset_doc)
 
         instance_data = {
             "folderPath": asset_name,
             "task": task_name,
-            "family": creator.family,
+            "productType": creator.product_type,
             "variant": variant
         }
         return creator.create(
-            subset_name,
+            product_name,
             instance_data,
             _pre_create_data
         )
@@ -2426,29 +2426,29 @@ class CreateContext:
         if failed_info:
             raise CreatorsRemoveFailed(failed_info)
 
-    def _get_publish_plugins_with_attr_for_family(self, family):
-        """Publish plugin attributes for passed family.
+    def _get_publish_plugins_with_attr_for_product_type(self, product_type):
+        """Publish plugin attributes for passed product type.
 
-        Attribute definitions for specific family are cached.
+        Attribute definitions for specific product type are cached.
 
         Args:
-            family(str): Instance family for which should be attribute
-                definitions returned.
+            product_type(str): Instance product type for which should be
+                attribute definitions returned.
         """
 
-        if family not in self._attr_plugins_by_family:
+        if product_type not in self._attr_plugins_by_product_type:
             import pyblish.logic
 
             filtered_plugins = pyblish.logic.plugins_by_families(
-                self.plugins_with_defs, [family]
+                self.plugins_with_defs, [product_type]
             )
             plugins = []
             for plugin in filtered_plugins:
                 if plugin.__instanceEnabled__:
                     plugins.append(plugin)
-            self._attr_plugins_by_family[family] = plugins
+            self._attr_plugins_by_product_type[product_type] = plugins
 
-        return self._attr_plugins_by_family[family]
+        return self._attr_plugins_by_product_type[product_type]
 
     def _get_publish_plugins_with_attr_for_context(self):
         """Publish plugins attributes for Context plugins.
diff --git a/client/ayon_core/pipeline/create/creator_plugins.py b/client/ayon_core/pipeline/create/creator_plugins.py
index 6fa0d2ffa1..cb8e4a2d1c 100644
--- a/client/ayon_core/pipeline/create/creator_plugins.py
+++ b/client/ayon_core/pipeline/create/creator_plugins.py
@@ -6,8 +6,8 @@ from abc import ABCMeta, abstractmethod
 
 import six
 
-from ayon_core.settings import get_system_settings, get_project_settings
-from ayon_core.lib import Logger, is_func_signature_supported
+from ayon_core.settings import get_project_settings
+from ayon_core.lib import Logger
 from ayon_core.pipeline.plugin_discover import (
     discover,
     register_plugin,
@@ -17,7 +17,7 @@ from ayon_core.pipeline.plugin_discover import (
 )
 
 from .constants import DEFAULT_VARIANT_VALUE
-from .subset_name import get_subset_name
+from .product_name import get_product_name
 from .utils import get_next_versions_for_instances
 from .legacy_create import LegacyCreator
 
@@ -179,7 +179,7 @@ class BaseCreator:
     # Creator is enabled (Probably does not have reason of existence?)
     enabled = True
 
-    # Creator (and family) icon
+    # Creator (and product type) icon
     # - may not be used if `get_icon` is reimplemented
     icon = None
 
@@ -201,7 +201,7 @@ class BaseCreator:
     settings_name = None
 
     def __init__(
-        self, project_settings, system_settings, create_context, headless=False
+        self, project_settings, create_context, headless=False
     ):
         # Reference to CreateContext
         self.create_context = create_context
@@ -211,34 +211,7 @@ class BaseCreator:
         # - we may use UI inside processing this attribute should be checked
         self.headless = headless
 
-        expect_system_settings = False
-        if is_func_signature_supported(
-            self.apply_settings, project_settings
-        ):
-            self.apply_settings(project_settings)
-        else:
-            expect_system_settings = True
-            # Backwards compatibility for system settings
-            self.apply_settings(project_settings, system_settings)
-
-        init_use_base = any(
-            self.__class__.__init__ is cls.__init__
-            for cls in {
-                BaseCreator,
-                Creator,
-                HiddenCreator,
-                AutoCreator,
-            }
-        )
-        if not init_use_base or expect_system_settings:
-            self.log.warning((
-                "WARNING: Source - Create plugin {}."
-                " System settings argument will not be passed to"
-                " '__init__' and 'apply_settings' methods in future versions"
-                " of OpenPype. Planned version to drop the support"
-                " is 3.16.6 or 3.17.0. Please contact Ynput core team if you"
-                " need to keep system settings."
-            ).format(self.__class__.__name__))
+        self.apply_settings(project_settings)
 
     @staticmethod
     def _get_settings_values(project_settings, category_name, plugin_name):
@@ -329,14 +302,14 @@ class BaseCreator:
     def identifier(self):
         """Identifier of creator (must be unique).
 
-        Default implementation returns plugin's family.
+        Default implementation returns plugin's product type.
         """
 
-        return self.family
+        return self.product_type
 
     @property
     @abstractmethod
-    def family(self):
+    def product_type(self):
         """Family that plugin represents."""
 
         pass
@@ -370,7 +343,7 @@ class BaseCreator:
 
         Default implementation use attributes in this order:
             - 'group_label' -> 'label' -> 'identifier'
-                Keep in mind that 'identifier' use 'family' by default.
+                Keep in mind that 'identifier' use 'product_type' by default.
 
         Returns:
             str: Group label that can be used for grouping of instances in UI.
@@ -489,7 +462,7 @@ class BaseCreator:
         pass
 
     def get_icon(self):
-        """Icon of creator (family).
+        """Icon of creator (product type).
 
         Can return path to image file or awesome icon name.
         """
@@ -497,9 +470,15 @@ class BaseCreator:
         return self.icon
 
     def get_dynamic_data(
-        self, variant, task_name, asset_doc, project_name, host_name, instance
+        self,
+        project_name,
+        asset_doc,
+        task_name,
+        variant,
+        host_name,
+        instance
     ):
-        """Dynamic data for subset name filling.
+        """Dynamic data for product name filling.
 
         These may be get dynamically created based on current context of
         workfile.
@@ -507,16 +486,16 @@ class BaseCreator:
 
         return {}
 
-    def get_subset_name(
+    def get_product_name(
         self,
-        variant,
-        task_name,
-        asset_doc,
         project_name,
+        asset_doc,
+        task_name,
+        variant,
         host_name=None,
         instance=None
     ):
-        """Return subset name for passed context.
+        """Return product name for passed context.
 
         CHANGES:
         Argument `asset_id` was replaced with `asset_doc`. It is easier to
@@ -526,33 +505,41 @@ class BaseCreator:
 
         NOTE:
         Asset document is not used yet but is required if would like to use
-        task type in subset templates.
+        task type in product templates.
 
-        Method is also called on subset name update. In that case origin
+        Method is also called on product name update. In that case origin
         instance is passed in.
 
         Args:
-            variant(str): Subset name variant. In most of cases user input.
-            task_name(str): For which task subset is created.
-            asset_doc(dict): Asset document for which subset is created.
-            project_name(str): Project name.
-            host_name(str): Which host creates subset.
-            instance(CreatedInstance|None): Object of 'CreatedInstance' for
-                which is subset name updated. Passed only on subset name
+            project_name (str): Project name.
+            asset_doc (dict): Asset document for which product is created.
+            task_name (str): For which task product is created.
+            variant (str): Product name variant. In most of cases user input.
+            host_name (Optional[str]): Which host creates product. Defaults
+                to host name on create context.
+            instance (Optional[CreatedInstance]): Object of 'CreatedInstance'
+                for which is product name updated. Passed only on product name
                 update.
         """
 
+        if host_name is None:
+            host_name = self.create_context.host_name
         dynamic_data = self.get_dynamic_data(
-            variant, task_name, asset_doc, project_name, host_name, instance
+            project_name,
+            asset_doc,
+            task_name,
+            variant,
+            host_name,
+            instance
         )
 
-        return get_subset_name(
-            self.family,
-            variant,
-            task_name,
-            asset_doc,
+        return get_product_name(
             project_name,
+            asset_doc,
+            task_name,
             host_name,
+            self.product_type,
+            variant,
             dynamic_data=dynamic_data,
             project_settings=self.project_settings
         )
@@ -599,8 +586,8 @@ class BaseCreator:
         """Prepare next versions for instances.
 
         This is helper method to receive next possible versions for instances.
-        It is using context information on instance to receive them, 'asset'
-        and 'subset'.
+        It is using context information on instance to receive them,
+        'folderPath' and 'product'.
 
         Output will contain version by each instance id.
 
@@ -620,7 +607,7 @@ class BaseCreator:
 class Creator(BaseCreator):
     """Creator that has more information for artist to show in UI.
 
-    Creation requires prepared subset name and instance data.
+    Creation requires prepared product name and instance data.
     """
 
     # GUI Purposes
@@ -630,11 +617,11 @@ class Creator(BaseCreator):
     # Default variant used in 'get_default_variant'
     _default_variant = None
 
-    # Short description of family
+    # Short description of product type
     # - may not be used if `get_description` is overriden
     description = None
 
-    # Detailed description of family for artists
+    # Detailed description of product type for artists
     # - may not be used if `get_detail_description` is overriden
     detailed_description = None
 
@@ -681,39 +668,39 @@ class Creator(BaseCreator):
         return self.order
 
     @abstractmethod
-    def create(self, subset_name, instance_data, pre_create_data):
+    def create(self, product_name, instance_data, pre_create_data):
         """Create new instance and store it.
 
         Ideally should be stored to workfile using host implementation.
 
         Args:
-            subset_name(str): Subset name of created instance.
+            product_name(str): Product name of created instance.
             instance_data(dict): Base data for instance.
             pre_create_data(dict): Data based on pre creation attributes.
                 Those may affect how creator works.
         """
 
         # instance = CreatedInstance(
-        #     self.family, subset_name, instance_data
+        #     self.product_type, product_name, instance_data
         # )
         pass
 
     def get_description(self):
-        """Short description of family and plugin.
+        """Short description of product type and plugin.
 
         Returns:
-            str: Short description of family.
+            str: Short description of product type.
         """
 
         return self.description
 
     def get_detail_description(self):
-        """Description of family and plugin.
+        """Description of product type and plugin.
 
         Can be detailed with markdown or html tags.
 
         Returns:
-            str: Detailed description of family for artist.
+            str: Detailed description of product type for artist.
         """
 
         return self.detailed_description
@@ -838,11 +825,10 @@ def discover_legacy_creator_plugins():
 
     plugins = discover(LegacyCreator)
     project_name = get_current_project_name()
-    system_settings = get_system_settings()
     project_settings = get_project_settings(project_name)
     for plugin in plugins:
         try:
-            plugin.apply_settings(project_settings, system_settings)
+            plugin.apply_settings(project_settings)
         except Exception:
             log.warning(
                 "Failed to apply settings to creator {}".format(
diff --git a/client/ayon_core/pipeline/create/legacy_create.py b/client/ayon_core/pipeline/create/legacy_create.py
index bc1528b9cd..5e23a74a79 100644
--- a/client/ayon_core/pipeline/create/legacy_create.py
+++ b/client/ayon_core/pipeline/create/legacy_create.py
@@ -12,18 +12,18 @@ 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
+from .product_name import get_product_name
 
 
 class LegacyCreator(object):
     """Determine how assets are created"""
     label = None
-    family = None
+    product_type = None
     defaults = None
     maintain_selection = True
     enabled = True
 
-    dynamic_subset_keys = []
+    dynamic_product_name_keys = []
 
     log = logging.getLogger("LegacyCreator")
     log.propagate = True
@@ -36,15 +36,15 @@ class LegacyCreator(object):
         self.data = collections.OrderedDict()
         # TODO use 'AYON_INSTANCE_ID' when all hosts support it
         self.data["id"] = AVALON_INSTANCE_ID
-        self.data["family"] = self.family
+        self.data["productType"] = self.product_type
         self.data["folderPath"] = folder_path
-        self.data["subset"] = name
+        self.data["productName"] = name
         self.data["active"] = True
 
         self.data.update(data or {})
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
+    def apply_settings(cls, project_settings):
         """Apply OpenPype settings to a plugin class."""
 
         host_name = os.environ.get("AYON_HOST_NAME")
@@ -89,23 +89,23 @@ class LegacyCreator(object):
 
     @classmethod
     def get_dynamic_data(
-        cls, variant, task_name, asset_id, project_name, host_name
+        cls, project_name, asset_id, task_name, variant, host_name
     ):
         """Return dynamic data for current Creator plugin.
 
-        By default return keys from `dynamic_subset_keys` attribute as mapping
-        to keep formatted template unchanged.
+        By default return keys from `dynamic_product_name_keys` attribute
+        as mapping to keep formatted template unchanged.
 
         ```
-        dynamic_subset_keys = ["my_key"]
+        dynamic_product_name_keys = ["my_key"]
         ---
         output = {
             "my_key": "{my_key}"
         }
         ```
 
-        Dynamic keys may override default Creator keys (family, task, asset,
-        ...) but do it wisely if you need.
+        Dynamic keys may override default Creator keys (productType, task,
+        folderPath, ...) but do it wisely if you need.
 
         All of keys will be converted into 3 variants unchanged, capitalized
         and all upper letters. Because of that are all keys lowered.
@@ -114,54 +114,54 @@ class LegacyCreator(object):
         is class method.
 
         Returns:
-            dict: Fill data for subset name template.
+            dict: Fill data for product name template.
         """
         dynamic_data = {}
-        for key in cls.dynamic_subset_keys:
+        for key in cls.dynamic_product_name_keys:
             key = key.lower()
             dynamic_data[key] = "{" + key + "}"
         return dynamic_data
 
     @classmethod
-    def get_subset_name(
-        cls, variant, task_name, asset_id, project_name, host_name=None
+    def get_product_name(
+        cls, project_name, asset_id, task_name, variant, host_name=None
     ):
-        """Return subset name created with entered arguments.
+        """Return product name created with entered arguments.
 
         Logic extracted from Creator tool. This method should give ability
-        to get subset name without the tool.
+        to get product name without the tool.
 
         TODO: Maybe change `variant` variable.
 
-        By default is output concatenated family with user text.
+        By default is output concatenated product type with variant.
 
         Args:
-            variant (str): What is entered by user in creator tool.
-            task_name (str): Context's task name.
-            asset_id (ObjectId): Mongo ID of context's asset.
             project_name (str): Context's project name.
+            asset_id (str): Folder id.
+            task_name (str): Context's task name.
+            variant (str): What is entered by user in creator tool.
             host_name (str): Name of host.
 
         Returns:
-            str: Formatted subset name with entered arguments. Should match
+            str: Formatted product name with entered arguments. Should match
                 config's logic.
         """
 
         dynamic_data = cls.get_dynamic_data(
-            variant, task_name, asset_id, project_name, host_name
+            project_name, asset_id, task_name, variant, host_name
         )
 
         asset_doc = get_asset_by_id(
             project_name, asset_id, fields=["data.tasks"]
         )
 
-        return get_subset_name(
-            cls.family,
-            variant,
-            task_name,
-            asset_doc,
+        return get_product_name(
             project_name,
+            asset_doc,
+            task_name,
             host_name,
+            cls.product_type,
+            variant,
             dynamic_data=dynamic_data
         )
 
@@ -169,23 +169,23 @@ class LegacyCreator(object):
 def legacy_create(Creator, name, asset, options=None, data=None):
     """Create a new instance
 
-    Associate nodes with a subset and family. These nodes are later
-    validated, according to their `family`, and integrated into the
-    shared environment, relative their `subset`.
+    Associate nodes with a product name and type. These nodes are later
+    validated, according to their `product type`, and integrated into the
+    shared environment, relative their `productName`.
 
-    Data relative each family, along with default data, are imprinted
+    Data relative each product type, along with default data, are imprinted
     into the resulting objectSet. This data is later used by extractors
     and finally asset browsers to help identify the origin of the asset.
 
     Arguments:
         Creator (Creator): Class of creator
-        name (str): Name of subset
+        name (str): Name of product
         asset (str): Name of asset
         options (dict, optional): Additional options from GUI
         data (dict, optional): Additional data from GUI
 
     Raises:
-        NameError on `subset` already exists
+        NameError on `productName` already exists
         KeyError on invalid dynamic property
         RuntimeError on host error
 
diff --git a/client/ayon_core/pipeline/create/subset_name.py b/client/ayon_core/pipeline/create/product_name.py
similarity index 64%
rename from client/ayon_core/pipeline/create/subset_name.py
rename to client/ayon_core/pipeline/create/product_name.py
index 5925ec0f2b..8413bfa9d8 100644
--- a/client/ayon_core/pipeline/create/subset_name.py
+++ b/client/ayon_core/pipeline/create/product_name.py
@@ -3,44 +3,44 @@ import os
 from ayon_core.settings import get_project_settings
 from ayon_core.lib import filter_profiles, prepare_template_data
 
-from .constants import DEFAULT_SUBSET_TEMPLATE
+from .constants import DEFAULT_PRODUCT_TEMPLATE
 
 
 class TaskNotSetError(KeyError):
     def __init__(self, msg=None):
         if not msg:
-            msg = "Creator's subset name template requires task name."
+            msg = "Creator's product name template requires task name."
         super(TaskNotSetError, self).__init__(msg)
 
 
 class TemplateFillError(Exception):
     def __init__(self, msg=None):
         if not msg:
-            msg = "Creator's subset name template is missing key value."
+            msg = "Creator's product name template is missing key value."
         super(TemplateFillError, self).__init__(msg)
 
 
-def get_subset_name_template(
+def get_product_name_template(
     project_name,
-    family,
+    product_type,
     task_name,
     task_type,
     host_name,
     default_template=None,
     project_settings=None
 ):
-    """Get subset name template based on passed context.
+    """Get product name template based on passed context.
 
     Args:
         project_name (str): Project on which the context lives.
-        family (str): Family (subset type) for which the subset name is
+        product_type (str): Product type for which the subset name is
             calculated.
-        host_name (str): Name of host in which the subset name is calculated.
-        task_name (str): Name of task in which context the subset is created.
-        task_type (str): Type of task in which context the subset is created.
+        host_name (str): Name of host in which the product name is calculated.
+        task_name (str): Name of task in which context the product is created.
+        task_type (str): Type of task in which context the product is created.
         default_template (Union[str, None]): Default template which is used if
             settings won't find any matching possitibility. Constant
-            'DEFAULT_SUBSET_TEMPLATE' is used if not defined.
+            'DEFAULT_PRODUCT_TEMPLATE' is used if not defined.
         project_settings (Union[Dict[str, Any], None]): Prepared settings for
             project. Settings are queried if not passed.
     """
@@ -50,7 +50,7 @@ def get_subset_name_template(
     tools_settings = project_settings["core"]["tools"]
     profiles = tools_settings["creator"]["product_name_profiles"]
     filtering_criteria = {
-        "product_types": family,
+        "product_types": product_type,
         "hosts": host_name,
         "tasks": task_name,
         "task_types": task_type
@@ -75,86 +75,70 @@ def get_subset_name_template(
 
     # Make sure template is set (matching may have empty string)
     if not template:
-        template = default_template or DEFAULT_SUBSET_TEMPLATE
+        template = default_template or DEFAULT_PRODUCT_TEMPLATE
     return template
 
 
-def get_subset_name(
-    family,
-    variant,
-    task_name,
+def get_product_name(
+    project_name,
     asset_doc,
-    project_name=None,
-    host_name=None,
+    task_name,
+    host_name,
+    product_type,
+    variant,
     default_template=None,
     dynamic_data=None,
     project_settings=None,
-    family_filter=None,
+    product_type_filter=None,
 ):
-    """Calculate subset name based on passed context and OpenPype settings.
+    """Calculate product name based on passed context and AYON settings.
 
     Subst name templates are defined in `project_settings/global/tools/creator
-    /product_name_profiles` where are profiles with host name, family,
+    /product_name_profiles` where are profiles with host name, product type,
     task name and task type filters. If context does not match any profile
-    then `DEFAULT_SUBSET_TEMPLATE` is used as default template.
+    then `DEFAULT_PRODUCT_TEMPLATE` is used as default template.
 
-    That's main reason why so many arguments are required to calculate subset
+    That's main reason why so many arguments are required to calculate product
     name.
 
-    Option to pass family filter was added for special cases when creator or
-    automated publishing require special subset name template which would be
-    hard to maintain using its family value.
-        Why not just pass the right family? -> Family is also used as fill
-            value and for filtering of publish plugins.
-
     Todos:
         Find better filtering options to avoid requirement of
             argument 'family_filter'.
 
     Args:
-        family (str): Instance family.
+        project_name (str): Project name.
+        host_name (str): Host name.
+        product_type (str): Product type.
         variant (str): In most of the cases it is user input during creation.
         task_name (str): Task name on which context is instance created.
         asset_doc (dict): Queried asset document with its tasks in data.
             Used to get task type.
-        project_name (Optional[str]): Name of project on which is instance
-            created. Important for project settings that are loaded.
-        host_name (Optional[str]): One of filtering criteria for template
-            profile filters.
         default_template (Optional[str]): Default template if any profile does
-            not match passed context. Constant 'DEFAULT_SUBSET_TEMPLATE'
+            not match passed context. Constant 'DEFAULT_PRODUCT_TEMPLATE'
             is used if is not passed.
         dynamic_data (Optional[Dict[str, Any]]): Dynamic data specific for
             a creator which creates instance.
         project_settings (Optional[Union[Dict[str, Any]]]): Prepared settings
             for project. Settings are queried if not passed.
-        family_filter (Optional[str]): Use different family for subset template
-            filtering. Value of 'family' is used when not passed.
+        product_type_filter (Optional[str]): Use different product type for
+            product template filtering. Value of `product_type` is used when
+            not passed.
 
     Raises:
-        TemplateFillError: If filled template contains placeholder key which is not
-            collected.
+        TemplateFillError: If filled template contains placeholder key which
+            is not collected.
     """
 
-    if not family:
+    if not product_type:
         return ""
 
-    if not host_name:
-        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("AYON_PROJECT_NAME")
-
     asset_tasks = asset_doc.get("data", {}).get("tasks") or {}
     task_info = asset_tasks.get(task_name) or {}
     task_type = task_info.get("type")
 
-    template = get_subset_name_template(
+    template = get_product_name_template(
         project_name,
-        family_filter or family,
+        product_type_filter or product_type,
         task_name,
         task_type,
         host_name,
@@ -166,10 +150,20 @@ def get_subset_name(
     if not task_name and "{task" in template.lower():
         raise TaskNotSetError()
 
+    task_value = {
+        "name": task_name,
+        "type": task_type,
+    }
+    if "{task}" in template.lower():
+        task_value = task_name
+
     fill_pairs = {
         "variant": variant,
-        "family": family,
-        "task": task_name
+        "family": product_type,
+        "task": task_value,
+        "product": {
+            "type": product_type
+        }
     }
     if dynamic_data:
         # Dynamic data may override default values
diff --git a/client/ayon_core/pipeline/create/utils.py b/client/ayon_core/pipeline/create/utils.py
index c2655f319f..44063bd9ac 100644
--- a/client/ayon_core/pipeline/create/utils.py
+++ b/client/ayon_core/pipeline/create/utils.py
@@ -11,14 +11,14 @@ from ayon_core.client import (
 def get_last_versions_for_instances(
     project_name, instances, use_value_for_missing=False
 ):
-    """Get last versions for instances by their asset and subset name.
+    """Get last versions for instances by their folder path and product name.
 
     Args:
         project_name (str): Project name.
         instances (list[CreatedInstance]): Instances to get next versions for.
         use_value_for_missing (Optional[bool]): Missing values are replaced
             with negative value if True. Otherwise None is used. -2 is used
-            for instances without filled asset or subset name. -1 is used
+            for instances without filled folder or product name. -1 is used
             for missing entities.
 
     Returns:
@@ -29,72 +29,72 @@ def get_last_versions_for_instances(
         instance.id: -1 if use_value_for_missing else None
         for instance in instances
     }
-    subset_names_by_asset_name = collections.defaultdict(set)
+    product_names_by_folder_path = collections.defaultdict(set)
     instances_by_hierarchy = {}
     for instance in instances:
-        asset_name = instance.data.get("folderPath")
-        subset_name = instance.subset_name
-        if not asset_name or not subset_name:
+        folder_path = instance.data.get("folderPath")
+        product_name = instance.product_name
+        if not folder_path or not product_name:
             if use_value_for_missing:
                 output[instance.id] = -2
             continue
 
         (
             instances_by_hierarchy
-            .setdefault(asset_name, {})
-            .setdefault(subset_name, [])
+            .setdefault(folder_path, {})
+            .setdefault(product_name, [])
             .append(instance)
         )
-        subset_names_by_asset_name[asset_name].add(subset_name)
+        product_names_by_folder_path[folder_path].add(product_name)
 
-    subset_names = set()
-    for names in subset_names_by_asset_name.values():
-        subset_names |= names
+    product_names = set()
+    for names in product_names_by_folder_path.values():
+        product_names |= names
 
-    if not subset_names:
+    if not product_names:
         return output
 
     asset_docs = get_assets(
         project_name,
-        asset_names=subset_names_by_asset_name.keys(),
+        asset_names=product_names_by_folder_path.keys(),
         fields=["name", "_id", "data.parents"]
     )
-    asset_names_by_id = {
+    folder_paths_by_id = {
         asset_doc["_id"]: get_asset_name_identifier(asset_doc)
         for asset_doc in asset_docs
     }
-    if not asset_names_by_id:
+    if not folder_paths_by_id:
         return output
 
     subset_docs = get_subsets(
         project_name,
-        asset_ids=asset_names_by_id.keys(),
-        subset_names=subset_names,
+        asset_ids=folder_paths_by_id.keys(),
+        subset_names=product_names,
         fields=["_id", "name", "parent"]
     )
     subset_docs_by_id = {}
     for subset_doc in subset_docs:
         # Filter subset docs by subset names under parent
-        asset_id = subset_doc["parent"]
-        asset_name = asset_names_by_id[asset_id]
-        subset_name = subset_doc["name"]
-        if subset_name not in subset_names_by_asset_name[asset_name]:
+        folder_id = subset_doc["parent"]
+        folder_path = folder_paths_by_id[folder_id]
+        product_name = subset_doc["name"]
+        if product_name not in product_names_by_folder_path[folder_path]:
             continue
         subset_docs_by_id[subset_doc["_id"]] = subset_doc
 
     if not subset_docs_by_id:
         return output
 
-    last_versions_by_subset_id = get_last_versions(
+    last_versions_by_product_id = get_last_versions(
         project_name,
         subset_docs_by_id.keys(),
         fields=["name", "parent"]
     )
-    for subset_id, version_doc in last_versions_by_subset_id.items():
+    for subset_id, version_doc in last_versions_by_product_id.items():
         subset_doc = subset_docs_by_id[subset_id]
-        asset_id = subset_doc["parent"]
-        asset_name = asset_names_by_id[asset_id]
-        _instances = instances_by_hierarchy[asset_name][subset_doc["name"]]
+        folder_id = subset_doc["parent"]
+        folder_path = folder_paths_by_id[folder_id]
+        _instances = instances_by_hierarchy[folder_path][subset_doc["name"]]
         for instance in _instances:
             output[instance.id] = version_doc["name"]
 
@@ -102,7 +102,7 @@ def get_last_versions_for_instances(
 
 
 def get_next_versions_for_instances(project_name, instances):
-    """Get next versions for instances by their asset and subset name.
+    """Get next versions for instances by their folder path and product name.
 
     Args:
         project_name (str): Project name.
@@ -110,7 +110,7 @@ def get_next_versions_for_instances(project_name, instances):
 
     Returns:
         dict[str, Union[int, None]]: Next versions by instance id. Version is
-            'None' if instance has no asset or subset name.
+            'None' if instance has no folder path or product name.
     """
 
     last_versions = get_last_versions_for_instances(
diff --git a/client/ayon_core/pipeline/farm/pyblish_functions.py b/client/ayon_core/pipeline/farm/pyblish_functions.py
index 4652d34011..c669d95c1e 100644
--- a/client/ayon_core/pipeline/farm/pyblish_functions.py
+++ b/client/ayon_core/pipeline/farm/pyblish_functions.py
@@ -58,16 +58,16 @@ def remap_source(path, anatomy):
     return source
 
 
-def extend_frames(asset, subset, start, end):
+def extend_frames(folder_path, product_name, start, end):
     """Get latest version of asset nad update frame range.
 
     Based on minimum and maximum values.
 
     Arguments:
-        asset (str): asset name
-        subset (str): subset name
-        start (int): start frame
-        end (int): end frame
+        folder_path (str): Folder path.
+        product_name (str): Product name.
+        start (int): Start frame.
+        end (int): End frame.
 
     Returns:
         (int, int): update frame start/end
@@ -80,8 +80,8 @@ def extend_frames(asset, subset, start, end):
     project_name = get_current_project_name()
     version = get_last_version_by_subset_name(
         project_name,
-        subset,
-        asset_name=asset
+        product_name,
+        asset_name=folder_path
     )
 
     # Set prev start / end frames for comparison
@@ -198,7 +198,7 @@ def create_skeleton_instance(
     if data.get("extendFrames", False):
         time_data.start, time_data.end = extend_frames(
             data["folderPath"],
-            data["subset"],
+            data["productName"],
             time_data.start,
             time_data.end,
         )
@@ -215,18 +215,18 @@ def create_skeleton_instance(
         log.warning(("Could not find root path for remapping \"{}\". "
                      "This may cause issues.").format(source))
 
-    family = ("render"
+    product_type = ("render"
               if "prerender.farm" not in instance.data["families"]
               else "prerender")
-    families = [family]
+    families = [product_type]
 
     # pass review to families if marked as review
     if data.get("review"):
         families.append("review")
 
     instance_skeleton_data = {
-        "family": family,
-        "subset": data["subset"],
+        "productType": product_type,
+        "productName": data["productName"],
         "families": families,
         "folderPath": data["folderPath"],
         "frameStart": time_data.start,
@@ -472,8 +472,8 @@ def create_instances_for_aov(instance, skeleton, aov_filter,
             expected files.
 
     """
-    # we cannot attach AOVs to other subsets as we consider every
-    # AOV subset of its own.
+    # we cannot attach AOVs to other products as we consider every
+    # AOV product of its own.
 
     log = Logger.get_logger("farm_publishing")
     additional_color_data = {
@@ -493,7 +493,7 @@ def create_instances_for_aov(instance, skeleton, aov_filter,
         log.warning(e)
         additional_color_data["colorspaceTemplate"] = colorspace_template
 
-    # if there are subset to attach to and more than one AOV,
+    # if there are product to attach to and more than one AOV,
     # we cannot proceed.
     if (
         len(instance.data.get("attachTo", [])) > 0
@@ -501,7 +501,7 @@ def create_instances_for_aov(instance, skeleton, aov_filter,
     ):
         raise KnownPublishError(
             "attaching multiple AOVs or renderable cameras to "
-            "subset is not supported yet.")
+            "product is not supported yet.")
 
     # create instances for every AOV we found in expected files.
     # NOTE: this is done for every AOV and every render camera (if
@@ -544,7 +544,7 @@ def _create_instances_for_aov(instance, skeleton, aov_filter, additional_data,
     task = os.environ["AYON_TASK_NAME"]
 
     anatomy = instance.context.data["anatomy"]
-    subset = skeleton["subset"]
+    s_product_name = skeleton["productName"]
     cameras = instance.data.get("cameras", [])
     exp_files = instance.data["expectedFiles"]
     log = Logger.get_logger("farm_publishing")
@@ -570,34 +570,33 @@ def _create_instances_for_aov(instance, skeleton, aov_filter, additional_data,
             ext = cols[0].tail.lstrip(".")
             col = list(cols[0])
 
-        # create subset name `familyTaskSubset_AOV`
+        # create product name `<product type><Task><Product name>`
         # TODO refactor/remove me
-        family = skeleton["family"]
-        if not subset.startswith(family):
+        product_type = skeleton["productType"]
+        if not s_product_name.startswith(product_type):
             group_name = '{}{}{}{}{}'.format(
-                family,
+                product_type,
                 task[0].upper(), task[1:],
-                subset[0].upper(), subset[1:])
+                s_product_name[0].upper(), s_product_name[1:])
         else:
-            group_name = subset
+            group_name = s_product_name
 
         # if there are multiple cameras, we need to add camera name
         expected_filepath = col[0] if isinstance(col, (list, tuple)) else col
         cams = [cam for cam in cameras if cam in expected_filepath]
         if cams:
             for cam in cams:
-                if aov:
-                    if not aov.startswith(cam):
-                        subset_name = '{}_{}_{}'.format(group_name, cam, aov)
-                    else:
-                        subset_name = "{}_{}".format(group_name, aov)
+                if not aov:
+                    product_name = '{}_{}'.format(group_name, cam)
+                elif not aov.startswith(cam):
+                    product_name = '{}_{}_{}'.format(group_name, cam, aov)
                 else:
-                    subset_name = '{}_{}'.format(group_name, cam)
+                    product_name = "{}_{}".format(group_name, aov)
         else:
             if aov:
-                subset_name = '{}_{}'.format(group_name, aov)
+                product_name = '{}_{}'.format(group_name, aov)
             else:
-                subset_name = '{}'.format(group_name)
+                product_name = '{}'.format(group_name)
 
         if isinstance(col, (list, tuple)):
             staging = os.path.dirname(col[0])
@@ -609,7 +608,7 @@ def _create_instances_for_aov(instance, skeleton, aov_filter, additional_data,
         except ValueError as e:
             log.warning(e)
 
-        log.info("Creating data for: {}".format(subset_name))
+        log.info("Creating data for: {}".format(product_name))
 
         app = os.environ.get("AYON_HOST_NAME", "")
 
@@ -626,7 +625,7 @@ def _create_instances_for_aov(instance, skeleton, aov_filter, additional_data,
             preview = True
 
         new_instance = deepcopy(skeleton)
-        new_instance["subset"] = subset_name
+        new_instance["productName"] = product_name
         new_instance["subsetGroup"] = group_name
 
         # explicitly disable review by user
@@ -778,7 +777,7 @@ def create_skeleton_instance_cache(instance):
     if data.get("extendFrames", False):
         time_data.start, time_data.end = extend_frames(
             data["folderPath"],
-            data["subset"],
+            data["productName"],
             time_data.start,
             time_data.end,
         )
@@ -795,15 +794,16 @@ def create_skeleton_instance_cache(instance):
         log.warning(("Could not find root path for remapping \"{}\". "
                      "This may cause issues.").format(source))
 
-    family = instance.data["family"]
+    product_type = instance.data["productType"]
     # Make sure "render" is in the families to go through
     # validating expected and rendered files
     # during publishing job.
-    families = ["render", family]
+    families = ["render", product_type]
 
     instance_skeleton_data = {
-        "family": family,
-        "subset": data["subset"],
+        "productName": data["productName"],
+        "productType": product_type,
+        "family": product_type,
         "families": families,
         "folderPath": data["folderPath"],
         "frameStart": time_data.start,
@@ -910,8 +910,8 @@ def create_instances_for_cache(instance, skeleton):
 
     """
     anatomy = instance.context.data["anatomy"]
-    subset = skeleton["subset"]
-    family = skeleton["family"]
+    product_name = skeleton["productName"]
+    product_type = skeleton["productType"]
     exp_files = instance.data["expectedFiles"]
     log = Logger.get_logger("farm_publishing")
 
@@ -948,9 +948,9 @@ def create_instances_for_cache(instance, skeleton):
 
         new_instance = deepcopy(skeleton)
 
-        new_instance["subset"] = subset
-        log.info("Creating data for: {}".format(subset))
-        new_instance["family"] = family
+        new_instance["productName"] = product_name
+        log.info("Creating data for: {}".format(product_name))
+        new_instance["productType"] = product_type
         new_instance["families"] = skeleton["families"]
         # create representation
         if isinstance(col, (list, tuple)):
@@ -984,7 +984,7 @@ def create_instances_for_cache(instance, skeleton):
 def copy_extend_frames(instance, representation):
     """Copy existing frames from latest version.
 
-    This will copy all existing frames from subset's latest version back
+    This will copy all existing frames from product's latest version back
     to render directory and rename them to what renderer is expecting.
 
     Arguments:
@@ -1005,20 +1005,20 @@ def copy_extend_frames(instance, representation):
     project_name = instance.context.data["project"]
     anatomy = instance.context.data["anatomy"]  # type: Anatomy
 
-    # get latest version of subset
-    # this will stop if subset wasn't published yet
+    # get latest version of product
+    # this will stop if product wasn't published yet
 
     version = get_last_version_by_subset_name(
         project_name,
-        instance.data.get("subset"),
+        instance.data.get("productName"),
         asset_name=instance.data.get("folderPath")
     )
 
     # get its files based on extension
-    subset_resources = get_resources(
+    product_resources = get_resources(
         project_name, version, representation.get("ext")
     )
-    r_col, _ = clique.assemble(subset_resources)
+    r_col, _ = clique.assemble(product_resources)
 
     # if override remove all frames we are expecting to be rendered,
     # so we'll copy only those missing from current render
@@ -1064,11 +1064,11 @@ def copy_extend_frames(instance, representation):
     log.info("Finished copying %i files" % len(resource_files))
 
 
-def attach_instances_to_subset(attach_to, instances):
-    """Attach instance to subset.
+def attach_instances_to_product(attach_to, instances):
+    """Attach instance to product.
 
-    If we are attaching to other subsets, create copy of existing
-    instances, change data to match its subset and replace
+    If we are attaching to other products, create copy of existing
+    instances, change data to match its product and replace
     existing instances with modified data.
 
     Args:
@@ -1084,7 +1084,8 @@ def attach_instances_to_subset(attach_to, instances):
         for i in instances:
             new_inst = copy.deepcopy(i)
             new_inst["version"] = attach_instance.get("version")
-            new_inst["subset"] = attach_instance.get("subset")
+            new_inst["productName"] = attach_instance.get("productName")
+            new_inst["productType"] = attach_instance.get("productType")
             new_inst["family"] = attach_instance.get("family")
             new_inst["append"] = True
             # don't set subsetGroup if we are attaching
@@ -1108,7 +1109,7 @@ def create_metadata_path(instance, anatomy):
         # directory is not available
         log.warning("Path is unreachable: `{}`".format(output_dir))
 
-    metadata_filename = "{}_metadata.json".format(ins_data["subset"])
+    metadata_filename = "{}_metadata.json".format(ins_data["productName"])
 
     metadata_path = os.path.join(output_dir, metadata_filename)
 
diff --git a/client/ayon_core/pipeline/farm/pyblish_functions.pyi b/client/ayon_core/pipeline/farm/pyblish_functions.pyi
index d9d46a63be..16c11aa480 100644
--- a/client/ayon_core/pipeline/farm/pyblish_functions.pyi
+++ b/client/ayon_core/pipeline/farm/pyblish_functions.pyi
@@ -16,9 +16,9 @@ class TimeData:
     ...
 
 def remap_source(source: str, anatomy: Anatomy): ...
-def extend_frames(asset: str, subset: str, start: int, end: int) -> Tuple[int, int]: ...
+def extend_frames(folder_path: str, product_name: str, start: int, end: int) -> Tuple[int, int]: ...
 def get_time_data_from_instance_or_context(instance: pyblish.api.Instance) -> TimeData: ...
 def get_transferable_representations(instance: pyblish.api.Instance) -> list: ...
 def create_skeleton_instance(instance: pyblish.api.Instance, families_transfer: list = ..., instance_transfer: dict = ...) -> dict: ...
 def create_instances_for_aov(instance: pyblish.api.Instance, skeleton: dict, aov_filter: dict) -> List[pyblish.api.Instance]: ...
-def attach_instances_to_subset(attach_to: list, instances: list) -> list: ...
+def attach_instances_to_product(attach_to: list, instances: list) -> list: ...
diff --git a/client/ayon_core/pipeline/farm/tools.py b/client/ayon_core/pipeline/farm/tools.py
index f3acac7a32..8ab3b87ff6 100644
--- a/client/ayon_core/pipeline/farm/tools.py
+++ b/client/ayon_core/pipeline/farm/tools.py
@@ -5,8 +5,9 @@ def get_published_workfile_instance(context):
     """Find workfile instance in context"""
     for i in context:
         is_workfile = (
-            "workfile" in i.data.get("families", []) or
-            i.data["family"] == "workfile"
+            i.data["productType"] == "workfile"
+            or "workfile" in i.data.get("families", [])
+
         )
         if not is_workfile:
             continue
diff --git a/client/ayon_core/pipeline/load/plugins.py b/client/ayon_core/pipeline/load/plugins.py
index 962417c6f2..5ac8038e66 100644
--- a/client/ayon_core/pipeline/load/plugins.py
+++ b/client/ayon_core/pipeline/load/plugins.py
@@ -1,7 +1,7 @@
 import os
 import logging
 
-from ayon_core.settings import get_system_settings, get_project_settings
+from ayon_core.settings import get_project_settings
 from ayon_core.pipeline import schema
 from ayon_core.pipeline.plugin_discover import (
     discover,
@@ -37,7 +37,7 @@ class LoaderPlugin(list):
     log.propagate = True
 
     @classmethod
-    def apply_settings(cls, project_settings, system_settings):
+    def apply_settings(cls, project_settings):
         host_name = os.environ.get("AYON_HOST_NAME")
         plugin_type = "load"
         plugin_type_settings = (
@@ -225,7 +225,7 @@ class LoaderPlugin(list):
             Returns static (cls) options or could collect from 'contexts'.
 
             Args:
-                contexts (list): of repre or subset contexts
+                contexts (list): of repre or product contexts
             Returns:
                 (list)
         """
@@ -246,7 +246,7 @@ class LoaderPlugin(list):
 
 
 class SubsetLoaderPlugin(LoaderPlugin):
-    """Load subset into host application
+    """Load product into host application
     Arguments:
         context (dict): avalon-core:context-1.0
         name (str, optional): Use pre-defined name
@@ -262,11 +262,10 @@ def discover_loader_plugins(project_name=None):
     plugins = discover(LoaderPlugin)
     if not project_name:
         project_name = get_current_project_name()
-    system_settings = get_system_settings()
     project_settings = get_project_settings(project_name)
     for plugin in plugins:
         try:
-            plugin.apply_settings(project_settings, system_settings)
+            plugin.apply_settings(project_settings)
         except Exception:
             log.warning(
                 "Failed to apply settings to loader {}".format(
diff --git a/client/ayon_core/pipeline/publish/abstract_collect_render.py b/client/ayon_core/pipeline/publish/abstract_collect_render.py
index 6ca1d81bc7..745632ca0a 100644
--- a/client/ayon_core/pipeline/publish/abstract_collect_render.py
+++ b/client/ayon_core/pipeline/publish/abstract_collect_render.py
@@ -28,10 +28,12 @@ class RenderInstance(object):
     time = attr.ib()  # time of instance creation (get_formatted_current_time)
     source = attr.ib()  # path to source scene file
     label = attr.ib()  # label to show in GUI
-    subset = attr.ib()  # subset name
-    task = attr.ib()  # task name
+    family = attr.ib()  # product type for pyblish filtering
+    productType = attr.ib()  # product type
+    productName = attr.ib()  # product name
     folderPath = attr.ib()  # folder path
-    attachTo = attr.ib()  # subset name to attach render to
+    task = attr.ib()  # task name
+    attachTo = attr.ib()  # product name to attach render to
     setMembers = attr.ib()  # list of nodes/members producing render output
     publish = attr.ib()  # bool, True to publish instance
     name = attr.ib()  # instance name
@@ -60,7 +62,7 @@ class RenderInstance(object):
     review = attr.ib(default=None)  # False - explicitly skip review
     priority = attr.ib(default=50)  # job priority on farm
 
-    family = attr.ib(default="renderlayer")
+    # family = attr.ib(default="renderlayer")
     families = attr.ib(default=["renderlayer"])  # list of families
     # True if should be rendered on farm, eg not integrate
     farm = attr.ib(default=False)
@@ -153,13 +155,13 @@ class AbstractCollectRender(pyblish.api.ContextPlugin):
             exp_files = self.get_expected_files(render_instance)
             assert exp_files, "no file names were generated, this is bug"
 
-            # if we want to attach render to subset, check if we have AOV's
+            # if we want to attach render to product, check if we have AOV's
             # in expectedFiles. If so, raise error as we cannot attach AOV
-            # (considered to be subset on its own) to another subset
+            # (considered to be product on its own) to another product
             if render_instance.attachTo:
                 assert isinstance(exp_files, list), (
                     "attaching multiple AOVs or renderable cameras to "
-                    "subset is not supported"
+                    "product is not supported"
                 )
 
             frame_start_render = int(render_instance.frameStart)
diff --git a/client/ayon_core/pipeline/publish/lib.py b/client/ayon_core/pipeline/publish/lib.py
index 7d980b4bbe..b4ed69b5d7 100644
--- a/client/ayon_core/pipeline/publish/lib.py
+++ b/client/ayon_core/pipeline/publish/lib.py
@@ -13,12 +13,8 @@ from ayon_core.lib import (
     Logger,
     import_filepath,
     filter_profiles,
-    is_func_signature_supported,
-)
-from ayon_core.settings import (
-    get_project_settings,
-    get_system_settings,
 )
+from ayon_core.settings import get_project_settings
 from ayon_core.pipeline import (
     tempdir,
     Anatomy
@@ -105,7 +101,7 @@ def get_hero_template_name_profiles(
 def get_publish_template_name(
     project_name,
     host_name,
-    family,
+    product_type,
     task_name,
     task_type,
     project_settings=None,
@@ -123,7 +119,7 @@ def get_publish_template_name(
     Args:
         project_name (str): Name of project where to look for settings.
         host_name (str): Name of host integration.
-        family (str): Family for which should be found template.
+        product_type (str): Product type for which should be found template.
         task_name (str): Task name on which is instance working.
         task_type (str): Task type on which is instance working.
         project_settings (Dict[str, Any]): Prepared project settings.
@@ -138,7 +134,7 @@ def get_publish_template_name(
     template = None
     filter_criteria = {
         "hosts": host_name,
-        "product_types": family,
+        "product_types": product_type,
         "task_names": task_name,
         "task_types": task_type,
     }
@@ -421,8 +417,8 @@ def apply_plugin_settings_automatically(plugin, settings, logger=None):
 def filter_pyblish_plugins(plugins):
     """Pyblish plugin filter which applies AYON settings.
 
-    Apply OpenPype settings on discovered plugins. On plugin with implemented
-    class method 'def apply_settings(cls, project_settings, system_settings)'
+    Apply settings on discovered plugins. On plugin with implemented
+    class method 'def apply_settings(cls, project_settings)'
     is called the method. Default behavior looks for plugin name and current
     host name to look for
 
@@ -440,7 +436,6 @@ def filter_pyblish_plugins(plugins):
     project_name = os.environ.get("AYON_PROJECT_NAME")
 
     project_settings = get_project_settings(project_name)
-    system_settings = get_system_settings()
 
     # iterate over plugins
     for plugin in plugins[:]:
@@ -452,19 +447,7 @@ def filter_pyblish_plugins(plugins):
             # - can be used to target settings from custom settings place
             # - skip default behavior when successful
             try:
-                # Support to pass only project settings
-                # - make sure that both settings are passed, when can be
-                #   - that covers cases when *args are in method parameters
-                both_supported = is_func_signature_supported(
-                    apply_settings_func, project_settings, system_settings
-                )
-                project_supported = is_func_signature_supported(
-                    apply_settings_func, project_settings
-                )
-                if not both_supported and project_supported:
-                    plugin.apply_settings(project_settings)
-                else:
-                    plugin.apply_settings(project_settings, system_settings)
+                plugin.apply_settings(project_settings)
 
             except Exception:
                 log.warning(
@@ -701,19 +684,26 @@ def get_publish_repre_path(instance, repre, only_published=False):
     return None
 
 
-def get_custom_staging_dir_info(project_name, host_name, family, task_name,
-                                task_type, subset_name,
-                                project_settings=None,
-                                anatomy=None, log=None):
+def get_custom_staging_dir_info(
+    project_name,
+    host_name,
+    product_type,
+    task_name,
+    task_type,
+    product_name,
+    project_settings=None,
+    anatomy=None,
+    log=None
+):
     """Checks profiles if context should use special custom dir as staging.
 
     Args:
         project_name (str)
         host_name (str)
-        family (str)
+        product_type (str)
         task_name (str)
         task_type (str)
-        subset_name (str)
+        product_name (str)
         project_settings(Dict[str, Any]): Prepared project settings.
         anatomy (Dict[str, Any])
         log (Logger) (optional)
@@ -736,10 +726,10 @@ def get_custom_staging_dir_info(project_name, host_name, family, task_name,
 
     filtering_criteria = {
         "hosts": host_name,
-        "families": family,
+        "families": product_type,
         "task_names": task_name,
         "task_types": task_type,
-        "subsets": subset_name
+        "subsets": product_name
     }
     profile = filter_profiles(custom_staging_dir_profiles,
                               filtering_criteria,
@@ -780,18 +770,18 @@ def _validate_transient_template(project_name, template_name, anatomy):
 def get_published_workfile_instance(context):
     """Find workfile instance in context"""
     for i in context:
-        is_workfile = (
-            "workfile" in i.data.get("families", []) or
-            i.data["family"] == "workfile"
-        )
-        if not is_workfile:
-            continue
-
         # test if there is instance of workfile waiting
         # to be published.
         if not i.data.get("publish", True):
             continue
 
+        if not (
+            i.data["productType"] == "workfile"
+            # QUESTION Is check in 'families' valid?
+            or "workfile" in i.data.get("families", [])
+        ):
+            continue
+
         return i
 
 
@@ -917,7 +907,7 @@ def get_publish_instance_label(instance):
     is used string conversion of instance object -> 'instance._name'.
 
     Todos:
-        Maybe 'subset' key could be used too.
+        Maybe 'productName' key could be used too.
 
     Args:
         instance (pyblish.api.Instance): Pyblish instance.
@@ -936,8 +926,8 @@ def get_publish_instance_label(instance):
 def get_publish_instance_families(instance):
     """Get all families of the instance.
 
-    Look for families under 'family' and 'families' keys in instance data.
-    Value of 'family' is used as first family and then all other families
+    Look for families under 'productType' and 'families' keys in instance data.
+    Value of 'productType' is used as first family and then all other families
     in random order.
 
     Args:
diff --git a/client/ayon_core/pipeline/template_data.py b/client/ayon_core/pipeline/template_data.py
index a5ca84c754..e9c57521d4 100644
--- a/client/ayon_core/pipeline/template_data.py
+++ b/client/ayon_core/pipeline/template_data.py
@@ -1,9 +1,9 @@
 from ayon_core.client import get_project, get_asset_by_name
-from ayon_core.settings import get_system_settings
+from ayon_core.settings import get_studio_settings
 from ayon_core.lib.local_settings import get_ayon_username
 
 
-def get_general_template_data(system_settings=None):
+def get_general_template_data(settings=None):
     """General template data based on system settings or machine.
 
     Output contains formatting keys:
@@ -12,12 +12,12 @@ def get_general_template_data(system_settings=None):
     - 'user'            - User's name using 'get_ayon_username'
 
     Args:
-        system_settings (Dict[str, Any]): System settings.
+        settings (Dict[str, Any]): Studio or project settings.
     """
 
-    if not system_settings:
-        system_settings = get_system_settings()
-    core_settings = system_settings["core"]
+    if not settings:
+        settings = get_studio_settings()
+    core_settings = settings["core"]
     return {
         "studio": {
             "name": core_settings["studio_name"],
@@ -154,7 +154,7 @@ def get_template_data(
     asset_doc=None,
     task_name=None,
     host_name=None,
-    system_settings=None
+    settings=None
 ):
     """Prepare data for templates filling from entered documents and info.
 
@@ -174,14 +174,14 @@ def get_template_data(
         asset_doc (Dict[str, Any]): Mongo document of asset from MongoDB.
         task_name (Union[str, None]): Task name under passed asset.
         host_name (Union[str, None]): Used to fill '{app}' key.
-        system_settings (Union[Dict, None]): Prepared system settings.
+        settings (Union[Dict, None]): Prepared studio or project settings.
             They're queried if not passed (may be slower).
 
     Returns:
         Dict[str, Any]: Data prepared for filling workdir template.
     """
 
-    template_data = get_general_template_data(system_settings)
+    template_data = get_general_template_data(settings)
     template_data.update(get_project_template_data(project_doc))
     if asset_doc:
         template_data.update(get_asset_template_data(
@@ -203,7 +203,7 @@ def get_template_data_with_names(
     asset_name=None,
     task_name=None,
     host_name=None,
-    system_settings=None
+    settings=None
 ):
     """Prepare data for templates filling from entered entity names and info.
 
@@ -218,7 +218,7 @@ def get_template_data_with_names(
         task_name (Union[str, None]): Task name under passed asset.
         host_name (Union[str, None]):Used to fill '{app}' key.
             because workdir template may contain `{app}` key.
-        system_settings (Union[Dict, None]): Prepared system settings.
+        settings (Union[Dict, None]): Prepared studio or project settings.
             They're queried if not passed.
 
     Returns:
@@ -236,5 +236,5 @@ def get_template_data_with_names(
             fields=["name", "data.parents", "data.tasks"]
         )
     return get_template_data(
-        project_doc, asset_doc, task_name, host_name, system_settings
+        project_doc, asset_doc, task_name, host_name, settings
     )
diff --git a/client/ayon_core/pipeline/version_start.py b/client/ayon_core/pipeline/version_start.py
index 4813910bf3..7ee20a5dd4 100644
--- a/client/ayon_core/pipeline/version_start.py
+++ b/client/ayon_core/pipeline/version_start.py
@@ -7,8 +7,8 @@ def get_versioning_start(
     host_name,
     task_name=None,
     task_type=None,
-    family=None,
-    subset=None,
+    product_type=None,
+    product_name=None,
     project_settings=None,
 ):
     """Get anatomy versioning start"""
@@ -22,12 +22,14 @@ def get_versioning_start(
     if not profiles:
         return version_start
 
+    # TODO use 'product_types' and 'product_name' instead of
+    #   'families' and 'subsets'
     filtering_criteria = {
         "host_names": host_name,
-        "families": family,
+        "families": product_type,
         "task_names": task_name,
         "task_types": task_type,
-        "subsets": subset
+        "subsets": product_name
     }
     profile = filter_profiles(profiles, filtering_criteria)
 
diff --git a/client/ayon_core/pipeline/workfile/build_workfile.py b/client/ayon_core/pipeline/workfile/build_workfile.py
index 3a0d9ba95e..34d8ef0c8f 100644
--- a/client/ayon_core/pipeline/workfile/build_workfile.py
+++ b/client/ayon_core/pipeline/workfile/build_workfile.py
@@ -48,18 +48,18 @@ class BuildWorkfile:
         return self._log
 
     @staticmethod
-    def map_subsets_by_family(subsets):
-        subsets_by_family = collections.defaultdict(list)
-        for subset in subsets:
-            family = subset["data"].get("family")
-            if not family:
-                families = subset["data"].get("families")
+    def map_products_by_type(subset_docs):
+        products_by_type = collections.defaultdict(list)
+        for subset_doc in subset_docs:
+            product_type = subset_doc["data"].get("family")
+            if not product_type:
+                families = subset_doc["data"].get("families")
                 if not families:
                     continue
-                family = families[0]
+                product_type = families[0]
 
-            subsets_by_family[family].append(subset)
-        return subsets_by_family
+            products_by_type[product_type].append(subset_doc)
+        return products_by_type
 
     def process(self):
         """Main method of this wrapper.
@@ -80,17 +80,17 @@ class BuildWorkfile:
         stored in Workfile profiles from presets. Profiles are set by host,
         filtered by current task name and used by families.
 
-        Each family can specify representation names and loaders for
+        Each product type can specify representation names and loaders for
         representations and first available and successful loaded
         representation is returned as container.
 
         At the end you'll get list of loaded containers per each asset.
 
         loaded_containers [{
-            "asset_entity": <AssetEntity1>,
+            "asset_doc": <AssetEntity1>,
             "containers": [<Container1>, <Container2>, ...]
         }, {
-            "asset_entity": <AssetEntity2>,
+            "asset_doc": <AssetEntity2>,
             "containers": [<Container3>, ...]
         }, {
             ...
@@ -110,14 +110,14 @@ class BuildWorkfile:
 
         # Get current asset name and entity
         project_name = get_current_project_name()
-        current_asset_name = get_current_asset_name()
-        current_asset_entity = get_asset_by_name(
-            project_name, current_asset_name
+        current_folder_path = get_current_asset_name()
+        current_asset_doc = get_asset_by_name(
+            project_name, current_folder_path
         )
         # Skip if asset was not found
-        if not current_asset_entity:
-            print("Asset entity with name `{}` was not found".format(
-                current_asset_name
+        if not current_asset_doc:
+            print("Folder entity `{}` was not found".format(
+                current_folder_path
             ))
             return loaded_containers
 
@@ -143,7 +143,7 @@ class BuildWorkfile:
 
         # Load workfile presets for task
         self.build_presets = self.get_build_presets(
-            current_task_name, current_asset_entity
+            current_task_name, current_asset_doc
         )
 
         # Skip if there are any presets for task
@@ -155,9 +155,9 @@ class BuildWorkfile:
             )
             return loaded_containers
 
-        # Get presets for loading current asset
+        # Get presets for loading current folder
         current_context_profiles = self.build_presets.get("current_context")
-        # Get presets for loading linked assets
+        # Get presets for loading linked folders
         link_context_profiles = self.build_presets.get("linked_assets")
         # Skip if both are missing
         if not current_context_profiles and not link_context_profiles:
@@ -177,38 +177,38 @@ class BuildWorkfile:
         elif not link_context_profiles:
             self.log.warning((
                 "Current task `{}` doesn't have any"
-                "loading preset for it's linked assets."
+                "loading preset for it's linked folders."
             ).format(current_task_name))
 
         # Prepare assets to process by workfile presets
-        assets = []
-        current_asset_id = None
+        asset_docs = []
+        current_folder_id = None
         if current_context_profiles:
             # Add current asset entity if preset has current context set
-            assets.append(current_asset_entity)
-            current_asset_id = current_asset_entity["_id"]
+            asset_docs.append(current_asset_doc)
+            current_folder_id = current_asset_doc["_id"]
 
         if link_context_profiles:
             # Find and append linked assets if preset has set linked mapping
-            link_assets = get_linked_assets(project_name, current_asset_entity)
+            link_assets = get_linked_assets(project_name, current_asset_doc)
             if link_assets:
-                assets.extend(link_assets)
+                asset_docs.extend(link_assets)
 
         # Skip if there are no assets. This can happen if only linked mapping
         # is set and there are no links for his asset.
-        if not assets:
+        if not asset_docs:
             self.log.warning(
                 "Asset does not have linked assets. Nothing to process."
             )
             return loaded_containers
 
         # Prepare entities from database for assets
-        prepared_entities = self._collect_last_version_repres(assets)
+        prepared_entities = self._collect_last_version_repres(asset_docs)
 
         # Load containers by prepared entities and presets
         # - Current asset containers
-        if current_asset_id and current_asset_id in prepared_entities:
-            current_context_data = prepared_entities.pop(current_asset_id)
+        if current_folder_id and current_folder_id in prepared_entities:
+            current_context_data = prepared_entities.pop(current_folder_id)
             loaded_data = self.load_containers_by_asset_data(
                 current_context_data, current_context_profiles, loaders_by_name
             )
@@ -281,7 +281,7 @@ class BuildWorkfile:
         with valid values.
         - "loaders" expects list of strings representing possible loaders.
         - "families" expects list of strings for filtering
-                     by main subset family.
+                     by product type.
         - "repre_names" expects list of strings for filtering by
                         representation name.
 
@@ -349,33 +349,33 @@ class BuildWorkfile:
 
         return valid_profiles
 
-    def _prepare_profile_for_subsets(self, subsets, profiles):
-        """Select profile for each subset by it's data.
+    def _prepare_profile_for_products(self, subset_docs, profiles):
+        """Select profile for each product by it's data.
 
-        Profiles are filtered for each subset individually.
-        Profile is filtered by subset's family, optionally by name regex and
+        Profiles are filtered for each product individually.
+        Profile is filtered by product type, optionally by name regex and
         representation names set in profile.
-        It is possible to not find matching profile for subset, in that case
-        subset is skipped and it is possible that none of subsets have
+        It is possible to not find matching profile for product, in that case
+        product is skipped and it is possible that none of products have
         matching profile.
 
         Args:
-            subsets (List[Dict[str, Any]]): Subset documents.
+            subset_docs (List[Dict[str, Any]]): Subset documents.
             profiles (List[Dict[str, Any]]): Build profiles.
 
         Returns:
-            Dict[str, Any]: Profile by subset's id.
+            Dict[str, Any]: Profile by product id.
         """
 
-        # Prepare subsets
-        subsets_by_family = self.map_subsets_by_family(subsets)
+        # Prepare products
+        products_by_type = self.map_products_by_type(subset_docs)
 
-        profiles_per_subset_id = {}
-        for family, subsets in subsets_by_family.items():
-            family_low = family.lower()
+        profiles_by_product_id = {}
+        for product_type, subset_docs in products_by_type.items():
+            product_type_low = product_type.lower()
             for profile in profiles:
-                # Skip profile if does not contain family
-                if family_low not in profile["product_types_lowered"]:
+                # Skip profile if does not contain product type
+                if product_type_low not in profile["product_types_lowered"]:
                     continue
 
                 # Precompile name filters as regexes
@@ -387,31 +387,31 @@ class BuildWorkfile:
                     profile_regexes = _profile_regexes
 
                 # TODO prepare regex compilation
-                for subset in subsets:
+                for subset_doc in subset_docs:
                     # Verify regex filtering (optional)
                     if profile_regexes:
                         valid = False
                         for pattern in profile_regexes:
-                            if re.match(pattern, subset["name"]):
+                            if re.match(pattern, subset_doc["name"]):
                                 valid = True
                                 break
 
                         if not valid:
                             continue
 
-                    profiles_per_subset_id[subset["_id"]] = profile
+                    profiles_by_product_id[subset_doc["_id"]] = profile
 
                 # break profiles loop on finding the first matching profile
                 break
-        return profiles_per_subset_id
+        return profiles_by_product_id
 
     def load_containers_by_asset_data(
-        self, asset_entity_data, build_profiles, loaders_by_name
+        self, asset_doc_data, build_profiles, loaders_by_name
     ):
         """Load containers for entered asset entity by Build profiles.
 
         Args:
-            asset_entity_data (Dict[str, Any]): Prepared data with subsets,
+            asset_doc_data (Dict[str, Any]): Prepared data with products,
                 last versions and representations for specific asset.
             build_profiles (Dict[str, Any]): Build profiles.
             loaders_by_name (Dict[str, LoaderPlugin]): Available loaders
@@ -423,10 +423,10 @@ class BuildWorkfile:
         """
 
         # Make sure all data are not empty
-        if not asset_entity_data or not build_profiles or not loaders_by_name:
+        if not asset_doc_data or not build_profiles or not loaders_by_name:
             return
 
-        asset_entity = asset_entity_data["asset_entity"]
+        asset_doc = asset_doc_data["asset_doc"]
 
         valid_profiles = self._filter_build_profiles(
             build_profiles, loaders_by_name
@@ -439,53 +439,53 @@ class BuildWorkfile:
 
         self.log.debug("Valid Workfile profiles: {}".format(valid_profiles))
 
-        subsets_by_id = {}
-        version_by_subset_id = {}
+        products_by_id = {}
+        version_by_product_id = {}
         repres_by_version_id = {}
-        for subset_id, in_data in asset_entity_data["subsets"].items():
-            subset_entity = in_data["subset_entity"]
-            subsets_by_id[subset_entity["_id"]] = subset_entity
+        for product_id, in_data in asset_doc_data["subsets"].items():
+            subset_doc = in_data["subset_doc"]
+            products_by_id[subset_doc["_id"]] = subset_doc
 
             version_data = in_data["version"]
-            version_entity = version_data["version_entity"]
-            version_by_subset_id[subset_id] = version_entity
-            repres_by_version_id[version_entity["_id"]] = (
+            version_doc = version_data["version_doc"]
+            version_by_product_id[product_id] = version_doc
+            repres_by_version_id[version_doc["_id"]] = (
                 version_data["repres"]
             )
 
-        if not subsets_by_id:
-            self.log.warning("There are not subsets for asset {0}".format(
-                asset_entity["name"]
+        if not products_by_id:
+            self.log.warning("There are not products for folder {0}".format(
+                asset_doc["name"]
             ))
             return
 
-        profiles_per_subset_id = self._prepare_profile_for_subsets(
-            subsets_by_id.values(), valid_profiles
+        profiles_by_product_id = self._prepare_profile_for_products(
+            products_by_id.values(), valid_profiles
         )
-        if not profiles_per_subset_id:
-            self.log.warning("There are not valid subsets.")
+        if not profiles_by_product_id:
+            self.log.warning("There are not valid products.")
             return
 
-        valid_repres_by_subset_id = collections.defaultdict(list)
-        for subset_id, profile in profiles_per_subset_id.items():
+        valid_repres_by_product_id = collections.defaultdict(list)
+        for product_id, profile in profiles_by_product_id.items():
             profile_repre_names = profile["repre_names_lowered"]
 
-            version_entity = version_by_subset_id[subset_id]
-            version_id = version_entity["_id"]
+            version_doc = version_by_product_id[product_id]
+            version_id = version_doc["_id"]
             repres = repres_by_version_id[version_id]
             for repre in repres:
                 repre_name_low = repre["name"].lower()
                 if repre_name_low in profile_repre_names:
-                    valid_repres_by_subset_id[subset_id].append(repre)
+                    valid_repres_by_product_id[product_id].append(repre)
 
         # DEBUG message
-        msg = "Valid representations for Asset: `{}`".format(
-            asset_entity["name"]
+        msg = "Valid representations for Folder: `{}`".format(
+            asset_doc["name"]
         )
-        for subset_id, repres in valid_repres_by_subset_id.items():
-            subset = subsets_by_id[subset_id]
-            msg += "\n# Subset Name/ID: `{}`/{}".format(
-                subset["name"], subset_id
+        for product_id, repres in valid_repres_by_product_id.items():
+            subset_doc = products_by_id[product_id]
+            msg += "\n# Product Name/ID: `{}`/{}".format(
+                subset_doc["name"], product_id
             )
             for repre in repres:
                 msg += "\n## Repre name: `{}`".format(repre["name"])
@@ -493,37 +493,37 @@ class BuildWorkfile:
         self.log.debug(msg)
 
         containers = self._load_containers(
-            valid_repres_by_subset_id, subsets_by_id,
-            profiles_per_subset_id, loaders_by_name
+            valid_repres_by_product_id, products_by_id,
+            profiles_by_product_id, loaders_by_name
         )
 
         return {
-            "asset_entity": asset_entity,
+            "asset_doc": asset_doc,
             "containers": containers
         }
 
     def _load_containers(
-        self, repres_by_subset_id, subsets_by_id,
-        profiles_per_subset_id, loaders_by_name
+        self, repres_by_product_id, products_by_id,
+        profiles_by_product_id, loaders_by_name
     ):
         """Real load by collected data happens here.
 
-        Loading of representations per subset happens here. Each subset can
+        Loading of representations per product happens here. Each product can
         loads one representation. Loading is tried in specific order.
         Representations are tried to load by names defined in configuration.
-        If subset has representation matching representation name each loader
+        If product has representation matching representation name each loader
         is tried to load it until any is successful. If none of them was
         successful then next representation name is tried.
         Subset process loop ends when any representation is loaded or
         all matching representations were already tried.
 
         Args:
-            repres_by_subset_id (Dict[str, Dict[str, Any]]): Available
-                representations mapped by their parent (subset) id.
-            subsets_by_id (Dict[str, Dict[str, Any]]): Subset documents
+            repres_by_product_id (Dict[str, Dict[str, Any]]): Available
+                representations mapped by their parent (product) id.
+            products_by_id (Dict[str, Dict[str, Any]]): Subset documents
                 mapped by their id.
-            profiles_per_subset_id (Dict[str, Dict[str, Any]]): Build profiles
-                mapped by subset id.
+            profiles_by_product_id (Dict[str, Dict[str, Any]]): Build profiles
+                mapped by product id.
             loaders_by_name (Dict[str, LoaderPlugin]): Available loaders
                 per name.
 
@@ -533,38 +533,40 @@ class BuildWorkfile:
 
         loaded_containers = []
 
-        # Get subset id order from build presets.
+        # Get product id order from build presets.
         build_presets = self.build_presets.get("current_context", [])
         build_presets += self.build_presets.get("linked_assets", [])
-        subset_ids_ordered = []
+        product_ids_ordered = []
         for preset in build_presets:
-            for preset_family in preset["product_types"]:
-                for id, subset in subsets_by_id.items():
-                    if preset_family not in subset["data"].get("families", []):
+            for product_type in preset["product_types"]:
+                for product_id, subset_doc in products_by_id.items():
+                    # TODO 'families' is not available on product
+                    families = subset_doc["data"].get("families") or []
+                    if product_type not in families:
                         continue
 
-                    subset_ids_ordered.append(id)
+                    product_ids_ordered.append(product_id)
 
-        # Order representations from subsets.
-        print("repres_by_subset_id", repres_by_subset_id)
+        # Order representations from products.
+        print("repres_by_product_id", repres_by_product_id)
         representations_ordered = []
         representations = []
-        for id in subset_ids_ordered:
-            for subset_id, repres in repres_by_subset_id.items():
+        for ordered_product_id in product_ids_ordered:
+            for product_id, repres in repres_by_product_id.items():
                 if repres in representations:
                     continue
 
-                if id == subset_id:
-                    representations_ordered.append((subset_id, repres))
+                if ordered_product_id == product_id:
+                    representations_ordered.append((product_id, repres))
                     representations.append(repres)
 
         print("representations", representations)
 
         # Load ordered representations.
-        for subset_id, repres in representations_ordered:
-            subset_name = subsets_by_id[subset_id]["name"]
+        for product_id, repres in representations_ordered:
+            product_name = products_by_id[product_id]["name"]
 
-            profile = profiles_per_subset_id[subset_id]
+            profile = profiles_by_product_id[product_id]
             loaders_last_idx = len(profile["loaders"]) - 1
             repre_names_last_idx = len(profile["repre_names_lowered"]) - 1
 
@@ -595,7 +597,7 @@ class BuildWorkfile:
                         container = load_container(
                             loader,
                             repre["_id"],
-                            name=subset_name
+                            name=product_name
                         )
                         loaded_containers.append(container)
                         is_loaded = True
@@ -618,8 +620,8 @@ class BuildWorkfile:
                             msg += " Trying next loader."
                         elif repre_name_idx < repre_names_last_idx:
                             msg += (
-                                " Loading of subset `{}` was not successful."
-                            ).format(subset_name)
+                                " Loading of product `{}` was not successful."
+                            ).format(product_name)
                         else:
                             msg += " Trying next representation."
                         self.log.info(msg)
@@ -627,7 +629,7 @@ class BuildWorkfile:
         return loaded_containers
 
     def _collect_last_version_repres(self, asset_docs):
-        """Collect subsets, versions and representations for asset_entities.
+        """Collect products, versions and representations for asset_entities.
 
         Args:
             asset_docs (List[Dict[str, Any]]): Asset entities for which
@@ -640,12 +642,12 @@ class BuildWorkfile:
         ```
         {
             {Asset ID}: {
-                "asset_entity": <AssetEntity>,
+                "asset_doc": <AssetEntity>,
                 "subsets": {
                     {Subset ID}: {
-                        "subset_entity": <SubsetEntity>,
+                        "subset_doc": <SubsetEntity>,
                         "version": {
-                            "version_entity": <VersionEntity>,
+                            "version_doc": <VersionEntity>,
                             "repres": [
                                 <RepreEntity1>, <RepreEntity2>, ...
                             ]
@@ -656,7 +658,7 @@ class BuildWorkfile:
             },
             ...
         }
-        output[asset_id]["subsets"][subset_id]["version"]["repres"]
+        output[folder_id]["subsets"][product_id]["version"]["repres"]
         ```
         """
 
@@ -666,20 +668,26 @@ class BuildWorkfile:
         if not asset_docs:
             return output
 
-        asset_docs_by_ids = {asset["_id"]: asset for asset in asset_docs}
+        asset_docs_by_ids = {
+            asset_doc["_id"]: asset_doc
+            for asset_doc in asset_docs
+        }
 
         project_name = get_current_project_name()
-        subsets = list(get_subsets(
+        subset_docs = list(get_subsets(
             project_name, asset_ids=asset_docs_by_ids.keys()
         ))
-        subset_entity_by_ids = {subset["_id"]: subset for subset in subsets}
+        subset_docs_by_id = {
+            subset_doc["_id"]: subset_doc
+            for subset_doc in subset_docs
+        }
 
-        last_version_by_subset_id = get_last_versions(
-            project_name, subset_entity_by_ids.keys()
+        last_version_by_product_id = get_last_versions(
+            project_name, subset_docs_by_id.keys()
         )
         last_version_docs_by_id = {
             version["_id"]: version
-            for version in last_version_by_subset_id.values()
+            for version in last_version_by_product_id.values()
         }
         repre_docs = get_representations(
             project_name, version_ids=last_version_docs_by_id.keys()
@@ -689,28 +697,28 @@ class BuildWorkfile:
             version_id = repre_doc["parent"]
             version_doc = last_version_docs_by_id[version_id]
 
-            subset_id = version_doc["parent"]
-            subset_doc = subset_entity_by_ids[subset_id]
+            product_id = version_doc["parent"]
+            subset_doc = subset_docs_by_id[product_id]
 
-            asset_id = subset_doc["parent"]
-            asset_doc = asset_docs_by_ids[asset_id]
+            folder_id = subset_doc["parent"]
+            asset_doc = asset_docs_by_ids[folder_id]
 
-            if asset_id not in output:
-                output[asset_id] = {
-                    "asset_entity": asset_doc,
+            if folder_id not in output:
+                output[folder_id] = {
+                    "asset_doc": asset_doc,
                     "subsets": {}
                 }
 
-            if subset_id not in output[asset_id]["subsets"]:
-                output[asset_id]["subsets"][subset_id] = {
-                    "subset_entity": subset_doc,
+            if product_id not in output[folder_id]["subsets"]:
+                output[folder_id]["subsets"][product_id] = {
+                    "subset_doc": subset_doc,
                     "version": {
-                        "version_entity": version_doc,
+                        "version_doc": version_doc,
                         "repres": []
                     }
                 }
 
-            output[asset_id]["subsets"][subset_id]["version"]["repres"].append(
+            output[folder_id]["subsets"][product_id]["version"]["repres"].append(
                 repre_doc
             )
 
diff --git a/client/ayon_core/pipeline/workfile/path_resolving.py b/client/ayon_core/pipeline/workfile/path_resolving.py
index 168e775475..7718e32317 100644
--- a/client/ayon_core/pipeline/workfile/path_resolving.py
+++ b/client/ayon_core/pipeline/workfile/path_resolving.py
@@ -321,7 +321,7 @@ def get_last_workfile(
             data["app"],
             task_name=data["task"]["name"],
             task_type=data["task"]["type"],
-            family="workfile"
+            product_type="workfile"
         )
         data.pop("comment", None)
         if not data.get("ext"):
diff --git a/client/ayon_core/pipeline/workfile/workfile_template_builder.py b/client/ayon_core/pipeline/workfile/workfile_template_builder.py
index eb3bcb544f..c889e0cafb 100644
--- a/client/ayon_core/pipeline/workfile/workfile_template_builder.py
+++ b/client/ayon_core/pipeline/workfile/workfile_template_builder.py
@@ -27,10 +27,7 @@ from ayon_core.client import (
     get_representations,
     get_ayon_server_api_connection,
 )
-from ayon_core.settings import (
-    get_project_settings,
-    get_system_settings,
-)
+from ayon_core.settings import get_project_settings
 from ayon_core.host import IWorkfileHost, HostBase
 from ayon_core.lib import (
     Logger,
@@ -118,7 +115,6 @@ class AbstractTemplateBuilder(object):
         self._creators_by_name = None
         self._create_context = None
 
-        self._system_settings = None
         self._project_settings = None
 
         self._current_asset_doc = None
@@ -152,12 +148,6 @@ class AbstractTemplateBuilder(object):
             "task_name": self.current_task_name
         }
 
-    @property
-    def system_settings(self):
-        if self._system_settings is None:
-            self._system_settings = get_system_settings()
-        return self._system_settings
-
     @property
     def project_settings(self):
         if self._project_settings is None:
@@ -256,7 +246,6 @@ class AbstractTemplateBuilder(object):
         self._linked_asset_docs = None
         self._task_type = None
 
-        self._system_settings = None
         self._project_settings = None
 
         self.clear_shared_data()
@@ -1299,6 +1288,10 @@ class PlaceholderLoadMixin(object):
             " used."
         )
 
+        product_type = options.get("product_type")
+        if product_type is None:
+            product_type = options.get("family")
+
         return [
             attribute_definitions.UISeparatorDef(),
             attribute_definitions.UILabelDef("Main attributes"),
@@ -1312,9 +1305,9 @@ class PlaceholderLoadMixin(object):
                 tooltip=build_type_help
             ),
             attribute_definitions.EnumDef(
-                "family",
-                label="Family",
-                default=options.get("family"),
+                "product_type",
+                label="Product type",
+                default=product_type,
                 items=families
             ),
             attribute_definitions.TextDef(
@@ -1467,7 +1460,7 @@ class PlaceholderLoadMixin(object):
 
         Note:
             This returns all representation documents from all versions of
-                matching subset. To filter for last version use
+                matching product. To filter for last version use
                 '_reduce_last_version_repre_docs'.
 
         Args:
@@ -1558,22 +1551,22 @@ class PlaceholderLoadMixin(object):
             repre_context = repre_doc["context"]
 
             asset_name = repre_context["asset"]
-            subset_name = repre_context["subset"]
+            product_name = repre_context["subset"]
             version = repre_context.get("version", -1)
 
             if asset_name not in mapping:
                 mapping[asset_name] = {}
 
-            subset_mapping = mapping[asset_name]
-            if subset_name not in subset_mapping:
-                subset_mapping[subset_name] = collections.defaultdict(list)
+            product_mapping = mapping[asset_name]
+            if product_name not in product_mapping:
+                product_mapping[product_name] = collections.defaultdict(list)
 
-            version_mapping = subset_mapping[subset_name]
+            version_mapping = product_mapping[product_name]
             version_mapping[version].append(repre_doc)
 
         output = []
-        for subset_mapping in mapping.values():
-            for version_mapping in subset_mapping.values():
+        for product_mapping in mapping.values():
+            for version_mapping in product_mapping.values():
                 last_version = tuple(sorted(version_mapping.keys()))[-1]
                 output.extend(version_mapping[last_version])
         return output
@@ -1584,8 +1577,8 @@ class PlaceholderLoadMixin(object):
         Note:
             Ignore repre ids is to avoid loading the same representation again
             on load. But the representation can be loaded with different loader
-            and there could be published new version of matching subset for the
-            representation. We should maybe expect containers.
+            and there could be published new version of matching product for
+            the representation. We should maybe expect containers.
 
             Also import loaders don't have containers at all...
 
@@ -1757,7 +1750,7 @@ class PlaceholderCreateMixin(object):
                 tooltip=(
                     "Creator"
                     "\nDefines variant name which will be use for "
-                    "\ncompiling of subset name."
+                    "\ncompiling of product name."
                 )
             ),
             attribute_definitions.UISeparatorDef(),
@@ -1792,7 +1785,7 @@ class PlaceholderCreateMixin(object):
 
         creator_plugin = self.builder.get_creators_by_name()[creator_name]
 
-        # create subset name
+        # create product name
         context = self._builder.get_current_context()
         project_name = context["project_name"]
         asset_name = context["folder_path"]
@@ -1803,38 +1796,38 @@ class PlaceholderCreateMixin(object):
                 project_name, asset_name, fields=["_id"]
             )
             assert asset_doc, "No current asset found in Session"
-            subset_name = creator_plugin.get_subset_name(
-                create_variant,
-                task_name,
+            product_name = creator_plugin.get_product_name(
+                project_name,
                 asset_doc["_id"],
-                project_name
+                task_name,
+                create_variant,
             )
 
         else:
             asset_doc = get_asset_by_name(project_name, asset_name)
             assert asset_doc, "No current asset found in Session"
-            subset_name = creator_plugin.get_subset_name(
-                create_variant,
-                task_name,
-                asset_doc,
+            product_name = creator_plugin.get_product_name(
                 project_name,
+                asset_doc,
+                task_name,
+                create_variant,
                 self.builder.host_name
             )
 
         creator_data = {
             "creator_name": creator_name,
             "create_variant": create_variant,
-            "subset_name": subset_name,
+            "product_name": product_name,
             "creator_plugin": creator_plugin
         }
 
         self._before_instance_create(placeholder)
 
-        # compile subset name from variant
+        # compile product name from variant
         try:
             if legacy_create:
                 creator_instance = creator_plugin(
-                    subset_name,
+                    product_name,
                     asset_name
                 ).process()
             else:
diff --git a/client/ayon_core/plugins/load/delete_old_versions.py b/client/ayon_core/plugins/load/delete_old_versions.py
index 956b232e2b..4fc61ebb8b 100644
--- a/client/ayon_core/plugins/load/delete_old_versions.py
+++ b/client/ayon_core/plugins/load/delete_old_versions.py
@@ -401,7 +401,7 @@
 #         import ftrack_api
 #
 #         session = ftrack_api.Session()
-#         subset_name = data["subset"]["name"]
+#         product_name = data["subset"]["name"]
 #         versions = {
 #             '"{}"'.format(version_doc["name"])
 #             for version_doc in data["versions"]
@@ -414,7 +414,7 @@
 #                 " and version in ({})"
 #             ).format(
 #                 asset_ftrack_id,
-#                 subset_name,
+#                 product_name,
 #                 ",".join(versions)
 #             )
 #         ).all()
diff --git a/client/ayon_core/plugins/publish/cleanup.py b/client/ayon_core/plugins/publish/cleanup.py
index db73d28e7a..57ef803352 100644
--- a/client/ayon_core/plugins/publish/cleanup.py
+++ b/client/ayon_core/plugins/publish/cleanup.py
@@ -72,7 +72,7 @@ class CleanUp(pyblish.api.InstancePlugin):
             self.clean_renders(instance, skip_cleanup_filepaths)
 
         if [ef for ef in self.exclude_families
-                if instance.data["family"] in ef]:
+                if instance.data["productType"] in ef]:
             return
         import tempfile
 
@@ -105,8 +105,8 @@ class CleanUp(pyblish.api.InstancePlugin):
     def clean_renders(self, instance, skip_cleanup_filepaths):
         transfers = instance.data.get("transfers", list())
 
-        current_families = instance.data.get("families", list())
-        instance_family = instance.data.get("family", None)
+        instance_families = instance.data.get("families", list())
+        instance_product_type = instance.data.get("productType")
         dirnames = []
         transfers_dirs = []
 
@@ -127,19 +127,24 @@ class CleanUp(pyblish.api.InstancePlugin):
                 ).format(src))
                 continue
 
-            if os.path.normpath(src) != os.path.normpath(dest):
-                if instance_family == 'render' or 'render' in current_families:
-                    self.log.info("Removing src: `{}`...".format(src))
-                    try:
-                        os.remove(src)
-                    except PermissionError:
-                        self.log.warning(
-                            "Insufficient permission to delete {}".format(src)
-                        )
-                        continue
+            if os.path.normpath(src) == os.path.normpath(dest):
+                continue
 
-                    # add dir for cleanup
-                    dirnames.append(os.path.dirname(src))
+            if (
+                instance_product_type == "render"
+                or "render" in instance_families
+            ):
+                self.log.info("Removing src: `{}`...".format(src))
+                try:
+                    os.remove(src)
+                except PermissionError:
+                    self.log.warning(
+                        "Insufficient permission to delete {}".format(src)
+                    )
+                    continue
+
+                # add dir for cleanup
+                dirnames.append(os.path.dirname(src))
 
         # clean by regex patterns
         # make unique set
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 fbdf26e76c..b5bb579498 100644
--- a/client/ayon_core/plugins/publish/collect_anatomy_context_data.py
+++ b/client/ayon_core/plugins/publish/collect_anatomy_context_data.py
@@ -47,7 +47,7 @@ class CollectAnatomyContextData(pyblish.api.ContextPlugin):
 
     def process(self, context):
         host_name = context.data["hostName"]
-        system_settings = context.data["system_settings"]
+        project_settings = context.data["project_settings"]
         project_entity = context.data["projectEntity"]
         asset_entity = context.data.get("assetEntity")
         task_name = None
@@ -55,7 +55,11 @@ class CollectAnatomyContextData(pyblish.api.ContextPlugin):
             task_name = context.data["task"]
 
         anatomy_data = get_template_data(
-            project_entity, asset_entity, task_name, host_name, system_settings
+            project_entity,
+            asset_entity,
+            task_name,
+            host_name,
+            project_settings
         )
         anatomy_data.update(context.data.get("datetimeData") or {})
 
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 f6326bb9e8..b62935dd6a 100644
--- a/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
+++ b/client/ayon_core/plugins/publish/collect_anatomy_instance_data.py
@@ -4,8 +4,8 @@ Requires:
     context     -> projectEntity
     context     -> assetEntity
     instance    -> folderPath
-    instance    -> subset
-    instance    -> family
+    instance    -> productName
+    instance    -> productType
 
 Optional:
     instance    -> version
@@ -120,7 +120,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
             ).format(joined_asset_names))
 
     def fill_latest_versions(self, context, project_name):
-        """Try to find latest version for each instance's subset.
+        """Try to find latest version for each instance's product name.
 
         Key "latestVersion" is always set to latest version or `None`.
 
@@ -134,7 +134,7 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
         self.log.debug("Querying latest versions for instances.")
 
         hierarchy = {}
-        names_by_asset_ids = collections.defaultdict(set)
+        names_by_folder_ids = collections.defaultdict(set)
         for instance in context:
             # Make sure `"latestVersion"` key is set
             latest_version = instance.data.get("latestVersion")
@@ -145,41 +145,41 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
             if not asset_doc:
                 continue
 
-            # Store asset ids and subset names for queries
-            asset_id = asset_doc["_id"]
-            subset_name = instance.data["subset"]
+            # Store folder ids and product names for queries
+            folder_id = asset_doc["_id"]
+            product_name = instance.data["productName"]
 
             # Prepare instance hierarchy for faster filling latest versions
-            if asset_id not in hierarchy:
-                hierarchy[asset_id] = {}
-            if subset_name not in hierarchy[asset_id]:
-                hierarchy[asset_id][subset_name] = []
-            hierarchy[asset_id][subset_name].append(instance)
-            names_by_asset_ids[asset_id].add(subset_name)
+            if folder_id not in hierarchy:
+                hierarchy[folder_id] = {}
+            if product_name not in hierarchy[folder_id]:
+                hierarchy[folder_id][product_name] = []
+            hierarchy[folder_id][product_name].append(instance)
+            names_by_folder_ids[folder_id].add(product_name)
 
         subset_docs = []
-        if names_by_asset_ids:
+        if names_by_folder_ids:
             subset_docs = list(get_subsets(
-                project_name, names_by_asset_ids=names_by_asset_ids
+                project_name, names_by_asset_ids=names_by_folder_ids
             ))
 
-        subset_ids = [
+        product_ids = {
             subset_doc["_id"]
             for subset_doc in subset_docs
-        ]
+        }
 
-        last_version_docs_by_subset_id = get_last_versions(
-            project_name, subset_ids, fields=["name"]
+        last_version_docs_by_product_id = get_last_versions(
+            project_name, product_ids, fields=["name"]
         )
         for subset_doc in subset_docs:
-            subset_id = subset_doc["_id"]
-            last_version_doc = last_version_docs_by_subset_id.get(subset_id)
+            product_id = subset_doc["_id"]
+            last_version_doc = last_version_docs_by_product_id.get(product_id)
             if last_version_doc is None:
                 continue
 
-            asset_id = subset_doc["parent"]
-            subset_name = subset_doc["name"]
-            _instances = hierarchy[asset_id][subset_name]
+            folder_id = subset_doc["parent"]
+            product_name = subset_doc["name"]
+            _instances = hierarchy[folder_id][product_name]
             for _instance in _instances:
                 _instance.data["latestVersion"] = last_version_doc["name"]
 
@@ -191,9 +191,15 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
 
         for instance in context:
             anatomy_data = copy.deepcopy(context.data["anatomyData"])
+            product_name = instance.data["productName"]
+            product_type = instance.data["productType"]
             anatomy_data.update({
-                "family": instance.data["family"],
-                "subset": instance.data["subset"],
+                "family": product_type,
+                "subset": product_name,
+                "product": {
+                    "name": product_name,
+                    "type": product_type,
+                }
             })
 
             self._fill_asset_data(instance, project_doc, anatomy_data)
@@ -227,8 +233,8 @@ class CollectAnatomyInstanceData(pyblish.api.ContextPlugin):
                     instance.context.data["hostName"],
                     task_name=task_name,
                     task_type=task_type,
-                    family=instance.data["family"],
-                    subset=instance.data["subset"]
+                    product_type=instance.data["productType"],
+                    product_name=instance.data["productName"]
                 )
             anatomy_data["version"] = version_number
 
diff --git a/client/ayon_core/plugins/publish/collect_audio.py b/client/ayon_core/plugins/publish/collect_audio.py
index f0efd546e7..357dad76d4 100644
--- a/client/ayon_core/plugins/publish/collect_audio.py
+++ b/client/ayon_core/plugins/publish/collect_audio.py
@@ -14,7 +14,7 @@ from ayon_core.pipeline.load import get_representation_path_with_anatomy
 class CollectAudio(pyblish.api.ContextPlugin):
     """Collect asset's last published audio.
 
-    The audio subset name searched for is defined in:
+    The audio product name searched for is defined in:
         project settings > Collect Audio
 
     Note:
@@ -71,9 +71,9 @@ class CollectAudio(pyblish.api.ContextPlugin):
 
         asset_names = set(instances_by_asset_name.keys())
         self.log.debug((
-            "Searching for audio product '{subset}' in assets {assets}"
+            "Searching for audio product '{product}' in assets {assets}"
         ).format(
-            subset=self.audio_product_name,
+            product=self.audio_product_name,
             assets=", ".join([
                 '"{}"'.format(asset_name)
                 for asset_name in asset_names
@@ -102,64 +102,64 @@ class CollectAudio(pyblish.api.ContextPlugin):
                 }]
                 self.log.debug("Audio Data added to instance ...")
 
-    def query_representations(self, project_name, asset_names):
-        """Query representations related to audio subsets for passed assets.
+    def query_representations(self, project_name, folder_paths):
+        """Query representations related to audio products for passed assets.
 
         Args:
             project_name (str): Project in which we're looking for all
                 entities.
-            asset_names (Iterable[str]): Asset names where to look for audio
-                subsets and their representations.
+            folder_paths (Iterable[str]): Folder paths where to look for audio
+                products and their representations.
 
         Returns:
             collections.defaultdict[str, List[Dict[Str, Any]]]: Representations
-                related to audio subsets by asset name.
+                related to audio products by asset name.
         """
 
         output = collections.defaultdict(list)
         # Query asset documents
         asset_docs = get_assets(
             project_name,
-            asset_names=asset_names,
+            asset_names=folder_paths,
             fields=["_id", "name", "data.parents"]
         )
 
-        asset_id_by_name = {
+        folder_id_by_path = {
             get_asset_name_identifier(asset_doc): asset_doc["_id"]
             for asset_doc in asset_docs
         }
-        asset_ids = set(asset_id_by_name.values())
+        folder_ids = set(folder_id_by_path.values())
 
-        # Query subsets with name define by 'audio_product_name' attr
-        # - one or none subsets with the name should be available on an asset
+        # Query products with name define by 'audio_product_name' attr
+        # - one or none products with the name should be available on an asset
         subset_docs = get_subsets(
             project_name,
             subset_names=[self.audio_product_name],
-            asset_ids=asset_ids,
+            asset_ids=folder_ids,
             fields=["_id", "parent"]
         )
-        subset_id_by_asset_id = {}
+        product_id_by_folder_id = {}
         for subset_doc in subset_docs:
-            asset_id = subset_doc["parent"]
-            subset_id_by_asset_id[asset_id] = subset_doc["_id"]
+            folder_id = subset_doc["parent"]
+            product_id_by_folder_id[folder_id] = subset_doc["_id"]
 
-        subset_ids = set(subset_id_by_asset_id.values())
-        if not subset_ids:
+        product_ids = set(product_id_by_folder_id.values())
+        if not product_ids:
             return output
 
-        # Find all latest versions for the subsets
-        version_docs_by_subset_id = get_last_versions(
-            project_name, subset_ids=subset_ids, fields=["_id", "parent"]
+        # Find all latest versions for the products
+        version_docs_by_product_id = get_last_versions(
+            project_name, subset_ids=product_ids, fields=["_id", "parent"]
         )
-        version_id_by_subset_id = {
-            subset_id: version_doc["_id"]
-            for subset_id, version_doc in version_docs_by_subset_id.items()
+        version_id_by_product_id = {
+            product_id: version_doc["_id"]
+            for product_id, version_doc in version_docs_by_product_id.items()
         }
-        version_ids = set(version_id_by_subset_id.values())
+        version_ids = set(version_id_by_product_id.values())
         if not version_ids:
             return output
 
-        # Find representations under latest versions of audio subsets
+        # Find representations under latest versions of audio products
         repre_docs = get_representations(
             project_name, version_ids=version_ids
         )
@@ -171,9 +171,9 @@ class CollectAudio(pyblish.api.ContextPlugin):
         if not repre_docs_by_version_id:
             return output
 
-        for asset_name in asset_names:
-            asset_id = asset_id_by_name.get(asset_name)
-            subset_id = subset_id_by_asset_id.get(asset_id)
-            version_id = version_id_by_subset_id.get(subset_id)
-            output[asset_name] = repre_docs_by_version_id[version_id]
+        for folder_path in folder_paths:
+            folder_id = folder_id_by_path.get(folder_path)
+            product_id = product_id_by_folder_id.get(folder_id)
+            version_id = version_id_by_product_id.get(product_id)
+            output[folder_path] = repre_docs_by_version_id[version_id]
         return output
diff --git a/client/ayon_core/plugins/publish/collect_comment.py b/client/ayon_core/plugins/publish/collect_comment.py
index 458c0a5658..980097ac0d 100644
--- a/client/ayon_core/plugins/publish/collect_comment.py
+++ b/client/ayon_core/plugins/publish/collect_comment.py
@@ -42,7 +42,7 @@ class CollectInstanceCommentDef(
         pass
 
     @classmethod
-    def apply_settings(cls, project_setting, _):
+    def apply_settings(cls, project_setting):
         plugin_settings = project_setting["core"]["publish"].get(
             "collect_comment_per_instance"
         )
diff --git a/client/ayon_core/plugins/publish/collect_custom_staging_dir.py b/client/ayon_core/plugins/publish/collect_custom_staging_dir.py
index 6840c8e416..e42f34b0ae 100644
--- a/client/ayon_core/plugins/publish/collect_custom_staging_dir.py
+++ b/client/ayon_core/plugins/publish/collect_custom_staging_dir.py
@@ -38,8 +38,8 @@ class CollectCustomStagingDir(pyblish.api.InstancePlugin):
     template_key = "transient"
 
     def process(self, instance):
-        family = instance.data["family"]
-        subset_name = instance.data["subset"]
+        product_type = instance.data["productType"]
+        product_name = instance.data["productName"]
         host_name = instance.context.data["hostName"]
         project_name = instance.context.data["projectName"]
         project_settings = instance.context.data["project_settings"]
@@ -47,9 +47,15 @@ class CollectCustomStagingDir(pyblish.api.InstancePlugin):
         task = instance.data["anatomyData"].get("task", {})
 
         transient_tml, is_persistent = get_custom_staging_dir_info(
-            project_name, host_name, family, task.get("name"),
-            task.get("type"), subset_name, project_settings=project_settings,
-            anatomy=anatomy, log=self.log)
+            project_name,
+            host_name,
+            product_type,
+            product_name,
+            task.get("name"),
+            task.get("type"),
+            project_settings=project_settings,
+            anatomy=anatomy,
+            log=self.log)
 
         if transient_tml:
             anatomy_data = copy.deepcopy(instance.data["anatomyData"])
@@ -66,5 +72,5 @@ class CollectCustomStagingDir(pyblish.api.InstancePlugin):
             result_str = "Not adding"
 
         self.log.debug("{} custom staging dir for instance with '{}'".format(
-            result_str, family
+            result_str, product_type
         ))
diff --git a/client/ayon_core/plugins/publish/collect_frames_fix.py b/client/ayon_core/plugins/publish/collect_frames_fix.py
index 6996844eda..0fe86b8d70 100644
--- a/client/ayon_core/plugins/publish/collect_frames_fix.py
+++ b/client/ayon_core/plugins/publish/collect_frames_fix.py
@@ -17,7 +17,7 @@ class CollectFramesFixDef(
 ):
     """Provides text field to insert frame(s) to be rerendered.
 
-    Published files of last version of an instance subset are collected into
+    Published files of last version of an instance product are collected into
     instance.data["last_version_published_files"]. All these but frames
     mentioned in text field will be reused for new version.
     """
@@ -40,7 +40,7 @@ class CollectFramesFixDef(
 
         instance.data["frames_to_fix"] = frames_to_fix
 
-        subset_name = instance.data["subset"]
+        product_name = instance.data["productName"]
         asset_name = instance.data["folderPath"]
 
         project_entity = instance.data["projectEntity"]
@@ -48,7 +48,7 @@ class CollectFramesFixDef(
 
         version = get_last_version_by_subset_name(
             project_name,
-            subset_name,
+            product_name,
             asset_name=asset_name
         )
         if not version:
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 7152446de8..8218806c4c 100644
--- a/client/ayon_core/plugins/publish/collect_from_create_context.py
+++ b/client/ayon_core/plugins/publish/collect_from_create_context.py
@@ -72,18 +72,22 @@ class CollectFromCreateContext(pyblish.api.ContextPlugin):
         transient_data,
         thumbnail_path
     ):
-        subset = in_data["subset"]
+        product_name = in_data["productName"]
         # If instance data already contain families then use it
         instance_families = in_data.get("families") or []
+        # Add product type to families
+        instance_families.append(in_data["productType"])
 
-        instance = context.create_instance(subset)
+        instance = context.create_instance(product_name)
         instance.data.update({
-            "subset": subset,
+            "publish": True,
+            "label": in_data.get("label") or product_name,
+            "name": product_name,
             "folderPath": in_data["folderPath"],
             "task": in_data["task"],
-            "label": in_data.get("label") or subset,
-            "name": subset,
-            "family": in_data["family"],
+            "productName": product_name,
+            "productType": in_data["productType"],
+            "family": in_data["productType"],
             "families": instance_families,
             "representations": [],
             "thumbnailSource": thumbnail_path
diff --git a/client/ayon_core/plugins/publish/collect_hierarchy.py b/client/ayon_core/plugins/publish/collect_hierarchy.py
index d7077d030a..8ba83d582f 100644
--- a/client/ayon_core/plugins/publish/collect_hierarchy.py
+++ b/client/ayon_core/plugins/publish/collect_hierarchy.py
@@ -28,11 +28,13 @@ class CollectHierarchy(pyblish.api.ContextPlugin):
 
             # shot data dict
             shot_data = {}
-            family = instance.data["family"]
+            product_type = instance.data["productType"]
             families = instance.data["families"]
 
             # exclude other families then self.families with intersection
-            if not set(self.families).intersection(set(families + [family])):
+            if not set(self.families).intersection(
+                set(families + [product_type])
+            ):
                 continue
 
             # exclude if not masterLayer True
diff --git a/client/ayon_core/plugins/publish/collect_otio_review.py b/client/ayon_core/plugins/publish/collect_otio_review.py
index 0e4d596213..69cf9199e7 100644
--- a/client/ayon_core/plugins/publish/collect_otio_review.py
+++ b/client/ayon_core/plugins/publish/collect_otio_review.py
@@ -91,7 +91,7 @@ class CollectOtioReview(pyblish.api.InstancePlugin):
 
         if otio_review_clips:
             # add review track to instance and change label to reflect it
-            label = instance.data.get("label", instance.data["subset"])
+            label = instance.data.get("label", instance.data["productName"])
             instance.data["label"] = label + " (review)"
             instance.data["families"] += ["review", "ftrack"]
             instance.data["otioReviewClips"] = otio_review_clips
diff --git a/client/ayon_core/plugins/publish/collect_otio_subset_resources.py b/client/ayon_core/plugins/publish/collect_otio_subset_resources.py
index e6817a4beb..3f47e6e3bf 100644
--- a/client/ayon_core/plugins/publish/collect_otio_subset_resources.py
+++ b/client/ayon_core/plugins/publish/collect_otio_subset_resources.py
@@ -16,7 +16,7 @@ from ayon_core.pipeline.publish import (
 
 
 class CollectOtioSubsetResources(pyblish.api.InstancePlugin):
-    """Get Resources for a subset version"""
+    """Get Resources for a product version"""
 
     label = "Collect OTIO Subset Resources"
     order = pyblish.api.CollectorOrder + 0.491
@@ -32,7 +32,7 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin):
             make_sequence_collection
         )
 
-        if "audio" in instance.data["family"]:
+        if "audio" in instance.data["productType"]:
             return
 
         if not instance.data.get("representations"):
@@ -250,14 +250,14 @@ class CollectOtioSubsetResources(pyblish.api.InstancePlugin):
 
         # Task can be optional in anatomy data
         host_name = context.data["hostName"]
-        family = instance.data["family"]
+        product_type = instance.data["productType"]
         anatomy_data = instance.data["anatomyData"]
         task_info = anatomy_data.get("task") or {}
 
         return get_publish_template_name(
             project_name,
             host_name,
-            family,
+            product_type,
             task_name=task_info.get("name"),
             task_type=task_info.get("type"),
             project_settings=context.data["project_settings"],
diff --git a/client/ayon_core/plugins/publish/collect_rendered_files.py b/client/ayon_core/plugins/publish/collect_rendered_files.py
index fcea773208..ca88a7aa82 100644
--- a/client/ayon_core/plugins/publish/collect_rendered_files.py
+++ b/client/ayon_core/plugins/publish/collect_rendered_files.py
@@ -103,9 +103,9 @@ class CollectRenderedFiles(pyblish.api.ContextPlugin):
         for instance_data in data.get("instances"):
 
             self.log.debug("  - processing instance for {}".format(
-                instance_data.get("subset")))
+                instance_data.get("productName")))
             instance = self._context.create_instance(
-                instance_data.get("subset")
+                instance_data.get("productName")
             )
 
             self._fill_staging_dir(instance_data, anatomy)
diff --git a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
index 397a3ce87c..c1326f164d 100644
--- a/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
+++ b/client/ayon_core/plugins/publish/collect_scene_loaded_versions.py
@@ -67,9 +67,9 @@ class CollectSceneLoadedVersions(pyblish.api.ContextPlugin):
             # NOTE:
             # may have more then one representation that are same version
             version = {
-                "subsetName": con["name"],
-                "representation": repre_doc["_id"],
-                "version": repre_doc["parent"],
+                "container_name": con["name"],
+                "representation_id": repre_doc["_id"],
+                "version_id": repre_doc["parent"],
             }
             loaded_versions.append(version)
 
diff --git a/client/ayon_core/plugins/publish/collect_settings.py b/client/ayon_core/plugins/publish/collect_settings.py
index 4e3331209d..66b89a114c 100644
--- a/client/ayon_core/plugins/publish/collect_settings.py
+++ b/client/ayon_core/plugins/publish/collect_settings.py
@@ -1,8 +1,5 @@
 from pyblish import api
-from ayon_core.settings import (
-    get_current_project_settings,
-    get_system_settings,
-)
+from ayon_core.settings import get_current_project_settings
 
 
 class CollectSettings(api.ContextPlugin):
@@ -13,4 +10,3 @@ class CollectSettings(api.ContextPlugin):
 
     def process(self, context):
         context.data["project_settings"] = get_current_project_settings()
-        context.data["system_settings"] = get_system_settings()
diff --git a/client/ayon_core/plugins/publish/extract_burnin.py b/client/ayon_core/plugins/publish/extract_burnin.py
index edba7d6d8a..ab6353a29f 100644
--- a/client/ayon_core/plugins/publish/extract_burnin.py
+++ b/client/ayon_core/plugins/publish/extract_burnin.py
@@ -156,16 +156,16 @@ class ExtractBurnin(publish.Extractor):
 
     def main_process(self, instance):
         host_name = instance.context.data["hostName"]
-        family = instance.data["family"]
+        product_type = instance.data["productType"]
+        product_name = instance.data["productName"]
         task_data = instance.data["anatomyData"].get("task", {})
         task_name = task_data.get("name")
         task_type = task_data.get("type")
-        subset = instance.data["subset"]
 
         filtering_criteria = {
             "hosts": host_name,
-            "product_types": family,
-            "product_names": subset,
+            "product_types": product_type,
+            "product_names": product_name,
             "task_names": task_name,
             "task_types": task_type,
         }
@@ -177,9 +177,11 @@ class ExtractBurnin(publish.Extractor):
         if not profile:
             self.log.debug((
                 "Skipped instance. None of profiles in presets are for"
-                " Host: \"{}\" | Product type: \"{}\" | Task name \"{}\""
-                " | Task type \"{}\" | Product name \"{}\" "
-            ).format(host_name, family, task_name, task_type, subset))
+                " Host: \"{}\" | Product type: \"{}\" | Product name \"{}\""
+                " | Task name \"{}\" | Task type \"{}\""
+            ).format(
+                host_name, product_type, product_name, task_name, task_type
+            ))
             return
 
         # Pre-filter burnin definitions by instance families
@@ -189,7 +191,7 @@ class ExtractBurnin(publish.Extractor):
                 "Skipped instance. Burnin definitions are not set for profile"
                 " Host: \"{}\" | Product type: \"{}\" | Task name \"{}\""
                 " | Profile \"{}\""
-            ).format(host_name, family, task_name, profile))
+            ).format(host_name, product_type, task_name, profile))
             return
 
         burnin_options = self._get_burnin_options()
diff --git a/client/ayon_core/plugins/publish/extract_color_transcode.py b/client/ayon_core/plugins/publish/extract_color_transcode.py
index 77c4673bca..b5ddebe05b 100644
--- a/client/ayon_core/plugins/publish/extract_color_transcode.py
+++ b/client/ayon_core/plugins/publish/extract_color_transcode.py
@@ -26,11 +26,11 @@ class ExtractOIIOTranscode(publish.Extractor):
     This dict contains source colorspace information, collected by hosts.
 
     Target colorspace is selected by profiles in the Settings, based on:
-    - families
-    - host
+    - host names
+    - product types
+    - product names
     - task types
     - task names
-    - subset names
 
     Can produce one or more representations (with different extensions) based
     on output definition in format:
@@ -313,15 +313,15 @@ class ExtractOIIOTranscode(publish.Extractor):
     def _get_profile(self, instance):
         """Returns profile if and how repre should be color transcoded."""
         host_name = instance.context.data["hostName"]
-        family = instance.data["family"]
+        product_type = instance.data["productType"]
+        product_name = instance.data["productName"]
         task_data = instance.data["anatomyData"].get("task", {})
         task_name = task_data.get("name")
         task_type = task_data.get("type")
-        subset = instance.data["subset"]
         filtering_criteria = {
             "hosts": host_name,
-            "product_types": family,
-            "product_names": subset,
+            "product_types": product_type,
+            "product_names": product_name,
             "task_names": task_name,
             "task_types": task_type,
         }
@@ -331,9 +331,11 @@ class ExtractOIIOTranscode(publish.Extractor):
         if not profile:
             self.log.debug((
               "Skipped instance. None of profiles in presets are for"
-              " Host: \"{}\" | Product types: \"{}\" | Task \"{}\""
-              " | Task type \"{}\" | Product names: \"{}\" "
-            ).format(host_name, family, task_name, task_type, subset))
+              " Host: \"{}\" | Product types: \"{}\" | Product names: \"{}\""
+              " | Task name \"{}\" | Task type \"{}\""
+            ).format(
+                host_name, product_type, product_name, task_name, task_type
+            ))
 
         return profile
 
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 dd45f3fc1a..a19b5b9090 100644
--- a/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
+++ b/client/ayon_core/plugins/publish/extract_otio_audio_tracks.py
@@ -103,7 +103,9 @@ class ExtractOtioAudioTracks(pyblish.api.ContextPlugin):
             else:
                 audio_fpath = recycling_file.pop()
 
-            if "audio" in (inst.data["families"] + [inst.data["family"]]):
+            if "audio" in (
+                inst.data["families"] + [inst.data["productType"]]
+            ):
                 # create empty representation attr
                 if "representations" not in inst.data:
                     inst.data["representations"] = []
@@ -140,10 +142,10 @@ class ExtractOtioAudioTracks(pyblish.api.ContextPlugin):
         """
         return [
             _i for _i in context
-            # filter only those with audio family
+            # filter only those with audio product type or family
             # and also with reviewAudio data key
             if bool("audio" in (
-                _i.data.get("families", []) + [_i.data["family"]])
+                _i.data.get("families", []) + [_i.data["productType"]])
             ) or _i.data.get("reviewAudio")
         ]
 
diff --git a/client/ayon_core/plugins/publish/extract_review.py b/client/ayon_core/plugins/publish/extract_review.py
index 927c8a3538..905158c851 100644
--- a/client/ayon_core/plugins/publish/extract_review.py
+++ b/client/ayon_core/plugins/publish/extract_review.py
@@ -103,38 +103,38 @@ class ExtractReview(pyblish.api.InstancePlugin):
 
     def _get_outputs_for_instance(self, instance):
         host_name = instance.context.data["hostName"]
-        family = self.main_family_from_instance(instance)
+        product_type = instance.data["productType"]
 
         self.log.debug("Host: \"{}\"".format(host_name))
-        self.log.debug("Family: \"{}\"".format(family))
+        self.log.debug("Product type: \"{}\"".format(product_type))
 
         profile = filter_profiles(
             self.profiles,
             {
                 "hosts": host_name,
-                "product_types": family,
+                "product_types": product_type,
             },
             logger=self.log)
         if not profile:
             self.log.info((
                 "Skipped instance. None of profiles in presets are for"
-                " Host: \"{}\" | Family: \"{}\""
-            ).format(host_name, family))
+                " Host: \"{}\" | Product type: \"{}\""
+            ).format(host_name, product_type))
             return
 
         self.log.debug("Matching profile: \"{}\"".format(json.dumps(profile)))
 
-        subset_name = instance.data.get("subset")
+        product_name = instance.data.get("productName")
         instance_families = self.families_from_instance(instance)
         filtered_outputs = self.filter_output_defs(
-            profile, subset_name, instance_families
+            profile, product_name, instance_families
         )
         if not filtered_outputs:
             self.log.info((
                 "Skipped instance. All output definitions from selected"
                 " profile do not match instance families \"{}\" or"
-                " subset name \"{}\"."
-            ).format(str(instance_families), subset_name))
+                " product name \"{}\"."
+            ).format(str(instance_families), product_name))
 
         # Store `filename_suffix` to save arguments
         profile_outputs = []
@@ -1463,13 +1463,6 @@ class ExtractReview(pyblish.api.InstancePlugin):
 
         return filters
 
-    def main_family_from_instance(self, instance):
-        """Returns main family of entered instance."""
-        family = instance.data.get("family")
-        if not family:
-            family = instance.data["families"][0]
-        return family
-
     def families_from_instance(self, instance):
         """Returns all families of entered instance."""
         families = []
@@ -1497,7 +1490,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
         return any(family.lower() in families_filter_lower
                    for family in families)
 
-    def filter_output_defs(self, profile, subset_name, families):
+    def filter_output_defs(self, profile, product_name, families):
         """Return outputs matching input instance families.
 
         Output definitions without families filter are marked as valid.
@@ -1505,7 +1498,7 @@ class ExtractReview(pyblish.api.InstancePlugin):
         Args:
             profile (dict): Profile from presets matching current context.
             families (list): All families of current instance.
-            subset_name (str): name of subset
+            product_name (str): Product name.
 
         Returns:
             dict[str, Any]: Containing all output definitions matching entered
@@ -1536,11 +1529,11 @@ class ExtractReview(pyblish.api.InstancePlugin):
                 # Skip empty strings
                 if name_filter
             ]
-            if subset_name and product_name_filters:
+            if product_name and product_name_filters:
                 match = False
                 for product_name_filter in product_name_filters:
                     compiled = re.compile(product_name_filter)
-                    if compiled.search(subset_name):
+                    if compiled.search(product_name):
                         match = True
                         break
 
diff --git a/client/ayon_core/plugins/publish/extract_thumbnail.py b/client/ayon_core/plugins/publish/extract_thumbnail.py
index e392ce630a..84c1000ba3 100644
--- a/client/ayon_core/plugins/publish/extract_thumbnail.py
+++ b/client/ayon_core/plugins/publish/extract_thumbnail.py
@@ -86,16 +86,16 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
                 instance.data["representations"].remove(repre)
 
     def _main_process(self, instance):
-        subset_name = instance.data["subset"]
+        product_name = instance.data["productName"]
         instance_repres = instance.data.get("representations")
         if not instance_repres:
             self.log.debug((
                 "Instance {} does not have representations. Skipping"
-            ).format(subset_name))
+            ).format(product_name))
             return
 
         self.log.debug(
-            "Processing instance with subset name {}".format(subset_name)
+            "Processing instance with product name {}".format(product_name)
         )
 
         # Skip if instance have 'review' key in data set to 'False'
@@ -110,15 +110,15 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
 
         # skip crypto passes.
         # TODO: This is just a quick fix and has its own side-effects - it is
-        #       affecting every subset name with `crypto` in its name.
+        #       affecting every prouct name with `crypto` in its name.
         #       This must be solved properly, maybe using tags on
         #       representation that can be determined much earlier and
         #       with better precision.
-        if "crypto" in subset_name.lower():
+        if "crypto" in product_name.lower():
             self.log.debug("Skipping crypto passes.")
             return
 
-        # We only want to process the subsets needed from settings.
+        # We only want to process the produces needed from settings.
         def validate_string_against_patterns(input_str, patterns):
             for pattern in patterns:
                 if re.match(pattern, input_str):
@@ -128,14 +128,12 @@ class ExtractThumbnail(pyblish.api.InstancePlugin):
         product_names = self.product_names
         if product_names:
             result = validate_string_against_patterns(
-                instance.data["subset"], product_names
+                product_name, product_names
             )
             if not result:
-                self.log.debug(
-                    "Product name \"{}\" did not match settings filters: {}".format(
-                        instance.data["subset"], product_names
-                    )
-                )
+                self.log.debug((
+                    "Product name \"{}\" did not match settings filters: {}"
+                ).format(product_name, product_names))
                 return
 
         # first check for any explicitly marked representations for thumbnail
diff --git a/client/ayon_core/plugins/publish/extract_thumbnail_from_source.py b/client/ayon_core/plugins/publish/extract_thumbnail_from_source.py
index 8d043d700d..7751d73335 100644
--- a/client/ayon_core/plugins/publish/extract_thumbnail_from_source.py
+++ b/client/ayon_core/plugins/publish/extract_thumbnail_from_source.py
@@ -38,9 +38,9 @@ class ExtractThumbnailFromSource(pyblish.api.InstancePlugin):
     def process(self, instance):
         self._create_context_thumbnail(instance.context)
 
-        subset_name = instance.data["subset"]
+        product_name = instance.data["productName"]
         self.log.debug(
-            "Processing instance with subset name {}".format(subset_name)
+            "Processing instance with product name {}".format(product_name)
         )
         thumbnail_source = instance.data.get("thumbnailSource")
         if not thumbnail_source:
diff --git a/client/ayon_core/plugins/publish/help/validate_unique_subsets.xml b/client/ayon_core/plugins/publish/help/validate_unique_subsets.xml
index b18f046f84..a4b289d848 100644
--- a/client/ayon_core/plugins/publish/help/validate_unique_subsets.xml
+++ b/client/ayon_core/plugins/publish/help/validate_unique_subsets.xml
@@ -3,11 +3,11 @@
 <error id="main">
 <title>Subset not unique</title>
 <description>
-## Clashing subset names found
+## Clashing product names found
 
-Multiples instances from your scene are set to publish into the same asset > subset.
+Multiples instances from your scene are set to publish into the same folder > product.
 
-    Non unique subset names: '{non_unique}'
+    Non unique product names: '{non_unique}'
 
 ### How to repair?
 
diff --git a/client/ayon_core/plugins/publish/integrate.py b/client/ayon_core/plugins/publish/integrate.py
index a502031595..12c702c93b 100644
--- a/client/ayon_core/plugins/publish/integrate.py
+++ b/client/ayon_core/plugins/publish/integrate.py
@@ -60,7 +60,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
     """Register publish in the database and transfer files to destinations.
 
     Steps:
-        1) Register the subset and version
+        1) Register the product and version
         2) Transfer the representation files to the destination
         3) Register the representation
 
@@ -148,8 +148,19 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
     # Representation context keys that should always be written to
     # the database even if not used by the destination template
     db_representation_context_keys = [
-        "project", "asset", "task", "subset", "version", "representation",
-        "family", "hierarchy", "username", "user", "output"
+        "project",
+        "asset",
+        "hierarchy",
+        "folder",
+        "task",
+        "product",
+        "subset",
+        "family",
+        "version",
+        "representation",
+        "username",
+        "user",
+        "output"
     ]
 
     def process(self, instance):
@@ -172,7 +183,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
             self.log.warning((
                 "Skipping, there are no representations"
                 " to integrate for instance {}"
-            ).format(instance.data["family"]))
+            ).format(instance.data["productType"]))
             return
 
         file_transactions = FileTransaction(log=self.log,
@@ -205,7 +216,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
         if not repres:
             raise KnownPublishError(
                 "Instance {} has no representations to integrate".format(
-                    instance.data["family"]
+                    instance.data["productType"]
                 )
             )
 
@@ -307,9 +318,9 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
         # increase if the file transaction takes a long time.
         op_session.commit()
 
-        self.log.info("Subset '{subset[name]}' version {version[name]} "
-                      "written to database..".format(subset=subset,
-                                                     version=version))
+        self.log.info((
+            "Product '{}' version {} written to database.."
+        ).format(subset["name"], version["name"]))
 
         # Process all file transfers of all integrations now
         self.log.debug("Integrating source files to destination ...")
@@ -403,13 +414,13 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
 
     def prepare_subset(self, instance, op_session, project_name):
         asset_doc = instance.data["assetEntity"]
-        subset_name = instance.data["subset"]
-        family = instance.data["family"]
-        self.log.debug("Subset: {}".format(subset_name))
+        product_name = instance.data["productName"]
+        product_type = instance.data["productType"]
+        self.log.debug("Product: {}".format(product_name))
 
         # Get existing subset if it exists
         existing_subset_doc = get_subset_by_name(
-            project_name, subset_name, asset_doc["_id"]
+            project_name, product_name, asset_doc["_id"]
         )
 
         # Define subset data
@@ -430,12 +441,14 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
         if existing_subset_doc:
             subset_id = existing_subset_doc["_id"]
         subset_doc = new_subset_document(
-            subset_name, family, asset_doc["_id"], data, subset_id
+            product_name, product_type, asset_doc["_id"], data, subset_id
         )
 
         if existing_subset_doc is None:
             # Create a new subset
-            self.log.info("Subset '%s' not found, creating ..." % subset_name)
+            self.log.info(
+                "Product '%s' not found, creating ..." % product_name
+            )
             op_session.create_entity(
                 project_name, subset_doc["type"], subset_doc
             )
@@ -455,7 +468,7 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
                 update_data
             )
 
-        self.log.debug("Prepared subset: {}".format(subset_name))
+        self.log.debug("Prepared product: {}".format(product_name))
         return subset_doc
 
     def prepare_version(self, instance, op_session, subset_doc, project_name):
@@ -914,13 +927,13 @@ class IntegrateAsset(pyblish.api.InstancePlugin):
         # Task can be optional in anatomy data
         host_name = context.data["hostName"]
         anatomy_data = instance.data["anatomyData"]
-        family = anatomy_data["family"]
+        product_type = instance.data["productType"]
         task_info = anatomy_data.get("task") or {}
 
         return get_publish_template_name(
             project_name,
             host_name,
-            family,
+            product_type,
             task_name=task_info.get("name"),
             task_type=task_info.get("type"),
             project_settings=context.data["project_settings"],
diff --git a/client/ayon_core/plugins/publish/integrate_hero_version.py b/client/ayon_core/plugins/publish/integrate_hero_version.py
index 6dec41b7b0..c275f75118 100644
--- a/client/ayon_core/plugins/publish/integrate_hero_version.py
+++ b/client/ayon_core/plugins/publish/integrate_hero_version.py
@@ -46,8 +46,18 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
     # Can specify representation names that will be ignored (lower case)
     ignored_representation_names = []
     db_representation_context_keys = [
-        "project", "asset", "task", "subset", "representation",
-        "family", "hierarchy", "task", "username", "user"
+        "project",
+        "folder",
+        "asset",
+        "hierarchy",
+        "task",
+        "product",
+        "subset",
+        "family",
+        "representation",
+        "username",
+        "user",
+        "output"
     ]
     # QUESTION/TODO this process should happen on server if crashed due to
     # permissions error on files (files were used or user didn't have perms)
@@ -57,8 +67,8 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
 
     def process(self, instance):
         self.log.debug(
-            "--- Integration of Hero version for subset `{}` begins.".format(
-                instance.data.get("subset", str(instance))
+            "--- Integration of Hero version for product `{}` begins.".format(
+                instance.data["productName"]
             )
         )
         published_repres = instance.data.get("published_representations")
@@ -503,10 +513,10 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
             raise
 
         self.log.debug((
-            "--- hero version integration for subset `{}`"
+            "--- hero version integration for product `{}`"
             " seems to be successful."
         ).format(
-            instance.data.get("subset", str(instance))
+            instance.data["productName"]
         ))
 
     def get_all_files_from_path(self, path):
@@ -558,14 +568,12 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
         anatomy_data = instance.data["anatomyData"]
         task_info = anatomy_data.get("task") or {}
         host_name = instance.context.data["hostName"]
-
-        # TODO raise error if Hero not set?
-        family = self.main_family_from_instance(instance)
+        product_type = instance.data["productType"]
 
         return get_publish_template_name(
             project_name,
             host_name,
-            family,
+            product_type,
             task_info.get("name"),
             task_info.get("type"),
             project_settings=instance.context.data["project_settings"],
@@ -573,13 +581,6 @@ class IntegrateHeroVersion(pyblish.api.InstancePlugin):
             logger=self.log
         )
 
-    def main_family_from_instance(self, instance):
-        """Returns main family of entered instance."""
-        family = instance.data.get("family")
-        if not family:
-            family = instance.data["families"][0]
-        return family
-
     def copy_file(self, src_path, dst_path):
         # TODO check drives if are the same to check if cas hardlink
         dirname = os.path.dirname(dst_path)
diff --git a/client/ayon_core/plugins/publish/integrate_inputlinks.py b/client/ayon_core/plugins/publish/integrate_inputlinks.py
index da8df53170..f7e802f410 100644
--- a/client/ayon_core/plugins/publish/integrate_inputlinks.py
+++ b/client/ayon_core/plugins/publish/integrate_inputlinks.py
@@ -61,8 +61,8 @@ class IntegrateInputLinksAYON(pyblish.api.ContextPlugin):
                     "Instance {} doesn't have version.".format(instance))
                 continue
 
-            family = instance.data.get("family")
-            if family == "workfile":
+            product_type = instance.data["productType"]
+            if product_type == "workfile":
                 workfile_instance = instance
             else:
                 other_instances.append(instance)
@@ -107,7 +107,7 @@ class IntegrateInputLinksAYON(pyblish.api.ContextPlugin):
             self.add_link(
                 new_links_by_type,
                 "reference",
-                version["version"],
+                version["version_id"],
                 workfile_version_id,
             )
 
diff --git a/client/ayon_core/plugins/publish/integrate_product_group.py b/client/ayon_core/plugins/publish/integrate_product_group.py
index 82646ed733..f69e7744d9 100644
--- a/client/ayon_core/plugins/publish/integrate_product_group.py
+++ b/client/ayon_core/plugins/publish/integrate_product_group.py
@@ -28,7 +28,7 @@ class IntegrateProductGroup(pyblish.api.InstancePlugin):
     product_grouping_profiles = None
 
     def process(self, instance):
-        """Look into subset group profiles set by settings.
+        """Look into product group profiles set by settings.
 
         Attribute 'product_grouping_profiles' is defined by settings.
         """
@@ -40,7 +40,7 @@ class IntegrateProductGroup(pyblish.api.InstancePlugin):
         if instance.data.get("subsetGroup"):
             # If subsetGroup is already set then allow that value to remain
             self.log.debug((
-                "Skipping collect subset group due to existing value: {}"
+                "Skipping collect product group due to existing value: {}"
             ).format(instance.data["subsetGroup"]))
             return
 
@@ -56,12 +56,18 @@ class IntegrateProductGroup(pyblish.api.InstancePlugin):
             return
 
         template = profile["template"]
+        product_name = instance.data["productName"]
+        product_type = instance.data["productType"]
 
         fill_pairs = prepare_template_data({
-            "family": filter_criteria["product_types"],
+            "family": product_type,
             "task": filter_criteria["tasks"],
             "host": filter_criteria["hosts"],
-            "subset": instance.data["subset"],
+            "subset": product_name,
+            "product": {
+                "name": product_name,
+                "type": product_type,
+            },
             "renderlayer": instance.data.get("renderlayer")
         })
 
@@ -91,7 +97,7 @@ class IntegrateProductGroup(pyblish.api.InstancePlugin):
 
         # Return filter criteria
         return {
-            "product_types": anatomy_data["family"],
+            "product_types": instance.data["productType"],
             "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 03bc8d2d3d..9eb649d5a0 100644
--- a/client/ayon_core/plugins/publish/integrate_thumbnail.py
+++ b/client/ayon_core/plugins/publish/integrate_thumbnail.py
@@ -42,10 +42,6 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
     label = "Integrate Thumbnails to AYON"
     order = pyblish.api.IntegratorOrder + 0.01
 
-    required_context_keys = [
-        "project", "asset", "task", "subset", "version"
-    ]
-
     def process(self, context):
         # Filter instances which can be used for integration
         filtered_instance_items = self._prepare_instances(context)
diff --git a/client/ayon_core/plugins/publish/integrate_version_attrs.py b/client/ayon_core/plugins/publish/integrate_version_attrs.py
index 5b5ec9cf5b..bc09af9db0 100644
--- a/client/ayon_core/plugins/publish/integrate_version_attrs.py
+++ b/client/ayon_core/plugins/publish/integrate_version_attrs.py
@@ -82,6 +82,6 @@ class IntegrateVersionAttributes(pyblish.api.ContextPlugin):
         return (
             instance.data.get("label")
             or instance.data.get("name")
-            or instance.data.get("subset")
+            or instance.data.get("productName")
             or str(instance)
         )
diff --git a/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py b/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py
index fc60948139..8bd67c0183 100644
--- a/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py
+++ b/client/ayon_core/plugins/publish/preintegrate_thumbnail_representation.py
@@ -37,8 +37,8 @@ class PreIntegrateThumbnails(pyblish.api.InstancePlugin):
         if not thumbnail_repres:
             return
 
-        family = instance.data["family"]
-        subset_name = instance.data["subset"]
+        product_type = instance.data["productType"]
+        product_name = instance.data["productName"]
         host_name = instance.context.data["hostName"]
 
         anatomy_data = instance.data["anatomyData"]
@@ -50,8 +50,8 @@ class PreIntegrateThumbnails(pyblish.api.InstancePlugin):
                 "hosts": host_name,
                 "task_names": task.get("name"),
                 "task_types": task.get("type"),
-                "families": family,
-                "subsets": subset_name,
+                "product_types": product_type,
+                "product_names": product_name,
             },
             logger=self.log
         )
diff --git a/client/ayon_core/plugins/publish/validate_publish_dir.py b/client/ayon_core/plugins/publish/validate_publish_dir.py
index 5827774cca..f89a7c6810 100644
--- a/client/ayon_core/plugins/publish/validate_publish_dir.py
+++ b/client/ayon_core/plugins/publish/validate_publish_dir.py
@@ -21,7 +21,7 @@ class ValidatePublishDir(pyblish.api.InstancePlugin):
 
     checked_template_names = ["source"]
     # validate instances might have interim family, needs to be mapped to final
-    family_mapping = {
+    product_type_mapping = {
         "renderLayer": "render",
         "renderLocal": "render"
     }
@@ -39,7 +39,7 @@ class ValidatePublishDir(pyblish.api.InstancePlugin):
                 self,
                 "Instance meant for in place publishing."
                 " Its 'originalDirname' must be collected."
-                " Contact OP developer to modify collector."
+                " Contact AYON developer to modify collector."
             )
 
         anatomy = instance.context.data["anatomy"]
@@ -62,15 +62,17 @@ class ValidatePublishDir(pyblish.api.InstancePlugin):
         """Find template which will be used during integration."""
         project_name = instance.context.data["projectName"]
         host_name = instance.context.data["hostName"]
+        product_type = instance.data["productType"]
+        mapped_product_type = (
+            self.product_type_mapping.get(product_type) or product_type
+        )
         anatomy_data = instance.data["anatomyData"]
-        family = anatomy_data["family"]
-        family = self.family_mapping.get(family) or family
         task_info = anatomy_data.get("task") or {}
 
         return get_publish_template_name(
             project_name,
             host_name,
-            family,
+            mapped_product_type,
             task_name=task_info.get("name"),
             task_type=task_info.get("type"),
             project_settings=instance.context.data["project_settings"],
diff --git a/client/ayon_core/plugins/publish/validate_unique_subsets.py b/client/ayon_core/plugins/publish/validate_unique_subsets.py
index 5e0e90cff6..3144675c50 100644
--- a/client/ayon_core/plugins/publish/validate_unique_subsets.py
+++ b/client/ayon_core/plugins/publish/validate_unique_subsets.py
@@ -6,17 +6,17 @@ from ayon_core.pipeline.publish import (
 
 
 class ValidateSubsetUniqueness(pyblish.api.ContextPlugin):
-    """Validate all subset names are unique.
+    """Validate all product names are unique.
 
     This only validates whether the instances currently set to publish from
-    the workfile overlap one another for the asset + subset they are publishing
+    the workfile overlap one another for the asset + product they are publishing
     to.
 
     This does not perform any check against existing publishes in the database
-    since it is allowed to publish into existing subsets resulting in
+    since it is allowed to publish into existing products resulting in
     versioning.
 
-    A subset may appear twice to publish from the workfile if one
+    A product may appear twice to publish from the workfile if one
     of them is set to publish to another asset than the other.
 
     """
@@ -27,8 +27,8 @@ class ValidateSubsetUniqueness(pyblish.api.ContextPlugin):
 
     def process(self, context):
 
-        # Find instance per (asset,subset)
-        instance_per_asset_subset = defaultdict(list)
+        # Find instance per (asset,product)
+        instance_per_asset_product = defaultdict(list)
         for instance in context:
 
             # Ignore disabled instances
@@ -42,30 +42,30 @@ class ValidateSubsetUniqueness(pyblish.api.ContextPlugin):
                                  "{}".format(instance.name))
                 continue
 
-            # Ignore instance without subset data
-            subset = instance.data.get("subset")
-            if subset is None:
-                self.log.warning("Instance found without `subset` data: "
-                                 "{}".format(instance.name))
+            # Ignore instance without product data
+            product_name = instance.data.get("productName")
+            if product_name is None:
+                self.log.warning((
+                    "Instance found without `productName` in data: {}"
+                ).format(instance.name))
                 continue
 
-            instance_per_asset_subset[(asset, subset)].append(instance)
+            instance_per_asset_product[(asset, product_name)].append(instance)
 
         non_unique = []
-        for (asset, subset), instances in instance_per_asset_subset.items():
+        for (asset, product_name), instances in instance_per_asset_product.items():
 
-            # A single instance per asset, subset is fine
+            # A single instance per asset, product is fine
             if len(instances) < 2:
                 continue
 
-            non_unique.append("{asset} > {subset}".format(asset=asset,
-                                                          subset=subset))
+            non_unique.append("{} > {}".format(asset, product_name))
 
         if not non_unique:
             # All is ok
             return
 
-        msg = ("Instance subset names {} are not unique. ".format(non_unique) +
+        msg = ("Instance product names {} are not unique. ".format(non_unique) +
                "Please remove or rename duplicates.")
         formatting_data = {
             "non_unique": ",".join(non_unique)
diff --git a/client/ayon_core/resources/app_icons/openrv.png b/client/ayon_core/resources/app_icons/openrv.png
new file mode 100644
index 0000000000..30077b38e8
Binary files /dev/null and b/client/ayon_core/resources/app_icons/openrv.png differ
diff --git a/client/ayon_core/settings/__init__.py b/client/ayon_core/settings/__init__.py
index d32b5f3391..ca76c550b8 100644
--- a/client/ayon_core/settings/__init__.py
+++ b/client/ayon_core/settings/__init__.py
@@ -1,7 +1,6 @@
 from .lib import (
     get_ayon_settings,
     get_studio_settings,
-    get_system_settings,
     get_project_settings,
     get_general_environments,
     get_current_project_settings,
@@ -11,7 +10,6 @@ from .lib import (
 __all__ = (
     "get_ayon_settings",
     "get_studio_settings",
-    "get_system_settings",
     "get_general_environments",
     "get_project_settings",
     "get_current_project_settings",
diff --git a/client/ayon_core/settings/lib.py b/client/ayon_core/settings/lib.py
index eadf3ba544..69525d5b86 100644
--- a/client/ayon_core/settings/lib.py
+++ b/client/ayon_core/settings/lib.py
@@ -163,10 +163,6 @@ def get_studio_settings(*args, **kwargs):
     return _AyonSettingsCache.get_value_by_project(None)
 
 
-# Backward compatibility
-get_system_settings = get_studio_settings
-
-
 def get_project_settings(project_name, *args, **kwargs):
     return _AyonSettingsCache.get_value_by_project(project_name)
 
diff --git a/client/ayon_core/style/style.css b/client/ayon_core/style/style.css
index f6ecebd683..ce467663fc 100644
--- a/client/ayon_core/style/style.css
+++ b/client/ayon_core/style/style.css
@@ -845,7 +845,7 @@ OverlayMessageWidget QWidget {
     padding: 1px 5px;
 }
 
-#CreatorFamilyLabel {
+#CreatorProductTypeLabel {
     font-size: 10pt;
     font-weight: bold;
 }
@@ -875,7 +875,7 @@ OverlayMessageWidget QWidget {
     border-radius: 0px;
 }
 
-#SubsetView::item, #RepresentationView:item {
+#ProductView::item, #RepresentationView:item {
     padding: 5px 1px;
     border: 0px;
 }
@@ -1025,7 +1025,7 @@ PixmapButton:disabled {
     background: {color:bg-view-selection};
 }
 
-#ListViewSubsetName[state="invalid"] {
+#ListViewProductName[state="invalid"] {
     color: {color:publisher:error};
 }
 
@@ -1192,7 +1192,7 @@ ValidationArtistMessage QLabel {
 #PublishCommentInput {
     padding: 0.2em;
 }
-#FamilyIconLabel {
+#ProductTypeIconLabel {
     font-size: 14pt;
 }
 #ArrowBtn, #ArrowBtn:disabled, #ArrowBtn:hover {
diff --git a/client/ayon_core/tools/creator/constants.py b/client/ayon_core/tools/creator/constants.py
index 5c4bbdcca3..ec555fbe9c 100644
--- a/client/ayon_core/tools/creator/constants.py
+++ b/client/ayon_core/tools/creator/constants.py
@@ -1,7 +1,7 @@
 from qtpy import QtCore
 
 
-FAMILY_ROLE = QtCore.Qt.UserRole + 1
+PRODUCT_TYPE_ROLE = QtCore.Qt.UserRole + 1
 ITEM_ID_ROLE = QtCore.Qt.UserRole + 2
 
 SEPARATOR = "---"
diff --git a/client/ayon_core/tools/creator/model.py b/client/ayon_core/tools/creator/model.py
index 3650993b9e..bf6c7380a1 100644
--- a/client/ayon_core/tools/creator/model.py
+++ b/client/ayon_core/tools/creator/model.py
@@ -4,7 +4,7 @@ from qtpy import QtGui, QtCore
 from ayon_core.pipeline import discover_legacy_creator_plugins
 
 from . constants import (
-    FAMILY_ROLE,
+    PRODUCT_TYPE_ROLE,
     ITEM_ID_ROLE
 )
 
@@ -28,15 +28,15 @@ class CreatorsModel(QtGui.QStandardItemModel):
             item_id = str(uuid.uuid4())
             self._creators_by_id[item_id] = creator
 
-            label = creator.label or creator.family
+            label = creator.label or creator.product_type
             item = QtGui.QStandardItem(label)
             item.setEditable(False)
             item.setData(item_id, ITEM_ID_ROLE)
-            item.setData(creator.family, FAMILY_ROLE)
+            item.setData(creator.product_type, PRODUCT_TYPE_ROLE)
             items.append(item)
 
         if not items:
-            item = QtGui.QStandardItem("No registered families")
+            item = QtGui.QStandardItem("No registered create plugins")
             item.setEnabled(False)
             item.setData(False, QtCore.Qt.ItemIsEnabled)
             items.append(item)
@@ -47,15 +47,15 @@ class CreatorsModel(QtGui.QStandardItemModel):
     def get_creator_by_id(self, item_id):
         return self._creators_by_id.get(item_id)
 
-    def get_indexes_by_family(self, family):
+    def get_indexes_by_product_type(self, product_type):
         indexes = []
         for row in range(self.rowCount()):
             index = self.index(row, 0)
             item_id = index.data(ITEM_ID_ROLE)
             creator_plugin = self._creators_by_id.get(item_id)
             if creator_plugin and (
-                creator_plugin.label.lower() == family.lower()
-                or creator_plugin.family.lower() == family.lower()
+                creator_plugin.label.lower() == product_type.lower()
+                or creator_plugin.product_type.lower() == product_type.lower()
             ):
                 indexes.append(index)
         return indexes
diff --git a/client/ayon_core/tools/creator/widgets.py b/client/ayon_core/tools/creator/widgets.py
index 05b5469151..53a2ee1080 100644
--- a/client/ayon_core/tools/creator/widgets.py
+++ b/client/ayon_core/tools/creator/widgets.py
@@ -5,7 +5,7 @@ from qtpy import QtWidgets, QtCore, QtGui
 
 import qtawesome
 
-from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
+from ayon_core.pipeline.create import PRODUCT_NAME_ALLOWED_SYMBOLS
 from ayon_core.tools.utils import ErrorMessageBox
 
 if hasattr(QtGui, "QRegularExpressionValidator"):
@@ -19,16 +19,16 @@ else:
 class CreateErrorMessageBox(ErrorMessageBox):
     def __init__(
         self,
-        family,
-        subset_name,
-        asset_name,
+        product_type,
+        product_name,
+        folder_path,
         exc_msg,
         formatted_traceback,
         parent
     ):
-        self._family = family
-        self._subset_name = subset_name
-        self._asset_name = asset_name
+        self._product_type = product_type
+        self._product_name = product_name
+        self._folder_path = folder_path
         self._exc_msg = exc_msg
         self._formatted_traceback = formatted_traceback
         super(CreateErrorMessageBox, self).__init__("Creation failed", parent)
@@ -42,14 +42,14 @@ class CreateErrorMessageBox(ErrorMessageBox):
 
     def _get_report_data(self):
         report_message = (
-            "Failed to create Product: \"{subset}\""
-            " Type: \"{family}\""
-            " in Asset: \"{asset}\""
+            "Failed to create Product: \"{product_name}\""
+            " Type: \"{product_type}\""
+            " in Folder: \"{folder_path}\""
             "\n\nError: {message}"
         ).format(
-            subset=self._subset_name,
-            family=self._family,
-            asset=self._asset_name,
+            product_name=self._product_name,
+            product_type=self._product_type,
+            folder_path=self._folder_path,
             message=self._exc_msg
         )
         if self._formatted_traceback:
@@ -74,7 +74,7 @@ class CreateErrorMessageBox(ErrorMessageBox):
         item_name_widget = QtWidgets.QLabel(self)
         item_name_widget.setText(
             item_name_template.format(
-                self._family, self._subset_name, self._asset_name
+                self._product_type, self._product_name, self._folder_path
             )
         )
         content_layout.addWidget(item_name_widget)
@@ -94,16 +94,16 @@ class CreateErrorMessageBox(ErrorMessageBox):
             content_layout.addWidget(tb_widget)
 
 
-class SubsetNameValidator(RegularExpressionValidatorClass):
+class ProductNameValidator(RegularExpressionValidatorClass):
     invalid = QtCore.Signal(set)
-    pattern = "^[{}]*$".format(SUBSET_NAME_ALLOWED_SYMBOLS)
+    pattern = "^[{}]*$".format(PRODUCT_NAME_ALLOWED_SYMBOLS)
 
     def __init__(self):
         reg = RegularExpressionClass(self.pattern)
-        super(SubsetNameValidator, self).__init__(reg)
+        super(ProductNameValidator, self).__init__(reg)
 
     def validate(self, text, pos):
-        results = super(SubsetNameValidator, self).validate(text, pos)
+        results = super(ProductNameValidator, self).validate(text, pos)
         if results[0] == self.Invalid:
             self.invalid.emit(self.invalid_chars(text))
         return results
@@ -131,7 +131,7 @@ class VariantLineEdit(QtWidgets.QLineEdit):
     def __init__(self, *args, **kwargs):
         super(VariantLineEdit, self).__init__(*args, **kwargs)
 
-        validator = SubsetNameValidator()
+        validator = ProductNameValidator()
         self.setValidator(validator)
         self.setToolTip("Only alphanumeric characters (A-Z a-z 0-9), "
                         "'_' and '.' are allowed.")
@@ -183,24 +183,24 @@ class VariantLineEdit(QtWidgets.QLineEdit):
     )
 
 
-class FamilyDescriptionWidget(QtWidgets.QWidget):
-    """A family description widget.
+class ProductTypeDescriptionWidget(QtWidgets.QWidget):
+    """A product type description widget.
 
-    Shows a family icon, family name and a help description.
+    Shows a product type icon, name and a help description.
     Used in creator header.
 
-     _________________
-    |  ____           |
-    | |icon| FAMILY   |
-    | |____| help     |
-    |_________________|
+     _______________________
+    |  ____                 |
+    | |icon| PRODUCT TYPE   |
+    | |____| help           |
+    |_______________________|
 
     """
 
     SIZE = 35
 
     def __init__(self, parent=None):
-        super(FamilyDescriptionWidget, self).__init__(parent=parent)
+        super(ProductTypeDescriptionWidget, self).__init__(parent=parent)
 
         icon_label = QtWidgets.QLabel(self)
         icon_label.setSizePolicy(
@@ -215,14 +215,14 @@ class FamilyDescriptionWidget(QtWidgets.QWidget):
         label_layout = QtWidgets.QVBoxLayout()
         label_layout.setSpacing(0)
 
-        family_label = QtWidgets.QLabel(self)
-        family_label.setObjectName("CreatorFamilyLabel")
-        family_label.setAlignment(QtCore.Qt.AlignBottom | QtCore.Qt.AlignLeft)
+        product_type_label = QtWidgets.QLabel(self)
+        product_type_label.setObjectName("CreatorProductTypeLabel")
+        product_type_label.setAlignment(QtCore.Qt.AlignBottom | QtCore.Qt.AlignLeft)
 
         help_label = QtWidgets.QLabel(self)
         help_label.setAlignment(QtCore.Qt.AlignTop | QtCore.Qt.AlignLeft)
 
-        label_layout.addWidget(family_label)
+        label_layout.addWidget(product_type_label)
         label_layout.addWidget(help_label)
 
         layout = QtWidgets.QHBoxLayout(self)
@@ -232,14 +232,15 @@ class FamilyDescriptionWidget(QtWidgets.QWidget):
         layout.addLayout(label_layout)
 
         self._help_label = help_label
-        self._family_label = family_label
+        self._product_type_label = product_type_label
         self._icon_label = icon_label
 
     def set_item(self, creator_plugin):
-        """Update elements to display information of a family item.
+        """Update elements to display information of a product type item.
 
         Args:
-            item (dict): A family item as registered with name, help and icon
+            creator_plugin (dict): A product type item as registered with
+                name, help and icon.
 
         Returns:
             None
@@ -247,7 +248,7 @@ class FamilyDescriptionWidget(QtWidgets.QWidget):
         """
         if not creator_plugin:
             self._icon_label.setPixmap(None)
-            self._family_label.setText("")
+            self._product_type_label.setText("")
             self._help_label.setText("")
             return
 
@@ -268,5 +269,5 @@ class FamilyDescriptionWidget(QtWidgets.QWidget):
         creator_help = docstring.splitlines()[0] if docstring else ""
 
         self._icon_label.setPixmap(pixmap)
-        self._family_label.setText(creator_plugin.family)
+        self._product_type_label.setText(creator_plugin.product_type)
         self._help_label.setText(creator_help)
diff --git a/client/ayon_core/tools/creator/window.py b/client/ayon_core/tools/creator/window.py
index 5862725076..7bf65ea510 100644
--- a/client/ayon_core/tools/creator/window.py
+++ b/client/ayon_core/tools/creator/window.py
@@ -14,7 +14,7 @@ from ayon_core.pipeline import (
     get_current_task_name,
 )
 from ayon_core.pipeline.create import (
-    SUBSET_NAME_ALLOWED_SYMBOLS,
+    PRODUCT_NAME_ALLOWED_SYMBOLS,
     legacy_create,
     CreatorError,
 )
@@ -23,7 +23,7 @@ from .model import CreatorsModel
 from .widgets import (
     CreateErrorMessageBox,
     VariantLineEdit,
-    FamilyDescriptionWidget
+    ProductTypeDescriptionWidget
 )
 from .constants import (
     ITEM_ID_ROLE,
@@ -45,7 +45,7 @@ class CreatorWindow(QtWidgets.QDialog):
                 self.windowFlags() | QtCore.Qt.WindowStaysOnTopHint
             )
 
-        creator_info = FamilyDescriptionWidget(self)
+        creator_info = ProductTypeDescriptionWidget(self)
 
         creators_model = CreatorsModel()
 
@@ -56,19 +56,19 @@ class CreatorWindow(QtWidgets.QDialog):
         creators_view.setObjectName("CreatorsView")
         creators_view.setModel(creators_proxy)
 
-        asset_name_input = QtWidgets.QLineEdit(self)
+        folder_path_input = QtWidgets.QLineEdit(self)
         variant_input = VariantLineEdit(self)
-        subset_name_input = QtWidgets.QLineEdit(self)
-        subset_name_input.setEnabled(False)
+        product_name_input = QtWidgets.QLineEdit(self)
+        product_name_input.setEnabled(False)
 
-        subset_button = QtWidgets.QPushButton()
-        subset_button.setFixedWidth(18)
-        subset_menu = QtWidgets.QMenu(subset_button)
-        subset_button.setMenu(subset_menu)
+        variants_btn = QtWidgets.QPushButton()
+        variants_btn.setFixedWidth(18)
+        variants_menu = QtWidgets.QMenu(variants_btn)
+        variants_btn.setMenu(variants_menu)
 
         name_layout = QtWidgets.QHBoxLayout()
         name_layout.addWidget(variant_input)
-        name_layout.addWidget(subset_button)
+        name_layout.addWidget(variants_btn)
         name_layout.setSpacing(3)
         name_layout.setContentsMargins(0, 0, 0, 0)
 
@@ -76,13 +76,13 @@ class CreatorWindow(QtWidgets.QDialog):
         body_layout.setContentsMargins(0, 0, 0, 0)
 
         body_layout.addWidget(creator_info, 0)
-        body_layout.addWidget(QtWidgets.QLabel("Family", self), 0)
+        body_layout.addWidget(QtWidgets.QLabel("Product type", self), 0)
         body_layout.addWidget(creators_view, 1)
-        body_layout.addWidget(QtWidgets.QLabel("Asset", self), 0)
-        body_layout.addWidget(asset_name_input, 0)
-        body_layout.addWidget(QtWidgets.QLabel("Subset", self), 0)
+        body_layout.addWidget(QtWidgets.QLabel("Folder path", self), 0)
+        body_layout.addWidget(folder_path_input, 0)
+        body_layout.addWidget(QtWidgets.QLabel("Product name", self), 0)
         body_layout.addLayout(name_layout, 0)
-        body_layout.addWidget(subset_name_input, 0)
+        body_layout.addWidget(product_name_input, 0)
 
         useselection_chk = QtWidgets.QCheckBox("Use selection", self)
         useselection_chk.setCheckState(QtCore.Qt.Checked)
@@ -116,7 +116,7 @@ class CreatorWindow(QtWidgets.QDialog):
         variant_input.returnPressed.connect(self._on_create)
         variant_input.textChanged.connect(self._on_data_changed)
         variant_input.report.connect(self.echo)
-        asset_name_input.textChanged.connect(self._on_data_changed)
+        folder_path_input.textChanged.connect(self._on_data_changed)
         creators_view.selectionModel().currentChanged.connect(
             self._on_selection_changed
         )
@@ -134,15 +134,15 @@ class CreatorWindow(QtWidgets.QDialog):
         self._create_btn = create_btn
         self._useselection_chk = useselection_chk
         self._variant_input = variant_input
-        self._subset_name_input = subset_name_input
-        self._asset_name_input = asset_name_input
+        self._product_name_input = product_name_input
+        self._folder_path_input = folder_path_input
 
         self._creators_model = creators_model
         self._creators_proxy = creators_proxy
         self._creators_view = creators_view
 
-        self._subset_btn = subset_button
-        self._subset_menu = subset_menu
+        self._variants_btn = variants_btn
+        self._variants_menu = variants_menu
 
         self._msg_label = msg_label
 
@@ -160,7 +160,7 @@ class CreatorWindow(QtWidgets.QDialog):
         self._create_btn.setEnabled(valid)
 
     def _build_menu(self, default_names=None):
-        """Create optional predefined subset names
+        """Create optional predefined variants.
 
         Args:
             default_names(list): all predefined names
@@ -171,8 +171,8 @@ class CreatorWindow(QtWidgets.QDialog):
         if not default_names:
             default_names = []
 
-        menu = self._subset_menu
-        button = self._subset_btn
+        menu = self._variants_menu
+        button = self._variants_btn
 
         # Get and destroy the action group
         group = button.findChild(QtWidgets.QActionGroup)
@@ -211,10 +211,10 @@ class CreatorWindow(QtWidgets.QDialog):
         item_id = index.data(ITEM_ID_ROLE)
         creator_plugin = self._creators_model.get_creator_by_id(item_id)
         user_input_text = self._variant_input.text()
-        asset_name = self._asset_name_input.text()
+        folder_path = self._folder_path_input.text()
 
-        # Early exit if no asset name
-        if not asset_name:
+        # Early exit if no folder path
+        if not folder_path:
             self._build_menu()
             self.echo("Asset name is required ..")
             self._set_valid_state(False)
@@ -225,64 +225,63 @@ class CreatorWindow(QtWidgets.QDialog):
         if creator_plugin:
             # Get the asset from the database which match with the name
             asset_doc = get_asset_by_name(
-                project_name, asset_name, fields=["_id"]
+                project_name, folder_path, fields=["_id"]
             )
 
         # Get plugin
         if not asset_doc or not creator_plugin:
-            subset_name = user_input_text
             self._build_menu()
 
             if not creator_plugin:
-                self.echo("No registered families ..")
+                self.echo("No registered product types ..")
             else:
-                self.echo("Asset '%s' not found .." % asset_name)
+                self.echo("Folder '{}' not found ..".format(folder_path))
             self._set_valid_state(False)
             return
 
-        asset_id = asset_doc["_id"]
+        folder_id = asset_doc["_id"]
         task_name = get_current_task_name()
 
-        # Calculate subset name with Creator plugin
-        subset_name = creator_plugin.get_subset_name(
-            user_input_text, task_name, asset_id, project_name
+        # Calculate product name with Creator plugin
+        product_name = creator_plugin.get_product_name(
+            project_name, folder_id, task_name, user_input_text
         )
         # Force replacement of prohibited symbols
         # QUESTION should Creator care about this and here should be only
         #   validated with schema regex?
 
-        # Allow curly brackets in subset name for dynamic keys
+        # Allow curly brackets in product name for dynamic keys
         curly_left = "__cbl__"
         curly_right = "__cbr__"
-        tmp_subset_name = (
-            subset_name
+        tmp_product_name = (
+            product_name
             .replace("{", curly_left)
             .replace("}", curly_right)
         )
         # Replace prohibited symbols
-        tmp_subset_name = re.sub(
-            "[^{}]+".format(SUBSET_NAME_ALLOWED_SYMBOLS),
+        tmp_product_name = re.sub(
+            "[^{}]+".format(PRODUCT_NAME_ALLOWED_SYMBOLS),
             "",
-            tmp_subset_name
+            tmp_product_name
         )
-        subset_name = (
-            tmp_subset_name
+        product_name = (
+            tmp_product_name
             .replace(curly_left, "{")
             .replace(curly_right, "}")
         )
-        self._subset_name_input.setText(subset_name)
+        self._product_name_input.setText(product_name)
 
-        # Get all subsets of the current asset
+        # Get all products of the current folder
         subset_docs = get_subsets(
-            project_name, asset_ids=[asset_id], fields=["name"]
+            project_name, asset_ids=[folder_id], fields=["name"]
         )
-        existing_subset_names = {
+        existing_product_names = {
             subset_doc["name"]
             for subset_doc in subset_docs
         }
-        existing_subset_names_low = set(
+        existing_product_names_low = set(
             _name.lower()
-            for _name in existing_subset_names
+            for _name in existing_product_names
         )
 
         # Defaults to dropdown
@@ -296,26 +295,26 @@ class CreatorWindow(QtWidgets.QDialog):
 
         # Replace
         compare_regex = re.compile(re.sub(
-            user_input_text, "(.+)", subset_name, flags=re.IGNORECASE
+            user_input_text, "(.+)", product_name, flags=re.IGNORECASE
         ))
-        subset_hints = set()
+        variant_hints = set()
         if user_input_text:
-            for _name in existing_subset_names:
+            for _name in existing_product_names:
                 _result = compare_regex.search(_name)
                 if _result:
-                    subset_hints |= set(_result.groups())
+                    variant_hints |= set(_result.groups())
 
-        if subset_hints:
+        if variant_hints:
             if defaults:
                 defaults.append(SEPARATOR)
-            defaults.extend(subset_hints)
+            defaults.extend(variant_hints)
         self._build_menu(defaults)
 
-        # Indicate subset existence
+        # Indicate product existence
         if not user_input_text:
             self._variant_input.as_empty()
-        elif subset_name.lower() in existing_subset_names_low:
-            # validate existence of subset name with lowered text
+        elif product_name.lower() in existing_product_names_low:
+            # validate existence of product name with lowered text
             #   - "renderMain" vs. "rensermain" mean same path item for
             #   windows
             self._variant_input.as_exists()
@@ -323,7 +322,7 @@ class CreatorWindow(QtWidgets.QDialog):
             self._variant_input.as_new()
 
         # Update the valid state
-        valid = subset_name.strip() != ""
+        valid = product_name.strip() != ""
 
         self._set_valid_state(valid)
 
@@ -373,7 +372,7 @@ class CreatorWindow(QtWidgets.QDialog):
             self.setStyleSheet(style.load_stylesheet())
 
     def refresh(self):
-        self._asset_name_input.setText(get_current_asset_name())
+        self._folder_path_input.setText(get_current_asset_name())
 
         self._creators_model.reset()
 
@@ -385,7 +384,7 @@ class CreatorWindow(QtWidgets.QDialog):
             ["product_types_smart_select"]
         )
         current_index = None
-        family = None
+        product_type = None
         task_name = get_current_task_name() or None
         lowered_task_name = task_name.lower()
         if task_name:
@@ -395,13 +394,15 @@ class CreatorWindow(QtWidgets.QDialog):
                 }
                 for _task_name in _low_task_names:
                     if _task_name in lowered_task_name:
-                        family = smart_item["name"]
+                        product_type = smart_item["name"]
                         break
-                if family:
+                if product_type:
                     break
 
-        if family:
-            indexes = self._creators_model.get_indexes_by_family(family)
+        if product_type:
+            indexes = self._creators_model.get_indexes_by_product_type(
+                product_type
+            )
             if indexes:
                 index = indexes[0]
                 current_index = self._creators_proxy.mapFromSource(index)
@@ -422,8 +423,8 @@ class CreatorWindow(QtWidgets.QDialog):
         if creator_plugin is None:
             return
 
-        subset_name = self._subset_name_input.text()
-        asset_name = self._asset_name_input.text()
+        product_name = self._product_name_input.text()
+        folder_path = self._folder_path_input.text()
         use_selection = self._useselection_chk.isChecked()
 
         variant = self._variant_input.text()
@@ -432,8 +433,8 @@ class CreatorWindow(QtWidgets.QDialog):
         try:
             legacy_create(
                 creator_plugin,
-                subset_name,
-                asset_name,
+                product_name,
+                folder_path,
                 options={"useSelection": use_selection},
                 data={"variant": variant}
             )
@@ -453,9 +454,9 @@ class CreatorWindow(QtWidgets.QDialog):
 
         if error_info:
             box = CreateErrorMessageBox(
-                creator_plugin.family,
-                subset_name,
-                asset_name,
+                creator_plugin.product_type,
+                product_name,
+                folder_path,
                 *error_info,
                 parent=self
             )
@@ -464,7 +465,7 @@ class CreatorWindow(QtWidgets.QDialog):
             self._message_dialog = box
 
         else:
-            self.echo("Created %s .." % subset_name)
+            self.echo("Created %s .." % product_name)
 
     def _on_msg_timer(self):
         self._msg_label.setText("")
@@ -475,7 +476,7 @@ class CreatorWindow(QtWidgets.QDialog):
 
 
 def show(parent=None):
-    """Display asset creator GUI
+    """Display product creator GUI
 
     Arguments:
         debug (bool, optional): Run loader in debug-mode,
diff --git a/client/ayon_core/tools/launcher/models/actions.py b/client/ayon_core/tools/launcher/models/actions.py
index 8d7da2748b..6b9a33e57a 100644
--- a/client/ayon_core/tools/launcher/models/actions.py
+++ b/client/ayon_core/tools/launcher/models/actions.py
@@ -293,6 +293,34 @@ class ActionsModel:
         self._get_action_objects()
         self._controller.emit_event("actions.refresh.finished")
 
+    def _should_start_last_workfile(
+        self,
+        project_name,
+        task_id,
+        identifier,
+        host_name,
+        not_open_workfile_actions
+    ):
+        from ayon_core.lib.applications import should_start_last_workfile
+
+        if identifier in not_open_workfile_actions:
+            return not not_open_workfile_actions[identifier]
+
+        task_name = None
+        task_type = None
+        if task_id is not None:
+            task = self._controller.get_task_entity(project_name, task_id)
+            task_name = task["name"]
+            task_type = task["taskType"]
+
+        output = should_start_last_workfile(
+            project_name,
+            host_name,
+            task_name,
+            task_type
+        )
+        return output
+
     def get_action_items(self, project_name, folder_id, task_id):
         """Get actions for project.
 
@@ -304,7 +332,6 @@ class ActionsModel:
         Returns:
             list[ActionItem]: List of actions.
         """
-
         not_open_workfile_actions = self._get_no_last_workfile_for_context(
             project_name, folder_id, task_id)
         session = self._prepare_session(project_name, folder_id, task_id)
@@ -318,8 +345,15 @@ class ActionsModel:
             # Handling of 'force_not_open_workfile' for applications
             if action_item.is_application:
                 action_item = action_item.copy()
+                start_last_workfile = self._should_start_last_workfile(
+                    project_name,
+                    task_id,
+                    identifier,
+                    action.application.host_name,
+                    not_open_workfile_actions
+                )
                 action_item.force_not_open_workfile = (
-                    not_open_workfile_actions.get(identifier, False)
+                    not start_last_workfile
                 )
 
             output.append(action_item)
@@ -359,11 +393,15 @@ class ActionsModel:
                 per_action = self._get_no_last_workfile_for_context(
                     project_name, folder_id, task_id
                 )
-                force_not_open_workfile = per_action.get(identifier, False)
-                if force_not_open_workfile:
-                    action.data["start_last_workfile"] = False
-                else:
-                    action.data.pop("start_last_workfile", None)
+                start_last_workfile = self._should_start_last_workfile(
+                    project_name,
+                    task_id,
+                    identifier,
+                    action.application.host_name,
+                    per_action
+                )
+                action.data["start_last_workfile"] = start_last_workfile
+
             action.process(session)
         except Exception as exc:
             self.log.warning("Action trigger failed.", exc_info=True)
@@ -461,9 +499,11 @@ class ActionsModel:
             if is_application:
                 action.project_entities[project_name] = project_entity
                 action.project_settings[project_name] = project_settings
+
             label = action.label or identifier
             variant_label = getattr(action, "label_variant", None)
             icon = get_action_icon(action)
+
             item = ActionItem(
                 identifier,
                 label,
diff --git a/client/ayon_core/tools/launcher/ui/actions_widget.py b/client/ayon_core/tools/launcher/ui/actions_widget.py
index 6667b4ed5f..617f3b0c91 100644
--- a/client/ayon_core/tools/launcher/ui/actions_widget.py
+++ b/client/ayon_core/tools/launcher/ui/actions_widget.py
@@ -358,6 +358,8 @@ class ActionsWidget(QtWidgets.QWidget):
 
     def _on_model_refresh(self):
         self._proxy_model.sort(0)
+        # Force repaint all items
+        self._view.update()
 
     def _on_animation(self):
         time_now = time.time()
diff --git a/client/ayon_core/tools/loader/models/actions.py b/client/ayon_core/tools/loader/models/actions.py
index c70ccb3e18..dff15ea16c 100644
--- a/client/ayon_core/tools/loader/models/actions.py
+++ b/client/ayon_core/tools/loader/models/actions.py
@@ -809,10 +809,10 @@ class LoaderActionsModel:
 
         error_info = []
         if loader.is_multiple_contexts_compatible:
-            subset_names = []
+            product_names = []
             for context in version_contexts:
-                subset_name = context.get("subset", {}).get("name") or "N/A"
-                subset_names.append(subset_name)
+                product_name = context.get("subset", {}).get("name") or "N/A"
+                product_names.append(product_name)
             try:
                 load_with_subset_contexts(
                     loader,
@@ -831,12 +831,12 @@ class LoaderActionsModel:
                     str(exc),
                     formatted_traceback,
                     None,
-                    ", ".join(subset_names),
+                    ", ".join(product_names),
                     None
                 ))
         else:
             for version_context in version_contexts:
-                subset_name = (
+                product_name = (
                     version_context.get("subset", {}).get("name") or "N/A"
                 )
                 try:
@@ -860,7 +860,7 @@ class LoaderActionsModel:
                         str(exc),
                         formatted_traceback,
                         None,
-                        subset_name,
+                        product_name,
                         None
                     ))
 
diff --git a/client/ayon_core/tools/loader/models/site_sync.py b/client/ayon_core/tools/loader/models/site_sync.py
index e6158ea280..2a6f1558ad 100644
--- a/client/ayon_core/tools/loader/models/site_sync.py
+++ b/client/ayon_core/tools/loader/models/site_sync.py
@@ -325,21 +325,21 @@ class SiteSyncModel:
         repre_docs = list(get_representations(
             project_name, representation_ids=representation_ids
         ))
-        families_per_repre_id = {
+        product_type_by_repre_id = {
             item["_id"]: item["context"]["family"]
             for item in repre_docs
         }
 
         for repre_id in representation_ids:
-            family = families_per_repre_id[repre_id]
+            product_type = product_type_by_repre_id[repre_id]
             if identifier == DOWNLOAD_IDENTIFIER:
                 self._add_site(
-                    project_name, repre_id, active_site, family
+                    project_name, repre_id, active_site, product_type
                 )
 
             elif identifier == UPLOAD_IDENTIFIER:
                 self._add_site(
-                    project_name, repre_id, remote_site, family
+                    project_name, repre_id, remote_site, product_type
                 )
 
             elif identifier == REMOVE_IDENTIFIER:
@@ -485,13 +485,13 @@ class SiteSyncModel:
             representation_ids=representation_ids,
         )
 
-    def _add_site(self, project_name, repre_id, site_name, family):
+    def _add_site(self, project_name, repre_id, site_name, product_type):
         self._site_sync_addon.add_site(
             project_name, repre_id, site_name, force=True
         )
 
         # TODO this should happen in site sync addon
-        if family != "workfile":
+        if product_type != "workfile":
             return
 
         links = get_linked_representation_id(
diff --git a/client/ayon_core/tools/loader/ui/folders_widget.py b/client/ayon_core/tools/loader/ui/folders_widget.py
index 9d5b95b2a6..34881ab49d 100644
--- a/client/ayon_core/tools/loader/ui/folders_widget.py
+++ b/client/ayon_core/tools/loader/ui/folders_widget.py
@@ -56,34 +56,34 @@ class UnderlinesFolderDelegate(QtWidgets.QItemDelegate):
         item_rect = QtCore.QRect(option.rect)
         item_rect.setHeight(option.rect.height() - self.bar_height)
 
-        subset_colors = index.data(UNDERLINE_COLORS_ROLE) or []
+        product_colors = index.data(UNDERLINE_COLORS_ROLE) or []
 
-        subset_colors_width = 0
-        if subset_colors:
-            subset_colors_width = option.rect.width() / len(subset_colors)
+        product_colors_width = 0
+        if product_colors:
+            product_colors_width = option.rect.width() / len(product_colors)
 
-        subset_rects = []
+        product_rects = []
         counter = 0
-        for subset_c in subset_colors:
+        for product_c in product_colors:
             new_color = None
             new_rect = None
-            if subset_c:
-                new_color = QtGui.QColor(subset_c)
+            if product_c:
+                new_color = QtGui.QColor(product_c)
 
                 new_rect = QtCore.QRect(
-                    option.rect.left() + (counter * subset_colors_width),
+                    option.rect.left() + (counter * product_colors_width),
                     option.rect.top() + (
                         option.rect.height() - self.bar_height
                     ),
-                    subset_colors_width,
+                    product_colors_width,
                     self.bar_height
                 )
-            subset_rects.append((new_color, new_rect))
+            product_rects.append((new_color, new_rect))
             counter += 1
 
         # Background
         if option.state & QtWidgets.QStyle.State_Selected:
-            if len(subset_colors) == 0:
+            if len(product_colors) == 0:
                 item_rect.setTop(item_rect.top() + (self.bar_height / 2))
 
             if option.state & QtWidgets.QStyle.State_MouseOver:
@@ -106,10 +106,10 @@ class UnderlinesFolderDelegate(QtWidgets.QItemDelegate):
         )
 
         if option.state & QtWidgets.QStyle.State_Selected:
-            for color, subset_rect in subset_rects:
-                if not color or not subset_rect:
+            for color, product_rect in product_rects:
+                if not color or not product_rect:
                     continue
-                painter.fillRect(subset_rect, QtGui.QBrush(color))
+                painter.fillRect(product_rect, QtGui.QBrush(color))
 
         # Icon
         icon_index = index.model().index(
diff --git a/client/ayon_core/tools/loader/ui/products_widget.py b/client/ayon_core/tools/loader/ui/products_widget.py
index 5a29f3f762..3025ec18bd 100644
--- a/client/ayon_core/tools/loader/ui/products_widget.py
+++ b/client/ayon_core/tools/loader/ui/products_widget.py
@@ -106,7 +106,7 @@ class ProductsWidget(QtWidgets.QWidget):
 
         products_view = DeselectableTreeView(self)
         # TODO - define custom object name in style
-        products_view.setObjectName("SubsetView")
+        products_view.setObjectName("ProductView")
         products_view.setSelectionMode(
             QtWidgets.QAbstractItemView.ExtendedSelection
         )
diff --git a/client/ayon_core/tools/publisher/constants.py b/client/ayon_core/tools/publisher/constants.py
index 4630eb144b..6676f14c3d 100644
--- a/client/ayon_core/tools/publisher/constants.py
+++ b/client/ayon_core/tools/publisher/constants.py
@@ -6,9 +6,9 @@ CONTEXT_LABEL = "Context"
 # Not showed anywhere - used as identifier
 CONTEXT_GROUP = "__ContextGroup__"
 
-CONVERTOR_ITEM_GROUP = "Incompatible subsets"
+CONVERTOR_ITEM_GROUP = "Incompatible products"
 
-# Allowed symbols for subset name (and variant)
+# Allowed symbols for product name (and variant)
 # - characters, numbers, unsercore and dash
 VARIANT_TOOLTIP = (
     "Variant may contain alphabetical characters (a-Z)"
@@ -24,7 +24,7 @@ SORT_VALUE_ROLE = QtCore.Qt.UserRole + 2
 IS_GROUP_ROLE = QtCore.Qt.UserRole + 3
 CREATOR_IDENTIFIER_ROLE = QtCore.Qt.UserRole + 4
 CREATOR_THUMBNAIL_ENABLED_ROLE = QtCore.Qt.UserRole + 5
-FAMILY_ROLE = QtCore.Qt.UserRole + 6
+PRODUCT_TYPE_ROLE = QtCore.Qt.UserRole + 6
 GROUP_ROLE = QtCore.Qt.UserRole + 7
 CONVERTER_IDENTIFIER_ROLE = QtCore.Qt.UserRole + 8
 CREATOR_SORT_ROLE = QtCore.Qt.UserRole + 9
@@ -48,7 +48,7 @@ __all__ = (
     "CREATOR_IDENTIFIER_ROLE",
     "CREATOR_THUMBNAIL_ENABLED_ROLE",
     "CREATOR_SORT_ROLE",
-    "FAMILY_ROLE",
+    "PRODUCT_TYPE_ROLE",
     "GROUP_ROLE",
     "CONVERTER_IDENTIFIER_ROLE",
 
diff --git a/client/ayon_core/tools/publisher/control.py b/client/ayon_core/tools/publisher/control.py
index 487748afd9..c639a509d3 100644
--- a/client/ayon_core/tools/publisher/control.py
+++ b/client/ayon_core/tools/publisher/control.py
@@ -351,7 +351,8 @@ class PublishReportMaker:
         return {
             "name": instance.data.get("name"),
             "label": get_publish_instance_label(instance),
-            "family": instance.data["family"],
+            "product_type": instance.data.get("productType"),
+            "family": instance.data.get("family"),
             "families": instance.data.get("families") or [],
             "exists": exists,
             "creator_identifier": instance.data.get("creator_identifier"),
@@ -879,7 +880,7 @@ class CreatorItem:
         self,
         identifier,
         creator_type,
-        family,
+        product_type,
         label,
         group_label,
         icon,
@@ -894,7 +895,7 @@ class CreatorItem:
     ):
         self.identifier = identifier
         self.creator_type = creator_type
-        self.family = family
+        self.product_type = product_type
         self.label = label
         self.group_label = group_label
         self.icon = icon
@@ -943,7 +944,7 @@ class CreatorItem:
         return cls(
             identifier,
             creator_type,
-            creator.family,
+            creator.product_type,
             creator.label or identifier,
             creator.get_group_label(),
             creator.get_icon(),
@@ -967,7 +968,7 @@ class CreatorItem:
         return {
             "identifier": self.identifier,
             "creator_type": str(self.creator_type),
-            "family": self.family,
+            "product_type": self.product_type,
             "label": self.label,
             "group_label": self.group_label,
             "icon": self.icon,
@@ -1117,7 +1118,7 @@ class AbstractPublisherController(object):
         pass
 
     @abstractmethod
-    def get_existing_subset_names(self, asset_name):
+    def get_existing_product_names(self, asset_name):
         pass
 
     @abstractmethod
@@ -1152,7 +1153,7 @@ class AbstractPublisherController(object):
         pass
 
     @abstractmethod
-    def get_subset_name(
+    def get_product_name(
         self,
         creator_identifier,
         variant,
@@ -1160,15 +1161,15 @@ class AbstractPublisherController(object):
         asset_name,
         instance_id=None
     ):
-        """Get subset name based on passed data.
+        """Get product name based on passed data.
 
         Args:
             creator_identifier (str): Identifier of creator which should be
-                responsible for subset name creation.
+                responsible for product name creation.
             variant (str): Variant value from user's input.
             task_name (str): Name of task for which is instance created.
             asset_name (str): Name of asset for which is instance created.
-            instance_id (Union[str, None]): Existing instance id when subset
+            instance_id (Union[str, None]): Existing instance id when product
                 name is updated.
         """
 
@@ -1176,7 +1177,7 @@ class AbstractPublisherController(object):
 
     @abstractmethod
     def create(
-        self, creator_identifier, subset_name, instance_data, options
+        self, creator_identifier, product_name, instance_data, options
     ):
         """Trigger creation by creator identifier.
 
@@ -1184,7 +1185,7 @@ class AbstractPublisherController(object):
 
         Args:
             creator_identifier (str): Identifier of Creator plugin.
-            subset_name (str): Calculated subset name.
+            product_name (str): Calculated product name.
             instance_data (Dict[str, Any]): Base instance data with variant,
                 asset name and task name.
             options (Dict[str, Any]): Data from pre-create attributes.
@@ -1830,7 +1831,7 @@ class PublisherController(BasePublisherController):
             )
         return result
 
-    def get_existing_subset_names(self, asset_name):
+    def get_existing_product_names(self, asset_name):
         project_name = self.project_name
         asset_doc = self._asset_docs_cache.get_asset_by_name(asset_name)
         if not asset_doc:
@@ -1927,7 +1928,7 @@ class PublisherController(BasePublisherController):
                 self._emit_event(
                     "convertors.find.failed",
                     {
-                        "title": "Collection of unsupported subset failed",
+                        "title": "Collection of unsupported product failed",
                         "failed_info": exc.failed_info
                     }
                 )
@@ -2069,7 +2070,7 @@ class PublisherController(BasePublisherController):
             ))
         return output
 
-    def get_subset_name(
+    def get_product_name(
         self,
         creator_identifier,
         variant,
@@ -2077,15 +2078,15 @@ class PublisherController(BasePublisherController):
         asset_name,
         instance_id=None
     ):
-        """Get subset name based on passed data.
+        """Get product name based on passed data.
 
         Args:
             creator_identifier (str): Identifier of creator which should be
-                responsible for subset name creation.
+                responsible for product name creation.
             variant (str): Variant value from user's input.
             task_name (str): Name of task for which is instance created.
             asset_name (str): Name of asset for which is instance created.
-            instance_id (Union[str, None]): Existing instance id when subset
+            instance_id (Union[str, None]): Existing instance id when product
                 name is updated.
         """
 
@@ -2096,8 +2097,8 @@ class PublisherController(BasePublisherController):
         if instance_id:
             instance = self.instances[instance_id]
 
-        return creator.get_subset_name(
-            variant, task_name, asset_doc, project_name, instance=instance
+        return creator.get_product_name(
+            project_name, asset_doc, task_name, variant, instance=instance
         )
 
     def trigger_convertor_items(self, convertor_identifiers):
@@ -2133,14 +2134,14 @@ class PublisherController(BasePublisherController):
         self.reset()
 
     def create(
-        self, creator_identifier, subset_name, instance_data, options
+        self, creator_identifier, product_name, instance_data, options
     ):
         """Trigger creation and refresh of instances in UI."""
 
         success = True
         try:
             self._create_context.create_with_unified_error(
-                creator_identifier, subset_name, instance_data, options
+                creator_identifier, product_name, instance_data, options
             )
 
         except CreatorsOperationFailed as exc:
diff --git a/client/ayon_core/tools/publisher/control_qt.py b/client/ayon_core/tools/publisher/control_qt.py
index 3d56c08131..2ddd676ec3 100644
--- a/client/ayon_core/tools/publisher/control_qt.py
+++ b/client/ayon_core/tools/publisher/control_qt.py
@@ -260,7 +260,7 @@ class QtRemotePublishController(BasePublisherController):
     def get_task_names_by_asset_names(self, asset_names):
         pass
 
-    def get_existing_subset_names(self, asset_name):
+    def get_existing_product_names(self, asset_name):
         pass
 
     @property
@@ -300,7 +300,7 @@ class QtRemotePublishController(BasePublisherController):
         pass
 
     @abstractmethod
-    def get_subset_name(
+    def get_product_name(
         self,
         creator_identifier,
         variant,
@@ -308,15 +308,15 @@ class QtRemotePublishController(BasePublisherController):
         asset_name,
         instance_id=None
     ):
-        """Get subset name based on passed data.
+        """Get product name based on passed data.
 
         Args:
             creator_identifier (str): Identifier of creator which should be
-                responsible for subset name creation.
+                responsible for product name creation.
             variant (str): Variant value from user's input.
             task_name (str): Name of task for which is instance created.
             asset_name (str): Name of asset for which is instance created.
-            instance_id (Union[str, None]): Existing instance id when subset
+            instance_id (Union[str, None]): Existing instance id when product
                 name is updated.
         """
 
@@ -324,7 +324,7 @@ class QtRemotePublishController(BasePublisherController):
 
     @abstractmethod
     def create(
-        self, creator_identifier, subset_name, instance_data, options
+        self, creator_identifier, product_name, instance_data, options
     ):
         """Trigger creation by creator identifier.
 
@@ -332,7 +332,7 @@ class QtRemotePublishController(BasePublisherController):
 
         Args:
             creator_identifier (str): Identifier of Creator plugin.
-            subset_name (str): Calculated subset name.
+            product_name (str): Calculated product name.
             instance_data (Dict[str, Any]): Base instance data with variant,
                 asset name and task name.
             options (Dict[str, Any]): Data from pre-create attributes.
diff --git a/client/ayon_core/tools/publisher/widgets/card_view_widgets.py b/client/ayon_core/tools/publisher/widgets/card_view_widgets.py
index 3396110121..47c5399cf7 100644
--- a/client/ayon_core/tools/publisher/widgets/card_view_widgets.py
+++ b/client/ayon_core/tools/publisher/widgets/card_view_widgets.py
@@ -179,7 +179,7 @@ class ConvertorItemsGroupWidget(BaseGroupWidget):
         # Remove instance widgets that are not in passed instances
         self._remove_all_except(items_by_id.keys())
 
-        # Sort instances by subset name
+        # Sort instances by product name
         sorted_labels = list(sorted(items_by_label.keys()))
 
         # Add new instances to widget
@@ -226,24 +226,24 @@ class InstanceGroupWidget(BaseGroupWidget):
                 CreateContext.
         """
 
-        # Store instances by id and by subset name
+        # Store instances by id and by product name
         instances_by_id = {}
-        instances_by_subset_name = collections.defaultdict(list)
+        instances_by_product_name = collections.defaultdict(list)
         for instance in instances:
             instances_by_id[instance.id] = instance
-            subset_name = instance["subset"]
-            instances_by_subset_name[subset_name].append(instance)
+            product_name = instance["productName"]
+            instances_by_product_name[product_name].append(instance)
 
         # Remove instance widgets that are not in passed instances
         self._remove_all_except(instances_by_id.keys())
 
-        # Sort instances by subset name
-        sorted_subset_names = list(sorted(instances_by_subset_name.keys()))
+        # Sort instances by product name
+        sorted_product_names = list(sorted(instances_by_product_name.keys()))
 
         # Add new instances to widget
         widget_idx = 1
-        for subset_names in sorted_subset_names:
-            for instance in instances_by_subset_name[subset_names]:
+        for product_names in sorted_product_names:
+            for instance in instances_by_product_name[product_names]:
                 if instance.id in self._widgets_by_id:
                     widget = self._widgets_by_id[instance.id]
                     widget.update_instance(instance)
@@ -326,7 +326,7 @@ class ContextCardWidget(CardWidget):
         self._group_identifier = CONTEXT_GROUP
 
         icon_widget = PublishPixmapLabel(None, self)
-        icon_widget.setObjectName("FamilyIconLabel")
+        icon_widget.setObjectName("ProductTypeIconLabel")
 
         label_widget = QtWidgets.QLabel(CONTEXT_LABEL, self)
 
@@ -357,7 +357,7 @@ class ConvertorItemCardWidget(CardWidget):
         self._group_identifier = CONVERTOR_ITEM_GROUP
 
         icon_widget = IconValuePixmapLabel("fa.magic", self)
-        icon_widget.setObjectName("FamilyIconLabel")
+        icon_widget.setObjectName("ProductTypeIconLabel")
 
         label_widget = QtWidgets.QLabel(item.label, self)
 
@@ -391,12 +391,12 @@ class InstanceCardWidget(CardWidget):
 
         self.instance = instance
 
-        self._last_subset_name = None
+        self._last_product_name = None
         self._last_variant = None
         self._last_label = None
 
         icon_widget = IconValuePixmapLabel(group_icon, self)
-        icon_widget.setObjectName("FamilyIconLabel")
+        icon_widget.setObjectName("ProductTypeIconLabel")
         context_warning = ContextWarningLabel(self)
 
         icon_layout = QtWidgets.QHBoxLayout()
@@ -475,19 +475,19 @@ class InstanceCardWidget(CardWidget):
         self._icon_widget.setVisible(valid)
         self._context_warning.setVisible(not valid)
 
-    def _update_subset_name(self):
+    def _update_product_name(self):
         variant = self.instance["variant"]
-        subset_name = self.instance["subset"]
+        product_name = self.instance["productName"]
         label = self.instance.label
         if (
             variant == self._last_variant
-            and subset_name == self._last_subset_name
+            and product_name == self._last_product_name
             and label == self._last_label
         ):
             return
 
         self._last_variant = variant
-        self._last_subset_name = subset_name
+        self._last_product_name = product_name
         self._last_label = label
         # Make `variant` bold
         label = html_escape(self.instance.label)
@@ -506,7 +506,7 @@ class InstanceCardWidget(CardWidget):
 
     def update_instance_values(self):
         """Update instance data"""
-        self._update_subset_name()
+        self._update_product_name()
         self.set_active(self.instance["active"])
         self._validate_context()
 
diff --git a/client/ayon_core/tools/publisher/widgets/create_widget.py b/client/ayon_core/tools/publisher/widgets/create_widget.py
index 8eae205882..e573e554d8 100644
--- a/client/ayon_core/tools/publisher/widgets/create_widget.py
+++ b/client/ayon_core/tools/publisher/widgets/create_widget.py
@@ -3,7 +3,7 @@ import re
 from qtpy import QtWidgets, QtCore, QtGui
 
 from ayon_core.pipeline.create import (
-    SUBSET_NAME_ALLOWED_SYMBOLS,
+    PRODUCT_NAME_ALLOWED_SYMBOLS,
     PRE_CREATE_THUMBNAIL_KEY,
     DEFAULT_VARIANT_VALUE,
     TaskNotSetError,
@@ -19,7 +19,7 @@ from .tasks_widget import CreateWidgetTasksWidget
 from .precreate_widget import PreCreateWidget
 from ..constants import (
     VARIANT_TOOLTIP,
-    FAMILY_ROLE,
+    PRODUCT_TYPE_ROLE,
     CREATOR_IDENTIFIER_ROLE,
     CREATOR_THUMBNAIL_ENABLED_ROLE,
     CREATOR_SORT_ROLE,
@@ -45,13 +45,13 @@ class CreatorShortDescWidget(QtWidgets.QWidget):
 
         # --- Short description widget ---
         icon_widget = IconValuePixmapLabel(None, self)
-        icon_widget.setObjectName("FamilyIconLabel")
+        icon_widget.setObjectName("ProductTypeIconLabel")
 
         # --- Short description inputs ---
         short_desc_input_widget = QtWidgets.QWidget(self)
 
-        family_label = QtWidgets.QLabel(short_desc_input_widget)
-        family_label.setAlignment(
+        product_type_label = QtWidgets.QLabel(short_desc_input_widget)
+        product_type_label.setAlignment(
             QtCore.Qt.AlignBottom | QtCore.Qt.AlignLeft
         )
 
@@ -64,7 +64,7 @@ class CreatorShortDescWidget(QtWidgets.QWidget):
             short_desc_input_widget
         )
         short_desc_input_layout.setSpacing(0)
-        short_desc_input_layout.addWidget(family_label)
+        short_desc_input_layout.addWidget(product_type_label)
         short_desc_input_layout.addWidget(description_label)
         # --------------------------------
 
@@ -75,13 +75,13 @@ class CreatorShortDescWidget(QtWidgets.QWidget):
         # --------------------------------
 
         self._icon_widget = icon_widget
-        self._family_label = family_label
+        self._product_type_label = product_type_label
         self._description_label = description_label
 
     def set_creator_item(self, creator_item=None):
         if not creator_item:
             self._icon_widget.set_icon_def(None)
-            self._family_label.setText("")
+            self._product_type_label.setText("")
             self._description_label.setText("")
             return
 
@@ -89,8 +89,8 @@ class CreatorShortDescWidget(QtWidgets.QWidget):
         description = creator_item.description or ""
 
         self._icon_widget.set_icon_def(plugin_icon)
-        self._family_label.setText("<b>{}</b>".format(creator_item.family))
-        self._family_label.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
+        self._product_type_label.setText("<b>{}</b>".format(creator_item.product_type))
+        self._product_type_label.setTextInteractionFlags(QtCore.Qt.NoTextInteraction)
         self._description_label.setText(description)
 
 
@@ -110,12 +110,12 @@ class CreateWidget(QtWidgets.QWidget):
         self._controller = controller
 
         self._asset_name = None
-        self._subset_names = None
+        self._product_names = None
         self._selected_creator = None
 
         self._prereq_available = False
 
-        name_pattern = "^[{}]*$".format(SUBSET_NAME_ALLOWED_SYMBOLS)
+        name_pattern = "^[{}]*$".format(PRODUCT_NAME_ALLOWED_SYMBOLS)
         self._name_pattern = name_pattern
         self._compiled_name_pattern = re.compile(name_pattern)
 
@@ -164,19 +164,19 @@ class CreateWidget(QtWidgets.QWidget):
         # --- Creator attr defs ---
         creators_attrs_widget = QtWidgets.QWidget(creators_splitter)
 
-        # Top part - variant / subset name + thumbnail
+        # Top part - variant / product name + thumbnail
         creators_attrs_top = QtWidgets.QWidget(creators_attrs_widget)
 
-        # Basics - variant / subset name
+        # Basics - variant / product name
         creator_basics_widget = ResizeControlWidget(creators_attrs_top)
 
-        variant_subset_label = QtWidgets.QLabel(
+        product_variant_label = QtWidgets.QLabel(
             "Create options", creator_basics_widget
         )
 
-        variant_subset_widget = QtWidgets.QWidget(creator_basics_widget)
-        # Variant and subset input
-        variant_widget = ResizeControlWidget(variant_subset_widget)
+        product_variant_widget = QtWidgets.QWidget(creator_basics_widget)
+        # Variant and product input
+        variant_widget = ResizeControlWidget(product_variant_widget)
         variant_widget.setObjectName("VariantInputsWidget")
 
         variant_input = QtWidgets.QLineEdit(variant_widget)
@@ -196,20 +196,20 @@ class CreateWidget(QtWidgets.QWidget):
         variant_layout.addWidget(variant_input, 1)
         variant_layout.addWidget(variant_hints_btn, 0, QtCore.Qt.AlignVCenter)
 
-        subset_name_input = QtWidgets.QLineEdit(variant_subset_widget)
-        subset_name_input.setEnabled(False)
+        product_name_input = QtWidgets.QLineEdit(product_variant_widget)
+        product_name_input.setEnabled(False)
 
-        variant_subset_layout = QtWidgets.QFormLayout(variant_subset_widget)
-        variant_subset_layout.setContentsMargins(0, 0, 0, 0)
-        variant_subset_layout.setHorizontalSpacing(INPUTS_LAYOUT_HSPACING)
-        variant_subset_layout.setVerticalSpacing(INPUTS_LAYOUT_VSPACING)
-        variant_subset_layout.addRow("Variant", variant_widget)
-        variant_subset_layout.addRow("Product", subset_name_input)
+        product_variant_layout = QtWidgets.QFormLayout(product_variant_widget)
+        product_variant_layout.setContentsMargins(0, 0, 0, 0)
+        product_variant_layout.setHorizontalSpacing(INPUTS_LAYOUT_HSPACING)
+        product_variant_layout.setVerticalSpacing(INPUTS_LAYOUT_VSPACING)
+        product_variant_layout.addRow("Variant", variant_widget)
+        product_variant_layout.addRow("Product", product_name_input)
 
         creator_basics_layout = QtWidgets.QVBoxLayout(creator_basics_widget)
         creator_basics_layout.setContentsMargins(0, 0, 0, 0)
-        creator_basics_layout.addWidget(variant_subset_label, 0)
-        creator_basics_layout.addWidget(variant_subset_widget, 0)
+        creator_basics_layout.addWidget(product_variant_label, 0)
+        creator_basics_layout.addWidget(product_variant_widget, 0)
 
         thumbnail_widget = ThumbnailWidget(controller, creators_attrs_top)
 
@@ -302,7 +302,7 @@ class CreateWidget(QtWidgets.QWidget):
         self._assets_widget = assets_widget
         self._tasks_widget = tasks_widget
 
-        self.subset_name_input = subset_name_input
+        self.product_name_input = product_name_input
 
         self.variant_input = variant_input
         self.variant_hints_btn = variant_hints_btn
@@ -467,20 +467,20 @@ class CreateWidget(QtWidgets.QWidget):
         if self._asset_name and self._asset_name == asset_name:
             return
 
-        # Make sure `_asset_name` and `_subset_names` variables are reset
+        # Make sure `_asset_name` and `_product_names` variables are reset
         self._asset_name = asset_name
-        self._subset_names = None
+        self._product_names = None
         if asset_name is None:
             return
 
-        subset_names = self._controller.get_existing_subset_names(asset_name)
+        product_names = self._controller.get_existing_product_names(asset_name)
 
-        self._subset_names = subset_names
-        if subset_names is None:
-            self.subset_name_input.setText("< Asset is not set >")
+        self._product_names = product_names
+        if product_names is None:
+            self.product_name_input.setText("< Asset is not set >")
 
     def _refresh_creators(self):
-        # Refresh creators and add their families to list
+        # Refresh creators and add their product types to list
         existing_items = {}
         old_creators = set()
         for row in range(self._creators_model.rowCount()):
@@ -489,7 +489,7 @@ class CreateWidget(QtWidgets.QWidget):
             existing_items[identifier] = item
             old_creators.add(identifier)
 
-        # Add new families
+        # Add new create plugins
         new_creators = set()
         creator_items_by_identifier = self._controller.creator_items
         for identifier, creator_item in creator_items_by_identifier.items():
@@ -515,11 +515,11 @@ class CreateWidget(QtWidgets.QWidget):
                 creator_item.create_allow_thumbnail,
                 CREATOR_THUMBNAIL_ENABLED_ROLE
             )
-            item.setData(creator_item.family, FAMILY_ROLE)
+            item.setData(creator_item.product_type, PRODUCT_TYPE_ROLE)
             if is_new:
                 self._creators_model.appendRow(item)
 
-        # Remove families that are no more available
+        # Remove create plugins that are no more available
         for identifier in (old_creators - new_creators):
             item = existing_items[identifier]
             self._creators_model.takeRow(item.row())
@@ -641,7 +641,7 @@ class CreateWidget(QtWidgets.QWidget):
                 self.variant_hints_menu.addAction(variant)
 
         variant_text = default_variant or DEFAULT_VARIANT_VALUE
-        # Make sure subset name is updated to new plugin
+        # Make sure product name is updated to new plugin
         if variant_text == self.variant_input.text():
             self._on_variant_change()
         else:
@@ -666,8 +666,8 @@ class CreateWidget(QtWidgets.QWidget):
 
         # This should probably never happen?
         if not self._selected_creator:
-            if self.subset_name_input.text():
-                self.subset_name_input.setText("")
+            if self.product_name_input.text():
+                self.product_name_input.setText("")
             return
 
         if variant_value is None:
@@ -676,52 +676,52 @@ class CreateWidget(QtWidgets.QWidget):
         if not self._compiled_name_pattern.match(variant_value):
             self._create_btn.setEnabled(False)
             self._set_variant_state_property("invalid")
-            self.subset_name_input.setText("< Invalid variant >")
+            self.product_name_input.setText("< Invalid variant >")
             return
 
         if not self._context_change_is_enabled():
             self._create_btn.setEnabled(True)
             self._set_variant_state_property("")
-            self.subset_name_input.setText("< Valid variant >")
+            self.product_name_input.setText("< Valid variant >")
             return
 
         asset_name = self._get_asset_name()
         task_name = self._get_task_name()
         creator_idenfier = self._selected_creator.identifier
-        # Calculate subset name with Creator plugin
+        # Calculate product name with Creator plugin
         try:
-            subset_name = self._controller.get_subset_name(
+            product_name = self._controller.get_product_name(
                 creator_idenfier, variant_value, task_name, asset_name
             )
         except TaskNotSetError:
             self._create_btn.setEnabled(False)
             self._set_variant_state_property("invalid")
-            self.subset_name_input.setText("< Missing task >")
+            self.product_name_input.setText("< Missing task >")
             return
 
-        self.subset_name_input.setText(subset_name)
+        self.product_name_input.setText(product_name)
 
         self._create_btn.setEnabled(True)
-        self._validate_subset_name(subset_name, variant_value)
+        self._validate_product_name(product_name, variant_value)
 
-    def _validate_subset_name(self, subset_name, variant_value):
-        # Get all subsets of the current asset
-        if self._subset_names:
-            existing_subset_names = set(self._subset_names)
+    def _validate_product_name(self, product_name, variant_value):
+        # Get all products of the current asset
+        if self._product_names:
+            existing_product_names = set(self._product_names)
         else:
-            existing_subset_names = set()
-        existing_subset_names_low = set(
+            existing_product_names = set()
+        existing_product_names_low = set(
             _name.lower()
-            for _name in existing_subset_names
+            for _name in existing_product_names
         )
 
         # Replace
         compare_regex = re.compile(re.sub(
-            variant_value, "(.+)", subset_name, flags=re.IGNORECASE
+            variant_value, "(.+)", product_name, flags=re.IGNORECASE
         ))
         variant_hints = set()
         if variant_value:
-            for _name in existing_subset_names:
+            for _name in existing_product_names:
                 _result = compare_regex.search(_name)
                 if _result:
                     variant_hints |= set(_result.groups())
@@ -741,12 +741,12 @@ class CreateWidget(QtWidgets.QWidget):
             action = self.variant_hints_menu.addAction(variant_hint)
             self.variant_hints_group.addAction(action)
 
-        # Indicate subset existence
+        # Indicate product existence
         if not variant_value:
             property_value = "empty"
 
-        elif subset_name.lower() in existing_subset_names_low:
-            # validate existence of subset name with lowered text
+        elif product_name.lower() in existing_product_names_low:
+            # validate existence of product name with lowered text
             #   - "renderMain" vs. "rendermain" mean same path item for
             #   windows
             property_value = "exists"
@@ -794,14 +794,14 @@ class CreateWidget(QtWidgets.QWidget):
 
         index = indexes[0]
         creator_identifier = index.data(CREATOR_IDENTIFIER_ROLE)
-        family = index.data(FAMILY_ROLE)
+        product_type = index.data(PRODUCT_TYPE_ROLE)
         variant = self.variant_input.text()
-        # Care about subset name only if context change is enabled
-        subset_name = None
+        # Care about product name only if context change is enabled
+        product_name = None
         asset_name = None
         task_name = None
         if self._context_change_is_enabled():
-            subset_name = self.subset_name_input.text()
+            product_name = self.product_name_input.text()
             asset_name = self._get_asset_name()
             task_name = self._get_task_name()
 
@@ -817,12 +817,12 @@ class CreateWidget(QtWidgets.QWidget):
             "folderPath": asset_name,
             "task": task_name,
             "variant": variant,
-            "family": family
+            "productType": product_type
         }
 
         success = self._controller.create(
             creator_identifier,
-            subset_name,
+            product_name,
             instance_data,
             pre_create_data
         )
diff --git a/client/ayon_core/tools/publisher/widgets/list_view_widgets.py b/client/ayon_core/tools/publisher/widgets/list_view_widgets.py
index fc76c47334..3322a73be6 100644
--- a/client/ayon_core/tools/publisher/widgets/list_view_widgets.py
+++ b/client/ayon_core/tools/publisher/widgets/list_view_widgets.py
@@ -123,8 +123,8 @@ class InstanceListItemWidget(QtWidgets.QWidget):
 
         instance_label = html_escape(instance_label)
 
-        subset_name_label = QtWidgets.QLabel(instance_label, self)
-        subset_name_label.setObjectName("ListViewSubsetName")
+        product_name_label = QtWidgets.QLabel(instance_label, self)
+        product_name_label.setObjectName("ListViewProductName")
 
         active_checkbox = NiceCheckbox(parent=self)
         active_checkbox.setChecked(instance["active"])
@@ -132,17 +132,17 @@ class InstanceListItemWidget(QtWidgets.QWidget):
         layout = QtWidgets.QHBoxLayout(self)
         content_margins = layout.contentsMargins()
         layout.setContentsMargins(content_margins.left() + 2, 0, 2, 0)
-        layout.addWidget(subset_name_label)
+        layout.addWidget(product_name_label)
         layout.addStretch(1)
         layout.addWidget(active_checkbox)
 
         self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
-        subset_name_label.setAttribute(QtCore.Qt.WA_TranslucentBackground)
+        product_name_label.setAttribute(QtCore.Qt.WA_TranslucentBackground)
         active_checkbox.setAttribute(QtCore.Qt.WA_TranslucentBackground)
 
         active_checkbox.stateChanged.connect(self._on_active_change)
 
-        self._instance_label_widget = subset_name_label
+        self._instance_label_widget = product_name_label
         self._active_checkbox = active_checkbox
 
         self._has_valid_context = None
@@ -185,7 +185,7 @@ class InstanceListItemWidget(QtWidgets.QWidget):
 
     def update_instance_values(self):
         """Update instance data propagated to widgets."""
-        # Check subset name
+        # Check product name
         label = self.instance.label
         if label != self._instance_label_widget.text():
             self._instance_label_widget.setText(html_escape(label))
@@ -631,8 +631,8 @@ class InstanceListView(AbstractInstanceView):
 
                 # Create new item and store it as new
                 item = QtGui.QStandardItem()
-                item.setData(instance["subset"], SORT_VALUE_ROLE)
-                item.setData(instance["subset"], GROUP_ROLE)
+                item.setData(instance["productName"], SORT_VALUE_ROLE)
+                item.setData(instance["productName"], GROUP_ROLE)
                 item.setData(instance_id, INSTANCE_ID_ROLE)
                 new_items.append(item)
                 new_items_with_instance.append((item, instance))
diff --git a/client/ayon_core/tools/publisher/widgets/overview_widget.py b/client/ayon_core/tools/publisher/widgets/overview_widget.py
index f1b271850a..dd82185830 100644
--- a/client/ayon_core/tools/publisher/widgets/overview_widget.py
+++ b/client/ayon_core/tools/publisher/widgets/overview_widget.py
@@ -5,7 +5,7 @@ from .border_label_widget import BorderedLabelWidget
 from .card_view_widgets import InstanceCardView
 from .list_view_widgets import InstanceListView
 from .widgets import (
-    SubsetAttributesWidget,
+    ProductAttributesWidget,
     CreateInstanceBtn,
     RemoveInstanceBtn,
     ChangeViewBtn,
@@ -28,72 +28,72 @@ class OverviewWidget(QtWidgets.QFrame):
         self._refreshing_instances = False
         self._controller = controller
 
-        subset_content_widget = QtWidgets.QWidget(self)
+        product_content_widget = QtWidgets.QWidget(self)
 
-        create_widget = CreateWidget(controller, subset_content_widget)
+        create_widget = CreateWidget(controller, product_content_widget)
 
-        # --- Created Subsets/Instances ---
+        # --- Created Products/Instances ---
         # Common widget for creation and overview
-        subset_views_widget = BorderedLabelWidget(
+        product_views_widget = BorderedLabelWidget(
             "Products to publish",
-            subset_content_widget
+            product_content_widget
         )
 
-        subset_view_cards = InstanceCardView(controller, subset_views_widget)
-        subset_list_view = InstanceListView(controller, subset_views_widget)
+        product_view_cards = InstanceCardView(controller, product_views_widget)
+        product_list_view = InstanceListView(controller, product_views_widget)
 
-        subset_views_layout = QtWidgets.QStackedLayout()
-        subset_views_layout.addWidget(subset_view_cards)
-        subset_views_layout.addWidget(subset_list_view)
-        subset_views_layout.setCurrentWidget(subset_view_cards)
+        product_views_layout = QtWidgets.QStackedLayout()
+        product_views_layout.addWidget(product_view_cards)
+        product_views_layout.addWidget(product_list_view)
+        product_views_layout.setCurrentWidget(product_view_cards)
 
-        # Buttons at the bottom of subset view
-        create_btn = CreateInstanceBtn(subset_views_widget)
-        delete_btn = RemoveInstanceBtn(subset_views_widget)
-        change_view_btn = ChangeViewBtn(subset_views_widget)
+        # Buttons at the bottom of product view
+        create_btn = CreateInstanceBtn(product_views_widget)
+        delete_btn = RemoveInstanceBtn(product_views_widget)
+        change_view_btn = ChangeViewBtn(product_views_widget)
 
         # --- Overview ---
-        # Subset details widget
-        subset_attributes_wrap = BorderedLabelWidget(
-            "Publish options", subset_content_widget
+        # pProduct details widget
+        product_attributes_wrap = BorderedLabelWidget(
+            "Publish options", product_content_widget
         )
-        subset_attributes_widget = SubsetAttributesWidget(
-            controller, subset_attributes_wrap
+        product_attributes_widget = ProductAttributesWidget(
+            controller, product_attributes_wrap
         )
-        subset_attributes_wrap.set_center_widget(subset_attributes_widget)
+        product_attributes_wrap.set_center_widget(product_attributes_widget)
 
-        # Layout of buttons at the bottom of subset view
-        subset_view_btns_layout = QtWidgets.QHBoxLayout()
-        subset_view_btns_layout.setContentsMargins(0, 5, 0, 0)
-        subset_view_btns_layout.addWidget(create_btn)
-        subset_view_btns_layout.addSpacing(5)
-        subset_view_btns_layout.addWidget(delete_btn)
-        subset_view_btns_layout.addStretch(1)
-        subset_view_btns_layout.addWidget(change_view_btn)
+        # Layout of buttons at the bottom of product view
+        product_view_btns_layout = QtWidgets.QHBoxLayout()
+        product_view_btns_layout.setContentsMargins(0, 5, 0, 0)
+        product_view_btns_layout.addWidget(create_btn)
+        product_view_btns_layout.addSpacing(5)
+        product_view_btns_layout.addWidget(delete_btn)
+        product_view_btns_layout.addStretch(1)
+        product_view_btns_layout.addWidget(change_view_btn)
 
         # Layout of view and buttons
-        # - widget 'subset_view_widget' is necessary
+        # - widget 'product_view_widget' is necessary
         # - only layout won't be resized automatically to minimum size hint
         #   on child resize request!
-        subset_view_widget = QtWidgets.QWidget(subset_views_widget)
-        subset_view_layout = QtWidgets.QVBoxLayout(subset_view_widget)
-        subset_view_layout.setContentsMargins(0, 0, 0, 0)
-        subset_view_layout.addLayout(subset_views_layout, 1)
-        subset_view_layout.addLayout(subset_view_btns_layout, 0)
+        product_view_widget = QtWidgets.QWidget(product_views_widget)
+        product_view_layout = QtWidgets.QVBoxLayout(product_view_widget)
+        product_view_layout.setContentsMargins(0, 0, 0, 0)
+        product_view_layout.addLayout(product_views_layout, 1)
+        product_view_layout.addLayout(product_view_btns_layout, 0)
 
-        subset_views_widget.set_center_widget(subset_view_widget)
+        product_views_widget.set_center_widget(product_view_widget)
 
-        # Whole subset layout with attributes and details
-        subset_content_layout = QtWidgets.QHBoxLayout(subset_content_widget)
-        subset_content_layout.setContentsMargins(0, 0, 0, 0)
-        subset_content_layout.addWidget(create_widget, 7)
-        subset_content_layout.addWidget(subset_views_widget, 3)
-        subset_content_layout.addWidget(subset_attributes_wrap, 7)
+        # Whole product layout with attributes and details
+        product_content_layout = QtWidgets.QHBoxLayout(product_content_widget)
+        product_content_layout.setContentsMargins(0, 0, 0, 0)
+        product_content_layout.addWidget(create_widget, 7)
+        product_content_layout.addWidget(product_views_widget, 3)
+        product_content_layout.addWidget(product_attributes_wrap, 7)
 
-        # Subset frame layout
+        # Product frame layout
         main_layout = QtWidgets.QVBoxLayout(self)
         main_layout.setContentsMargins(0, 0, 0, 0)
-        main_layout.addWidget(subset_content_widget, 1)
+        main_layout.addWidget(product_content_widget, 1)
 
         change_anim = QtCore.QVariantAnimation()
         change_anim.setStartValue(float(0))
@@ -101,7 +101,7 @@ class OverviewWidget(QtWidgets.QFrame):
         change_anim.setDuration(self.anim_duration)
         change_anim.setEasingCurve(QtCore.QEasingCurve.InOutQuad)
 
-        # --- Calbacks for instances/subsets view ---
+        # --- Calbacks for instances/products view ---
         create_btn.clicked.connect(self._on_create_clicked)
         delete_btn.clicked.connect(self._on_delete_clicked)
         change_view_btn.clicked.connect(self._on_change_view_clicked)
@@ -110,24 +110,24 @@ class OverviewWidget(QtWidgets.QFrame):
         change_anim.finished.connect(self._on_change_anim_finished)
 
         # Selection changed
-        subset_list_view.selection_changed.connect(
-            self._on_subset_change
+        product_list_view.selection_changed.connect(
+            self._on_product_change
         )
-        subset_view_cards.selection_changed.connect(
-            self._on_subset_change
+        product_view_cards.selection_changed.connect(
+            self._on_product_change
         )
         # Active instances changed
-        subset_list_view.active_changed.connect(
+        product_list_view.active_changed.connect(
             self._on_active_changed
         )
-        subset_view_cards.active_changed.connect(
+        product_view_cards.active_changed.connect(
             self._on_active_changed
         )
         # Instance context has changed
-        subset_attributes_widget.instance_context_changed.connect(
+        product_attributes_widget.instance_context_changed.connect(
             self._on_instance_context_change
         )
-        subset_attributes_widget.convert_requested.connect(
+        product_attributes_widget.convert_requested.connect(
             self._on_convert_requested
         )
 
@@ -145,26 +145,26 @@ class OverviewWidget(QtWidgets.QFrame):
             "instances.refresh.finished", self._on_instances_refresh
         )
 
-        self._subset_content_widget = subset_content_widget
-        self._subset_content_layout = subset_content_layout
+        self._product_content_widget = product_content_widget
+        self._product_content_layout = product_content_layout
 
-        self._subset_view_cards = subset_view_cards
-        self._subset_list_view = subset_list_view
-        self._subset_views_layout = subset_views_layout
+        self._product_view_cards = product_view_cards
+        self._product_list_view = product_list_view
+        self._product_views_layout = product_views_layout
 
         self._create_btn = create_btn
         self._delete_btn = delete_btn
 
-        self._subset_attributes_widget = subset_attributes_widget
+        self._product_attributes_widget = product_attributes_widget
         self._create_widget = create_widget
-        self._subset_views_widget = subset_views_widget
-        self._subset_attributes_wrap = subset_attributes_wrap
+        self._product_views_widget = product_views_widget
+        self._product_attributes_wrap = product_attributes_wrap
 
         self._change_anim = change_anim
 
         # Start in create mode
         self._current_state = "create"
-        subset_attributes_wrap.setVisible(False)
+        product_attributes_wrap.setVisible(False)
 
     def make_sure_animation_is_finished(self):
         if self._change_anim.state() == QtCore.QAbstractAnimation.Running:
@@ -193,18 +193,18 @@ class OverviewWidget(QtWidgets.QFrame):
             self._start_animation()
 
     def _start_animation(self):
-        views_geo = self._subset_views_widget.geometry()
-        layout_spacing = self._subset_content_layout.spacing()
+        views_geo = self._product_views_widget.geometry()
+        layout_spacing = self._product_content_layout.spacing()
         if self._create_widget.isVisible():
             create_geo = self._create_widget.geometry()
-            subset_geo = QtCore.QRect(create_geo)
-            subset_geo.moveTop(views_geo.top())
-            subset_geo.moveLeft(views_geo.right() + layout_spacing)
-            self._subset_attributes_wrap.setVisible(True)
+            product_geo = QtCore.QRect(create_geo)
+            product_geo.moveTop(views_geo.top())
+            product_geo.moveLeft(views_geo.right() + layout_spacing)
+            self._product_attributes_wrap.setVisible(True)
 
-        elif self._subset_attributes_wrap.isVisible():
-            subset_geo = self._subset_attributes_wrap.geometry()
-            create_geo = QtCore.QRect(subset_geo)
+        elif self._product_attributes_wrap.isVisible():
+            product_geo = self._product_attributes_wrap.geometry()
+            create_geo = QtCore.QRect(product_geo)
             create_geo.moveTop(views_geo.top())
             create_geo.moveRight(views_geo.left() - (layout_spacing + 1))
             self._create_widget.setVisible(True)
@@ -212,26 +212,26 @@ class OverviewWidget(QtWidgets.QFrame):
             self._change_anim.start()
             return
 
-        while self._subset_content_layout.count():
-            self._subset_content_layout.takeAt(0)
-        self._subset_views_widget.setGeometry(views_geo)
+        while self._product_content_layout.count():
+            self._product_content_layout.takeAt(0)
+        self._product_views_widget.setGeometry(views_geo)
         self._create_widget.setGeometry(create_geo)
-        self._subset_attributes_wrap.setGeometry(subset_geo)
+        self._product_attributes_wrap.setGeometry(product_geo)
 
         self._change_anim.start()
 
-    def get_subset_views_geo(self):
-        parent = self._subset_views_widget.parent()
-        global_pos = parent.mapToGlobal(self._subset_views_widget.pos())
+    def get_product_views_geo(self):
+        parent = self._product_views_widget.parent()
+        global_pos = parent.mapToGlobal(self._product_views_widget.pos())
         return QtCore.QRect(
             global_pos.x(),
             global_pos.y(),
-            self._subset_views_widget.width(),
-            self._subset_views_widget.height()
+            self._product_views_widget.width(),
+            self._product_views_widget.height()
         )
 
     def has_items(self):
-        view = self._subset_views_layout.currentWidget()
+        view = self._product_views_layout.currentWidget()
         return view.has_items()
 
     def _on_create_clicked(self):
@@ -272,7 +272,7 @@ class OverviewWidget(QtWidgets.QFrame):
     def _on_change_view_clicked(self):
         self._change_view_type()
 
-    def _on_subset_change(self, *_args):
+    def _on_product_change(self, *_args):
         # Ignore changes if in middle of refreshing
         if self._refreshing_instances:
             return
@@ -289,7 +289,7 @@ class OverviewWidget(QtWidgets.QFrame):
             instances_by_id[instance_id]
             for instance_id in instance_ids
         ]
-        self._subset_attributes_widget.set_current_instances(
+        self._product_attributes_widget.set_current_instances(
             instances, context_selected, convertor_identifiers
         )
 
@@ -300,59 +300,59 @@ class OverviewWidget(QtWidgets.QFrame):
 
     def _on_change_anim(self, value):
         self._create_widget.setVisible(True)
-        self._subset_attributes_wrap.setVisible(True)
-        layout_spacing = self._subset_content_layout.spacing()
+        self._product_attributes_wrap.setVisible(True)
+        layout_spacing = self._product_content_layout.spacing()
 
         content_width = (
-            self._subset_content_widget.width() - (layout_spacing * 2)
+            self._product_content_widget.width() - (layout_spacing * 2)
         )
-        content_height = self._subset_content_widget.height()
+        content_height = self._product_content_widget.height()
         views_width = max(
             int(content_width * 0.3),
-            self._subset_views_widget.minimumWidth()
+            self._product_views_widget.minimumWidth()
         )
         width = content_width - views_width
         # Visible widths of other widgets
-        subset_attrs_width = int((float(width) / self.anim_end_value) * value)
-        create_width = width - subset_attrs_width
+        product_attrs_width = int((float(width) / self.anim_end_value) * value)
+        create_width = width - product_attrs_width
 
         views_geo = QtCore.QRect(
             create_width + layout_spacing, 0,
             views_width, content_height
         )
         create_geo = QtCore.QRect(0, 0, width, content_height)
-        subset_attrs_geo = QtCore.QRect(create_geo)
+        product_attrs_geo = QtCore.QRect(create_geo)
         create_geo.moveRight(views_geo.left() - (layout_spacing + 1))
-        subset_attrs_geo.moveLeft(views_geo.right() + layout_spacing)
+        product_attrs_geo.moveLeft(views_geo.right() + layout_spacing)
 
-        self._subset_views_widget.setGeometry(views_geo)
+        self._product_views_widget.setGeometry(views_geo)
         self._create_widget.setGeometry(create_geo)
-        self._subset_attributes_wrap.setGeometry(subset_attrs_geo)
+        self._product_attributes_wrap.setGeometry(product_attrs_geo)
 
     def _on_change_anim_finished(self):
         self._change_visibility_for_state()
-        self._subset_content_layout.addWidget(self._create_widget, 7)
-        self._subset_content_layout.addWidget(self._subset_views_widget, 3)
-        self._subset_content_layout.addWidget(self._subset_attributes_wrap, 7)
+        self._product_content_layout.addWidget(self._create_widget, 7)
+        self._product_content_layout.addWidget(self._product_views_widget, 3)
+        self._product_content_layout.addWidget(self._product_attributes_wrap, 7)
 
     def _change_visibility_for_state(self):
         self._create_widget.setVisible(
             self._current_state == "create"
         )
-        self._subset_attributes_wrap.setVisible(
+        self._product_attributes_wrap.setVisible(
             self._current_state == "publish"
         )
 
     def _on_instance_context_change(self):
-        current_idx = self._subset_views_layout.currentIndex()
-        for idx in range(self._subset_views_layout.count()):
+        current_idx = self._product_views_layout.currentIndex()
+        for idx in range(self._product_views_layout.count()):
             if idx == current_idx:
                 continue
-            widget = self._subset_views_layout.widget(idx)
+            widget = self._product_views_layout.widget(idx)
             if widget.refreshed:
                 widget.set_refreshed(False)
 
-        current_widget = self._subset_views_layout.widget(current_idx)
+        current_widget = self._product_views_layout.widget(current_idx)
         current_widget.refresh_instance_states()
 
         self.instance_context_changed.emit()
@@ -369,7 +369,7 @@ class OverviewWidget(QtWidgets.QFrame):
                 convertor plugins.
         """
 
-        view = self._subset_views_layout.currentWidget()
+        view = self._product_views_layout.currentWidget()
         return view.get_selected_items()
 
     def get_selected_legacy_convertors(self):
@@ -384,11 +384,11 @@ class OverviewWidget(QtWidgets.QFrame):
         return convertor_identifiers
 
     def _change_view_type(self):
-        idx = self._subset_views_layout.currentIndex()
-        new_idx = (idx + 1) % self._subset_views_layout.count()
+        idx = self._product_views_layout.currentIndex()
+        new_idx = (idx + 1) % self._product_views_layout.count()
 
-        old_view = self._subset_views_layout.currentWidget()
-        new_view = self._subset_views_layout.widget(new_idx)
+        old_view = self._product_views_layout.currentWidget()
+        new_view = self._product_views_layout.widget(new_idx)
 
         if not new_view.refreshed:
             new_view.refresh()
@@ -403,9 +403,9 @@ class OverviewWidget(QtWidgets.QFrame):
             instance_ids, context_selected, convertor_identifiers
         )
 
-        self._subset_views_layout.setCurrentIndex(new_idx)
+        self._product_views_layout.setCurrentIndex(new_idx)
 
-        self._on_subset_change()
+        self._on_product_change()
 
     def _refresh_instances(self):
         if self._refreshing_instances:
@@ -413,41 +413,41 @@ class OverviewWidget(QtWidgets.QFrame):
 
         self._refreshing_instances = True
 
-        for idx in range(self._subset_views_layout.count()):
-            widget = self._subset_views_layout.widget(idx)
+        for idx in range(self._product_views_layout.count()):
+            widget = self._product_views_layout.widget(idx)
             widget.set_refreshed(False)
 
-        view = self._subset_views_layout.currentWidget()
+        view = self._product_views_layout.currentWidget()
         view.refresh()
         view.set_refreshed(True)
 
         self._refreshing_instances = False
 
         # Force to change instance and refresh details
-        self._on_subset_change()
+        self._on_product_change()
 
     def _on_publish_start(self):
         """Publish started."""
 
         self._create_btn.setEnabled(False)
-        self._subset_attributes_wrap.setEnabled(False)
-        for idx in range(self._subset_views_layout.count()):
-            widget = self._subset_views_layout.widget(idx)
+        self._product_attributes_wrap.setEnabled(False)
+        for idx in range(self._product_views_layout.count()):
+            widget = self._product_views_layout.widget(idx)
             widget.set_active_toggle_enabled(False)
 
     def _on_controller_reset_start(self):
         """Controller reset started."""
 
-        for idx in range(self._subset_views_layout.count()):
-            widget = self._subset_views_layout.widget(idx)
+        for idx in range(self._product_views_layout.count()):
+            widget = self._product_views_layout.widget(idx)
             widget.set_active_toggle_enabled(True)
 
     def _on_publish_reset(self):
         """Context in controller has been reseted."""
 
         self._create_btn.setEnabled(True)
-        self._subset_attributes_wrap.setEnabled(True)
-        self._subset_content_widget.setEnabled(self._controller.host_is_valid)
+        self._product_attributes_wrap.setEnabled(True)
+        self._product_content_widget.setEnabled(self._controller.host_is_valid)
 
     def _on_instances_refresh(self):
         """Controller refreshed instances."""
@@ -457,5 +457,5 @@ class OverviewWidget(QtWidgets.QFrame):
         # Give a change to process Resize Request
         QtWidgets.QApplication.processEvents()
         # Trigger update geometry of
-        widget = self._subset_views_layout.currentWidget()
+        widget = self._product_views_layout.currentWidget()
         widget.updateGeometry()
diff --git a/client/ayon_core/tools/publisher/widgets/report_page.py b/client/ayon_core/tools/publisher/widgets/report_page.py
index c4a37da887..1bbe8033f9 100644
--- a/client/ayon_core/tools/publisher/widgets/report_page.py
+++ b/client/ayon_core/tools/publisher/widgets/report_page.py
@@ -744,7 +744,7 @@ class PublishInstanceCardWidget(BaseClickableFrame):
         self.setObjectName("CardViewWidget")
 
         icon_widget = IconValuePixmapLabel(icon, self)
-        icon_widget.setObjectName("FamilyIconLabel")
+        icon_widget.setObjectName("ProductTypeIconLabel")
 
         label_widget = QtWidgets.QLabel(instance.label, self)
 
diff --git a/client/ayon_core/tools/publisher/widgets/widgets.py b/client/ayon_core/tools/publisher/widgets/widgets.py
index bd5ab250bd..c95f7d8045 100644
--- a/client/ayon_core/tools/publisher/widgets/widgets.py
+++ b/client/ayon_core/tools/publisher/widgets/widgets.py
@@ -22,7 +22,7 @@ from ayon_core.tools.utils import (
 )
 from ayon_core.style import get_objected_colors
 from ayon_core.pipeline.create import (
-    SUBSET_NAME_ALLOWED_SYMBOLS,
+    PRODUCT_NAME_ALLOWED_SYMBOLS,
     TaskNotSetError,
 )
 from .thumbnail_widget import ThumbnailWidget
@@ -127,7 +127,7 @@ class ContextWarningLabel(PublishPixmapLabel):
         self.setToolTip(
             "Contain invalid context. Please check details."
         )
-        self.setObjectName("FamilyIconLabel")
+        self.setObjectName("ProductTypeIconLabel")
 
 
 class PublishIconBtn(IconButton):
@@ -901,7 +901,7 @@ class VariantInputWidget(PlaceholderLineEdit):
         self.setObjectName("VariantInput")
         self.setToolTip(VARIANT_TOOLTIP)
 
-        name_pattern = "^[{}]*$".format(SUBSET_NAME_ALLOWED_SYMBOLS)
+        name_pattern = "^[{}]*$".format(PRODUCT_NAME_ALLOWED_SYMBOLS)
         self._name_pattern = name_pattern
         self._compiled_name_pattern = re.compile(name_pattern)
 
@@ -1077,10 +1077,10 @@ class MultipleItemWidget(QtWidgets.QWidget):
 
 
 class GlobalAttrsWidget(QtWidgets.QWidget):
-    """Global attributes mainly to define context and subset name of instances.
+    """Global attributes mainly to define context and product name of instances.
 
-    Subset name is or may be affected on context. Gives abiity to modify
-    context and subset name of instance. This change is not autopromoted but
+    product name is or may be affected on context. Gives abiity to modify
+    context and product name of instance. This change is not autopromoted but
     must be submitted.
 
     Warning: Until artist hit `Submit` changes must not be propagated to
@@ -1088,10 +1088,10 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
 
     Global attributes contain these widgets:
     Variant:      [  text input  ]
-    Asset:        [ asset dialog ]
+    Folder:       [ folder dialog ]
     Task:         [   combobox   ]
-    Family:       [   immutable  ]
-    Subset name:  [   immutable  ]
+    Product type: [   immutable  ]
+    product name: [   immutable  ]
                      [Submit] [Cancel]
     """
     instance_context_changed = QtCore.Signal()
@@ -1108,8 +1108,8 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
         variant_input = VariantInputWidget(self)
         asset_value_widget = AssetsField(controller, self)
         task_value_widget = TasksCombobox(controller, self)
-        family_value_widget = MultipleItemWidget(self)
-        subset_value_widget = MultipleItemWidget(self)
+        product_type_value_widget = MultipleItemWidget(self)
+        product_value_widget = MultipleItemWidget(self)
 
         variant_input.set_multiselection_text(self.multiselection_text)
         asset_value_widget.set_multiselection_text(self.multiselection_text)
@@ -1118,8 +1118,8 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
         variant_input.set_value()
         asset_value_widget.set_selected_items()
         task_value_widget.set_selected_items()
-        family_value_widget.set_value()
-        subset_value_widget.set_value()
+        product_type_value_widget.set_value()
+        product_value_widget.set_value()
 
         submit_btn = QtWidgets.QPushButton("Confirm", self)
         cancel_btn = QtWidgets.QPushButton("Cancel", self)
@@ -1139,8 +1139,8 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
         main_layout.addRow("Variant", variant_input)
         main_layout.addRow("Folder", asset_value_widget)
         main_layout.addRow("Task", task_value_widget)
-        main_layout.addRow("Product type", family_value_widget)
-        main_layout.addRow("Product name", subset_value_widget)
+        main_layout.addRow("Product type", product_type_value_widget)
+        main_layout.addRow("Product name", product_value_widget)
         main_layout.addRow(btns_layout)
 
         variant_input.value_changed.connect(self._on_variant_change)
@@ -1152,8 +1152,8 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
         self.variant_input = variant_input
         self.asset_value_widget = asset_value_widget
         self.task_value_widget = task_value_widget
-        self.family_value_widget = family_value_widget
-        self.subset_value_widget = subset_value_widget
+        self.product_type_value_widget = product_type_value_widget
+        self.product_value_widget = product_value_widget
         self.submit_btn = submit_btn
         self.cancel_btn = cancel_btn
 
@@ -1172,7 +1172,7 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
         if self.task_value_widget.has_value_changed():
             task_name = self.task_value_widget.get_selected_items()[0]
 
-        subset_names = set()
+        product_names = set()
         invalid_tasks = False
         asset_names = []
         for instance in self._current_instances:
@@ -1190,7 +1190,7 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
 
             asset_names.append(new_asset_name)
             try:
-                new_subset_name = self._controller.get_subset_name(
+                new_product_name = self._controller.get_product_name(
                     instance.creator_identifier,
                     new_variant_value,
                     new_task_name,
@@ -1201,10 +1201,10 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
             except TaskNotSetError:
                 invalid_tasks = True
                 instance.set_task_invalid(True)
-                subset_names.add(instance["subset"])
+                product_names.add(instance["productName"])
                 continue
 
-            subset_names.add(new_subset_name)
+            product_names.add(new_product_name)
             if variant_value is not None:
                 instance["variant"] = variant_value
 
@@ -1216,12 +1216,12 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
                 instance["task"] = task_name or None
                 instance.set_task_invalid(False)
 
-            instance["subset"] = new_subset_name
+            instance["productName"] = new_product_name
 
         if invalid_tasks:
             self.task_value_widget.set_invalid_empty_task()
 
-        self.subset_value_widget.set_value(subset_names)
+        self.product_value_widget.set_value(product_names)
 
         self._set_btns_enabled(False)
         self._set_btns_visible(invalid_tasks)
@@ -1292,8 +1292,8 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
 
         asset_names = set()
         variants = set()
-        families = set()
-        subset_names = set()
+        product_types = set()
+        product_names = set()
 
         editable = True
         if len(instances) == 0:
@@ -1306,12 +1306,12 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
                 editable = False
 
             variants.add(instance.get("variant") or self.unknown_value)
-            families.add(instance.get("family") or self.unknown_value)
+            product_types.add(instance.get("productType") or self.unknown_value)
             asset_name = instance.get("folderPath") or self.unknown_value
             task_name = instance.get("task") or ""
             asset_names.add(asset_name)
             asset_task_combinations.append((asset_name, task_name))
-            subset_names.add(instance.get("subset") or self.unknown_value)
+            product_names.add(instance.get("productName") or self.unknown_value)
 
         self.variant_input.set_value(variants)
 
@@ -1319,8 +1319,8 @@ class GlobalAttrsWidget(QtWidgets.QWidget):
         self.asset_value_widget.set_selected_items(asset_names)
         # Set context of task widget
         self.task_value_widget.set_selected_items(asset_task_combinations)
-        self.family_value_widget.set_value(families)
-        self.subset_value_widget.set_value(subset_names)
+        self.product_type_value_widget.set_value(product_types)
+        self.product_value_widget.set_value(product_names)
 
         self.variant_input.setEnabled(editable)
         self.asset_value_widget.setEnabled(editable)
@@ -1476,7 +1476,7 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget):
     Widgets are disabled if context of instance is not valid.
 
     Definitions are shown for all instance no matter if they have different
-    families. Similar definitions are merged into one (different label
+    product types. Similar definitions are merged into one (different label
     does not count).
     """
 
@@ -1624,7 +1624,7 @@ class PublishPluginAttrsWidget(QtWidgets.QWidget):
             plugin_val[attr_def.key] = value
 
 
-class SubsetAttributesWidget(QtWidgets.QWidget):
+class ProductAttributesWidget(QtWidgets.QWidget):
     """Wrapper widget where attributes of instance/s are modified.
     ┌─────────────────┬─────────────┐
     │   Global        │             │
@@ -1640,7 +1640,7 @@ class SubsetAttributesWidget(QtWidgets.QWidget):
     convert_requested = QtCore.Signal()
 
     def __init__(self, controller, parent):
-        super(SubsetAttributesWidget, self).__init__(parent)
+        super(ProductAttributesWidget, self).__init__(parent)
 
         # TOP PART
         top_widget = QtWidgets.QWidget(self)
@@ -1666,9 +1666,9 @@ class SubsetAttributesWidget(QtWidgets.QWidget):
         # Set the label text with 'setText' to apply html
         convert_label.setText(
             (
-                "Found old publishable subsets"
+                "Found old publishable products"
                 " incompatible with new publisher."
-                "<br/><br/>Press the <b>update subsets</b> button"
+                "<br/><br/>Press the <b>update products</b> button"
                 " to automatically update them"
                 " to be able to publish again."
             )
@@ -1677,7 +1677,7 @@ class SubsetAttributesWidget(QtWidgets.QWidget):
         convert_label.setAlignment(QtCore.Qt.AlignCenter)
 
         convert_btn = QtWidgets.QPushButton(
-            "Update subsets", convert_widget
+            "Update products", convert_widget
         )
         convert_separator = QtWidgets.QFrame(convert_widget)
         convert_separator.setObjectName("Separator")
diff --git a/client/ayon_core/tools/publisher/window.py b/client/ayon_core/tools/publisher/window.py
index f4dadf7f67..123864ff6c 100644
--- a/client/ayon_core/tools/publisher/window.py
+++ b/client/ayon_core/tools/publisher/window.py
@@ -1029,7 +1029,7 @@ class PublisherWindow(QtWidgets.QDialog):
         under_mouse = False
         my_pos = self.mapFromGlobal(global_pos)
         if self.rect().contains(my_pos):
-            widget_geo = self._overview_widget.get_subset_views_geo()
+            widget_geo = self._overview_widget.get_product_views_geo()
             widget_x = widget_geo.left() + (widget_geo.width() * 0.5)
             under_mouse = widget_x < global_pos.x()
         self._create_overlay_button.set_under_mouse(under_mouse)
diff --git a/client/ayon_core/tools/push_to_project/control.py b/client/ayon_core/tools/push_to_project/control.py
index 1336721e5a..3b6bd85028 100644
--- a/client/ayon_core/tools/push_to_project/control.py
+++ b/client/ayon_core/tools/push_to_project/control.py
@@ -9,7 +9,7 @@ from ayon_core.client import (
 from ayon_core.settings import get_project_settings
 from ayon_core.lib import prepare_template_data
 from ayon_core.lib.events import QueuedEventSystem
-from ayon_core.pipeline.create import get_subset_name_template
+from ayon_core.pipeline.create import get_product_name_template
 from ayon_core.tools.ayon_utils.models import ProjectsModel, HierarchyModel
 
 from .models import (
@@ -256,12 +256,12 @@ class PushToContextController:
 
         project_settings = get_project_settings(project_name)
         subset_doc = self._src_subset_doc
-        family = subset_doc["data"].get("family")
-        if not family:
-            family = subset_doc["data"]["families"][0]
-        template = get_subset_name_template(
+        product_type = subset_doc["data"].get("family")
+        if not product_type:
+            product_type = subset_doc["data"]["families"][0]
+        template = get_product_name_template(
             self._src_project_name,
-            family,
+            product_type,
             task_name,
             task_type,
             None,
@@ -279,28 +279,31 @@ class PushToContextController:
         template_s = template[:idx]
         template_e = template[idx + len(variant_placeholder):]
         fill_data = prepare_template_data({
-            "family": family,
+            "family": product_type,
+            "product": {
+                "type": product_type,
+            },
             "task": task_name
         })
         try:
-            subset_s = template_s.format(**fill_data)
-            subset_e = template_e.format(**fill_data)
+            product_s = template_s.format(**fill_data)
+            product_e = template_e.format(**fill_data)
         except Exception as exc:
             print("Failed format", exc)
             return ""
 
-        subset_name = self._src_subset_doc["name"]
+        product_name = self._src_subset_doc["name"]
         if (
-            (subset_s and not subset_name.startswith(subset_s))
-            or (subset_e and not subset_name.endswith(subset_e))
+            (product_s and not product_name.startswith(product_s))
+            or (product_e and not product_name.endswith(product_e))
         ):
             return ""
 
-        if subset_s:
-            subset_name = subset_name[len(subset_s):]
-        if subset_e:
-            subset_name = subset_name[:len(subset_e)]
-        return subset_name
+        if product_s:
+            product_name = product_name[len(product_s):]
+        if product_e:
+            product_name = product_name[:len(product_e)]
+        return product_name
 
     def _check_submit_validations(self):
         if not self._user_values.is_valid:
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 3de1beb2d2..b427f3d226 100644
--- a/client/ayon_core/tools/push_to_project/models/integrate.py
+++ b/client/ayon_core/tools/push_to_project/models/integrate.py
@@ -42,7 +42,7 @@ from ayon_core.pipeline import Anatomy
 from ayon_core.pipeline.version_start import get_versioning_start
 from ayon_core.pipeline.template_data import get_template_data
 from ayon_core.pipeline.publish import get_publish_template_name
-from ayon_core.pipeline.create import get_subset_name
+from ayon_core.pipeline.create import get_product_name
 
 UNKNOWN = object()
 
@@ -461,8 +461,8 @@ class ProjectPushItemProcess:
         self._subset_doc = None
         self._version_doc = None
 
-        self._family = None
-        self._subset_name = None
+        self._product_type = None
+        self._product_name = None
 
         self._project_settings = None
         self._template_name = None
@@ -494,9 +494,9 @@ class ProjectPushItemProcess:
             self._log_info("Destination project was found")
             self._fill_or_create_destination_asset()
             self._log_info("Destination asset was determined")
-            self._determine_family()
+            self._determine_product_type()
             self._determine_publish_template_name()
-            self._determine_subset_name()
+            self._determine_product_name()
             self._make_sure_subset_exists()
             self._make_sure_version_exists()
             self._log_info("Prerequirements were prepared")
@@ -584,11 +584,11 @@ class ProjectPushItemProcess:
             ))
             raise PushToProjectError(self._status.fail_reason)
 
-        subset_id = version_doc["parent"]
-        subset_doc = get_subset_by_id(src_project_name, subset_id)
+        product_id = version_doc["parent"]
+        subset_doc = get_subset_by_id(src_project_name, product_id)
         if not subset_doc:
             self._status.set_failed((
-                f"Could find subset with id \"{subset_id}\""
+                f"Could find product with id \"{product_id}\""
                 f" in project \"{src_project_name}\""
             ))
             raise PushToProjectError(self._status.fail_reason)
@@ -791,29 +791,30 @@ class ProjectPushItemProcess:
         task_info.update(task_type_info)
         self._task_info = task_info
 
-    def _determine_family(self):
+    def _determine_product_type(self):
         subset_doc = self._src_subset_doc
-        family = subset_doc["data"].get("family")
+        product_type = subset_doc["data"].get("family")
         families = subset_doc["data"].get("families")
-        if not family and families:
-            family = families[0]
+        if not product_type and families:
+            product_type = families[0]
 
-        if not family:
+        if not product_type:
             self._status.set_failed(
-                "Couldn't figure out family from source subset"
+                "Couldn't figure out product type from source product"
             )
             raise PushToProjectError(self._status.fail_reason)
 
         self._log_debug(
-            f"Publishing family is '{family}' (Based on source subset)"
+            f"Publishing product type is '{product_type}'"
+            f" (Based on source product)"
         )
-        self._family = family
+        self._product_type = product_type
 
     def _determine_publish_template_name(self):
         template_name = get_publish_template_name(
             self._item.dst_project_name,
             self.host_name,
-            self._family,
+            self._product_type,
             self._task_info.get("name"),
             self._task_info.get("type"),
             project_settings=self._project_settings
@@ -823,39 +824,39 @@ class ProjectPushItemProcess:
         )
         self._template_name = template_name
 
-    def _determine_subset_name(self):
-        family = self._family
+    def _determine_product_name(self):
+        product_type = self._product_type
         asset_doc = self._asset_doc
         task_info = self._task_info
-        subset_name = get_subset_name(
-            family,
-            self._item.variant,
-            task_info.get("name"),
+        product_name = get_product_name(
+            self._item.dst_project_name,
             asset_doc,
-            project_name=self._item.dst_project_name,
-            host_name=self.host_name,
+            task_info.get("name"),
+            self.host_name,
+            product_type,
+            self._item.variant,
             project_settings=self._project_settings
         )
         self._log_info(
-            f"Push will be integrating to subset with name '{subset_name}'"
+            f"Push will be integrating to product with name '{product_name}'"
         )
-        self._subset_name = subset_name
+        self._product_name = product_name
 
     def _make_sure_subset_exists(self):
         project_name = self._item.dst_project_name
         asset_id = self._asset_doc["_id"]
-        subset_name = self._subset_name
-        family = self._family
-        subset_doc = get_subset_by_name(project_name, subset_name, asset_id)
+        product_name = self._product_name
+        product_type = self._product_type
+        subset_doc = get_subset_by_name(project_name, product_name, asset_id)
         if subset_doc:
             self._subset_doc = subset_doc
             return subset_doc
 
         data = {
-            "families": [family]
+            "families": [product_type]
         }
         subset_doc = new_subset_document(
-            subset_name, family, asset_id, data
+            product_name, product_type, asset_id, data
         )
         self._operations.create_entity(project_name, "subset", subset_doc)
         self._subset_doc = subset_doc
@@ -867,7 +868,7 @@ class ProjectPushItemProcess:
         version = self._item.dst_version
         src_version_doc = self._src_version_doc
         subset_doc = self._subset_doc
-        subset_id = subset_doc["_id"]
+        product_id = subset_doc["_id"]
         src_data = src_version_doc["data"]
         families = subset_doc["data"].get("families")
         if not families:
@@ -884,7 +885,7 @@ class ProjectPushItemProcess:
         }
         if version is None:
             last_version_doc = get_last_version_by_subset_id(
-                project_name, subset_id
+                project_name, product_id
             )
             if last_version_doc:
                 version = int(last_version_doc["name"]) + 1
@@ -894,17 +895,17 @@ class ProjectPushItemProcess:
                     self.host_name,
                     task_name=self._task_info["name"],
                     task_type=self._task_info["type"],
-                    family=families[0],
-                    subset=subset_doc["name"]
+                    product_type=families[0],
+                    product_name=subset_doc["name"]
                 )
 
         existing_version_doc = get_version_by_name(
-            project_name, version, subset_id
+            project_name, version, product_id
         )
         # Update existing version
         if existing_version_doc:
             version_doc = new_version_doc(
-                version, subset_id, version_data, existing_version_doc["_id"]
+                version, product_id, version_data, existing_version_doc["_id"]
             )
             update_data = prepare_version_update_data(
                 existing_version_doc, version_doc
@@ -921,7 +922,7 @@ class ProjectPushItemProcess:
             return
 
         version_doc = new_version_doc(
-            version, subset_id, version_data
+            version, product_id, version_data
         )
         self._operations.create_entity(project_name, "version", version_doc)
 
@@ -955,8 +956,12 @@ class ProjectPushItemProcess:
             self.host_name
         )
         formatting_data.update({
-            "subset": self._subset_name,
-            "family": self._family,
+            "subset": self._product_name,
+            "family": self._product_type,
+            "product": {
+                "name": self._product_name,
+                "type": self._product_type,
+            },
             "version": version_doc["name"]
         })
 
diff --git a/client/ayon_core/tools/push_to_project/models/user_values.py b/client/ayon_core/tools/push_to_project/models/user_values.py
index a12a1513ee..edef2fe4fb 100644
--- a/client/ayon_core/tools/push_to_project/models/user_values.py
+++ b/client/ayon_core/tools/push_to_project/models/user_values.py
@@ -1,6 +1,6 @@
 import re
 
-from ayon_core.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
+from ayon_core.pipeline.create import PRODUCT_NAME_ALLOWED_SYMBOLS
 
 
 class UserPublishValuesModel:
@@ -12,7 +12,7 @@ class UserPublishValuesModel:
     """
 
     folder_name_regex = re.compile("^[a-zA-Z0-9_.]+$")
-    variant_regex = re.compile("^[{}]+$".format(SUBSET_NAME_ALLOWED_SYMBOLS))
+    variant_regex = re.compile("^[{}]+$".format(PRODUCT_NAME_ALLOWED_SYMBOLS))
 
     def __init__(self, controller):
         self._controller = controller
diff --git a/client/ayon_core/tools/pyblish_pype/model.py b/client/ayon_core/tools/pyblish_pype/model.py
index 4c91fb567f..3a402f386e 100644
--- a/client/ayon_core/tools/pyblish_pype/model.py
+++ b/client/ayon_core/tools/pyblish_pype/model.py
@@ -34,8 +34,6 @@ import qtawesome
 from six import text_type
 from .constants import PluginStates, InstanceStates, GroupStates, Roles
 
-from ayon_core.settings import get_system_settings
-
 
 # ItemTypes
 UserType = QtGui.QStandardItem.UserType
@@ -105,12 +103,8 @@ class IntentModel(QtGui.QStandardItemModel):
         self._item_count = 0
         self.default_index = 0
 
-        intent_settings = (
-            get_system_settings()
-            .get("modules", {})
-            .get("ftrack", {})
-            .get("intent", {})
-        )
+        # Intent settings are not available in core addon
+        intent_settings = {}
 
         items = intent_settings.get("items", {})
         if not items:
diff --git a/client/ayon_core/tools/sceneinventory/model.py b/client/ayon_core/tools/sceneinventory/model.py
index 05ecfd442d..18fc56db0b 100644
--- a/client/ayon_core/tools/sceneinventory/model.py
+++ b/client/ayon_core/tools/sceneinventory/model.py
@@ -43,7 +43,7 @@ class InventoryModel(TreeModel):
         "Name",
         "version",
         "count",
-        "family",
+        "productType",
         "group",
         "loader",
         "objectName",
@@ -140,8 +140,8 @@ class InventoryModel(TreeModel):
                 return qtawesome.icon("fa.file-o", color=color)
 
             if index.column() == 3:
-                # Family icon
-                return item.get("familyIcon", None)
+                # Product type icon
+                return item.get("productTypeIcon", None)
 
             column_name = self.Columns[index.column()]
 
@@ -174,7 +174,7 @@ class InventoryModel(TreeModel):
         return super(InventoryModel, self).data(index, role)
 
     def set_hierarchy_view(self, state):
-        """Set whether to display subsets in hierarchy view."""
+        """Set whether to display products in hierarchy view."""
         state = bool(state)
 
         if state != self._hierarchy_view:
@@ -297,7 +297,7 @@ class InventoryModel(TreeModel):
                 self.add_child(item_node, parent=group_node)
 
         # TODO Use product icons
-        family_icon = qtawesome.icon(
+        product_type_icon = qtawesome.icon(
             "fa.folder", color="#0091B2"
         )
         # Prepare site sync specific data
@@ -313,18 +313,18 @@ class InventoryModel(TreeModel):
             subset = group_dict["subset"]
             asset = group_dict["asset"]
 
-            # Get the primary family
+            # Get product type
             maj_version, _ = schema.get_schema_version(subset["schema"])
             if maj_version < 3:
                 src_doc = version
             else:
                 src_doc = subset
 
-            prim_family = src_doc["data"].get("family")
-            if not prim_family:
+            product_type = src_doc["data"].get("family")
+            if not product_type:
                 families = src_doc["data"].get("families")
                 if families:
-                    prim_family = families[0]
+                    product_type = families[0]
 
             # Store the highest available version so the model can know
             # whether current version is currently up-to-date.
@@ -340,8 +340,8 @@ class InventoryModel(TreeModel):
             group_node["representation"] = repre_id
             group_node["version"] = version["name"]
             group_node["highest_version"] = highest_version["name"]
-            group_node["family"] = prim_family or ""
-            group_node["familyIcon"] = family_icon
+            group_node["productType"] = product_type or ""
+            group_node["productTypeIcon"] = product_type_icon
             group_node["count"] = len(group_containers)
             group_node["isGroupNode"] = True
             group_node["group"] = subset["data"].get("subsetGroup")
diff --git a/client/ayon_core/tools/sceneinventory/view.py b/client/ayon_core/tools/sceneinventory/view.py
index 214be68ae0..80c89338f5 100644
--- a/client/ayon_core/tools/sceneinventory/view.py
+++ b/client/ayon_core/tools/sceneinventory/view.py
@@ -112,17 +112,17 @@ class SceneInventoryView(QtWidgets.QTreeView):
 
         loaded_hero_versions = []
         versions_by_parent_id = collections.defaultdict(list)
-        subset_ids = set()
+        product_ids = set()
         for version in loaded_versions:
             if version["type"] == "hero_version":
                 loaded_hero_versions.append(version)
             else:
                 parent_id = version["parent"]
                 versions_by_parent_id[parent_id].append(version)
-                subset_ids.add(parent_id)
+                product_ids.add(parent_id)
 
         all_versions = get_versions(
-            project_name, subset_ids=subset_ids, hero=True
+            project_name, subset_ids=product_ids, hero=True
         )
         hero_versions = []
         versions = []
diff --git a/client/ayon_core/tools/sceneinventory/window.py b/client/ayon_core/tools/sceneinventory/window.py
index f1bea26bb9..9584524edd 100644
--- a/client/ayon_core/tools/sceneinventory/window.py
+++ b/client/ayon_core/tools/sceneinventory/window.py
@@ -78,7 +78,7 @@ class SceneInventoryWindow(QtWidgets.QDialog):
         view.setColumnWidth(0, 250)  # name
         view.setColumnWidth(1, 55)   # version
         view.setColumnWidth(2, 55)   # count
-        view.setColumnWidth(3, 150)  # family
+        view.setColumnWidth(3, 150)  # product type
         view.setColumnWidth(4, 120)  # group
         view.setColumnWidth(5, 150)  # loader
 
diff --git a/client/ayon_core/tools/subsetmanager/model.py b/client/ayon_core/tools/subsetmanager/model.py
index 638d096918..4964abd86d 100644
--- a/client/ayon_core/tools/subsetmanager/model.py
+++ b/client/ayon_core/tools/subsetmanager/model.py
@@ -32,7 +32,11 @@ class InstanceModel(QtGui.QStandardItemModel):
         items = []
         for instance_data in instances:
             item_id = str(uuid.uuid4())
-            label = instance_data.get("label") or instance_data["subset"]
+            product_name = (
+                instance_data.get("productName")
+                or instance_data.get("subset")
+            )
+            label = instance_data.get("label") or product_name
             item = QtGui.QStandardItem(label)
             item.setEnabled(True)
             item.setEditable(False)
diff --git a/client/ayon_core/tools/subsetmanager/window.py b/client/ayon_core/tools/subsetmanager/window.py
index 97dab1adb2..164ffa95a7 100644
--- a/client/ayon_core/tools/subsetmanager/window.py
+++ b/client/ayon_core/tools/subsetmanager/window.py
@@ -45,7 +45,7 @@ class SubsetManagerWindow(QtWidgets.QDialog):
 
         # Filter input
         filter_input = PlaceholderLineEdit(header_widget)
-        filter_input.setPlaceholderText("Filter subsets..")
+        filter_input.setPlaceholderText("Filter products..")
 
         # Refresh button
         icon = qtawesome.icon("fa.refresh", color="white")
diff --git a/client/ayon_core/tools/texture_copy/app.py b/client/ayon_core/tools/texture_copy/app.py
index eef648eaf9..120051060b 100644
--- a/client/ayon_core/tools/texture_copy/app.py
+++ b/client/ayon_core/tools/texture_copy/app.py
@@ -31,14 +31,23 @@ class TextureCopy:
         if parents and len(parents) > 0:
             hierarchy = os.path.join(*parents)
 
+        product_name = "Main"
+        product_type = "texture"
         template_data = {
             "project": {
                 "name": project_name,
                 "code": project['data']['code']
             },
-            "asset": asset['name'],
-            "family": 'texture',
-            "subset": 'Main',
+            "asset": asset["name"],
+            "family": product_type,
+            "subset": product_name,
+            "folder": {
+                "name": asset["name"],
+            },
+            "product": {
+                "name": product_name,
+                "type": product_type,
+            },
             "hierarchy": hierarchy
         }
         anatomy = Anatomy(project_name)
diff --git a/client/ayon_core/tools/workfiles/models/workfiles.py b/client/ayon_core/tools/workfiles/models/workfiles.py
index 55653e34d4..1e9491b3d7 100644
--- a/client/ayon_core/tools/workfiles/models/workfiles.py
+++ b/client/ayon_core/tools/workfiles/models/workfiles.py
@@ -246,7 +246,7 @@ class WorkareaModel:
                 self._controller.get_host_name(),
                 task_name=task_info.get("name"),
                 task_type=task_info.get("type"),
-                family="workfile",
+                product_type="workfile",
                 project_settings=self._controller.project_settings,
             )
         else:
@@ -630,7 +630,7 @@ class PublishWorkfilesModel:
         if not product_ids:
             return output
 
-        # Get version docs of subsets with their families
+        # Get version docs of products with their families
         version_entities = ayon_api.get_versions(
             project_name,
             product_ids=product_ids,
diff --git a/client/ayon_core/tools/workfiles/widgets/save_as_dialog.py b/client/ayon_core/tools/workfiles/widgets/save_as_dialog.py
index 2ed2dd0659..77dac1198a 100644
--- a/client/ayon_core/tools/workfiles/widgets/save_as_dialog.py
+++ b/client/ayon_core/tools/workfiles/widgets/save_as_dialog.py
@@ -49,7 +49,7 @@ class SubversionLineEdit(QtWidgets.QWidget):
         self._input_field.setText(action.text())
 
     def _update(self, values):
-        """Create optional predefined subset names
+        """Create optional predefined product names
 
         Args:
             default_names(list): all predefined names
diff --git a/server_addon/applications/server/applications.json b/server_addon/applications/server/applications.json
index a2fbbac83f..b72d117225 100644
--- a/server_addon/applications/server/applications.json
+++ b/server_addon/applications/server/applications.json
@@ -1201,6 +1201,30 @@
                 }
             ]
         },
+        "openrv": {
+            "enabled": true,
+            "label": "OpenRV",
+            "icon": "{}/app_icons/openrv.png",
+            "host_name": "openrv",
+            "environment": "{\n    \n}",
+            "variants": [
+                {
+                    "name": "1.0.0",
+                    "use_python_2": false,
+                    "executables": {
+                        "windows": [],
+                        "darwin": [],
+                        "linux": []
+                    },
+                    "arguments": {
+                        "windows": [],
+                        "darwin": [],
+                        "linux": []
+                    },
+                    "environment": "{\n   \n}"
+                }
+            ]
+        },
         "additional_apps": []
     }
 }
diff --git a/server_addon/applications/server/settings.py b/server_addon/applications/server/settings.py
index e0a59604c8..a49175d488 100644
--- a/server_addon/applications/server/settings.py
+++ b/server_addon/applications/server/settings.py
@@ -186,6 +186,8 @@ class ApplicationsSettings(BaseSettingsModel):
         default_factory=AppGroupWithPython, title="Unreal Editor")
     wrap: AppGroup = SettingsField(
         default_factory=AppGroupWithPython, title="Wrap")
+    openrv: AppGroup = SettingsField(
+        default_factory=AppGroupWithPython, title="OpenRV")
     additional_apps: list[AdditionalAppGroup] = SettingsField(
         default_factory=list, title="Additional Applications")
 
diff --git a/server_addon/applications/server/version.py b/server_addon/applications/server/version.py
index 1276d0254f..0a8da88258 100644
--- a/server_addon/applications/server/version.py
+++ b/server_addon/applications/server/version.py
@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"