From fa8a3146a35970fa357adec40b907ed5de9194cf Mon Sep 17 00:00:00 2001
From: MustafaJafar <mustafataherzaky@outlook.com>
Date: Thu, 15 Feb 2024 21:28:28 +0200
Subject: [PATCH] use standard keys

---
 .../plugins/create/create_alembic_camera.py   |  4 +-
 .../plugins/create/create_arnold_ass.py       |  4 +-
 .../plugins/create/create_arnold_rop.py       |  8 ++--
 .../houdini/plugins/create/create_bgeo.py     |  4 +-
 .../plugins/create/create_composite.py        |  4 +-
 .../houdini/plugins/create/create_hda.py      |  4 +-
 .../plugins/create/create_karma_rop.py        | 10 ++--
 .../plugins/create/create_mantra_ifd.py       |  4 +-
 .../plugins/create/create_mantra_rop.py       |  8 ++--
 .../plugins/create/create_pointcache.py       |  4 +-
 .../plugins/create/create_redshift_proxy.py   |  4 +-
 .../plugins/create/create_redshift_rop.py     |  8 ++--
 .../houdini/plugins/create/create_review.py   |  4 +-
 .../plugins/create/create_staticmesh.py       |  4 +-
 .../houdini/plugins/create/create_usd.py      |  4 +-
 .../plugins/create/create_vbd_cache.py        |  4 +-
 .../houdini/plugins/create/create_vray_rop.py | 10 ++--
 .../houdini/server/settings/create.py         | 46 +++++++++----------
 18 files changed, 69 insertions(+), 69 deletions(-)

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 61d903e875..84cfed1ed6 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
@@ -13,7 +13,7 @@ class CreateAlembicCamera(plugin.HoudiniCreator):
     label = "Camera (Abc)"
     family = "camera"
     icon = "camera"
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.abc"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.abc"
 
     def create(self, subset_name, instance_data, pre_create_data):
         import hou
@@ -29,7 +29,7 @@ class CreateAlembicCamera(plugin.HoudiniCreator):
         instance_node = hou.node(instance.get("instance_node"))
 
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name}
         )
 
         parms = {
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 265f591513..54cb12e3f2 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
@@ -16,7 +16,7 @@ class CreateArnoldAss(plugin.HoudiniCreator):
     # however calling HoudiniCreator.create()
     # will override it by the value in the project settings
     ext = ".ass"
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.{ext}"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.{ext}"
 
     def create(self, subset_name, instance_data, pre_create_data):
         import hou
@@ -41,7 +41,7 @@ class CreateArnoldAss(plugin.HoudiniCreator):
         instance_node.setParmTemplateGroup(parm_template_group)
         
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+            product={"name": subset_name},
             ext=self.ext.lstrip(".")
         )
         
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 50a3bafa41..cc7c05613f 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
@@ -9,8 +9,8 @@ class CreateArnoldRop(plugin.HoudiniCreator):
     label = "Arnold ROP"
     family = "arnold_rop"
     icon = "magic"
-    render_staging_dir = "$HIP/ayon/{product_name}/render/{product_name}.$F4.{ext}"
-    ass_dir = "$HIP/ayon/{product_name}/ass/{product_name}.$F4.{ext}"
+    render_staging_dir = "$HIP/ayon/{product[name]}/render/{product[name]}.$F4.{ext}"
+    ass_dir = "$HIP/ayon/{product[name]}/ass/{product[name]}.$F4.{ext}"
 
     # Default extension
     ext = "exr"
@@ -40,7 +40,7 @@ class CreateArnoldRop(plugin.HoudiniCreator):
         ext = pre_create_data.get("image_format")
         
         filepath = self.render_staging_dir.format(
-            product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+            product={"name": subset_name},
             ext=ext
         )
 
@@ -55,7 +55,7 @@ class CreateArnoldRop(plugin.HoudiniCreator):
 
         if pre_create_data.get("export_job"):
             ass_filepath = self.ass_dir.format(
-                product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+                product={"name": subset_name},
                 ext="ass"
             )
             
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 57c71fe9ec..2e791510be 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_bgeo.py
@@ -12,7 +12,7 @@ class CreateBGEO(plugin.HoudiniCreator):
     label = "PointCache (Bgeo)"
     family = "pointcache"
     icon = "gears"
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.$F4.{ext}"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.$F4.{ext}"
 
     def create(self, subset_name, instance_data, pre_create_data):
 
