diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json
index 3e59ac86dc..3e35b7b5c2 100644
--- a/resources/machines/ultimaker2plus_025.json
+++ b/resources/machines/ultimaker2plus_025.json
@@ -9,7 +9,7 @@
 
     "inherits": "ultimaker2plus.json",
 
-    "variant": "0.25mm Nozzle",
+    "variant": "0.25 mm",
 
     "overrides": {
         "machine_nozzle_size": { "default": 0.25 },
diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json
index 452559591b..30b4b8ad58 100644
--- a/resources/machines/ultimaker2plus_040.json
+++ b/resources/machines/ultimaker2plus_040.json
@@ -9,7 +9,7 @@
 
     "inherits": "ultimaker2plus.json",
 
-    "variant": "0.40mm Nozzle",
+    "variant": "0.4 mm",
 
     "overrides": {
         "machine_nozzle_size": { "default": 0.40 },
diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json
index 0bfab6aecd..fe3c4ee513 100644
--- a/resources/machines/ultimaker2plus_060.json
+++ b/resources/machines/ultimaker2plus_060.json
@@ -9,7 +9,7 @@
 
     "inherits": "ultimaker2plus.json",
 
-    "variant": "0.60mm Nozzle",
+    "variant": "0.6 mm",
 
     "overrides": {
         "machine_nozzle_size": { "default": 0.60 },
diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json
index b0f6376e9d..5df120b7f0 100644
--- a/resources/machines/ultimaker2plus_080.json
+++ b/resources/machines/ultimaker2plus_080.json
@@ -9,7 +9,7 @@
 
     "inherits": "ultimaker2plus.json",
 
-    "variant": "0.80mm Nozzle",
+    "variant": "0.8 mm",
 
     "overrides": {
         "machine_nozzle_size": { "default": 0.80 },
diff --git a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
index 8b1285edbe..fd6b51c059 100644
--- a/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.25_high.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = High Quality
 machine_type = ultimaker2plus
-machine_variant = 0.25mm Nozzle
+machine_variant = 0.25 mm
 material = ABS
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
index edceecb6eb..8ff2f1be6f 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Fast Prints
 machine_type = ultimaker2plus
-machine_variant = 0.4mm Nozzle
+machine_variant = 0.4 mm
 material = ABS
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
index 63eff46857..55eae0a8f4 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = High Quality
 machine_type = ultimaker2plus
-machine_variant = 0.4mm Nozzle
+machine_variant = 0.4 mm
 material = ABS
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
index c7c7464400..627f22aa61 100644
--- a/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Normal Quality
 machine_type = ultimaker2plus
-machine_variant = 0.4mm Nozzle
+machine_variant = 0.4 mm
 material = ABS
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
index 0f6372adae..54904f0e2d 100644
--- a/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Normal Quality
 machine_type = ultimaker2plus
-machine_variant = 0.6mm Nozzle
+machine_variant = 0.6 mm
 material = ABS
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
index 4b28e8d3c1..45ac82364b 100644
--- a/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Fast Prints
 machine_type = ultimaker2plus
-machine_variant = 0.8mm Nozzle
+machine_variant = 0.8 mm
 material = ABS
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
index f4627dcca5..6442cbd5e9 100644
--- a/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = High Quality
 machine_type = ultimaker2plus
-machine_variant = 0.25mm Nozzle
+machine_variant = 0.25 mm
 material = CPE
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
index 0aa1fce5b6..9b2a4dd901 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_fast.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Fast Prints
 machine_type = ultimaker2plus
-machine_variant = 0.4mm Nozzle
+machine_variant = 0.4 mm
 material = CPE
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
index fa98b33f12..0ca6bdca19 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_high.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = High Quality
 machine_type = ultimaker2plus
-machine_variant = 0.4mm Nozzle
+machine_variant = 0.4 mm
 material = CPE
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
index d314011f1d..340ded170e 100644
--- a/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Normal Quality
 machine_type = ultimaker2plus
-machine_variant = 0.4mm Nozzle
+machine_variant = 0.4 mm
 material = CPE
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
index aeeb753473..d1b26b64e8 100644
--- a/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Normal Quality
 machine_type = ultimaker2plus
-machine_variant = 0.6mm Nozzle
+machine_variant = 0.6 mm
 material = CPE
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
index a2cbd4f25f..94cb538b63 100644
--- a/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Fast Prints
 machine_type = ultimaker2plus
-machine_variant = 0.8mm Nozzle
+machine_variant = 0.8 mm
 material = CPE
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
index d1f108edbb..db552e3f82 100644
--- a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = High Quality
 machine_type = ultimaker2plus
-machine_variant = 0.25mm Nozzle
+machine_variant = 0.25 mm
 material = PLA
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
index 7f4ddcec47..b13bfc075f 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Fast Prints
 machine_type = ultimaker2plus
-machine_variant = 0.4mm Nozzle
+machine_variant = 0.4 mm
 material = PLA
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
index fc2c68d965..baf1848efb 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = High Quality
 machine_type = ultimaker2plus
-machine_variant = 0.4mm Nozzle
+machine_variant = 0.4 mm
 material = PLA
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
index 5575a5e6ef..db5ea4fd44 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Normal Quality
 machine_type = ultimaker2plus
-machine_variant = 0.4mm Nozzle
+machine_variant = 0.4 mm
 material = PLA
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
index cf502a8486..09d1061880 100644
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Normal Quality
 machine_type = ultimaker2plus
-machine_variant = 0.6mm Nozzle
+machine_variant = 0.6 mm
 material = PLA
 
 [settings]
diff --git a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
index 03b28cacc3..a3d4242072 100644
--- a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
@@ -2,7 +2,7 @@
 version = 1
 name = Fast Prints
 machine_type = ultimaker2plus
-machine_variant = 0.8mm Nozzle
+machine_variant = 0.8 mm
 material = PLA
 
 [settings]