ENH: rename third-party printers' filaments

Change-Id: Ie6a52f5b91cba9be83c6160f64f5d7edd113c2e9

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",
+            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_asa.json"
+            "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",
+            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_pa.json"
+            "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Anker Generic PLA",
+            "name": "Generic ABS @Anker",
-            "sub_path": "filament/Anker Generic PLA.json"
+            "sub_path": "filament/Generic ABS @Anker.json"
         },
         {
-            "name": "Anker Generic PLA-CF",
+            "name": "Generic ASA @Anker",
-            "sub_path": "filament/Anker Generic PLA-CF.json"
+            "sub_path": "filament/Generic ASA @Anker.json"
         },
         {
-            "name": "Anker Generic PETG",
+            "name": "Generic PA @Anker",
-            "sub_path": "filament/Anker Generic PETG.json"
+            "sub_path": "filament/Generic PA @Anker.json"
         },
         {
-            "name": "Anker Generic ABS",
+            "name": "Generic PA-CF @Anker",
-            "sub_path": "filament/Anker Generic ABS.json"
+            "sub_path": "filament/Generic PA-CF @Anker.json"
         },
         {
-            "name": "Anker Generic TPU",
+            "name": "Generic PC @Anker",
-            "sub_path": "filament/Anker Generic TPU.json"
+            "sub_path": "filament/Generic PC @Anker.json"
         },
         {
-            "name": "Anker Generic ASA",
+            "name": "Generic PETG @Anker",
-            "sub_path": "filament/Anker Generic ASA.json"
+            "sub_path": "filament/Generic PETG @Anker.json"
         },
         {
-            "name": "Anker Generic PC",
+            "name": "Generic PLA @Anker",
-            "sub_path": "filament/Anker Generic PC.json"
+            "sub_path": "filament/Generic PLA @Anker.json"
         },
         {
-            "name": "Anker Generic PVA",
+            "name": "Generic PLA-CF @Anker",
-            "sub_path": "filament/Anker Generic PVA.json"
+            "sub_path": "filament/Generic PLA-CF @Anker.json"
         },
         {
-            "name": "Anker Generic PA",
+            "name": "Generic PVA @Anker",
-            "sub_path": "filament/Anker Generic PA.json"
+            "sub_path": "filament/Generic PVA @Anker.json"
         },
         {
-            "name": "Anker Generic PA-CF",
+            "name": "Generic TPU @Anker",
-            "sub_path": "filament/Anker Generic PA-CF.json"
+            "sub_path": "filament/Generic TPU @Anker.json"
         }
     ],
     "machine_list": [

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",

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",

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",

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"
     ]

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",

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,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": [
         "Anker M5 0.4 nozzle"
     ]

resources/profiles/Anker/filament/Generic PLA @Anker.json

