diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json
index a043d51433..7db87efed7 100644
--- a/resources/profiles/Creality.json
+++ b/resources/profiles/Creality.json
@@ -1,6 +1,6 @@
 {
 	"name": "Creality",
-	"version": "02.03.02.78",
+	"version": "02.03.02.79",
 	"force_update": "0",
 	"description": "Creality configurations",
 	"machine_model_list": [
@@ -1809,8 +1809,8 @@
 			"sub_path": "filament/Generic PLA @Creality Ender-3V3-all.json"
 		},
 		{
-			"name": "Creality Generic PLA @Hi-all",
-			"sub_path": "filament/Creality Generic PLA @Hi-all.json"
+			"name": "Generic PLA @Creality Hi-all",
+			"sub_path": "filament/Generic PLA @Creality Hi-all.json"
 		},
 		{
 			"name": "Generic PLA @Creality K1-all",
diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA @Creality Hi-all.json
similarity index 91%
rename from resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json
rename to resources/profiles/Creality/filament/Generic PLA @Creality Hi-all.json
index 63f51623a0..452c7854ae 100644
--- a/resources/profiles/Creality/filament/Creality Generic PLA @Hi-all.json	
+++ b/resources/profiles/Creality/filament/Generic PLA @Creality Hi-all.json	
@@ -1,9 +1,10 @@
 {
 	"type": "filament",
-	"name": "Creality Generic PLA @Hi-all",
+	"name": "Generic PLA @Creality Hi-all",
 	"inherits": "Generic PLA @Creality",
+	"renamed_from": "Creality Generic PLA @Hi-all;Creality Generic PLA Hi-all",
 	"from": "system",
-	"setting_id": "3gf0CImK4nJwfXrB",
+	"setting_id": "6rwK4GqvNrgaw4kF",
 	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"
diff --git a/resources/profiles/Creality/filament/Generic PLA @Hi-all.json b/resources/profiles/Creality/filament/Generic PLA @Hi-all.json
index b79aa1d05f..43bb0786ea 100644
--- a/resources/profiles/Creality/filament/Generic PLA @Hi-all.json	
+++ b/resources/profiles/Creality/filament/Generic PLA @Hi-all.json	
@@ -136,8 +136,6 @@
     "pressure_advance": "0.04",
     "support_material_interface_fan_speed": "-1",
     "compatible_printers": [
-        "Creality Hi 0.4 nozzle",
-        "Creality Hi 0.6 nozzle",
         "Creality Hi 0.8 nozzle"
     ],
     "filament_id": "OFDSrzZ8"
diff --git a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json
index 0e64943dd5..cb184a432a 100644
--- a/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json	
+++ b/resources/profiles/Creality/filament/Generic PLA High Speed @Creality Hi-all.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PLA High Speed @Creality Hi-all",
-	"inherits": "Creality Generic PLA @Hi-all",
+	"inherits": "Generic PLA @Creality Hi-all",
 	"renamed_from": "Creality Generic PLA High Speed @Hi-all;Creality Generic PLA High Speed Hi-all",
 	"from": "system",
 	"setting_id": "KJZ1ztg3jL2Cg4fi",
diff --git a/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json
index c657630c40..1cff84c8bf 100644
--- a/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json	
+++ b/resources/profiles/Creality/filament/Generic PLA Matte @Creality Hi-all.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PLA Matte @Creality Hi-all",
-	"inherits": "Creality Generic PLA @Hi-all",
+	"inherits": "Generic PLA @Creality Hi-all",
 	"renamed_from": "Creality Generic PLA Matte @Hi-all;Creality Generic PLA Matte Hi-all",
 	"from": "system",
 	"setting_id": "pFxJgjam0WAeSKqf",
diff --git a/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json
index bd41fff189..3358b98c75 100644
--- a/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json	
+++ b/resources/profiles/Creality/filament/Generic PLA Silk @Creality Hi-all.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PLA Silk @Creality Hi-all",
-	"inherits": "Creality Generic PLA @Hi-all",
+	"inherits": "Generic PLA @Creality Hi-all",
 	"renamed_from": "Creality Generic PLA Silk @Hi-all;Creality Generic PLA Silk Hi-all",
 	"from": "system",
 	"setting_id": "k1ofgUXqhHGSPDPY",
diff --git a/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json b/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json
index b272cb185a..62f6ddf42c 100644
--- a/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json	
+++ b/resources/profiles/Creality/filament/Generic PLA Wood @Creality Hi-all.json	
@@ -1,7 +1,7 @@
 {
 	"type": "filament",
 	"name": "Generic PLA Wood @Creality Hi-all",
-	"inherits": "Creality Generic PLA @Hi-all",
+	"inherits": "Generic PLA @Creality Hi-all",
 	"renamed_from": "Creality Generic PLA Wood @Hi-all;Creality Generic PLA Wood Hi-all",
 	"from": "system",
 	"setting_id": "PNqfF5ecYqqpobdh",
diff --git a/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json
index b7a1676baa..57dcd7e949 100644
--- a/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json	
+++ b/resources/profiles/Creality/machine/Creality Hi 0.2 nozzle.json	
@@ -91,7 +91,7 @@
 	"use_relative_e_distances": "1",
 	"z_offset": "0",
 	"default_filament_profile": [
-		"Creality Generic PLA @Hi-all"
+		"Generic PLA @System"
 	],
 	"deretraction_speed": "40",
 	"extruder_colour": "#018001",
diff --git a/resources/profiles/Creality/machine/Creality Hi 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Hi 0.4 nozzle.json
index 74cd4559d5..0372431a1e 100644
--- a/resources/profiles/Creality/machine/Creality Hi 0.4 nozzle.json	
+++ b/resources/profiles/Creality/machine/Creality Hi 0.4 nozzle.json	
@@ -135,7 +135,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X260 Y180 F30000\nG1 Z{z_after_toolchange} F600",
 	"default_filament_profile": [
-		"Creality Generic PLA @Hi-all"
+		"Generic PLA @Creality Hi-all"
 	],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM104 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 E0.8 F300\nG1 X0 Y0 E9 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X150 Y0 E9 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "G1 X0 Y180 F8000\nEND_PRINT",
diff --git a/resources/profiles/Creality/machine/Creality Hi 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Hi 0.6 nozzle.json
index 402771c410..f7bcd5884d 100644
--- a/resources/profiles/Creality/machine/Creality Hi 0.6 nozzle.json	
+++ b/resources/profiles/Creality/machine/Creality Hi 0.6 nozzle.json	
@@ -135,7 +135,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"change_filament_gcode": "G2 Z{z_after_toolchange + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\nG1 X260 Y180 F30000\nG1 Z{z_after_toolchange} F600",
 	"default_filament_profile": [
-		"Creality Generic PLA @Hi-all"
+		"Generic PLA @Creality Hi-all"
 	],
 	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM104 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y150 F12000\nG1 X0 F12000\nG1 Z0.2 F600\nG1 X0 Y150 F6000\nG1 E0.8 F300\nG1 X0 Y0 E9 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X150 Y0 E9 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "G1 X0 Y180 F8000\nEND_PRINT",
diff --git a/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json
index 5f43c0992c..23e19a2a66 100644
--- a/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json	
+++ b/resources/profiles/Creality/machine/Creality Hi 0.8 nozzle.json	
@@ -86,7 +86,7 @@
 	"use_relative_e_distances": "1",
 	"z_offset": "0",
 	"default_filament_profile": [
-		"Creality Generic PLA @Hi-all"
+		"Generic PLA @Hi-all"
 	],
 	"deretraction_speed": "40",
 	"extruder_colour": "#018001",
diff --git a/resources/profiles/Creality/machine/Creality Hi.json b/resources/profiles/Creality/machine/Creality Hi.json
index 107d587cc5..279daf531c 100644
--- a/resources/profiles/Creality/machine/Creality Hi.json	
+++ b/resources/profiles/Creality/machine/Creality Hi.json	
@@ -9,5 +9,5 @@
 	"bed_texture": "creality_hi_buildplate_texture.svg",
 	"default_bed_type": "Textured PEI Plate",
 	"hotend_model": "",
-	"default_materials": "Generic ABS @Creality Hi-all;Generic ASA @Creality Hi-all;Generic ASA-CF @Creality Hi-all;Generic PETG @Creality Hi-all;Generic PETG-CF @Creality Hi-all;Generic PLA @Creality Hi-all;Generic PLA High Speed @Creality Hi-all;Generic PLA Matte @Creality Hi-all;Generic PLA Silk @Creality Hi-all;Generic PLA-CF @Creality Hi-all;Generic PLA Wood @Creality Hi-all;Generic TPU @Creality Hi-all"
+	"default_materials": "Generic ABS @Creality Hi-all;Generic ABS @Hi-all;Generic ASA @Creality Hi-all;Generic ASA-CF @Creality Hi-all;Generic PETG @Creality Hi-all;Generic PETG @Hi-all;Generic PETG-CF @Creality Hi-all;Generic PLA @Creality Hi-all;Generic PLA @Hi-all;Generic PLA High Speed @Creality Hi-all;Generic PLA Matte @Creality Hi-all;Generic PLA Silk @Creality Hi-all;Generic PLA-CF @Creality Hi-all;Generic PLA Wood @Creality Hi-all;Generic TPU @Creality Hi-all"
 }
diff --git a/scripts/filament_id_snapshot.json b/scripts/filament_id_snapshot.json
index c9966fc8d6..efaffb0654 100644
--- a/scripts/filament_id_snapshot.json
+++ b/scripts/filament_id_snapshot.json
@@ -2055,7 +2055,6 @@
    "Co Print/Generic PLA",
    "CoLiDo/Generic PLA",
    "Comgrow/Generic PLA",
-   "Creality/Creality Generic PLA",
    "Creality/Generic PLA",
    "Custom/Generic PLA",
    "DeltaMaker/Generic PLA",