diff --git a/resources/definitions/anycubic_kossel_linear.def.json b/resources/definitions/anycubic_kossel.def.json
similarity index 83%
rename from resources/definitions/anycubic_kossel_linear.def.json
rename to resources/definitions/anycubic_kossel.def.json
index 1b7ef9a68a..0543282a62 100644
--- a/resources/definitions/anycubic_kossel_linear.def.json
+++ b/resources/definitions/anycubic_kossel.def.json
@@ -1,9 +1,9 @@
 {
-	"name": "Anycubic Kossel Linear",
+	"name": "Anycubic Kossel",
 	"version": 2,
 	"inherits": "fdmprinter",
 	"metadata": {
-		"visible": true,
+		"visible": false,
 		"author": "Allester Fox",
 		"manufacturer": "Anycubic",
 		"file_formats": "text/x-gcode",
@@ -12,7 +12,7 @@
 		"preferred_material": "generic_pla",
 		"platform": "kossel_platform.3mf",
 		"machine_extruder_trains": {
-			"0": "anycubic_kossel_linear_extruder_0"
+			"0": "anycubic_kossel_extruder_0"
 		}
 	},
 	"overrides": {
@@ -44,7 +44,7 @@
 			"default_value": "G21        ;metric values\nG90        ;absolute positioning\nM107       ;start with the fan off\nG28   ;move to endstops\nG92 E0                  ;zero the extruded length\nG1 F200 E3              ;extrude 3mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F{speed_travel}\n;Put printing message on LCD screen\nM117 Printing..."
 		},
 		"machine_end_gcode": {
-			"default_value": "M400      ;Free buffer\nG91      ;relative positioning\nG1 E-1 F300      ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5 X+1 Y+1   ;move Z up a bit and retract filament even more\nG90      ;absolute positioning\nM104 S0      ;extruder heater off\nM140 S0      ;heated bed heater off (if you have it)\nM107      ;fan off\nM84      ;steppers off\nG28      ;move to endstop\nM84      ;steppers off"
+			"default_value": "M400      ;Free buffer\nG91      ;relative positioning\nG1 E-1 F300      ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5        ;move Z up a bit and retract filament even more\nG90      ;absolute positioning\nM104 S0      ;extruder heater off\nM140 S0      ;heated bed heater off\nM107      ;fan off\nM84      ;steppers off\nG28      ;move to endstop\nM84      ;steppers off"
 		},
 		"machine_shape": {
 			"default_value": "elliptic"
diff --git a/resources/definitions/anycubic_kossel_linear_plus.def.json b/resources/definitions/anycubic_kossel_linear_plus.def.json
index 398b1b546d..88362f6c64 100644
--- a/resources/definitions/anycubic_kossel_linear_plus.def.json
+++ b/resources/definitions/anycubic_kossel_linear_plus.def.json
@@ -1,11 +1,12 @@
 {
 	"name": "Anycubic Kossel Linear Plus",
 	"version": 2,
-	"inherits": "anycubic_kossel_linear",
+	"inherits": "anycubic_kossel",
 	"metadata": {
 		"visible": true,
+		"platform": "kossel_pro_build_platform.3mf",
 		"machine_extruder_trains": {
-			"0": "anycubic_kossel_linear_extruder_0"
+			"0": "anycubic_kossel_extruder_0"
 		}
 	},
 	"overrides": {
diff --git a/resources/definitions/anycubic_kossel_pulley.def.json b/resources/definitions/anycubic_kossel_pulley.def.json
index eee2d0d85c..6360206e89 100644
--- a/resources/definitions/anycubic_kossel_pulley.def.json
+++ b/resources/definitions/anycubic_kossel_pulley.def.json
@@ -1,11 +1,11 @@
 {
 	"name": "Anycubic Kossel Pulley",
 	"version": 2,
-	"inherits": "anycubic_kossel_linear",
+	"inherits": "anycubic_kossel",
 	"metadata": {
 		"visible": true,
 		"machine_extruder_trains": {
-			"0": "anycubic_kossel_linear_extruder_0"
+			"0": "anycubic_kossel_extruder_0"
 		}
 	},
 	"overrides": {
diff --git a/resources/extruders/anycubic_kossel_linear_extruder_0.def.json b/resources/extruders/anycubic_kossel_extruder_0.def.json
similarity index 87%
rename from resources/extruders/anycubic_kossel_linear_extruder_0.def.json
rename to resources/extruders/anycubic_kossel_extruder_0.def.json
index cad4f8e898..5e1929568c 100644
--- a/resources/extruders/anycubic_kossel_linear_extruder_0.def.json
+++ b/resources/extruders/anycubic_kossel_extruder_0.def.json
@@ -3,7 +3,7 @@
 	"name": "Extruder 1",
 	"inherits": "fdmextruder",
 	"metadata": {
-		"machine": "anycubic_kossel_linear",
+		"machine": "anycubic_kossel",
 		"position": "0"
 	},