@@ -2,16 +2,13 @@
     "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"
     ],

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"
     ],

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,9 +15,6 @@
     "slow_down_layer_time": [
         "7"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
     "compatible_printers": [
         "Anker M5 0.4 nozzle"
     ]

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",

resources/profiles/Anycubic.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",
+            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_asa.json"
+            "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",
+            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_pa.json"
+            "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Anycubic Generic PLA",
+            "name": "Generic ABS @Anycubic",
-            "sub_path": "filament/Anycubic Generic PLA.json"
+            "sub_path": "filament/Generic ABS @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PLA-CF",
+            "name": "Generic ASA @Anycubic",
-            "sub_path": "filament/Anycubic Generic PLA-CF.json"
+            "sub_path": "filament/Generic ASA @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PETG",
+            "name": "Generic PA @Anycubic",
-            "sub_path": "filament/Anycubic Generic PETG.json"
+            "sub_path": "filament/Generic PA @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic ABS",
+            "name": "Generic PA-CF @Anycubic",
-            "sub_path": "filament/Anycubic Generic ABS.json"
+            "sub_path": "filament/Generic PA-CF @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic TPU",
+            "name": "Generic PC @Anycubic",
-            "sub_path": "filament/Anycubic Generic TPU.json"
+            "sub_path": "filament/Generic PC @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic ASA",
+            "name": "Generic PETG @Anycubic",
-            "sub_path": "filament/Anycubic Generic ASA.json"
+            "sub_path": "filament/Generic PETG @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PC",
+            "name": "Generic PLA @Anycubic",
-            "sub_path": "filament/Anycubic Generic PC.json"
+            "sub_path": "filament/Generic PLA @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PVA",
+            "name": "Generic PLA-CF @Anycubic",
-            "sub_path": "filament/Anycubic Generic PVA.json"
+            "sub_path": "filament/Generic PLA-CF @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PA",
+            "name": "Generic PVA @Anycubic",
-            "sub_path": "filament/Anycubic Generic PA.json"
+            "sub_path": "filament/Generic PVA @Anycubic.json"
         },
         {
-            "name": "Anycubic Generic PA-CF",
+            "name": "Generic TPU @Anycubic",
-            "sub_path": "filament/Anycubic Generic PA-CF.json"
+            "sub_path": "filament/Generic TPU @Anycubic.json"
         }
     ],
     "machine_list": [

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",

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",

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",

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",

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",

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",

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"
     ],

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"
     ],

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",

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",

resources/profiles/Creality.json