@@ -31,7 +31,7 @@ class CreateBGEO(plugin.HoudiniCreator):
         instance_node = hou.node(instance.get("instance_node"))
 
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+            product={"name": subset_name},
             ext=pre_create_data.get("bgeo_type") or "bgeo.sc"
         )
 
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 c76acdf58e..bc72a08a44 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_composite.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_composite.py
@@ -13,7 +13,7 @@ class CreateCompositeSequence(plugin.HoudiniCreator):
     label = "Composite (Image Sequence)"
     family = "imagesequence"
     icon = "gears"
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.$F4.{ext}"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.$F4.{ext}"
     ext = "exr"
 
     def create(self, subset_name, instance_data, pre_create_data):
@@ -30,7 +30,7 @@ class CreateCompositeSequence(plugin.HoudiniCreator):
         instance_node = hou.node(instance.get("instance_node"))
         
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+            product={"name": subset_name},
             ext=self.ext
         )
         
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 97347f432a..66163cb0d8 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_hda.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_hda.py
@@ -16,7 +16,7 @@ class CreateHDA(plugin.HoudiniCreator):
     family = "hda"
     icon = "gears"
     maintain_selection = False
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.{ext}"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.{ext}"
     ext = "hda"
 
     def _check_existing(self, asset_name, subset_name):
@@ -62,7 +62,7 @@ class CreateHDA(plugin.HoudiniCreator):
             # for consistency I'm using {subset} as it's
             # the same key used in other creators
             filepath = self.staging_dir.format(
-                product_name=node_name,
+                product={"name": node_name},
                 ext=self.ext
             )
             
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 a00b48a7e0..dacbb3bf3b 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
@@ -11,8 +11,8 @@ class CreateKarmaROP(plugin.HoudiniCreator):
     label = "Karma ROP"
     family = "karma_rop"
     icon = "magic"
-    render_staging_dir = "$HIP/ayon/{product_name}/render/{product_name}.$F4.{ext}"
-    checkpoint_dir = "$HIP/ayon/{product_name}/checkpoint/{product_name}.$F4.checkpoint"
+    render_staging_dir = "$HIP/ayon/{product[name]}/render/{product[name]}.$F4.{ext}"
+    checkpoint_dir = "$HIP/ayon/{product[name]}/checkpoint/{product[name]}.$F4.checkpoint"
     usd_dir = "$HIP/ayon/{product_name}/usd/{product_name}_$RENDERID"
 
     def create(self, subset_name, instance_data, pre_create_data):
