diff --git a/resources/profiles/Anker.json b/resources/profiles/Anker.json
index 25f9ee7aac..a885207f83 100644
--- a/resources/profiles/Anker.json
+++ b/resources/profiles/Anker.json
@@ -24,77 +24,78 @@
             "name": "fdm_filament_common",
             "sub_path": "filament/fdm_filament_common.json"
         },
-        {
-            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_pla.json"
-        },
-        {
-            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_tpu.json"
-        },
-        {
-            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_pet.json"
-        },
         {
             "name": "fdm_filament_abs",
             "sub_path": "filament/fdm_filament_abs.json"
         },
+        {
+            "name": "fdm_filament_asa",
+            "sub_path": "filament/fdm_filament_asa.json"
+        },
+
+        {
+            "name": "fdm_filament_pa",
+            "sub_path": "filament/fdm_filament_pa.json"
+        },
         {
             "name": "fdm_filament_pc",
             "sub_path": "filament/fdm_filament_pc.json"
         },
         {
-            "name": "fdm_filament_asa",
-            "sub_path": "filament/fdm_filament_asa.json"
+            "name": "fdm_filament_pet",
+            "sub_path": "filament/fdm_filament_pet.json"
+        },
+        {
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
         },
         {
             "name": "fdm_filament_pva",
             "sub_path": "filament/fdm_filament_pva.json"
         },
         {
-            "name": "fdm_filament_pa",
-            "sub_path": "filament/fdm_filament_pa.json"
+            "name": "fdm_filament_tpu",
+            "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Anker Generic PLA",
-            "sub_path": "filament/Anker Generic PLA.json"
+            "name": "Generic ABS @Anker",
+            "sub_path": "filament/Generic ABS @Anker.json"
         },
         {
-            "name": "Anker Generic PLA-CF",
-            "sub_path": "filament/Anker Generic PLA-CF.json"
+            "name": "Generic ASA @Anker",
+            "sub_path": "filament/Generic ASA @Anker.json"
         },
         {
-            "name": "Anker Generic PETG",
-            "sub_path": "filament/Anker Generic PETG.json"
+            "name": "Generic PA @Anker",
+            "sub_path": "filament/Generic PA @Anker.json"
         },
         {
-            "name": "Anker Generic ABS",
-            "sub_path": "filament/Anker Generic ABS.json"
+            "name": "Generic PA-CF @Anker",
+            "sub_path": "filament/Generic PA-CF @Anker.json"
         },
         {
-            "name": "Anker Generic TPU",
-            "sub_path": "filament/Anker Generic TPU.json"
+            "name": "Generic PC @Anker",
+            "sub_path": "filament/Generic PC @Anker.json"
         },
         {
-            "name": "Anker Generic ASA",
-            "sub_path": "filament/Anker Generic ASA.json"
+            "name": "Generic PETG @Anker",
+            "sub_path": "filament/Generic PETG @Anker.json"
         },
         {
-            "name": "Anker Generic PC",
-            "sub_path": "filament/Anker Generic PC.json"
+            "name": "Generic PLA @Anker",
+            "sub_path": "filament/Generic PLA @Anker.json"
         },
         {
-            "name": "Anker Generic PVA",
-            "sub_path": "filament/Anker Generic PVA.json"
+            "name": "Generic PLA-CF @Anker",
+            "sub_path": "filament/Generic PLA-CF @Anker.json"
         },
         {
-            "name": "Anker Generic PA",
-            "sub_path": "filament/Anker Generic PA.json"
+            "name": "Generic PVA @Anker",
+            "sub_path": "filament/Generic PVA @Anker.json"
         },
         {
-            "name": "Anker Generic PA-CF",
-            "sub_path": "filament/Anker Generic PA-CF.json"
+            "name": "Generic TPU @Anker",
+            "sub_path": "filament/Generic TPU @Anker.json"
         }
     ],
     "machine_list": [
@@ -107,4 +108,4 @@
             "sub_path": "machine/Anker M5 0.4 nozzle.json"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anker/filament/Anker Generic ABS.json b/resources/profiles/Anker/filament/Generic ABS @Anker.json
similarity index 83%
rename from resources/profiles/Anker/filament/Anker Generic ABS.json
rename to resources/profiles/Anker/filament/Generic ABS @Anker.json
index 39d442abe0..59af2a4f30 100644
--- a/resources/profiles/Anker/filament/Anker Generic ABS.json	
+++ b/resources/profiles/Anker/filament/Generic ABS @Anker.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB99",
     "setting_id": "GFSB99_Anker_00",
-    "name": "Anker Generic ABS",
+    "name": "Generic ABS @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_abs",
@@ -13,6 +13,6 @@
         "12"
     ],
     "compatible_printers": [
-      "Anker M5 0.4 nozzle"
+        "Anker M5 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anker/filament/Anker Generic ASA.json b/resources/profiles/Anker/filament/Generic ASA @Anker.json
similarity index 83%
rename from resources/profiles/Anker/filament/Anker Generic ASA.json
rename to resources/profiles/Anker/filament/Generic ASA @Anker.json
index c5e0b15216..f991471239 100644
--- a/resources/profiles/Anker/filament/Anker Generic ASA.json	
+++ b/resources/profiles/Anker/filament/Generic ASA @Anker.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB98",
     "setting_id": "GFSB98_Anker_00",
-    "name": "Anker Generic ASA",
+    "name": "Generic ASA @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_asa",
@@ -13,6 +13,6 @@
         "12"
     ],
     "compatible_printers": [
-      "Anker M5 0.4 nozzle"
+        "Anker M5 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anker/filament/Anker Generic PA.json b/resources/profiles/Anker/filament/Generic PA @Anker.json
similarity index 92%
rename from resources/profiles/Anker/filament/Anker Generic PA.json
rename to resources/profiles/Anker/filament/Generic PA @Anker.json
index 77defc184a..54ed12dc67 100644
--- a/resources/profiles/Anker/filament/Anker Generic PA.json	
+++ b/resources/profiles/Anker/filament/Generic PA @Anker.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN99",
     "setting_id": "GFSN99_Anker_00",
-    "name": "Anker Generic PA",
+    "name": "Generic PA @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
diff --git a/resources/profiles/Anker/filament/Anker Generic PA-CF.json b/resources/profiles/Anker/filament/Generic PA-CF @Anker.json
similarity index 81%
rename from resources/profiles/Anker/filament/Anker Generic PA-CF.json
rename to resources/profiles/Anker/filament/Generic PA-CF @Anker.json
index cf60917bb5..e8137e5eec 100644
--- a/resources/profiles/Anker/filament/Anker Generic PA-CF.json	
+++ b/resources/profiles/Anker/filament/Generic PA-CF @Anker.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN98",
     "setting_id": "GFSN98_Anker_00",
-    "name": "Anker Generic PA-CF",
+    "name": "Generic PA-CF @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
@@ -15,9 +15,6 @@
     "nozzle_temperature": [
         "280"
     ],
-    "filament_max_volumetric_speed": [
-        "8"
-    ],
     "compatible_printers": [
         "Anker M5 0.4 nozzle"
     ]
diff --git a/resources/profiles/Anker/filament/Anker Generic PC.json b/resources/profiles/Anker/filament/Generic PC @Anker.json
similarity index 91%
rename from resources/profiles/Anker/filament/Anker Generic PC.json
rename to resources/profiles/Anker/filament/Generic PC @Anker.json
index a39599d0ce..36ce69699e 100644
--- a/resources/profiles/Anker/filament/Anker Generic PC.json	
+++ b/resources/profiles/Anker/filament/Generic PC @Anker.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFC99",
     "setting_id": "GFSC99_Anker_00",
-    "name": "Anker Generic PC",
+    "name": "Generic PC @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pc",
diff --git a/resources/profiles/Anker/filament/Anker Generic PETG.json b/resources/profiles/Anker/filament/Generic PETG @Anker.json
similarity index 61%
rename from resources/profiles/Anker/filament/Anker Generic PETG.json
rename to resources/profiles/Anker/filament/Generic PETG @Anker.json
index f8c141996c..c0a39d45fb 100644
--- a/resources/profiles/Anker/filament/Anker Generic PETG.json	
+++ b/resources/profiles/Anker/filament/Generic PETG @Anker.json	
@@ -2,16 +2,10 @@
     "type": "filament",
     "filament_id": "GFG99",
     "setting_id": "GFSG99_Anker_00",
-    "name": "Anker Generic PETG",
+    "name": "Generic PETG @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pet",
-    "reduce_fan_stop_start_freq": [
-        "1"
-    ],
-    "slow_down_for_layer_cooling": [
-        "1"
-    ],
     "fan_cooling_layer_time": [
         "30"
     ],
@@ -27,22 +21,13 @@
     "fan_min_speed": [
         "40"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
-    "slow_down_layer_time": [
-        "8"
-    ],
     "filament_flow_ratio": [
         "0.95"
     ],
     "filament_max_volumetric_speed": [
         "10"
     ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
-    ],
     "compatible_printers": [
-      "Anker M5 0.4 nozzle"
+        "Anker M5 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anker/filament/Anker Generic PLA.json b/resources/profiles/Anker/filament/Generic PLA @Anker.json
similarity index 71%
rename from resources/profiles/Anker/filament/Anker Generic PLA.json
rename to resources/profiles/Anker/filament/Generic PLA @Anker.json
index 74a0f1ca0e..3d6c19257f 100644
--- a/resources/profiles/Anker/filament/Anker Generic PLA.json	
+++ b/resources/profiles/Anker/filament/Generic PLA @Anker.json	
@@ -2,20 +2,17 @@
     "type": "filament",
     "filament_id": "GFL99",
     "setting_id": "GFSL99_Anker_00",
-    "name": "Anker Generic PLA",
+    "name": "Generic PLA @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
     "filament_flow_ratio": [
         "0.98"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "8"
     ],
     "compatible_printers": [
-      "Anker M5 0.4 nozzle"
+        "Anker M5 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anker/filament/Anker Generic PLA-CF.json b/resources/profiles/Anker/filament/Generic PLA-CF @Anker.json
similarity index 80%
rename from resources/profiles/Anker/filament/Anker Generic PLA-CF.json
rename to resources/profiles/Anker/filament/Generic PLA-CF @Anker.json
index 371e900e0c..c61cd7a38e 100644
--- a/resources/profiles/Anker/filament/Anker Generic PLA-CF.json	
+++ b/resources/profiles/Anker/filament/Generic PLA-CF @Anker.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFL98",
     "setting_id": "GFSL98_Anker_00",
-    "name": "Anker Generic PLA-CF",
+    "name": "Generic PLA-CF @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
@@ -12,9 +12,6 @@
     "filament_type": [
         "PLA-CF"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "7"
     ],
diff --git a/resources/profiles/Anker/filament/Anker Generic PVA.json b/resources/profiles/Anker/filament/Generic PVA @Anker.json
similarity index 76%
rename from resources/profiles/Anker/filament/Anker Generic PVA.json
rename to resources/profiles/Anker/filament/Generic PVA @Anker.json
index 9efa0b993e..bf713e88ab 100644
--- a/resources/profiles/Anker/filament/Anker Generic PVA.json	
+++ b/resources/profiles/Anker/filament/Generic PVA @Anker.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFS99",
     "setting_id": "GFSS99_Anker_00",
-    "name": "Anker Generic PVA",
+    "name": "Generic PVA @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pva",
@@ -15,10 +15,7 @@
     "slow_down_layer_time": [
         "7"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
     "compatible_printers": [
-      "Anker M5 0.4 nozzle"
+        "Anker M5 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anker/filament/Anker Generic TPU.json b/resources/profiles/Anker/filament/Generic TPU @Anker.json
similarity index 80%
rename from resources/profiles/Anker/filament/Anker Generic TPU.json
rename to resources/profiles/Anker/filament/Generic TPU @Anker.json
index 3d8bc32400..ea339b6b5f 100644
--- a/resources/profiles/Anker/filament/Anker Generic TPU.json	
+++ b/resources/profiles/Anker/filament/Generic TPU @Anker.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFU99",
     "setting_id": "GFSU99_Anker_00",
-    "name": "Anker Generic TPU",
+    "name": "Generic TPU @Anker",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_tpu",
@@ -10,6 +10,6 @@
         "3.2"
     ],
     "compatible_printers": [
-      "Anker M5 0.4 nozzle"
+        "Anker M5 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anycubic.json b/resources/profiles/Anycubic.json
index 02cc3ccb29..98c1e14e50 100644
--- a/resources/profiles/Anycubic.json
+++ b/resources/profiles/Anycubic.json
@@ -4,7 +4,7 @@
     "force_update": "0",
     "description": "Anycubic configurations",
     "machine_model_list": [
-	    {
+        {
             "name": "Anycubic i3 Mega S",
             "sub_path": "machine/Anycubic i3 Mega S.json"
         },
@@ -104,77 +104,78 @@
             "name": "fdm_filament_common",
             "sub_path": "filament/fdm_filament_common.json"
         },
-        {
-            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_pla.json"
-        },
-        {
-            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_tpu.json"
-        },
-        {
-            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_pet.json"
-        },
         {
             "name": "fdm_filament_abs",
             "sub_path": "filament/fdm_filament_abs.json"
         },
+        {
+            "name": "fdm_filament_asa",
+            "sub_path": "filament/fdm_filament_asa.json"
+        },
+        
+        {
+            "name": "fdm_filament_pa",
+            "sub_path": "filament/fdm_filament_pa.json"
+        },
         {
             "name": "fdm_filament_pc",
             "sub_path": "filament/fdm_filament_pc.json"
         },
         {
-            "name": "fdm_filament_asa",
-            "sub_path": "filament/fdm_filament_asa.json"
+            "name": "fdm_filament_pet",
+            "sub_path": "filament/fdm_filament_pet.json"
+        },
+        {
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
         },
         {
             "name": "fdm_filament_pva",
             "sub_path": "filament/fdm_filament_pva.json"
         },
         {
-            "name": "fdm_filament_pa",
-            "sub_path": "filament/fdm_filament_pa.json"
+            "name": "fdm_filament_tpu",
+            "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Anycubic Generic PLA",
-            "sub_path": "filament/Anycubic Generic PLA.json"
+            "name": "Generic ABS @Anycubic",
+            "sub_path": "filament/Generic ABS @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PLA-CF",
-            "sub_path": "filament/Anycubic Generic PLA-CF.json"
+            "name": "Generic ASA @Anycubic",
+            "sub_path": "filament/Generic ASA @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PETG",
-            "sub_path": "filament/Anycubic Generic PETG.json"
+            "name": "Generic PA @Anycubic",
+            "sub_path": "filament/Generic PA @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic ABS",
-            "sub_path": "filament/Anycubic Generic ABS.json"
+            "name": "Generic PA-CF @Anycubic",
+            "sub_path": "filament/Generic PA-CF @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic TPU",
-            "sub_path": "filament/Anycubic Generic TPU.json"
+            "name": "Generic PC @Anycubic",
+            "sub_path": "filament/Generic PC @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic ASA",
-            "sub_path": "filament/Anycubic Generic ASA.json"
+            "name": "Generic PETG @Anycubic",
+            "sub_path": "filament/Generic PETG @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PC",
-            "sub_path": "filament/Anycubic Generic PC.json"
+            "name": "Generic PLA @Anycubic",
+            "sub_path": "filament/Generic PLA @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PVA",
-            "sub_path": "filament/Anycubic Generic PVA.json"
+            "name": "Generic PLA-CF @Anycubic",
+            "sub_path": "filament/Generic PLA-CF @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PA",
-            "sub_path": "filament/Anycubic Generic PA.json"
+            "name": "Generic PVA @Anycubic",
+            "sub_path": "filament/Generic PVA @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PA-CF",
-            "sub_path": "filament/Anycubic Generic PA-CF.json"
+            "name": "Generic TPU @Anycubic",
+            "sub_path": "filament/Generic TPU @Anycubic.json"
         }
     ],
     "machine_list": [
@@ -207,4 +208,4 @@
             "sub_path": "machine/Anycubic 4Max Pro 2 0.4 nozzle.json"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json
similarity index 93%
rename from resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
rename to resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json
index 9e444ff952..bf6f616fc5 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic ABS.json	
+++ b/resources/profiles/Anycubic/filament/Generic ABS @Anycubic.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB99",
     "setting_id": "GFSB99_ANYCUBIC_00",
-    "name": "Anycubic Generic ABS",
+    "name": "Generic ABS @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_abs",
@@ -20,4 +20,4 @@
         "Anycubic 4Max Pro 0.4 nozzle",
         "Anycubic 4Max Pro 2 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json b/resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json
similarity index 93%
rename from resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
rename to resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json
index 3213002366..5f8f2a17a7 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic ASA.json	
+++ b/resources/profiles/Anycubic/filament/Generic ASA @Anycubic.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB98",
     "setting_id": "GFSB98_ANYCUBIC_00",
-    "name": "Anycubic Generic ASA",
+    "name": "Generic ASA @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_asa",
@@ -20,4 +20,4 @@
         "Anycubic 4Max Pro 0.4 nozzle",
         "Anycubic 4Max Pro 2 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PA.json b/resources/profiles/Anycubic/filament/Generic PA @Anycubic.json
similarity index 94%
rename from resources/profiles/Anycubic/filament/Anycubic Generic PA.json
rename to resources/profiles/Anycubic/filament/Generic PA @Anycubic.json
index 7ef654d6e3..ec4e33b72f 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic PA.json	
+++ b/resources/profiles/Anycubic/filament/Generic PA @Anycubic.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN99",
     "setting_id": "GFSN99_ANYCUBIC_00",
-    "name": "Anycubic Generic PA",
+    "name": "Generic PA @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json b/resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json
similarity index 86%
rename from resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
rename to resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json
index dfadb774d4..7e2c03f88b 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json	
+++ b/resources/profiles/Anycubic/filament/Generic PA-CF @Anycubic.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN98",
     "setting_id": "GFSN98_ANYCUBIC_00",
-    "name": "Anycubic Generic PA-CF",
+    "name": "Generic PA-CF @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
@@ -15,9 +15,6 @@
     "nozzle_temperature": [
         "280"
     ],
-    "filament_max_volumetric_speed": [
-        "8"
-    ],
     "compatible_printers": [
         "Anycubic i3 Mega S 0.4 nozzle",
         "Anycubic Chiron 0.4 nozzle",
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PC.json b/resources/profiles/Anycubic/filament/Generic PC @Anycubic.json
similarity index 94%
rename from resources/profiles/Anycubic/filament/Anycubic Generic PC.json
rename to resources/profiles/Anycubic/filament/Generic PC @Anycubic.json
index efc74d483e..ac48ba25ca 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic PC.json	
+++ b/resources/profiles/Anycubic/filament/Generic PC @Anycubic.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFC99",
     "setting_id": "GFSC99_ANYCUBIC_00",
-    "name": "Anycubic Generic PC",
+    "name": "Generic PC @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pc",
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json
similarity index 71%
rename from resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
rename to resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json
index 1978364a51..cdb1c40ef8 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic PETG.json	
+++ b/resources/profiles/Anycubic/filament/Generic PETG @Anycubic.json	
@@ -2,16 +2,10 @@
     "type": "filament",
     "filament_id": "GFG99",
     "setting_id": "GFSG99_ANYCUBIC_00",
-    "name": "Anycubic Generic PETG",
+    "name": "Generic PETG @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pet",
-    "reduce_fan_stop_start_freq": [
-        "1"
-    ],
-    "slow_down_for_layer_cooling": [
-        "1"
-    ],
     "fan_cooling_layer_time": [
         "30"
     ],
@@ -27,21 +21,12 @@
     "fan_min_speed": [
         "40"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
-    "slow_down_layer_time": [
-        "8"
-    ],
     "filament_flow_ratio": [
         "0.95"
     ],
     "filament_max_volumetric_speed": [
         "10"
     ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
-    ],
     "compatible_printers": [
         "Anycubic i3 Mega S 0.4 nozzle",
         "Anycubic Chiron 0.4 nozzle",
@@ -50,4 +35,4 @@
         "Anycubic 4Max Pro 0.4 nozzle",
         "Anycubic 4Max Pro 2 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json b/resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json
similarity index 85%
rename from resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
rename to resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json
index 7d4b7b0bb7..b7537345ee 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic PLA.json	
+++ b/resources/profiles/Anycubic/filament/Generic PLA @Anycubic.json	
@@ -2,16 +2,13 @@
     "type": "filament",
     "filament_id": "GFL99",
     "setting_id": "GFSL99_ANYCUBIC_00",
-    "name": "Anycubic Generic PLA",
+    "name": "Generic PLA @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
     "filament_flow_ratio": [
         "0.98"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "8"
     ],
@@ -23,4 +20,4 @@
         "Anycubic 4Max Pro 0.4 nozzle",
         "Anycubic 4Max Pro 2 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json b/resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json
similarity index 86%
rename from resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
rename to resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json
index 03357a114a..450e9ee78d 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json	
+++ b/resources/profiles/Anycubic/filament/Generic PLA-CF @Anycubic.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFL98",
     "setting_id": "GFSL98_ANYCUBIC_00",
-    "name": "Anycubic Generic PLA-CF",
+    "name": "Generic PLA-CF @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
@@ -12,9 +12,6 @@
     "filament_type": [
         "PLA-CF"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "7"
     ],
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json b/resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json
similarity index 87%
rename from resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
rename to resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json
index c7548e4e4c..d473b89815 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic PVA.json	
+++ b/resources/profiles/Anycubic/filament/Generic PVA @Anycubic.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFS99",
     "setting_id": "GFSS99_ANYCUBIC_00",
-    "name": "Anycubic Generic PVA",
+    "name": "Generic PVA @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pva",
@@ -15,9 +15,6 @@
     "slow_down_layer_time": [
         "7"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
     "compatible_printers": [
         "Anycubic i3 Mega S 0.4 nozzle",
         "Anycubic Chiron 0.4 nozzle",
@@ -26,4 +23,4 @@
         "Anycubic 4Max Pro 0.4 nozzle",
         "Anycubic 4Max Pro 2 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json
similarity index 93%
rename from resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
rename to resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json
index ca8eccbc01..bf89d670b6 100644
--- a/resources/profiles/Anycubic/filament/Anycubic Generic TPU.json	
+++ b/resources/profiles/Anycubic/filament/Generic TPU @Anycubic.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFU99",
     "setting_id": "GFSU99_ANYCUBIC_00",
-    "name": "Anycubic Generic TPU",
+    "name": "Generic TPU @Anycubic",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_tpu",
@@ -17,4 +17,4 @@
         "Anycubic 4Max Pro 0.4 nozzle",
         "Anycubic 4Max Pro 2 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json
index 4723c19fd7..331be02c77 100644
--- a/resources/profiles/Creality.json
+++ b/resources/profiles/Creality.json
@@ -157,28 +157,28 @@
             "sub_path": "filament/fdm_filament_common.json"
         },
         {
-            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_pla.json"
+            "name": "fdm_filament_abs",
+            "sub_path": "filament/fdm_filament_abs.json"
         },
         {
             "name": "fdm_filament_pet",
             "sub_path": "filament/fdm_filament_pet.json"
         },
         {
-            "name": "fdm_filament_abs",
-            "sub_path": "filament/fdm_filament_abs.json"
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
         },
         {
-            "name": "Creality Generic PLA",
-            "sub_path": "filament/Creality Generic PLA.json"
+            "name": "Generic ABS @Creality",
+            "sub_path": "filament/Generic ABS @Creality.json"
         },
         {
-            "name": "Creality Generic PETG",
-            "sub_path": "filament/Creality Generic PETG.json"
+            "name": "Generic PETG @Creality",
+            "sub_path": "filament/Generic PETG @Creality.json"
         },
         {
-            "name": "Creality Generic ABS",
-            "sub_path": "filament/Creality Generic ABS.json"
+            "name": "Generic PLA @Creality",
+            "sub_path": "filament/Generic PLA @Creality.json"
         }
     ],
     "machine_list": [
@@ -231,4 +231,4 @@
             "sub_path": "machine/Creality Ender-6 0.4 nozzle.json"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic ABS.json b/resources/profiles/Creality/filament/Generic ABS @Creality.json
similarity index 90%
rename from resources/profiles/Creality/filament/Creality Generic ABS.json
rename to resources/profiles/Creality/filament/Generic ABS @Creality.json
index d77f707995..00f8a1f592 100644
--- a/resources/profiles/Creality/filament/Creality Generic ABS.json	
+++ b/resources/profiles/Creality/filament/Generic ABS @Creality.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB99",
     "setting_id": "GFSB99_Creality_00",
-    "name": "Creality Generic ABS",
+    "name": "Generic ABS @Creality",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_abs",
@@ -12,7 +12,7 @@
     "filament_max_volumetric_speed": [
         "12"
     ],
-	"compatible_printers": [
+    "compatible_printers": [
         "Creality CR-10 V2 0.4 nozzle",
         "Creality CR-10 Max 0.4 nozzle",
         "Creality Ender-3 V2 0.4 nozzle",
@@ -23,5 +23,5 @@
         "Creality Ender-5S 0.4 nozzle",
         "Creality Ender-5 S1 0.4 nozzle",
         "Creality Ender-6 0.4 nozzle"
-	]
-}
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PETG.json b/resources/profiles/Creality/filament/Generic PETG @Creality.json
similarity index 73%
rename from resources/profiles/Creality/filament/Creality Generic PETG.json
rename to resources/profiles/Creality/filament/Generic PETG @Creality.json
index 975abf2a15..326f869b5b 100644
--- a/resources/profiles/Creality/filament/Creality Generic PETG.json	
+++ b/resources/profiles/Creality/filament/Generic PETG @Creality.json	
@@ -2,16 +2,10 @@
     "type": "filament",
     "filament_id": "GFG99",
     "setting_id": "GFSG99_Creality_00",
-    "name": "Creality Generic PETG",
+    "name": "Generic PETG @Creality",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pet",
-    "reduce_fan_stop_start_freq": [
-        "1"
-    ],
-    "slow_down_for_layer_cooling": [
-        "1"
-    ],
     "fan_cooling_layer_time": [
         "30"
     ],
@@ -27,22 +21,13 @@
     "fan_min_speed": [
         "40"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
-    "slow_down_layer_time": [
-        "8"
-    ],
     "filament_flow_ratio": [
         "0.95"
     ],
     "filament_max_volumetric_speed": [
         "10"
     ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
-    ],
-	"compatible_printers": [
+    "compatible_printers": [
         "Creality CR-10 V2 0.4 nozzle",
         "Creality CR-10 Max 0.4 nozzle",
         "Creality Ender-3 V2 0.4 nozzle",
@@ -53,5 +38,5 @@
         "Creality Ender-5S 0.4 nozzle",
         "Creality Ender-5 S1 0.4 nozzle",
         "Creality Ender-6 0.4 nozzle"
-	]
-}
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA.json b/resources/profiles/Creality/filament/Generic PLA @Creality.json
similarity index 84%
rename from resources/profiles/Creality/filament/Creality Generic PLA.json
rename to resources/profiles/Creality/filament/Generic PLA @Creality.json
index a32dc39264..f359de6776 100644
--- a/resources/profiles/Creality/filament/Creality Generic PLA.json	
+++ b/resources/profiles/Creality/filament/Generic PLA @Creality.json	
@@ -2,20 +2,17 @@
     "type": "filament",
     "filament_id": "GFL99",
     "setting_id": "GFSL99_Creality_00",
-    "name": "Creality Generic PLA",
+    "name": "Generic PLA @Creality",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
     "filament_flow_ratio": [
         "0.98"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "8"
     ],
-	"compatible_printers": [
+    "compatible_printers": [
         "Creality CR-10 V2 0.4 nozzle",
         "Creality CR-10 Max 0.4 nozzle",
         "Creality Ender-3 V2 0.4 nozzle",
@@ -26,5 +23,5 @@
         "Creality Ender-5S 0.4 nozzle",
         "Creality Ender-5 S1 0.4 nozzle",
         "Creality Ender-6 0.4 nozzle"
-	]
-}
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json
index 1cd3a74c57..fa668c5088 100644
--- a/resources/profiles/Elegoo.json
+++ b/resources/profiles/Elegoo.json
@@ -285,16 +285,16 @@
             "sub_path": "filament/fdm_filament_pla.json"
         },
         {
-            "name": "Elegoo Generic ABS",
-            "sub_path": "filament/Elegoo Generic ABS.json"
+            "name": "Generic ABS @Elegoo",
+            "sub_path": "filament/Generic ABS @Elegoo.json"
         },
         {
-            "name": "Elegoo Generic PETG",
-            "sub_path": "filament/Elegoo Generic PETG.json"
+            "name": "Generic PETG @Elegoo",
+            "sub_path": "filament/Generic PETG @Elegoo.json"
         },
         {
-            "name": "Elegoo Generic PLA",
-            "sub_path": "filament/Elegoo Generic PLA.json"
+            "name": "Generic PLA @Elegoo",
+            "sub_path": "filament/Generic PLA @Elegoo.json"
         }
     ],
     "machine_list": [
@@ -343,4 +343,4 @@
             "sub_path": "machine/Elegoo Neptune 3 Max 0.4 nozzle.json"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic ABS.json b/resources/profiles/Elegoo/filament/Generic ABS @Elegoo.json
similarity index 95%
rename from resources/profiles/Elegoo/filament/Elegoo Generic ABS.json
rename to resources/profiles/Elegoo/filament/Generic ABS @Elegoo.json
index 9db5bd38d4..e1a30614d5 100644
--- a/resources/profiles/Elegoo/filament/Elegoo Generic ABS.json	
+++ b/resources/profiles/Elegoo/filament/Generic ABS @Elegoo.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB99",
     "setting_id": "GFSB99_Elegoo_00",
-    "name": "Elegoo Generic ABS",
+    "name": "Generic ABS @Elegoo",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_abs",
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PETG.json b/resources/profiles/Elegoo/filament/Generic PETG @Elegoo.json
similarity index 65%
rename from resources/profiles/Elegoo/filament/Elegoo Generic PETG.json
rename to resources/profiles/Elegoo/filament/Generic PETG @Elegoo.json
index 26e1dd5211..1f25d5b07b 100644
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PETG.json	
+++ b/resources/profiles/Elegoo/filament/Generic PETG @Elegoo.json	
@@ -2,16 +2,10 @@
     "type": "filament",
     "filament_id": "GFG99",
     "setting_id": "GFSG99_Elegoo_00",
-    "name": "Elegoo Generic PETG",
+    "name": "Generic PETG @Elegoo",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pet",
-    "reduce_fan_stop_start_freq": [
-        "1"
-    ],
-    "slow_down_for_layer_cooling": [
-        "1"
-    ],
     "fan_cooling_layer_time": [
         "30"
     ],
@@ -21,30 +15,12 @@
     "overhang_fan_threshold": [
         "25%"
     ],
-    "nozzle_temperature_initial_layer": [
-        "240"
-    ],
-    "fan_max_speed": [
-        "50"
-    ],
-    "fan_min_speed": [
-        "20"
-    ],
-    "slow_down_min_speed": [
-        "10"
-    ],
-    "slow_down_layer_time": [
-        "8"
-    ],
     "filament_flow_ratio": [
         "0.95"
     ],
     "filament_max_volumetric_speed": [
         "10"
     ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
-    ],
     "compatible_printers": [
         "Elegoo Neptune 0.4 nozzle",
         "Elegoo Neptune X 0.4 nozzle",
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA.json b/resources/profiles/Elegoo/filament/Generic PLA @Elegoo.json
similarity index 81%
rename from resources/profiles/Elegoo/filament/Elegoo Generic PLA.json
rename to resources/profiles/Elegoo/filament/Generic PLA @Elegoo.json
index 17ba59d80f..9dce08376f 100644
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA.json	
+++ b/resources/profiles/Elegoo/filament/Generic PLA @Elegoo.json	
@@ -2,19 +2,13 @@
     "type": "filament",
     "filament_id": "GFL99",
     "setting_id": "GFSL99_Elegoo_00",
-    "name": "Elegoo Generic PLA",
+    "name": "Generic PLA @Elegoo",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
     "filament_flow_ratio": [
         "0.98"
     ],
-    "filament_max_volumetric_speed": [
-        "15"
-    ],
-    "nozzle_temperature_initial_layer": [
-        "210"
-    ],
     "slow_down_layer_time": [
         "8"
     ],
@@ -29,4 +23,4 @@
         "Elegoo Neptune 3 Plus 0.4 nozzle",
         "Elegoo Neptune 3 Max 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json
index e721cff8a0..0ed864dece 100644
--- a/resources/profiles/Prusa.json
+++ b/resources/profiles/Prusa.json
@@ -32,77 +32,78 @@
             "name": "fdm_filament_common",
             "sub_path": "filament/fdm_filament_common.json"
         },
-        {
-            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_pla.json"
-        },
-        {
-            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_tpu.json"
-        },
-        {
-            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_pet.json"
-        },
         {
             "name": "fdm_filament_abs",
             "sub_path": "filament/fdm_filament_abs.json"
         },
+        {
+            "name": "fdm_filament_asa",
+            "sub_path": "filament/fdm_filament_asa.json"
+        },
+       
+        {
+            "name": "fdm_filament_pa",
+            "sub_path": "filament/fdm_filament_pa.json"
+        },
         {
             "name": "fdm_filament_pc",
             "sub_path": "filament/fdm_filament_pc.json"
         },
         {
-            "name": "fdm_filament_asa",
-            "sub_path": "filament/fdm_filament_asa.json"
+            "name": "fdm_filament_pet",
+            "sub_path": "filament/fdm_filament_pet.json"
+        },
+        {
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
         },
         {
             "name": "fdm_filament_pva",
             "sub_path": "filament/fdm_filament_pva.json"
         },
         {
-            "name": "fdm_filament_pa",
-            "sub_path": "filament/fdm_filament_pa.json"
+            "name": "fdm_filament_tpu",
+            "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Prusa Generic PLA",
-            "sub_path": "filament/Prusa Generic PLA.json"
+            "name": "Generic ABS @Prusa",
+            "sub_path": "filament/Generic ABS @Prusa.json"
         },
         {
-            "name": "Prusa Generic PLA-CF",
-            "sub_path": "filament/Prusa Generic PLA-CF.json"
+            "name": "Generic ASA @Prusa",
+            "sub_path": "filament/Generic ASA @Prusa.json"
         },
         {
-            "name": "Prusa Generic PETG",
-            "sub_path": "filament/Prusa Generic PETG.json"
+            "name": "Generic PA @Prusa",
+            "sub_path": "filament/Generic PA @Prusa.json"
         },
         {
-            "name": "Prusa Generic ABS",
-            "sub_path": "filament/Prusa Generic ABS.json"
+            "name": "Generic PA-CF @Prusa",
+            "sub_path": "filament/Generic PA-CF @Prusa.json"
         },
         {
-            "name": "Prusa Generic TPU",
-            "sub_path": "filament/Prusa Generic TPU.json"
+            "name": "Generic PC @Prusa",
+            "sub_path": "filament/Generic PC @Prusa.json"
         },
         {
-            "name": "Prusa Generic ASA",
-            "sub_path": "filament/Prusa Generic ASA.json"
+            "name": "Generic PETG @Prusa",
+            "sub_path": "filament/Generic PETG @Prusa.json"
         },
         {
-            "name": "Prusa Generic PC",
-            "sub_path": "filament/Prusa Generic PC.json"
+            "name": "Generic PLA @Prusa",
+            "sub_path": "filament/Generic PLA @Prusa.json"
         },
         {
-            "name": "Prusa Generic PVA",
-            "sub_path": "filament/Prusa Generic PVA.json"
+            "name": "Generic PLA-CF @Prusa",
+            "sub_path": "filament/Generic PLA-CF @Prusa.json"
         },
         {
-            "name": "Prusa Generic PA",
-            "sub_path": "filament/Prusa Generic PA.json"
+            "name": "Generic PVA @Prusa",
+            "sub_path": "filament/Generic PVA @Prusa.json"
         },
         {
-            "name": "Prusa Generic PA-CF",
-            "sub_path": "filament/Prusa Generic PA-CF.json"
+            "name": "Generic TPU @Prusa",
+            "sub_path": "filament/Generic TPU @Prusa.json"
         }
     ],
     "machine_list": [
@@ -119,4 +120,4 @@
             "sub_path": "machine/Prusa MINI 0.4 nozzle.json"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa.json
similarity index 76%
rename from resources/profiles/Prusa/filament/Prusa Generic ABS.json
rename to resources/profiles/Prusa/filament/Generic ABS @Prusa.json
index ba22caf601..9a47d7e91d 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic ABS.json	
+++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB99",
     "setting_id": "GFSB99_PRUSA_00",
-    "name": "Prusa Generic ABS",
+    "name": "Generic ABS @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_abs",
@@ -13,7 +13,7 @@
         "12"
     ],
     "compatible_printers": [
-      "Prusa MK3S 0.4 nozzle",
-      "Prusa MINI 0.4 nozzle"
+        "Prusa MK3S 0.4 nozzle",
+        "Prusa MINI 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Prusa/filament/Prusa Generic ASA.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa.json
similarity index 76%
rename from resources/profiles/Prusa/filament/Prusa Generic ASA.json
rename to resources/profiles/Prusa/filament/Generic ASA @Prusa.json
index b5717c4288..fd86abbdc4 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic ASA.json	
+++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB98",
     "setting_id": "GFSB98_PRUSA_00",
-    "name": "Prusa Generic ASA",
+    "name": "Generic ASA @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_asa",
@@ -13,7 +13,7 @@
         "12"
     ],
     "compatible_printers": [
-      "Prusa MK3S 0.4 nozzle",
-      "Prusa MINI 0.4 nozzle"
+        "Prusa MK3S 0.4 nozzle",
+        "Prusa MINI 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA.json b/resources/profiles/Prusa/filament/Generic PA @Prusa.json
similarity index 93%
rename from resources/profiles/Prusa/filament/Prusa Generic PA.json
rename to resources/profiles/Prusa/filament/Generic PA @Prusa.json
index f906df9fb4..4da98e6e91 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic PA.json	
+++ b/resources/profiles/Prusa/filament/Generic PA @Prusa.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN99",
     "setting_id": "GFSN99_PRUSA_00",
-    "name": "Prusa Generic PA",
+    "name": "Generic PA @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
diff --git a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json
similarity index 76%
rename from resources/profiles/Prusa/filament/Prusa Generic PA-CF.json
rename to resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json
index e4d604a301..6ec7f17e87 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic PA-CF.json	
+++ b/resources/profiles/Prusa/filament/Generic PA-CF @Prusa.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN98",
     "setting_id": "GFSN98_PRUSA_00",
-    "name": "Prusa Generic PA-CF",
+    "name": "Generic PA-CF @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
@@ -15,11 +15,8 @@
     "nozzle_temperature": [
         "280"
     ],
-    "filament_max_volumetric_speed": [
-        "8"
-    ],
     "compatible_printers": [
         "Prusa MK3S 0.4 nozzle",
-      "Prusa MINI 0.4 nozzle"
+        "Prusa MINI 0.4 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/filament/Prusa Generic PC.json b/resources/profiles/Prusa/filament/Generic PC @Prusa.json
similarity index 84%
rename from resources/profiles/Prusa/filament/Prusa Generic PC.json
rename to resources/profiles/Prusa/filament/Generic PC @Prusa.json
index e8e154b789..6e4969b145 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic PC.json	
+++ b/resources/profiles/Prusa/filament/Generic PC @Prusa.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFC99",
     "setting_id": "GFSC99_PRUSA_00",
-    "name": "Prusa Generic PC",
+    "name": "Generic PC @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pc",
@@ -14,6 +14,6 @@
     ],
     "compatible_printers": [
         "Prusa MK3S 0.4 nozzle",
-      "Prusa MINI 0.4 nozzle"
+        "Prusa MINI 0.4 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa.json
similarity index 59%
rename from resources/profiles/Prusa/filament/Prusa Generic PETG.json
rename to resources/profiles/Prusa/filament/Generic PETG @Prusa.json
index 3ae2b2483e..7eae2cac36 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic PETG.json	
+++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa.json	
@@ -2,16 +2,10 @@
     "type": "filament",
     "filament_id": "GFG99",
     "setting_id": "GFSG99_PRUSA_00",
-    "name": "Prusa Generic PETG",
+    "name": "Generic PETG @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pet",
-    "reduce_fan_stop_start_freq": [
-        "1"
-    ],
-    "slow_down_for_layer_cooling": [
-        "1"
-    ],
     "fan_cooling_layer_time": [
         "30"
     ],
@@ -27,23 +21,14 @@
     "fan_min_speed": [
         "40"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
-    "slow_down_layer_time": [
-        "8"
-    ],
     "filament_flow_ratio": [
         "0.95"
     ],
     "filament_max_volumetric_speed": [
         "10"
     ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
-    ],
     "compatible_printers": [
-      "Prusa MK3S 0.4 nozzle",
-      "Prusa MINI 0.4 nozzle"
+        "Prusa MK3S 0.4 nozzle",
+        "Prusa MINI 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa.json
similarity index 66%
rename from resources/profiles/Prusa/filament/Prusa Generic PLA.json
rename to resources/profiles/Prusa/filament/Generic PLA @Prusa.json
index d52943d9f3..3e93a80607 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic PLA.json	
+++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa.json	
@@ -2,21 +2,18 @@
     "type": "filament",
     "filament_id": "GFL99",
     "setting_id": "GFSL99_PRUSA_00",
-    "name": "Prusa Generic PLA",
+    "name": "Generic PLA @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
     "filament_flow_ratio": [
         "0.98"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "8"
     ],
     "compatible_printers": [
-      "Prusa MK3S 0.4 nozzle",
-      "Prusa MINI 0.4 nozzle"
+        "Prusa MK3S 0.4 nozzle",
+        "Prusa MINI 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json
similarity index 75%
rename from resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json
rename to resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json
index 429773c84a..1ffd6c2d10 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json	
+++ b/resources/profiles/Prusa/filament/Generic PLA-CF @Prusa.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFL98",
     "setting_id": "GFSL98_PRUSA_00",
-    "name": "Prusa Generic PLA-CF",
+    "name": "Generic PLA-CF @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
@@ -12,14 +12,11 @@
     "filament_type": [
         "PLA-CF"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "7"
     ],
     "compatible_printers": [
         "Prusa MK3S 0.4 nozzle",
-      "Prusa MINI 0.4 nozzle"
+        "Prusa MINI 0.4 nozzle"
     ]
 }
\ No newline at end of file
diff --git a/resources/profiles/Prusa/filament/Prusa Generic PVA.json b/resources/profiles/Prusa/filament/Generic PVA @Prusa.json
similarity index 71%
rename from resources/profiles/Prusa/filament/Prusa Generic PVA.json
rename to resources/profiles/Prusa/filament/Generic PVA @Prusa.json
index 2481fbebd4..cc6cc55476 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic PVA.json	
+++ b/resources/profiles/Prusa/filament/Generic PVA @Prusa.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFS99",
     "setting_id": "GFSS99_PRUSA_00",
-    "name": "Prusa Generic PVA",
+    "name": "Generic PVA @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pva",
@@ -15,11 +15,8 @@
     "slow_down_layer_time": [
         "7"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
     "compatible_printers": [
-      "Prusa MK3S 0.4 nozzle",
-      "Prusa MINI 0.4 nozzle"
+        "Prusa MK3S 0.4 nozzle",
+        "Prusa MINI 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Prusa/filament/Prusa Generic TPU.json b/resources/profiles/Prusa/filament/Generic TPU @Prusa.json
similarity index 73%
rename from resources/profiles/Prusa/filament/Prusa Generic TPU.json
rename to resources/profiles/Prusa/filament/Generic TPU @Prusa.json
index 828877723f..b0b161a219 100644
--- a/resources/profiles/Prusa/filament/Prusa Generic TPU.json	
+++ b/resources/profiles/Prusa/filament/Generic TPU @Prusa.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFU99",
     "setting_id": "GFSU99_PRUSA_00",
-    "name": "Prusa Generic TPU",
+    "name": "Generic TPU @Prusa",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_tpu",
@@ -10,7 +10,7 @@
         "3.2"
     ],
     "compatible_printers": [
-      "Prusa MK3S 0.4 nozzle",
-      "Prusa MINI 0.4 nozzle"
+        "Prusa MK3S 0.4 nozzle",
+        "Prusa MINI 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json
index 887e807b6a..c7a4d290a8 100644
--- a/resources/profiles/Qidi.json
+++ b/resources/profiles/Qidi.json
@@ -197,52 +197,52 @@
             "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Qidi Generic ABS",
-            "sub_path": "filament/Qidi Generic ABS.json"
+            "name": "Generic ABS @Qidi",
+            "sub_path": "filament/Generic ABS @Qidi.json"
         },
         {
-            "name": "Qidi Generic ASA",
-            "sub_path": "filament/Qidi Generic ASA.json"
+            "name": "Generic ASA @Qidi",
+            "sub_path": "filament/Generic ASA @Qidi.json"
         },
         {
-            "name": "Qidi Generic PA",
-            "sub_path": "filament/Qidi Generic PA.json"
+            "name": "Generic PA @Qidi",
+            "sub_path": "filament/Generic PA @Qidi.json"
         },
         {
-            "name": "Qidi Generic PA-CF",
-            "sub_path": "filament/Qidi Generic PA-CF.json"
+            "name": "Generic PA-CF @Qidi",
+            "sub_path": "filament/Generic PA-CF @Qidi.json"
         },
         {
-            "name": "Qidi Generic PC",
-            "sub_path": "filament/Qidi Generic PC.json"
+            "name": "Generic PC @Qidi",
+            "sub_path": "filament/Generic PC @Qidi.json"
         },
         {
-            "name": "Qidi Generic PETG",
-            "sub_path": "filament/Qidi Generic PETG.json"
+            "name": "Generic PETG @Qidi",
+            "sub_path": "filament/Generic PETG @Qidi.json"
         },
         {
-            "name": "Qidi Generic PETG-CF",
-            "sub_path": "filament/Qidi Generic PETG-CF.json"
+            "name": "Generic PETG-CF @Qidi",
+            "sub_path": "filament/Generic PETG-CF @Qidi.json"
         },
         {
-            "name": "Qidi Generic PLA Silk",
-            "sub_path": "filament/Qidi Generic PLA Silk.json"
+            "name": "Generic PLA @Qidi",
+            "sub_path": "filament/Generic PLA @Qidi.json"
         },
         {
-            "name": "Qidi Generic PLA",
-            "sub_path": "filament/Qidi Generic PLA.json"
+            "name": "Generic PLA Silk @Qidi",
+            "sub_path": "filament/Generic PLA Silk @Qidi.json"
         },
         {
-            "name": "Qidi Generic PLA-CF",
-            "sub_path": "filament/Qidi Generic PLA-CF.json"
+            "name": "Generic PLA-CF @Qidi",
+            "sub_path": "filament/Generic PLA-CF @Qidi.json"
         },
         {
-            "name": "Qidi Generic PVA",
-            "sub_path": "filament/Qidi Generic PVA.json"
+            "name": "Generic PVA @Qidi",
+            "sub_path": "filament/Generic PVA @Qidi.json"
         },
         {
-            "name": "Qidi Generic TPU",
-            "sub_path": "filament/Qidi Generic TPU.json"
+            "name": "Generic TPU @Qidi",
+            "sub_path": "filament/Generic TPU @Qidi.json"
         }
     ],
     "machine_list": [
diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json
similarity index 94%
rename from resources/profiles/Qidi/filament/Qidi Generic ABS.json
rename to resources/profiles/Qidi/filament/Generic ABS @Qidi.json
index 63137c68d2..60f6c96d0e 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic ABS.json	
+++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB99",
     "setting_id": "GFSB99_Qidi_00",
-    "name": "Qidi Generic ABS",
+    "name": "Generic ABS @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_abs",
diff --git a/resources/profiles/Qidi/filament/Qidi Generic ASA.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json
similarity index 94%
rename from resources/profiles/Qidi/filament/Qidi Generic ASA.json
rename to resources/profiles/Qidi/filament/Generic ASA @Qidi.json
index 2152b392f3..3848d71b9e 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic ASA.json	
+++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB99",
     "setting_id": "GFSB99_Qidi_01",
-    "name": "Qidi Generic ASA",
+    "name": "Generic ASA @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_asa",
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA.json b/resources/profiles/Qidi/filament/Generic PA @Qidi.json
similarity index 95%
rename from resources/profiles/Qidi/filament/Qidi Generic PA.json
rename to resources/profiles/Qidi/filament/Generic PA @Qidi.json
index 3626e5907b..94b38505de 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic PA.json	
+++ b/resources/profiles/Qidi/filament/Generic PA @Qidi.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN99",
     "setting_id": "GFSN99_Qidi_00",
-    "name": "Qidi Generic PA",
+    "name": "Generic PA @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json b/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json
similarity index 78%
rename from resources/profiles/Qidi/filament/Qidi Generic PA-CF.json
rename to resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json
index 7be152daa3..66d70c49f3 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic PA-CF.json	
+++ b/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json	
@@ -2,22 +2,13 @@
     "type": "filament",
     "filament_id": "GFN98",
     "setting_id": "GFSN98_Qidi_00",
-    "name": "Qidi Generic PA-CF",
+    "name": "Generic PA-CF @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
     "filament_type": [
         "PA-CF"
     ],
-    "nozzle_temperature_initial_layer": [
-        "290"
-    ],
-    "nozzle_temperature": [
-        "290"
-    ],
-    "filament_max_volumetric_speed": [
-        "8"
-    ],
     "fan_max_speed": [
         "30"
     ],
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PC.json b/resources/profiles/Qidi/filament/Generic PC @Qidi.json
similarity index 94%
rename from resources/profiles/Qidi/filament/Qidi Generic PC.json
rename to resources/profiles/Qidi/filament/Generic PC @Qidi.json
index 129da3c1f6..257344cdd9 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic PC.json	
+++ b/resources/profiles/Qidi/filament/Generic PC @Qidi.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFC99",
     "setting_id": "GFSC99_Qidi_00",
-    "name": "Qidi Generic PC",
+    "name": "Generic PC @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pc",
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json
similarity index 71%
rename from resources/profiles/Qidi/filament/Qidi Generic PETG.json
rename to resources/profiles/Qidi/filament/Generic PETG @Qidi.json
index 9997927d4d..d26b1fb46e 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic PETG.json	
+++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json	
@@ -2,16 +2,10 @@
     "type": "filament",
     "filament_id": "GFG99",
     "setting_id": "GFSG99_Qidi_00",
-    "name": "Qidi Generic PETG",
+    "name": "Generic PETG @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pet",
-    "reduce_fan_stop_start_freq": [
-        "1"
-    ],
-    "slow_down_for_layer_cooling": [
-        "1"
-    ],
     "fan_cooling_layer_time": [
         "30"
     ],
@@ -27,21 +21,12 @@
     "fan_min_speed": [
         "40"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
-    "slow_down_layer_time": [
-        "8"
-    ],
     "filament_flow_ratio": [
         "0.95"
     ],
     "filament_max_volumetric_speed": [
         "10"
     ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
-    ],
     "compatible_printers": [
         "Qidi X-Plus 0.4 nozzle",
         "Qidi X-Max 0.4 nozzle",
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json b/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json
similarity index 88%
rename from resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json
rename to resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json
index f2b846a10c..69f9717559 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic PETG-CF.json	
+++ b/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFG98",
     "setting_id": "GFSG98_Qidi_00",
-    "name": "Qidi Generic PETG-CF",
+    "name": "Generic PETG-CF @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pet",
@@ -54,12 +54,6 @@
     "nozzle_temperature_range_high": [
         "270"
     ],
-    "nozzle_temperature_initial_layer": [
-        "255"
-    ],
-    "nozzle_temperature": [
-        "255"
-    ],
     "filament_cost": [
         "34.99"
     ],
@@ -78,9 +72,6 @@
     "slow_down_layer_time": [
         "6"
     ],
-    "fan_cooling_layer_time": [
-        "20"
-    ],
     "compatible_printers": [
         "Qidi X-Plus 0.4 nozzle",
         "Qidi X-Max 0.4 nozzle",
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json
similarity index 85%
rename from resources/profiles/Qidi/filament/Qidi Generic PLA.json
rename to resources/profiles/Qidi/filament/Generic PLA @Qidi.json
index 09d7490b18..585f09bd41 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic PLA.json	
+++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json	
@@ -2,16 +2,13 @@
     "type": "filament",
     "filament_id": "GFL99",
     "setting_id": "GFSL99_Qidi_00",
-    "name": "Qidi Generic PLA",
+    "name": "Generic PLA @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
     "filament_flow_ratio": [
         "0.98"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "8"
     ],
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json
similarity index 90%
rename from resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json
rename to resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json
index 51970e5192..0ada592e3d 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic PLA Silk.json	
+++ b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json	
@@ -2,13 +2,10 @@
     "type": "filament",
     "filament_id": "GFA05",
     "setting_id": "GFSA05_Qidi_01",
-    "name": "Qidi Generic PLA Silk",
+    "name": "Generic PLA Silk @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "filament_retraction_length": [
         "0.5"
     ],
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json b/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json
similarity index 87%
rename from resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json
rename to resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json
index cfb6c21cc0..1dc14d5063 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic PLA-CF.json	
+++ b/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFL98",
     "setting_id": "GFSL98_Qidi_00",
-    "name": "Qidi Generic PLA-CF",
+    "name": "Generic PLA-CF @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
@@ -15,9 +15,6 @@
     "filament_type": [
         "PLA-CF"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "7"
     ],
@@ -27,9 +24,6 @@
     "temperature_vitrification": [
         "55"
     ],
-    "nozzle_temperature_range_low": [
-        "190"
-    ],
     "nozzle_temperature_range_high": [
         "240"
     ],
diff --git a/resources/profiles/Qidi/filament/Qidi Generic PVA.json b/resources/profiles/Qidi/filament/Generic PVA @Qidi.json
similarity index 87%
rename from resources/profiles/Qidi/filament/Qidi Generic PVA.json
rename to resources/profiles/Qidi/filament/Generic PVA @Qidi.json
index 7aeaeca5ee..a847d02a55 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic PVA.json	
+++ b/resources/profiles/Qidi/filament/Generic PVA @Qidi.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFS99",
     "setting_id": "GFSS99_Qidi_00",
-    "name": "Qidi Generic PVA",
+    "name": "Generic PVA @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pva",
@@ -15,9 +15,6 @@
     "slow_down_layer_time": [
         "7"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
     "compatible_printers": [
         "Qidi X-Plus 0.4 nozzle",
         "Qidi X-Max 0.4 nozzle",
diff --git a/resources/profiles/Qidi/filament/Qidi Generic TPU.json b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json
similarity index 95%
rename from resources/profiles/Qidi/filament/Qidi Generic TPU.json
rename to resources/profiles/Qidi/filament/Generic TPU @Qidi.json
index 0b0084e4ec..43c69581fc 100644
--- a/resources/profiles/Qidi/filament/Qidi Generic TPU.json	
+++ b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFU99",
     "setting_id": "GFSU99_Qidi_00",
-    "name": "Qidi Generic TPU",
+    "name": "Generic TPU @Qidi",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_tpu",
diff --git a/resources/profiles/Voron.json b/resources/profiles/Voron.json
index accbbfef22..e4c1a87b17 100644
--- a/resources/profiles/Voron.json
+++ b/resources/profiles/Voron.json
@@ -72,77 +72,77 @@
             "name": "fdm_filament_common",
             "sub_path": "filament/fdm_filament_common.json"
         },
-        {
-            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_pla.json"
-        },
-        {
-            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_tpu.json"
-        },
-        {
-            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_pet.json"
-        },
         {
             "name": "fdm_filament_abs",
             "sub_path": "filament/fdm_filament_abs.json"
         },
-        {
-            "name": "fdm_filament_pc",
-            "sub_path": "filament/fdm_filament_pc.json"
-        },
         {
             "name": "fdm_filament_asa",
             "sub_path": "filament/fdm_filament_asa.json"
         },
-        {
-            "name": "fdm_filament_pva",
-            "sub_path": "filament/fdm_filament_pva.json"
-        },
         {
             "name": "fdm_filament_pa",
             "sub_path": "filament/fdm_filament_pa.json"
         },
         {
-            "name": "Voron Generic PLA",
-            "sub_path": "filament/Voron Generic PLA.json"
+            "name": "fdm_filament_pc",
+            "sub_path": "filament/fdm_filament_pc.json"
         },
         {
-            "name": "Voron Generic PLA-CF",
-            "sub_path": "filament/Voron Generic PLA-CF.json"
+            "name": "fdm_filament_pet",
+            "sub_path": "filament/fdm_filament_pet.json"
         },
         {
-            "name": "Voron Generic PETG",
-            "sub_path": "filament/Voron Generic PETG.json"
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
         },
         {
-            "name": "Voron Generic ABS",
-            "sub_path": "filament/Voron Generic ABS.json"
+            "name": "fdm_filament_pva",
+            "sub_path": "filament/fdm_filament_pva.json"
         },
         {
-            "name": "Voron Generic TPU",
-            "sub_path": "filament/Voron Generic TPU.json"
+            "name": "fdm_filament_tpu",
+            "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Voron Generic ASA",
-            "sub_path": "filament/Voron Generic ASA.json"
+            "name": "Generic ABS @Voron",
+            "sub_path": "filament/Generic ABS @Voron.json"
         },
         {
-            "name": "Voron Generic PC",
-            "sub_path": "filament/Voron Generic PC.json"
+            "name": "Generic ASA @Voron",
+            "sub_path": "filament/Generic ASA @Voron.json"
         },
         {
-            "name": "Voron Generic PVA",
-            "sub_path": "filament/Voron Generic PVA.json"
+            "name": "Generic PA @Voron",
+            "sub_path": "filament/Generic PA @Voron.json"
         },
         {
-            "name": "Voron Generic PA",
-            "sub_path": "filament/Voron Generic PA.json"
+            "name": "Generic PA-CF @Voron",
+            "sub_path": "filament/Generic PA-CF @Voron.json"
         },
         {
-            "name": "Voron Generic PA-CF",
-            "sub_path": "filament/Voron Generic PA-CF.json"
+            "name": "Generic PC @Voron",
+            "sub_path": "filament/Generic PC @Voron.json"
+        },
+        {
+            "name": "Generic PETG @Voron",
+            "sub_path": "filament/Generic PETG @Voron.json"
+        },
+        {
+            "name": "Generic PLA @Voron",
+            "sub_path": "filament/Generic PLA @Voron.json"
+        },
+        {
+            "name": "Generic PLA-CF @Voron",
+            "sub_path": "filament/Generic PLA-CF @Voron.json"
+        },
+        {
+            "name": "Generic PVA @Voron",
+            "sub_path": "filament/Generic PVA @Voron.json"
+        },
+        {
+            "name": "Generic TPU @Voron",
+            "sub_path": "filament/Generic TPU @Voron.json"
         }
     ],
     "machine_list": [
@@ -183,4 +183,4 @@
             "sub_path": "machine/Voron 0.1 0.4 nozzle.json"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Voron Generic ABS.json b/resources/profiles/Voron/filament/Generic ABS @Voron.json
similarity index 52%
rename from resources/profiles/Voron/filament/Voron Generic ABS.json
rename to resources/profiles/Voron/filament/Generic ABS @Voron.json
index fb65c0a59c..a292299710 100644
--- a/resources/profiles/Voron/filament/Voron Generic ABS.json	
+++ b/resources/profiles/Voron/filament/Generic ABS @Voron.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB99",
     "setting_id": "GFSB99_VORON_00",
-    "name": "Voron Generic ABS",
+    "name": "Generic ABS @Voron",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_abs",
@@ -13,12 +13,12 @@
         "12"
     ],
     "compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Voron Generic ASA.json b/resources/profiles/Voron/filament/Generic ASA @Voron.json
similarity index 52%
rename from resources/profiles/Voron/filament/Voron Generic ASA.json
rename to resources/profiles/Voron/filament/Generic ASA @Voron.json
index 1283f53401..51a777c456 100644
--- a/resources/profiles/Voron/filament/Voron Generic ASA.json	
+++ b/resources/profiles/Voron/filament/Generic ASA @Voron.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB98",
     "setting_id": "GFSB98_VORON_00",
-    "name": "Voron Generic ASA",
+    "name": "Generic ASA @Voron",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_asa",
@@ -13,12 +13,12 @@
         "12"
     ],
     "compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Voron Generic PA.json b/resources/profiles/Voron/filament/Generic PA @Voron.json
similarity index 52%
rename from resources/profiles/Voron/filament/Voron Generic PA.json
rename to resources/profiles/Voron/filament/Generic PA @Voron.json
index 2796576ab7..6b57e1748c 100644
--- a/resources/profiles/Voron/filament/Voron Generic PA.json	
+++ b/resources/profiles/Voron/filament/Generic PA @Voron.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFN99",
     "setting_id": "GFSN99_VORON_00",
-    "name": "Voron Generic PA",
+    "name": "Generic PA @Voron",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pa",
@@ -15,13 +15,13 @@
     "filament_max_volumetric_speed": [
         "12"
     ],
-"compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
+    "compatible_printers": [
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Generic PA-CF @Voron.json b/resources/profiles/Voron/filament/Generic PA-CF @Voron.json
new file mode 100644
index 0000000000..246cf10c5f
--- /dev/null
+++ b/resources/profiles/Voron/filament/Generic PA-CF @Voron.json	
@@ -0,0 +1,27 @@
+{
+    "type": "filament",
+    "filament_id": "GFN98",
+    "setting_id": "GFSN98_VORON_00",
+    "name": "Generic PA-CF @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pa",
+    "filament_type": [
+        "PA-CF"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "280"
+    ],
+    "nozzle_temperature": [
+        "280"
+    ],
+    "compatible_printers": [
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Generic PC @Voron.json b/resources/profiles/Voron/filament/Generic PC @Voron.json
new file mode 100644
index 0000000000..5b45a164ea
--- /dev/null
+++ b/resources/profiles/Voron/filament/Generic PC @Voron.json	
@@ -0,0 +1,24 @@
+{
+    "type": "filament",
+    "filament_id": "GFC99",
+    "setting_id": "GFSC99_VORON_00",
+    "name": "Generic PC @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pc",
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "filament_flow_ratio": [
+        "0.94"
+    ],
+    "compatible_printers": [
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Voxelab/filament/Voxelab Generic PETG.json b/resources/profiles/Voron/filament/Generic PETG @Voron.json
similarity index 50%
rename from resources/profiles/Voxelab/filament/Voxelab Generic PETG.json
rename to resources/profiles/Voron/filament/Generic PETG @Voron.json
index f6c872b2f4..e3b86bfa3f 100644
--- a/resources/profiles/Voxelab/filament/Voxelab Generic PETG.json	
+++ b/resources/profiles/Voron/filament/Generic PETG @Voron.json	
@@ -1,45 +1,39 @@
 {
     "type": "filament",
-	"filament_id": "GFG99",
-    "setting_id": "GFSG99_Voxelab_00",
-    "name": "Voxelab Generic PETG",
+    "filament_id": "GFG99",
+    "setting_id": "GFSG99_VORON_00",
+    "name": "Generic PETG @Voron",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pet",
-	"reduce_fan_stop_start_freq": [
-        "1"
-    ],
-    "slow_down_for_layer_cooling": [
-        "1"
-    ],
     "fan_cooling_layer_time": [
         "30"
     ],
     "overhang_fan_speed": [
         "90"
     ],
+    "overhang_fan_threshold": [
+        "25%"
+    ],
     "fan_max_speed": [
-        "40"
+        "90"
     ],
     "fan_min_speed": [
-        "20"
-    ],
-    "slow_down_min_speed": [
-        "10"
-    ],
-    "slow_down_layer_time": [
-        "8"
+        "40"
     ],
     "filament_flow_ratio": [
         "0.95"
     ],
     "filament_max_volumetric_speed": [
-        "15"
-    ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
+        "10"
     ],
     "compatible_printers": [
-        "Voxelab Aquila X2 0.4 nozzle"
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Generic PLA @Voron.json b/resources/profiles/Voron/filament/Generic PLA @Voron.json
new file mode 100644
index 0000000000..bad7d6ef85
--- /dev/null
+++ b/resources/profiles/Voron/filament/Generic PLA @Voron.json	
@@ -0,0 +1,24 @@
+{
+    "type": "filament",
+    "filament_id": "GFL99",
+    "setting_id": "GFSL99_VORON_00",
+    "name": "Generic PLA @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_flow_ratio": [
+        "0.98"
+    ],
+    "slow_down_layer_time": [
+        "8"
+    ],
+    "compatible_printers": [
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Generic PLA-CF @Voron.json b/resources/profiles/Voron/filament/Generic PLA-CF @Voron.json
new file mode 100644
index 0000000000..2e2805c4b8
--- /dev/null
+++ b/resources/profiles/Voron/filament/Generic PLA-CF @Voron.json	
@@ -0,0 +1,27 @@
+{
+    "type": "filament",
+    "filament_id": "GFL98",
+    "setting_id": "GFSL98_VORON_00",
+    "name": "Generic PLA-CF @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pla",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_type": [
+        "PLA-CF"
+    ],
+    "slow_down_layer_time": [
+        "7"
+    ],
+    "compatible_printers": [
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Voron Generic PVA.json b/resources/profiles/Voron/filament/Generic PVA @Voron.json
similarity index 53%
rename from resources/profiles/Voron/filament/Voron Generic PVA.json
rename to resources/profiles/Voron/filament/Generic PVA @Voron.json
index 9ae752a638..1807c465aa 100644
--- a/resources/profiles/Voron/filament/Voron Generic PVA.json	
+++ b/resources/profiles/Voron/filament/Generic PVA @Voron.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFS99",
     "setting_id": "GFSS99_VORON_00",
-    "name": "Voron Generic PVA",
+    "name": "Generic PVA @Voron",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pva",
@@ -15,16 +15,13 @@
     "slow_down_layer_time": [
         "7"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
     "compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Generic TPU @Voron.json b/resources/profiles/Voron/filament/Generic TPU @Voron.json
new file mode 100644
index 0000000000..53bc48bc5b
--- /dev/null
+++ b/resources/profiles/Voron/filament/Generic TPU @Voron.json	
@@ -0,0 +1,21 @@
+{
+    "type": "filament",
+    "filament_id": "GFU99",
+    "setting_id": "GFSU99_VORON_00",
+    "name": "Generic TPU @Voron",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_tpu",
+    "filament_max_volumetric_speed": [
+        "3.2"
+    ],
+    "compatible_printers": [
+        "Voron 2.4 250 0.4 nozzle",
+        "Voron 2.4 300 0.4 nozzle",
+        "Voron 2.4 350 0.4 nozzle",
+        "Voron Trident 250 0.4 nozzle",
+        "Voron Trident 300 0.4 nozzle",
+        "Voron Trident 350 0.4 nozzle",
+        "Voron 0.1 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Voron/filament/Voron Generic PA-CF.json b/resources/profiles/Voron/filament/Voron Generic PA-CF.json
deleted file mode 100644
index 5353ad9adb..0000000000
--- a/resources/profiles/Voron/filament/Voron Generic PA-CF.json	
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "type": "filament",
-    "filament_id": "GFN98",
-    "setting_id": "GFSN98_VORON_00",
-    "name": "Voron Generic PA-CF",
-    "from": "system",
-    "instantiation": "true",
-    "inherits": "fdm_filament_pa",
-    "filament_type": [
-        "PA-CF"
-    ],
-    "nozzle_temperature_initial_layer": [
-        "280"
-    ],
-    "nozzle_temperature": [
-        "280"
-    ],
-    "filament_max_volumetric_speed": [
-        "8"
-    ],
-"compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
-    ]
-}
diff --git a/resources/profiles/Voron/filament/Voron Generic PC.json b/resources/profiles/Voron/filament/Voron Generic PC.json
deleted file mode 100644
index 23890ca49d..0000000000
--- a/resources/profiles/Voron/filament/Voron Generic PC.json	
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "type": "filament",
-    "filament_id": "GFC99",
-    "setting_id": "GFSC99_VORON_00",
-    "name": "Voron Generic PC",
-    "from": "system",
-    "instantiation": "true",
-    "inherits": "fdm_filament_pc",
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
-    "filament_flow_ratio": [
-        "0.94"
-    ],
-"compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
-    ]
-}
diff --git a/resources/profiles/Voron/filament/Voron Generic PETG.json b/resources/profiles/Voron/filament/Voron Generic PETG.json
deleted file mode 100644
index 0f89eb6bbe..0000000000
--- a/resources/profiles/Voron/filament/Voron Generic PETG.json	
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "type": "filament",
-    "filament_id": "GFG99",
-    "setting_id": "GFSG99_VORON_00",
-    "name": "Voron Generic PETG",
-    "from": "system",
-    "instantiation": "true",
-    "inherits": "fdm_filament_pet",
-    "reduce_fan_stop_start_freq": [
-        "1"
-    ],
-    "slow_down_for_layer_cooling": [
-        "1"
-    ],
-    "fan_cooling_layer_time": [
-        "30"
-    ],
-    "overhang_fan_speed": [
-        "90"
-    ],
-    "overhang_fan_threshold": [
-        "25%"
-    ],
-    "fan_max_speed": [
-        "90"
-    ],
-    "fan_min_speed": [
-        "40"
-    ],
-    "slow_down_min_speed": [
-        "10"
-    ],
-    "slow_down_layer_time": [
-        "8"
-    ],
-    "filament_flow_ratio": [
-        "0.95"
-    ],
-    "filament_max_volumetric_speed": [
-        "10"
-    ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
-    ],
-    "compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
-    ]
-}
diff --git a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json
deleted file mode 100644
index 46ec3f9710..0000000000
--- a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json	
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "type": "filament",
-    "filament_id": "GFL98",
-    "setting_id": "GFSL98_VORON_00",
-    "name": "Voron Generic PLA-CF",
-    "from": "system",
-    "instantiation": "true",
-    "inherits": "fdm_filament_pla",
-    "filament_flow_ratio": [
-        "0.95"
-    ],
-    "filament_type": [
-        "PLA-CF"
-    ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
-    "slow_down_layer_time": [
-        "7"
-    ],
-"compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
-    ]
-}
diff --git a/resources/profiles/Voron/filament/Voron Generic PLA.json b/resources/profiles/Voron/filament/Voron Generic PLA.json
deleted file mode 100644
index 85839be793..0000000000
--- a/resources/profiles/Voron/filament/Voron Generic PLA.json	
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "type": "filament",
-    "filament_id": "GFL99",
-    "setting_id": "GFSL99_VORON_00",
-    "name": "Voron Generic PLA",
-    "from": "system",
-    "instantiation": "true",
-    "inherits": "fdm_filament_pla",
-    "filament_flow_ratio": [
-        "0.98"
-    ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
-    "slow_down_layer_time": [
-        "8"
-    ],
-    "compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
-    ]
-}
diff --git a/resources/profiles/Voron/filament/Voron Generic TPU.json b/resources/profiles/Voron/filament/Voron Generic TPU.json
deleted file mode 100644
index 53ce822f2b..0000000000
--- a/resources/profiles/Voron/filament/Voron Generic TPU.json	
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "type": "filament",
-    "filament_id": "GFU99",
-    "setting_id": "GFSU99_VORON_00",
-    "name": "Voron Generic TPU",
-    "from": "system",
-    "instantiation": "true",
-    "inherits": "fdm_filament_tpu",
-    "filament_max_volumetric_speed": [
-        "3.2"
-    ],
-    "compatible_printers": [
-      "Voron 2.4 250 0.4 nozzle",
-      "Voron 2.4 300 0.4 nozzle",
-      "Voron 2.4 350 0.4 nozzle",
-      "Voron Trident 250 0.4 nozzle",
-      "Voron Trident 300 0.4 nozzle",
-      "Voron Trident 350 0.4 nozzle",
-      "Voron 0.1 0.4 nozzle"
-    ]
-}
diff --git a/resources/profiles/Voxelab.json b/resources/profiles/Voxelab.json
index 909255b703..cbd4bd172b 100644
--- a/resources/profiles/Voxelab.json
+++ b/resources/profiles/Voxelab.json
@@ -41,16 +41,16 @@
             "sub_path": "filament/fdm_filament_pla.json"
         },
         {
-            "name": "Voxelab Generic ABS",
-            "sub_path": "filament/Voxelab Generic ABS.json"
+            "name": "Generic ABS @Voxelab",
+            "sub_path": "filament/Generic ABS @Voxelab.json"
         },
         {
-            "name": "Voxelab Generic PETG",
-            "sub_path": "filament/Voxelab Generic PETG.json"
+            "name": "Generic PETG @Voxelab",
+            "sub_path": "filament/Generic PETG @Voxelab.json"
         },
         {
-            "name": "Voxelab Generic PLA",
-            "sub_path": "filament/Voxelab Generic PLA.json"
+            "name": "Generic PLA @Voxelab",
+            "sub_path": "filament/Generic PLA @Voxelab.json"
         }
     ],
     "machine_list": [
@@ -63,4 +63,4 @@
             "sub_path": "machine/Voxelab Aquila X2 0.4 nozzle.json"
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Voxelab/filament/Voxelab Generic ABS.json b/resources/profiles/Voxelab/filament/Generic ABS @Voxelab.json
similarity index 90%
rename from resources/profiles/Voxelab/filament/Voxelab Generic ABS.json
rename to resources/profiles/Voxelab/filament/Generic ABS @Voxelab.json
index 763b24db30..02386fe7a4 100644
--- a/resources/profiles/Voxelab/filament/Voxelab Generic ABS.json	
+++ b/resources/profiles/Voxelab/filament/Generic ABS @Voxelab.json	
@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFB99",
     "setting_id": "GFSB99_Voxelab_00",
-    "name": "Voxelab Generic ABS",
+    "name": "Generic ABS @Voxelab",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_abs",
@@ -15,4 +15,4 @@
     "compatible_printers": [
         "Voxelab Aquila X2 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file
diff --git a/resources/profiles/Voxelab/filament/Generic PETG @Voxelab.json b/resources/profiles/Voxelab/filament/Generic PETG @Voxelab.json
new file mode 100644
index 0000000000..b40a81d04a
--- /dev/null
+++ b/resources/profiles/Voxelab/filament/Generic PETG @Voxelab.json	
@@ -0,0 +1,24 @@
+{
+    "type": "filament",
+    "filament_id": "GFG99",
+    "setting_id": "GFSG99_Voxelab_00",
+    "name": "Generic PETG @Voxelab",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_pet",
+    "fan_cooling_layer_time": [
+        "30"
+    ],
+    "overhang_fan_speed": [
+        "90"
+    ],
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_max_volumetric_speed": [
+        "15"
+    ],
+    "compatible_printers": [
+        "Voxelab Aquila X2 0.4 nozzle"
+    ]
+}
\ No newline at end of file
diff --git a/resources/profiles/Voxelab/filament/Voxelab Generic PLA.json b/resources/profiles/Voxelab/filament/Generic PLA @Voxelab.json
similarity index 79%
rename from resources/profiles/Voxelab/filament/Voxelab Generic PLA.json
rename to resources/profiles/Voxelab/filament/Generic PLA @Voxelab.json
index 80dadd8d57..0f6ec682eb 100644
--- a/resources/profiles/Voxelab/filament/Voxelab Generic PLA.json	
+++ b/resources/profiles/Voxelab/filament/Generic PLA @Voxelab.json	
@@ -1,12 +1,12 @@
 {
     "type": "filament",
-	"filament_id": "GFL99",
+    "filament_id": "GFL99",
     "setting_id": "GFSL99_Voxelab_00",
-    "name": "Voxelab Generic PLA",
+    "name": "Generic PLA @Voxelab",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",
-	"filament_flow_ratio": [
+    "filament_flow_ratio": [
         "0.98"
     ],
     "filament_max_volumetric_speed": [
@@ -18,4 +18,4 @@
     "compatible_printers": [
         "Voxelab Aquila X2 0.4 nozzle"
     ]
-}
+}
\ No newline at end of file