@@ -157,28 +157,28 @@
             "sub_path": "filament/fdm_filament_common.json"
         },
         {
-            "name": "fdm_filament_pla",
+            "name": "fdm_filament_abs",
-            "sub_path": "filament/fdm_filament_pla.json"
+            "sub_path": "filament/fdm_filament_abs.json"
         },
         {
             "name": "fdm_filament_pet",
             "sub_path": "filament/fdm_filament_pet.json"
         },
         {
-            "name": "fdm_filament_abs",
+            "name": "fdm_filament_pla",
-            "sub_path": "filament/fdm_filament_abs.json"
+            "sub_path": "filament/fdm_filament_pla.json"
         },
         {
-            "name": "Creality Generic PLA",
+            "name": "Generic ABS @Creality",
-            "sub_path": "filament/Creality Generic PLA.json"
+            "sub_path": "filament/Generic ABS @Creality.json"
         },
         {
-            "name": "Creality Generic PETG",
+            "name": "Generic PETG @Creality",
-            "sub_path": "filament/Creality Generic PETG.json"
+            "sub_path": "filament/Generic PETG @Creality.json"
         },
         {
-            "name": "Creality Generic ABS",
+            "name": "Generic PLA @Creality",
-            "sub_path": "filament/Creality Generic ABS.json"
+            "sub_path": "filament/Generic PLA @Creality.json"
         }
     ],
     "machine_list": [

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",

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,20 +21,11 @@
     "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": [
         "Creality CR-10 V2 0.4 nozzle",

resources/profiles/Creality/filament/Generic PLA @Creality.json

@@ -2,16 +2,13 @@
     "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"
     ],

resources/profiles/Elegoo.json

@@ -285,16 +285,16 @@
             "sub_path": "filament/fdm_filament_pla.json"
         },
         {
-            "name": "Elegoo Generic ABS",
+            "name": "Generic ABS @Elegoo",
-            "sub_path": "filament/Elegoo Generic ABS.json"
+            "sub_path": "filament/Generic ABS @Elegoo.json"
         },
         {
-            "name": "Elegoo Generic PETG",
+            "name": "Generic PETG @Elegoo",
-            "sub_path": "filament/Elegoo Generic PETG.json"
+            "sub_path": "filament/Generic PETG @Elegoo.json"
         },
         {
-            "name": "Elegoo Generic PLA",
+            "name": "Generic PLA @Elegoo",
-            "sub_path": "filament/Elegoo Generic PLA.json"
+            "sub_path": "filament/Generic PLA @Elegoo.json"
         }
     ],
     "machine_list": [

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",

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",

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"
     ],

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",
+            "name": "fdm_filament_pet",
-            "sub_path": "filament/fdm_filament_asa.json"
+            "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",
+            "name": "fdm_filament_tpu",
-            "sub_path": "filament/fdm_filament_pa.json"
+            "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Prusa Generic PLA",
+            "name": "Generic ABS @Prusa",
-            "sub_path": "filament/Prusa Generic PLA.json"
+            "sub_path": "filament/Generic ABS @Prusa.json"
         },
         {
-            "name": "Prusa Generic PLA-CF",
+            "name": "Generic ASA @Prusa",
-            "sub_path": "filament/Prusa Generic PLA-CF.json"
+            "sub_path": "filament/Generic ASA @Prusa.json"
         },
         {
-            "name": "Prusa Generic PETG",
+            "name": "Generic PA @Prusa",
-            "sub_path": "filament/Prusa Generic PETG.json"
+            "sub_path": "filament/Generic PA @Prusa.json"
         },
         {
-            "name": "Prusa Generic ABS",
+            "name": "Generic PA-CF @Prusa",
-            "sub_path": "filament/Prusa Generic ABS.json"
+            "sub_path": "filament/Generic PA-CF @Prusa.json"
         },
         {
-            "name": "Prusa Generic TPU",
+            "name": "Generic PC @Prusa",
-            "sub_path": "filament/Prusa Generic TPU.json"
+            "sub_path": "filament/Generic PC @Prusa.json"
         },
         {
-            "name": "Prusa Generic ASA",
+            "name": "Generic PETG @Prusa",
-            "sub_path": "filament/Prusa Generic ASA.json"
+            "sub_path": "filament/Generic PETG @Prusa.json"
         },
         {
-            "name": "Prusa Generic PC",
+            "name": "Generic PLA @Prusa",
-            "sub_path": "filament/Prusa Generic PC.json"
+            "sub_path": "filament/Generic PLA @Prusa.json"
         },
         {
-            "name": "Prusa Generic PVA",
+            "name": "Generic PLA-CF @Prusa",
-            "sub_path": "filament/Prusa Generic PVA.json"
+            "sub_path": "filament/Generic PLA-CF @Prusa.json"
         },
         {
-            "name": "Prusa Generic PA",
+            "name": "Generic PVA @Prusa",
-            "sub_path": "filament/Prusa Generic PA.json"
+            "sub_path": "filament/Generic PVA @Prusa.json"
         },
         {
-            "name": "Prusa Generic PA-CF",
+            "name": "Generic TPU @Prusa",
-            "sub_path": "filament/Prusa Generic PA-CF.json"
+            "sub_path": "filament/Generic TPU @Prusa.json"
         }
     ],
     "machine_list": [

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",

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",

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",

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,9 +15,6 @@
     "nozzle_temperature": [
         "280"
     ],
-    "filament_max_volumetric_speed": [
-        "8"
-    ],
     "compatible_printers": [
         "Prusa MK3S 0.4 nozzle",
         "Prusa MINI 0.4 nozzle"

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",

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,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": [
         "Prusa MK3S 0.4 nozzle",
         "Prusa MINI 0.4 nozzle"

resources/profiles/Prusa/filament/Generic PLA @Prusa.json

@@ -2,16 +2,13 @@
     "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"
     ],

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,9 +12,6 @@
     "filament_type": [
         "PLA-CF"
     ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "slow_down_layer_time": [
         "7"
     ],

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,9 +15,6 @@
     "slow_down_layer_time": [
         "7"
     ],
-    "slow_down_min_speed": [
-        "10"
-    ],
     "compatible_printers": [
         "Prusa MK3S 0.4 nozzle",
         "Prusa MINI 0.4 nozzle"

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",

resources/profiles/Qidi.json

@@ -197,52 +197,52 @@
             "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Qidi Generic ABS",
+            "name": "Generic ABS @Qidi",
-            "sub_path": "filament/Qidi Generic ABS.json"
+            "sub_path": "filament/Generic ABS @Qidi.json"
         },
         {
-            "name": "Qidi Generic ASA",
+            "name": "Generic ASA @Qidi",
-            "sub_path": "filament/Qidi Generic ASA.json"
+            "sub_path": "filament/Generic ASA @Qidi.json"
         },
         {
-            "name": "Qidi Generic PA",
+            "name": "Generic PA @Qidi",
-            "sub_path": "filament/Qidi Generic PA.json"
+            "sub_path": "filament/Generic PA @Qidi.json"
         },
         {
-            "name": "Qidi Generic PA-CF",
+            "name": "Generic PA-CF @Qidi",
-            "sub_path": "filament/Qidi Generic PA-CF.json"
+            "sub_path": "filament/Generic PA-CF @Qidi.json"
         },
         {
-            "name": "Qidi Generic PC",
+            "name": "Generic PC @Qidi",
-            "sub_path": "filament/Qidi Generic PC.json"
+            "sub_path": "filament/Generic PC @Qidi.json"
         },
         {
-            "name": "Qidi Generic PETG",
+            "name": "Generic PETG @Qidi",
-            "sub_path": "filament/Qidi Generic PETG.json"
+            "sub_path": "filament/Generic PETG @Qidi.json"
         },
         {
-            "name": "Qidi Generic PETG-CF",
+            "name": "Generic PETG-CF @Qidi",
-            "sub_path": "filament/Qidi Generic PETG-CF.json"
+            "sub_path": "filament/Generic PETG-CF @Qidi.json"
         },
         {
-            "name": "Qidi Generic PLA Silk",
+            "name": "Generic PLA @Qidi",
-            "sub_path": "filament/Qidi Generic PLA Silk.json"
+            "sub_path": "filament/Generic PLA @Qidi.json"
         },
         {
-            "name": "Qidi Generic PLA",
+            "name": "Generic PLA Silk @Qidi",
-            "sub_path": "filament/Qidi Generic PLA.json"
+            "sub_path": "filament/Generic PLA Silk @Qidi.json"
         },
         {
-            "name": "Qidi Generic PLA-CF",
+            "name": "Generic PLA-CF @Qidi",
-            "sub_path": "filament/Qidi Generic PLA-CF.json"
+            "sub_path": "filament/Generic PLA-CF @Qidi.json"
         },
         {
-            "name": "Qidi Generic PVA",
+            "name": "Generic PVA @Qidi",
-            "sub_path": "filament/Qidi Generic PVA.json"
+            "sub_path": "filament/Generic PVA @Qidi.json"
         },
         {
-            "name": "Qidi Generic TPU",
+            "name": "Generic TPU @Qidi",
-            "sub_path": "filament/Qidi Generic TPU.json"
+            "sub_path": "filament/Generic TPU @Qidi.json"
         }
     ],
     "machine_list": [

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",

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",

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",

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"
     ],

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",

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",

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",

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"
     ],

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"
     ],

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"
     ],

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",

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",

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",
+            "name": "fdm_filament_pc",
-            "sub_path": "filament/Voron Generic PLA.json"
+            "sub_path": "filament/fdm_filament_pc.json"
         },
         {
-            "name": "Voron Generic PLA-CF",
+            "name": "fdm_filament_pet",
-            "sub_path": "filament/Voron Generic PLA-CF.json"
+            "sub_path": "filament/fdm_filament_pet.json"
         },
         {
-            "name": "Voron Generic PETG",
+            "name": "fdm_filament_pla",
-            "sub_path": "filament/Voron Generic PETG.json"
+            "sub_path": "filament/fdm_filament_pla.json"
         },
         {
-            "name": "Voron Generic ABS",
+            "name": "fdm_filament_pva",
-            "sub_path": "filament/Voron Generic ABS.json"
+            "sub_path": "filament/fdm_filament_pva.json"
         },
         {
-            "name": "Voron Generic TPU",
+            "name": "fdm_filament_tpu",
-            "sub_path": "filament/Voron Generic TPU.json"
+            "sub_path": "filament/fdm_filament_tpu.json"
         },
         {
-            "name": "Voron Generic ASA",
+            "name": "Generic ABS @Voron",
-            "sub_path": "filament/Voron Generic ASA.json"
+            "sub_path": "filament/Generic ABS @Voron.json"
         },
         {
-            "name": "Voron Generic PC",
+            "name": "Generic ASA @Voron",
-            "sub_path": "filament/Voron Generic PC.json"
+            "sub_path": "filament/Generic ASA @Voron.json"
         },
         {
-            "name": "Voron Generic PVA",
+            "name": "Generic PA @Voron",
-            "sub_path": "filament/Voron Generic PVA.json"
+            "sub_path": "filament/Generic PA @Voron.json"
         },
         {
-            "name": "Voron Generic PA",
+            "name": "Generic PA-CF @Voron",
-            "sub_path": "filament/Voron Generic PA.json"
+            "sub_path": "filament/Generic PA-CF @Voron.json"
         },
         {
-            "name": "Voron Generic PA-CF",
+            "name": "Generic PC @Voron",
-            "sub_path": "filament/Voron Generic PA-CF.json"
+            "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": [

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",

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",

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",

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"
+    ]
+}

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"
+    ]
+}

