diff --git a/resources/profiles/OrcaArena.json b/resources/profiles/OrcaArena.json
index e1dc5d09c6..ce13352349 100644
--- a/resources/profiles/OrcaArena.json
+++ b/resources/profiles/OrcaArena.json
@@ -1,7 +1,7 @@
 {
     "name": "Orca Arena Printer",
     "url": "",
-    "version": "01.06.00.03",
+    "version": "01.06.01.00",
     "force_update": "0",
     "description": "Orca Arena configuration files",
     "machine_model_list": [
@@ -306,92 +306,92 @@
             "sub_path": "filament/PolyLite PLA @base.json"
         },
         {
-            "name": "Generic PLA @base",
-            "sub_path": "filament/Generic PLA @base.json"
+            "name": "OrcaArena Generic PLA @base",
+            "sub_path": "filament/OrcaArena Generic PLA @base.json"
         },
         {
-            "name": "Generic PLA",
-            "sub_path": "filament/Generic PLA.json"
+            "name": "OrcaArena Generic PLA",
+            "sub_path": "filament/OrcaArena Generic PLA.json"
         },
         {
-            "name": "Generic PLA Silk @base",
-            "sub_path": "filament/Generic PLA Silk @base.json"
+            "name": "OrcaArena Generic PLA Silk @base",
+            "sub_path": "filament/OrcaArena Generic PLA Silk @base.json"
         },
         {
-            "name": "Generic PLA Silk",
-            "sub_path": "filament/Generic PLA Silk.json"
+            "name": "OrcaArena Generic PLA Silk",
+            "sub_path": "filament/OrcaArena Generic PLA Silk.json"
         },
         {
-            "name": "Generic PLA @0.2 nozzle",
-            "sub_path": "filament/Generic PLA @0.2 nozzle.json"
+            "name": "OrcaArena Generic PLA @0.2 nozzle",
+            "sub_path": "filament/OrcaArena Generic PLA @0.2 nozzle.json"
         },
         {
-            "name": "Generic PLA-CF @base",
-            "sub_path": "filament/Generic PLA-CF @base.json"
+            "name": "OrcaArena Generic PLA-CF @base",
+            "sub_path": "filament/OrcaArena Generic PLA-CF @base.json"
         },
         {
-            "name": "Generic PLA-CF",
-            "sub_path": "filament/Generic PLA-CF.json"
+            "name": "OrcaArena Generic PLA-CF",
+            "sub_path": "filament/OrcaArena Generic PLA-CF.json"
         },
         {
-            "name": "Generic PETG @base",
-            "sub_path": "filament/Generic PETG @base.json"
+            "name": "OrcaArena Generic PETG @base",
+            "sub_path": "filament/OrcaArena Generic PETG @base.json"
         },
         {
-            "name": "Generic PETG",
-            "sub_path": "filament/Generic PETG.json"
+            "name": "OrcaArena Generic PETG",
+            "sub_path": "filament/OrcaArena Generic PETG.json"
         },
         {
-            "name": "Generic ABS @base",
-            "sub_path": "filament/Generic ABS @base.json"
+            "name": "OrcaArena Generic ABS @base",
+            "sub_path": "filament/OrcaArena Generic ABS @base.json"
         },
         {
-            "name": "Generic ABS",
-            "sub_path": "filament/Generic ABS.json"
+            "name": "OrcaArena Generic ABS",
+            "sub_path": "filament/OrcaArena Generic ABS.json"
         },
         {
-            "name": "Generic ABS @0.2 nozzle",
-            "sub_path": "filament/Generic ABS @0.2 nozzle.json"
+            "name": "OrcaArena Generic ABS @0.2 nozzle",
+            "sub_path": "filament/OrcaArena Generic ABS @0.2 nozzle.json"
         },
         {
-            "name": "Generic TPU",
-            "sub_path": "filament/Generic TPU.json"
+            "name": "OrcaArena Generic TPU",
+            "sub_path": "filament/OrcaArena Generic TPU.json"
         },
         {
-            "name": "Generic ASA @base",
-            "sub_path": "filament/Generic ASA @base.json"
+            "name": "OrcaArena Generic ASA @base",
+            "sub_path": "filament/OrcaArena Generic ASA @base.json"
         },
         {
-            "name": "Generic ASA @0.2 nozzle",
-            "sub_path": "filament/Generic ASA @0.2 nozzle.json"
+            "name": "OrcaArena Generic ASA @0.2 nozzle",
+            "sub_path": "filament/OrcaArena Generic ASA @0.2 nozzle.json"
         },
         {
-            "name": "Generic ASA",
-            "sub_path": "filament/Generic ASA.json"
+            "name": "OrcaArena Generic ASA",
+            "sub_path": "filament/OrcaArena Generic ASA.json"
         },
         {
-            "name": "Generic PC @base",
-            "sub_path": "filament/Generic PC @base.json"
+            "name": "OrcaArena Generic PC @base",
+            "sub_path": "filament/OrcaArena Generic PC @base.json"
         },
         {
-            "name": "Generic PC @0.2 nozzle",
-            "sub_path": "filament/Generic PC @0.2 nozzle.json"
+            "name": "OrcaArena Generic PC @0.2 nozzle",
+            "sub_path": "filament/OrcaArena Generic PC @0.2 nozzle.json"
         },
         {
-            "name": "Generic PC",
-            "sub_path": "filament/Generic PC.json"
+            "name": "OrcaArena Generic PC",
+            "sub_path": "filament/OrcaArena Generic PC.json"
         },
         {
-            "name": "Generic PVA @base",
-            "sub_path": "filament/Generic PVA @base.json"
+            "name": "OrcaArena Generic PVA @base",
+            "sub_path": "filament/OrcaArena Generic PVA @base.json"
         },
         {
-            "name": "Generic PETG-CF @base",
-            "sub_path": "filament/Generic PETG-CF @base.json"
+            "name": "OrcaArena Generic PETG-CF @base",
+            "sub_path": "filament/OrcaArena Generic PETG-CF @base.json"
         },
         {
-            "name": "Generic PETG-CF @Arena X1C",
-            "sub_path": "filament/Generic PETG-CF @Arena X1C.json"
+            "name": "OrcaArena Generic PETG-CF @Arena X1C",
+            "sub_path": "filament/OrcaArena Generic PETG-CF @Arena X1C.json"
         },
         {
             "name": "Arena PETG-CF @base",
@@ -402,20 +402,20 @@
             "sub_path": "filament/Arena PETG-CF @Arena X1C.json"
         },
         {
-            "name": "Generic PVA @0.2 nozzle",
-            "sub_path": "filament/Generic PVA @0.2 nozzle.json"
+            "name": "OrcaArena Generic PVA @0.2 nozzle",
+            "sub_path": "filament/OrcaArena Generic PVA @0.2 nozzle.json"
         },
         {
-            "name": "Generic PVA",
-            "sub_path": "filament/Generic PVA.json"
+            "name": "OrcaArena Generic PVA",
+            "sub_path": "filament/OrcaArena Generic PVA.json"
         },
         {
-            "name": "Generic PA",
-            "sub_path": "filament/Generic PA.json"
+            "name": "OrcaArena Generic PA",
+            "sub_path": "filament/OrcaArena Generic PA.json"
         },
         {
-            "name": "Generic PA-CF",
-            "sub_path": "filament/Generic PA-CF.json"
+            "name": "OrcaArena Generic PA-CF",
+            "sub_path": "filament/OrcaArena Generic PA-CF.json"
         },
         {
             "name": "Arena TPU 95A @Arena X1C",
@@ -542,8 +542,8 @@
             "sub_path": "filament/PolyLite PLA @Arena X1C 0.2 nozzle.json"
         },
         {
-            "name":"Generic PETG @0.2 nozzle",
-            "sub_path":"filament/Generic PETG @0.2 nozzle.json"
+            "name":"OrcaArena Generic PETG @0.2 nozzle",
+            "sub_path":"filament/OrcaArena Generic PETG @0.2 nozzle.json"
         },
         {
             "name":"Arena PLA Metal @Arena X1C 0.2 nozzle",
diff --git a/resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json
similarity index 71%
rename from resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json
index bccc573e80..6ac7b4ed85 100644
--- a/resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSB99_00",
-    "name": "Generic ABS @0.2 nozzle",
+    "name": "OrcaArena Generic ABS @0.2 nozzle",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic ABS @base",
+    "inherits": "OrcaArena Generic ABS @base",
     "filament_max_volumetric_speed": [
         "2"
     ],
diff --git a/resources/profiles/OrcaArena/filament/Generic ABS @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json
similarity index 85%
rename from resources/profiles/OrcaArena/filament/Generic ABS @base.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json
index 044703f6a9..43284e8f5b 100644
--- a/resources/profiles/OrcaArena/filament/Generic ABS @base.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFB99",
-    "name": "Generic ABS @base",
+    "name": "OrcaArena Generic ABS @base",
     "from": "system",
     "instantiation": "false",
     "inherits": "fdm_filament_abs",
diff --git a/resources/profiles/OrcaArena/filament/Generic ABS.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json
similarity index 75%
rename from resources/profiles/OrcaArena/filament/Generic ABS.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json
index e37b104d62..1b1314994d 100644
--- a/resources/profiles/OrcaArena/filament/Generic ABS.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSB99",
-    "name": "Generic ABS",
+    "name": "OrcaArena Generic ABS",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic ABS @base",
+    "inherits": "OrcaArena Generic ABS @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
diff --git a/resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json
similarity index 71%
rename from resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json
index 667287b51b..9356809a5d 100644
--- a/resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSB98_00",
-    "name": "Generic ASA @0.2 nozzle",
+    "name": "OrcaArena Generic ASA @0.2 nozzle",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic ASA @base",
+    "inherits": "OrcaArena Generic ASA @base",
     "filament_max_volumetric_speed": [
         "2"
     ],
diff --git a/resources/profiles/OrcaArena/filament/Generic ASA @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json
similarity index 85%
rename from resources/profiles/OrcaArena/filament/Generic ASA @base.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json
index ac74598de7..82b9837944 100644
--- a/resources/profiles/OrcaArena/filament/Generic ASA @base.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFB98",
-    "name": "Generic ASA @base",
+    "name": "OrcaArena Generic ASA @base",
     "from": "system",
     "instantiation": "false",
     "inherits": "fdm_filament_asa",
diff --git a/resources/profiles/OrcaArena/filament/Generic ASA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json
similarity index 75%
rename from resources/profiles/OrcaArena/filament/Generic ASA.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json
index 1155e485ac..3be7360a35 100644
--- a/resources/profiles/OrcaArena/filament/Generic ASA.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSB98",
-    "name": "Generic ASA",
+    "name": "OrcaArena Generic ASA",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic ASA @base",
+    "inherits": "OrcaArena Generic ASA @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
diff --git a/resources/profiles/OrcaArena/filament/Generic PA-CF.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json
similarity index 95%
rename from resources/profiles/OrcaArena/filament/Generic PA-CF.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json
index 24756fe1c6..3e22d39802 100644
--- a/resources/profiles/OrcaArena/filament/Generic PA-CF.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN98",
     "setting_id": "GFSN99",
-    "name": "Generic PA-CF",
+    "name": "OrcaArena Generic PA-CF",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
diff --git a/resources/profiles/OrcaArena/filament/Generic PA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json
similarity index 93%
rename from resources/profiles/OrcaArena/filament/Generic PA.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json
index ae32f87113..40e7fc7566 100644
--- a/resources/profiles/OrcaArena/filament/Generic PA.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN99",
     "setting_id": "GFSN98",
-    "name": "Generic PA",
+    "name": "OrcaArena Generic PA",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
diff --git a/resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json
similarity index 72%
rename from resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json
index 1e4998246f..5fcda82782 100644
--- a/resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSC99_00",
-    "name": "Generic PC @0.2 nozzle",
+    "name": "OrcaArena Generic PC @0.2 nozzle",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic PC @base",
+    "inherits": "OrcaArena Generic PC @base",
     "filament_max_volumetric_speed": [
         "1"
     ],
diff --git a/resources/profiles/OrcaArena/filament/Generic PC @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json
similarity index 85%
rename from resources/profiles/OrcaArena/filament/Generic PC @base.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json
index dc053680d1..d6b4dead3e 100644
--- a/resources/profiles/OrcaArena/filament/Generic PC @base.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFC99",
-    "name": "Generic PC @base",
+    "name": "OrcaArena Generic PC @base",
     "from": "system",
     "instantiation": "false",
     "inherits": "fdm_filament_pc",
diff --git a/resources/profiles/OrcaArena/filament/Generic PC.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json
similarity index 75%
rename from resources/profiles/OrcaArena/filament/Generic PC.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json
index 6e40cc6a44..1dfdab1bf9 100644
--- a/resources/profiles/OrcaArena/filament/Generic PC.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json	
@@ -1,10 +1,10 @@
 {
   "type": "filament",
   "setting_id": "GFSC99",
-  "name": "Generic PC",
+  "name": "OrcaArena Generic PC",
   "from": "system",
   "instantiation": "true",
-  "inherits": "Generic PC @base",
+  "inherits": "OrcaArena Generic PC @base",
   "compatible_printers": [
     "Orca Arena X1 Carbon 0.4 nozzle",
     "Orca Arena X1 Carbon 0.6 nozzle",
diff --git a/resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json
similarity index 71%
rename from resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json
index ff6d76438d..d95c4e3843 100644
--- a/resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSG99_01",
-    "name": "Generic PETG @0.2 nozzle",
+    "name": "OrcaArena Generic PETG @0.2 nozzle",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic PETG @base",
+    "inherits": "OrcaArena Generic PETG @base",
     "filament_max_volumetric_speed": [
       "1"
     ],
diff --git a/resources/profiles/OrcaArena/filament/Generic PETG @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json
similarity index 97%
rename from resources/profiles/OrcaArena/filament/Generic PETG @base.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json
index 6a0a6ec4d7..edf0fdd6d8 100644
--- a/resources/profiles/OrcaArena/filament/Generic PETG @base.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFG99",
-    "name": "Generic PETG @base",
+    "name": "OrcaArena Generic PETG @base",
     "from": "system",
     "instantiation": "false",
     "inherits": "fdm_filament_pet",
diff --git a/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json
similarity index 71%
rename from resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json
index f4e0c713d4..61e7cafef1 100644
--- a/resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json	
@@ -1,10 +1,10 @@
 {
   "type": "filament",
   "setting_id": "GFSG50",
-  "name": "Generic PETG-CF @Arena X1C",
+  "name": "OrcaArena Generic PETG-CF @Arena X1C",
   "from": "system",
   "instantiation": "true",
-  "inherits": "Generic PETG-CF @base",
+  "inherits": "OrcaArena Generic PETG-CF @base",
   "compatible_printers": [
     "Orca Arena X1 Carbon 0.4 nozzle",
     "Orca Arena X1 Carbon 0.6 nozzle",
diff --git a/resources/profiles/OrcaArena/filament/Generic PETG-CF @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json
similarity index 96%
rename from resources/profiles/OrcaArena/filament/Generic PETG-CF @base.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json
index e33cdd0aa6..cc77cf8c93 100644
--- a/resources/profiles/OrcaArena/filament/Generic PETG-CF @base.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json	
@@ -1,7 +1,7 @@
 {
   "type": "filament",
   "filament_id": "GFG98",
-  "name": "Generic PETG-CF @base",
+  "name": "OrcaArena Generic PETG-CF @base",
   "from": "system",
   "instantiation": "false",
   "inherits": "fdm_filament_pet",
diff --git a/resources/profiles/OrcaArena/filament/Generic PETG.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json
similarity index 75%
rename from resources/profiles/OrcaArena/filament/Generic PETG.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json
index 6c180bd2d2..e37fcf7ba3 100644
--- a/resources/profiles/OrcaArena/filament/Generic PETG.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSG99",
-    "name": "Generic PETG",
+    "name": "OrcaArena Generic PETG",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic PETG @base",
+    "inherits": "OrcaArena Generic PETG @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json
similarity index 85%
rename from resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json
index 6695ad062d..542ffae426 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSL99_00",
-    "name": "Generic PLA @0.2 nozzle",
+    "name": "OrcaArena Generic PLA @0.2 nozzle",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic PLA @base",
+    "inherits": "OrcaArena Generic PLA @base",
     "filament_max_volumetric_speed": [
         "2"
     ],
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json
similarity index 93%
rename from resources/profiles/OrcaArena/filament/Generic PLA @base.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json
index 43de916b4a..c3abe2465a 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA @base.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFL99",
-    "name": "Generic PLA @base",
+    "name": "OrcaArena Generic PLA @base",
     "from": "system",
     "instantiation": "false",
     "inherits": "fdm_filament_pla",
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA Silk @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json
similarity index 92%
rename from resources/profiles/OrcaArena/filament/Generic PLA Silk @base.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json
index cf7e7b080a..43d37d01f4 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA Silk @base.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json	
@@ -1,7 +1,7 @@
 {
   "type": "filament",
   "filament_id": "GFA05",
-  "name": "Generic PLA Silk @base",
+  "name": "OrcaArena Generic PLA Silk @base",
   "from": "system",
   "instantiation": "false",
   "inherits": "fdm_filament_pla",
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA Silk.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json
similarity index 80%
rename from resources/profiles/OrcaArena/filament/Generic PLA Silk.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json
index 80d06431a2..2548433549 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA Silk.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSL99_01",
-    "name": "Generic PLA Silk",
+    "name": "OrcaArena Generic PLA Silk",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic PLA Silk @base",
+    "inherits": "OrcaArena Generic PLA Silk @base",
     "filament_max_volumetric_speed": [
         "7.5"
     ],
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA-CF @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json
similarity index 95%
rename from resources/profiles/OrcaArena/filament/Generic PLA-CF @base.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json
index aebf40321e..f9a0a19582 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA-CF @base.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json	
@@ -1,7 +1,7 @@
 {
   "type": "filament",
   "filament_id": "GFL98",
-  "name": "Generic PLA-CF @base",
+  "name": "OrcaArena Generic PLA-CF @base",
   "from": "system",
   "instantiation": "false",
   "inherits": "fdm_filament_pla",
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA-CF.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json
similarity index 75%
rename from resources/profiles/OrcaArena/filament/Generic PLA-CF.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json
index fe217605ca..6975276e9a 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA-CF.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSL98",
-    "name": "Generic PLA-CF",
+    "name": "OrcaArena Generic PLA-CF",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic PLA-CF @base",
+    "inherits": "OrcaArena Generic PLA-CF @base",
     "compatible_printers": [
         "Orca Arena X1 Carbon 0.4 nozzle",
         "Orca Arena X1 Carbon 0.6 nozzle",
diff --git a/resources/profiles/OrcaArena/filament/Generic PLA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json
similarity index 75%
rename from resources/profiles/OrcaArena/filament/Generic PLA.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json
index d8d2983ad1..e69be4831c 100644
--- a/resources/profiles/OrcaArena/filament/Generic PLA.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSL99",
-    "name": "Generic PLA",
+    "name": "OrcaArena Generic PLA",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic PLA @base",
+    "inherits": "OrcaArena Generic PLA @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
diff --git a/resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json
similarity index 71%
rename from resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json
index 9988ae406a..c82eb3e788 100644
--- a/resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSS99_00",
-    "name": "Generic PVA @0.2 nozzle",
+    "name": "OrcaArena Generic PVA @0.2 nozzle",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic PVA @base",
+    "inherits": "OrcaArena Generic PVA @base",
     "filament_max_volumetric_speed": [
         "0.5"
     ],
diff --git a/resources/profiles/OrcaArena/filament/Generic PVA @base.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json
similarity index 89%
rename from resources/profiles/OrcaArena/filament/Generic PVA @base.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json
index 87f3d3a422..a8bf7e3c1a 100644
--- a/resources/profiles/OrcaArena/filament/Generic PVA @base.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFS99",
-    "name": "Generic PVA @base",
+    "name": "OrcaArena Generic PVA @base",
     "from": "system",
     "instantiation": "false",
     "inherits": "fdm_filament_pva",
diff --git a/resources/profiles/OrcaArena/filament/Generic PVA.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json
similarity index 75%
rename from resources/profiles/OrcaArena/filament/Generic PVA.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json
index 1d6dd63cdf..9d14b44dff 100644
--- a/resources/profiles/OrcaArena/filament/Generic PVA.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json	
@@ -1,10 +1,10 @@
 {
     "type": "filament",
     "setting_id": "GFSS99",
-    "name": "Generic PVA",
+    "name": "OrcaArena Generic PVA",
     "from": "system",
     "instantiation": "true",
-    "inherits": "Generic PVA @base",
+    "inherits": "OrcaArena Generic PVA @base",
     "compatible_printers": [
       "Orca Arena X1 Carbon 0.4 nozzle",
       "Orca Arena X1 Carbon 0.6 nozzle",
diff --git a/resources/profiles/OrcaArena/filament/Generic TPU.json b/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json
similarity index 94%
rename from resources/profiles/OrcaArena/filament/Generic TPU.json
rename to resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json
index 3c6b2e90e6..c0644851e5 100644
--- a/resources/profiles/OrcaArena/filament/Generic TPU.json	
+++ b/resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFU99",
     "setting_id": "GFSR99",
-    "name": "Generic TPU",
+    "name": "OrcaArena Generic TPU",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_tpu",
diff --git a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json
index 6c8a74d4aa..84009b104c 100644
--- a/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json	
+++ b/resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json	
@@ -9,5 +9,5 @@
     "bed_model": "",
     "bed_texture": "",
     "hotend_model": "",
-    "default_materials": "Generic PLA Silk;Generic PLA;Arena PLA Matte @Arena X1C;Arena PLA Basic @Arena X1C;Arena ABS @Arena X1C;Arena PC @Arena X1C;Arena Support W @Arena X1C;Arena TPU 95A @Arena X1C;PolyTerra PLA @Arena X1C;PolyLite PLA @Arena X1C;"
+    "default_materials": "OrcaArena Generic PLA Silk;OrcaArena Generic PLA;Arena PLA Matte @Arena X1C;Arena PLA Basic @Arena X1C;Arena ABS @Arena X1C;Arena PC @Arena X1C;Arena Support W @Arena X1C;Arena TPU 95A @Arena X1C;PolyTerra PLA @Arena X1C;PolyLite PLA @Arena X1C;"
 }