diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
index 92f5ffd308..0126c9c2f2 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg
@@ -1,12 +1,12 @@
 [general]
 version = 2
-name = Fast Quality
+name = Normal
 definition = ultimaker2_plus
 
 [metadata]
 type = quality
 material = generic_polypropylene_ultimaker2_plus_0.4_mm
-weight = 0
+weight = -1
 quality_type = fast
 
 [values]
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
index f7bd19e3e2..380c5c0a53 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Normal Quality
+name = Fine
 definition = ultimaker2_plus
 
 [metadata]
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
index 314ed8ace8..b968b08ad2 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg
@@ -1,12 +1,12 @@
 [general]
 version = 2
-name = Draft Print
+name = Fast
 definition = ultimaker2_plus
 
 [metadata]
 type = quality
 material = generic_polypropylene_ultimaker2_plus_0.6_mm
-weight = 0
+weight = -2
 quality_type = draft
 
 [values]
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
index 89e21dadce..f54040463c 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg
@@ -1,6 +1,6 @@
 [general]
 version = 2
-name = Fast Print
+name = Fast
 definition = ultimaker2_plus
 
 [metadata]
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
index 926f75066d..a7ba848950 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg
@@ -1,13 +1,13 @@
 [general]
 version = 2
-name = Draft Print
+name = Fast Print
 definition = ultimaker2_plus
 
 [metadata]
 type = quality
 material = generic_polypropylene_ultimaker2_plus_0.8_mm
-weight = 0
-quality_type = draft
+weight = -2
+quality_type = fast
 
 [values]
 acceleration_enabled = True
@@ -24,7 +24,7 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
 cool_fan_speed_max = 100
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 20
-gradual_infill_step_height = =layer_height * 2
+gradual_infill_step_height = =layer_height * 3
 gradual_infill_steps = 3
 infill_line_width = =round(line_width * 0.8 / 0.76, 2)
 infill_overlap = 0
@@ -41,7 +41,7 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.3
+layer_height = 0.2
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12
diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
similarity index 95%
rename from resources/quality/ultimaker2_plus/um2p_pp_0.8_fast.inst.cfg
rename to resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
index 1891f57644..7277ba8363 100644
--- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg
@@ -1,13 +1,13 @@
 [general]
 version = 2
-name = Fast Print
+name = Extra Fast
 definition = ultimaker2_plus
 
 [metadata]
 type = quality
 material = generic_polypropylene_ultimaker2_plus_0.8_mm
-weight = 0
-quality_type = fast
+weight = -3
+quality_type = draft
 
 [values]
 acceleration_enabled = True
@@ -24,7 +24,7 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
 cool_fan_speed_max = 100
 cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 20
-gradual_infill_step_height = =layer_height * 3
+gradual_infill_step_height = =layer_height * 2
 gradual_infill_steps = 3
 infill_line_width = =round(line_width * 0.8 / 0.76, 2)
 infill_overlap = 0
@@ -41,7 +41,7 @@ jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
 jerk_wall = =math.ceil(jerk_print * 10 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
-layer_height = 0.2
+layer_height = 0.3
 line_width = =machine_nozzle_size * 0.95
 multiple_mesh_overlap = 0
 retraction_count_max = 12