resources/profiles/Voron/filament/Generic PETG @Voron.json

@@ -1,45 +1,39 @@
 {
     "type": "filament",
     "filament_id": "GFG99",
-    "setting_id": "GFSG99_Voxelab_00",
+    "setting_id": "GFSG99_VORON_00",
-    "name": "Voxelab Generic PETG",
+    "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"
+        "40"
-    ],
-    "slow_down_min_speed": [
-        "10"
-    ],
-    "slow_down_layer_time": [
-        "8"
     ],
     "filament_flow_ratio": [
         "0.95"
     ],
     "filament_max_volumetric_speed": [
-        "15"
+        "10"
-    ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
     ],
     "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"
     ]
 }

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"
+    ]
+}

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"
+    ]
+}

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,9 +15,6 @@
     "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",

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"
+    ]
+}

resources/profiles/Voron/filament/Voron Generic PA-CF.json

@@ -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"
-    ]
-}

resources/profiles/Voron/filament/Voron Generic PC.json

@@ -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"
-    ]
-}

resources/profiles/Voron/filament/Voron Generic PETG.json

@@ -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"
-    ]
-}

resources/profiles/Voron/filament/Voron Generic PLA-CF.json

@@ -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"
-    ]
-}

resources/profiles/Voron/filament/Voron Generic PLA.json