@@ -35,16 +35,16 @@ class CreateKarmaROP(plugin.HoudiniCreator):
         ext = pre_create_data.get("image_format")
 
         filepath = self.render_staging_dir.format(
-            product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+            product={"name": subset_name},
             ext=ext
         )
 
         checkpoint = self.checkpoint_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name}
         )
 
         usd_directory = self.usd_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name}
         )
 
         parms = {
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 ad74ad0fb0..3298c73028 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
@@ -11,7 +11,7 @@ class CreateMantraIFD(plugin.HoudiniCreator):
     label = "Mantra IFD"
     family = "mantraifd"
     icon = "gears"
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.$F4.ifd"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.$F4.ifd"
 
     def create(self, subset_name, instance_data, pre_create_data):
         import hou
@@ -28,7 +28,7 @@ class CreateMantraIFD(plugin.HoudiniCreator):
         instance_node = hou.node(instance.get("instance_node"))
         
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name}
         )
 
         parms = {
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 4c41020eed..dcf7d8efa1 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
@@ -11,8 +11,8 @@ class CreateMantraROP(plugin.HoudiniCreator):
     label = "Mantra ROP"
     family = "mantra_rop"
     icon = "magic"
-    render_staging_dir = "$HIP/ayon/{product_name}/render/{product_name}.$F4.{ext}",
-    ifd_dir = "$HIP/ayon/{product_name}/ifd/{product_name}.$F4.ifd"
+    render_staging_dir = "$HIP/ayon/{product[name]}/render/{product[name]}.$F4.{ext}",
+    ifd_dir = "$HIP/ayon/{product[name]}/ifd/{product[name]}.$F4.ifd"
 
     # Default to split export and render jobs
     export_job = True
@@ -37,7 +37,7 @@ class CreateMantraROP(plugin.HoudiniCreator):
         ext = pre_create_data.get("image_format")
         
         filepath = self.render_staging_dir.format(
-            product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+            product={"name": subset_name},
             ext=ext
         )
 
@@ -50,7 +50,7 @@ class CreateMantraROP(plugin.HoudiniCreator):
 
         if pre_create_data.get("export_job"):
             ifd_filepath = self.ifd_dir.format(
-                product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+                product={"name": subset_name}
             )
             
             parms["soho_outputmode"] = 1
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 b7c1df6bed..108ff7744a 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_pointcache.py
@@ -13,7 +13,7 @@ class CreatePointCache(plugin.HoudiniCreator):
     label = "PointCache (Abc)"
     family = "pointcache"
     icon = "gears"
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.abc"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.abc"
 
     def create(self, subset_name, instance_data, pre_create_data):
         instance_data.pop("active", None)
@@ -30,7 +30,7 @@ class CreatePointCache(plugin.HoudiniCreator):
         instance_node = hou.node(instance.get("instance_node"))
 
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name}
         )
 
         parms = {
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 0e307ae53f..1e559f6fc5 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
@@ -11,7 +11,7 @@ class CreateRedshiftProxy(plugin.HoudiniCreator):
     label = "Redshift Proxy"
     family = "redshiftproxy"
     icon = "magic"
-    staging_dir = "$HIP/ayon"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.$F4.rs"
 
     def create(self, subset_name, instance_data, pre_create_data):
 
@@ -38,7 +38,7 @@ class CreateRedshiftProxy(plugin.HoudiniCreator):
         instance_node = hou.node(instance.get("instance_node"))
 
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name},
         )
 
         parms = {
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 f33caec5a2..b3280754bf 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
@@ -14,8 +14,8 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
     family = "redshift_rop"
     icon = "magic"
     ext = "exr"
-    render_staging_dir = "$HIP/ayon/{product_name}/render/{product_name}.$AOV.$F4.{ext}"
-    rs_dir = "$HIP/ayon/{product_name}/rs/{product_name}.$F4.rs"
+    render_staging_dir = "$HIP/ayon/{product[name]}/render/{product[name]}.$AOV.$F4.{ext}"
+    rs_dir = "$HIP/ayon/{product[name]}/rs/{product[name]}.$F4.rs"
 
     # Default to split export and render jobs
     split_render = True
@@ -60,7 +60,7 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
         ext = pre_create_data.get("image_format")
 
         filepath = self.render_staging_dir.format(
-            product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+            product={"name": subset_name},
             ext=ext
         )
 
@@ -85,7 +85,7 @@ class CreateRedshiftROP(plugin.HoudiniCreator):
             parms["RS_renderCamera"] = camera or ""
 
         rs_filepath = self.rs_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name}
         )
 
         parms["RS_archive_file"] = rs_filepath
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 ab579fe6a6..6091620037 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_review.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_review.py
@@ -14,7 +14,7 @@ class CreateReview(plugin.HoudiniCreator):
     label = "Review"
     family = "review"
     icon = "video-camera"
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.$F4.{ext}"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.$F4.{ext}"
 
     def create(self, subset_name, instance_data, pre_create_data):
 
@@ -33,7 +33,7 @@ class CreateReview(plugin.HoudiniCreator):
         frame_range = hou.playbar.frameRange()
 
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+            product={"name": subset_name},
             ext=pre_create_data.get("image_format", "png") 
         )
 
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 c13b8a339b..37bf2bed2a 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_staticmesh.py
@@ -15,7 +15,7 @@ class CreateStaticMesh(plugin.HoudiniCreator):
     icon = "fa5s.cubes"
 
     default_variants = ["Main"]
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.fbx"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.fbx"
 
     def create(self, subset_name, instance_data, pre_create_data):
 
