diff --git a/VERSION b/VERSION
index 3227fc33..e59b77f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.16.2-develop39
+1.16.2-develop40
diff --git a/modules/meta.py b/modules/meta.py
index c33c9c8d..b0895c88 100644
--- a/modules/meta.py
+++ b/modules/meta.py
@@ -139,10 +139,9 @@ class DataFile:
                                     if str(dv) not in optional:
                                         if template["default"][dv] is not None:
                                             final_value = str(template["default"][dv])
-                                            if "<<collection_name>>" in final_value:
-                                                final_value = final_value.replace("<<collection_name>>", str(name))
-                                            if "<<playlist_name>>" in final_value:
-                                                final_value = final_value.replace("<<playlist_name>>", str(name))
+                                            for key in variables:
+                                                if f"<<{key}>>" in final_value:
+                                                    final_value = final_value.replace(f"<<{key}>>", str(name))
                                             default[dv] = final_value
                                         else:
                                             raise Failed(f"{self.data_type} Error: template default sub-attribute {dv} is blank")