@@ -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"
-    ]
-}

resources/profiles/Voron/filament/Voron Generic TPU.json

@@ -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"
-    ]
-}

resources/profiles/Voxelab.json

@@ -41,16 +41,16 @@
             "sub_path": "filament/fdm_filament_pla.json"
         },
         {
-            "name": "Voxelab Generic ABS",
+            "name": "Generic ABS @Voxelab",
-            "sub_path": "filament/Voxelab Generic ABS.json"
+            "sub_path": "filament/Generic ABS @Voxelab.json"
         },
         {
-            "name": "Voxelab Generic PETG",
+            "name": "Generic PETG @Voxelab",
-            "sub_path": "filament/Voxelab Generic PETG.json"
+            "sub_path": "filament/Generic PETG @Voxelab.json"
         },
         {
-            "name": "Voxelab Generic PLA",
+            "name": "Generic PLA @Voxelab",
-            "sub_path": "filament/Voxelab Generic PLA.json"
+            "sub_path": "filament/Generic PLA @Voxelab.json"
         }
     ],
     "machine_list": [

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",

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"
+    ]
+}

resources/profiles/Voxelab/filament/Generic PLA @Voxelab.json

@@ -2,7 +2,7 @@
     "type": "filament",
     "filament_id": "GFL99",
     "setting_id": "GFSL99_Voxelab_00",
-    "name": "Voxelab Generic PLA",
+    "name": "Generic PLA @Voxelab",
     "from": "system",
     "instantiation": "true",
     "inherits": "fdm_filament_pla",