@@ -31,7 +31,7 @@ class CreateStaticMesh(plugin.HoudiniCreator):
 
         # prepare parms
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name}
         )
 
         parms = {
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 69e8688ae2..ac6e6285ac 100644
--- a/client/ayon_core/hosts/houdini/plugins/create/create_usd.py
+++ b/client/ayon_core/hosts/houdini/plugins/create/create_usd.py
@@ -13,7 +13,7 @@ class CreateUSD(plugin.HoudiniCreator):
     family = "usd"
     icon = "gears"
     enabled = False
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.usd"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.usd"
 
     def create(self, subset_name, instance_data, pre_create_data):
 
@@ -28,7 +28,7 @@ class CreateUSD(plugin.HoudiniCreator):
         instance_node = hou.node(instance.get("instance_node"))
 
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name}
         )
 
         parms = {
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 f883489574..a3976d9872 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
@@ -14,7 +14,7 @@ class CreateVDBCache(plugin.HoudiniCreator):
     label = "VDB Cache"
     family = "vdbcache"
     icon = "cloud"
-    staging_dir = "$HIP/ayon/{product_name}/{product_name}.$F4.vdb"
+    staging_dir = "$HIP/ayon/{product[name]}/{product[name]}.$F4.vdb"
 
     def create(self, subset_name, instance_data, pre_create_data):
         import hou
@@ -32,7 +32,7 @@ class CreateVDBCache(plugin.HoudiniCreator):
         instance_node = hou.node(instance.get("instance_node"))
 
         filepath = self.staging_dir.format(
-            product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+            product={"name": subset_name}
         )
 
         parms = {
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 84f268b920..c67dbaf886 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
@@ -15,8 +15,8 @@ class CreateVrayROP(plugin.HoudiniCreator):
     family = "vray_rop"
     icon = "magic"
     ext = "exr"
-    render_staging_dir = "$HIP/ayon/{product_name}/render/{product_name}.$AOV.$F4.{ext}",
-    vrscene_dir = "$HIP/ayon/{product_name}/vrscene/{product_name}.$F4.vrscene"
+    render_staging_dir = "$HIP/ayon/{product[name]}/render/{product[name]}.$AOV.$F4.{ext}",
+    vrscene_dir = "$HIP/ayon/{product[name]}/vrscene/{product[name]}.$F4.vrscene"
 
     # Default to split export and render jobs
     export_job = True
@@ -60,7 +60,7 @@ class CreateVrayROP(plugin.HoudiniCreator):
         if pre_create_data.get("export_job"):
 
             scene_filepath = self.vrscene_dir.format(
-                product_name="`chs(\"subset\")`"  # keep dynamic link to subset
+                product={"name": subset_name}
             )
             # Setting render_export_mode to "2" because that's for
             # "Export only" ("1" is for "Export & Render")
@@ -83,7 +83,7 @@ class CreateVrayROP(plugin.HoudiniCreator):
         if pre_create_data.get("render_element_enabled", True):
             # Vray has its own tag for AOV file output
             filepath = self.render_staging_dir.format(
-                product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+                product={"name": subset_name},
                 ext=ext
             )
 
@@ -102,7 +102,7 @@ class CreateVrayROP(plugin.HoudiniCreator):
 
         else:
             filepath = self.render_staging_dir.format(
-                product_name="`chs(\"subset\")`",  # keep dynamic link to subset
+                product={"name": subset_name},
                 ext=ext
             ).replace(".$AOV", "")
         
diff --git a/server_addon/houdini/server/settings/create.py b/server_addon/houdini/server/settings/create.py
index 136e2c5f45..0fbe3f0bdc 100644
--- a/server_addon/houdini/server/settings/create.py
+++ b/server_addon/houdini/server/settings/create.py
@@ -148,73 +148,73 @@ DEFAULT_HOUDINI_CREATE_SETTINGS = {
     "CreateAlembicCamera": {
         "enabled": True,
         "default_variants": ["Main"],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.abc"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.abc"
     },
     "CreateArnoldAss": {
         "enabled": True,
         "default_variants": ["Main"],
         "ext": ".ass",
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.$F4.{ext}"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.$F4.{ext}"
     },
     "CreateArnoldRop": {
         "enabled": True,
         "default_variants": ["Main"],
-        "render_staging_dir": "$HIP/ayon/{product_name}/render/{product_name}.$F4.{ext}",
-        "ass_dir": "$HIP/ayon/{product_name}/ass/{product_name}.$F4.{ext}"
+        "render_staging_dir": "$HIP/ayon/{product[name]}/render/{product[name]}.$F4.{ext}",
+        "ass_dir": "$HIP/ayon/{product[name]}/ass/{product[name]}.$F4.{ext}"
     },
     "CreateCompositeSequence": {
         "enabled": True,
         "default_variants": ["Main"],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.$F4.{ext}"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.$F4.{ext}"
     },
     "CreateHDA": {
         "enabled": True,
         "default_variants": ["Main"],
-        "staging_dir":  "$HIP/ayon/{product_name}/{product_name}.{ext}"
+        "staging_dir":  "$HIP/ayon/{product[name]}/{product[name]}.{ext}"
     },
     "CreateKarmaROP": {
         "enabled": True,
         "default_variants": ["Main"],
-        "render_staging_dir": "$HIP/ayon/{product_name}/render/{product_name}.$F4.{ext}",
-        "checkpoint_dir": "$HIP/ayon/{product_name}/checkpoint/{product_name}.$F4.checkpoint",
-        "usd_dir": "$HIP/ayon/{product_name}/usd/{product_name}_$RENDERID"
+        "render_staging_dir": "$HIP/ayon/{product[name]}/render/{product[name]}.$F4.{ext}",
+        "checkpoint_dir": "$HIP/ayon/{product[name]}/checkpoint/{product[name]}.$F4.checkpoint",
+        "usd_dir": "$HIP/ayon/{product[name]}/usd/{product[name]}_$RENDERID"
     },
     "CreateMantraIFD": {
         "enabled": True,
         "default_variants": ["Main"],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.$F4.ifd"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.$F4.ifd"
     },
     "CreateMantraROP": {
         "enabled": True,
         "default_variants": ["Main"],
-        "render_staging_dir": "$HIP/ayon/{product_name}/render/{product_name}.$F4.{ext}",
-        "ifd_dir": "$HIP/ayon/{product_name}/ifd/{product_name}.$F4.ifd"
+        "render_staging_dir": "$HIP/ayon/{product[name]}/render/{product[name]}.$F4.{ext}",
+        "ifd_dir": "$HIP/ayon/{product[name]}/ifd/{product[name]}.$F4.ifd"
     },
     "CreatePointCache": {
         "enabled": True,
         "default_variants": ["Main"],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.abc"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.abc"
     },
     "CreateBGEO": {
         "enabled": True,
         "default_variants": ["Main"],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.$F4.{ext}"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.$F4.{ext}"
     },
     "CreateRedshiftProxy": {
         "enabled": True,
         "default_variants": ["Main"],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.$F4.rs"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.$F4.rs"
     },
     "CreateRedshiftROP": {
         "enabled": True,
         "default_variants": ["Main"],
-        "render_staging_dir": "$HIP/ayon/{product_name}/render/{product_name}.$AOV.$F4.{ext}",
-        "rs_dir": "$HIP/ayon/{product_name}/rs/{product_name}.$F4.rs"
+        "render_staging_dir": "$HIP/ayon/{product[name]}/render/{product[name]}.$AOV.$F4.{ext}",
+        "rs_dir": "$HIP/ayon/{product[name]}/rs/{product[name]}.$F4.rs"
     },
     "CreateReview": {
         "enabled": True,
         "default_variants": ["Main"],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.$F4.{ext}"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.$F4.{ext}"
     },
     "CreateStaticMesh": {
         "enabled": True,
@@ -228,12 +228,12 @@ DEFAULT_HOUDINI_CREATE_SETTINGS = {
             "USP",
             "UCX"
         ],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.fbx"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.fbx"
     },
     "CreateUSD": {
         "enabled": False,
         "default_variants": ["Main"],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.usd"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.usd"
     },
     "CreateUSDRender": {
         "enabled": False,
@@ -243,12 +243,12 @@ DEFAULT_HOUDINI_CREATE_SETTINGS = {
     "CreateVDBCache": {
         "enabled": True,
         "default_variants": ["Main"],
-        "staging_dir": "$HIP/ayon/{product_name}/{product_name}.$F4.vdb"
+        "staging_dir": "$HIP/ayon/{product[name]}/{product[name]}.$F4.vdb"
     },
     "CreateVrayROP": {
         "enabled": True,
         "default_variants": ["Main"],
-        "render_staging_dir": "$HIP/ayon/{product_name}/render/{product_name}.$AOV.$F4.{ext}",
-        "vrscene_dir": "$HIP/ayon/{product_name}/vrscene/{product_name}.$F4.vrscene"
+        "render_staging_dir": "$HIP/ayon/{product[name]}/render/{product[name]}.$AOV.$F4.{ext}",
+        "vrscene_dir": "$HIP/ayon/{product[name]}/vrscene/{product[name]}.$F4.vrscene"
     },
 }