diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json
index 07130d11ee..cce8ed38d8 100644
--- a/resources/definitions/creality_base.def.json
+++ b/resources/definitions/creality_base.def.json
@@ -142,7 +142,7 @@
     "metadata": {
         "visible": false,
         "author": "trouch.com",
-        "manufacturer": "CreawsomeMod",
+        "manufacturer": "Creality3D",
         "file_formats": "text/x-gcode",
         "first_start_actions": ["MachineSettingsAction"],
 
diff --git a/resources/definitions/easyarts_ares.def.json b/resources/definitions/easyarts_ares.def.json
index 5655d0a795..0e2742f484 100644
--- a/resources/definitions/easyarts_ares.def.json
+++ b/resources/definitions/easyarts_ares.def.json
@@ -5,7 +5,7 @@
     "metadata": {
         "visible": true,
         "author": "nliaudat",
-        "manufacturer": "EasyArts (discontinued)",
+        "manufacturer": "EasyArts",
         "file_formats": "text/x-gcode",
         "machine_extruder_trains":
         {
diff --git a/resources/definitions/kossel_mini.def.json b/resources/definitions/kossel_mini.def.json
index 91f374fb6d..d9c3b3d37f 100644
--- a/resources/definitions/kossel_mini.def.json
+++ b/resources/definitions/kossel_mini.def.json
@@ -5,7 +5,7 @@
     "metadata": {
         "visible": true,
         "author": "Claudio Sampaio (Patola)",
-        "manufacturer": "Other",
+        "manufacturer": "Johann",
         "file_formats": "text/x-gcode",
         "platform": "kossel_platform.stl",
         "platform_offset": [0, -0.25, 0],
diff --git a/resources/definitions/kossel_pro.def.json b/resources/definitions/kossel_pro.def.json
index e104538b2c..f26c6ed068 100644
--- a/resources/definitions/kossel_pro.def.json
+++ b/resources/definitions/kossel_pro.def.json
@@ -5,7 +5,7 @@
     "metadata": {
         "visible": true,
         "author": "Chris Petersen",
-        "manufacturer": "OpenBeam",
+        "manufacturer": "Johann",
         "file_formats": "text/x-gcode",
         "platform": "kossel_pro_build_platform.stl",
         "platform_offset": [0, -0.25, 0],
diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json
index dd6c87c046..581de6fd98 100644
--- a/resources/definitions/prusa_i3.def.json
+++ b/resources/definitions/prusa_i3.def.json
@@ -5,7 +5,7 @@
     "metadata": {
         "visible": true,
         "author": "Quillford",
-        "manufacturer": "Prusajr",
+        "manufacturer": "Prusa3D",
         "file_formats": "text/x-gcode",
         "platform": "prusai3_platform.stl",
         "machine_extruder_trains":
diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json
index 29407b0afd..ff6f4469e7 100644
--- a/resources/definitions/prusa_i3_mk2.def.json
+++ b/resources/definitions/prusa_i3_mk2.def.json
@@ -5,7 +5,7 @@
     "metadata": {
         "visible": true,
         "author": "Apsu, Nounours2099",
-        "manufacturer": "Prusa Research",
+        "manufacturer": "Prusa3D",
         "file_formats": "text/x-gcode",
         "platform": "prusai3_platform.stl",
         "has_materials": true,
diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json
index aa5fcf6df9..b9628b9430 100644
--- a/resources/definitions/prusa_i3_xl.def.json
+++ b/resources/definitions/prusa_i3_xl.def.json
@@ -5,7 +5,7 @@
     "metadata": {
         "visible": true,
         "author": "guigashm",
-        "manufacturer": "Prusajr",
+        "manufacturer": "Prusa3D",
         "file_formats": "text/x-gcode",
         "platform": "prusai3_xl_platform.stl",
         "machine_extruder_trains":
diff --git a/resources/definitions/stereotech_start.def.json b/resources/definitions/stereotech_start.def.json
index 26c4b6a3a2..e85893d811 100644
--- a/resources/definitions/stereotech_start.def.json
+++ b/resources/definitions/stereotech_start.def.json
@@ -5,12 +5,12 @@
     "metadata": {
         "visible": true,
         "author": "Stereotech",
-        "manufacturer": "Other",
+        "manufacturer": "Stereotech LLC.",
         "file_formats": "text/x-gcode",
         "platform": "stereotech_start.stl",
         "icon": "icon_ultimaker2",
-		"platform_offset": [0, 0, 0],
-		"machine_extruder_trains":
+        "platform_offset": [0, 0, 0],
+        "machine_extruder_trains":
         {
             "0": "stereotech_start_extruder_0"
         }
diff --git a/resources/definitions/vertex_delta_k8800.def.json b/resources/definitions/vertex_delta_k8800.def.json
index 51c745a841..c92476da49 100644
--- a/resources/definitions/vertex_delta_k8800.def.json
+++ b/resources/definitions/vertex_delta_k8800.def.json
@@ -3,10 +3,10 @@
   "version": 2,
   "inherits": "fdmprinter",
   "metadata": {
-    "manufacturer": "Velleman nv",
+    "manufacturer": "Velleman N.V.",
     "file_formats": "text/x-gcode",
     "visible": true,
-    "author": "Velleman",
+    "author": "Velleman N.V.",
     "has_machine_quality": true,
     "has_materials": true,
     "machine_extruder_trains":
diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json
index b43751cadc..6bba095978 100644
--- a/resources/definitions/vertex_k8400.def.json
+++ b/resources/definitions/vertex_k8400.def.json
@@ -4,7 +4,7 @@
     "inherits": "fdmprinter",
     "metadata": {
         "visible": true,
-        "manufacturer": "Velleman",
+        "manufacturer": "Velleman N.V.",
         "file_formats": "text/x-gcode",
         "platform": "Vertex_build_panel.stl",
         "platform_offset": [0, -3, 0],
diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json
index 145cb7abec..9d014b9cf8 100644
--- a/resources/definitions/vertex_k8400_dual.def.json
+++ b/resources/definitions/vertex_k8400_dual.def.json
@@ -4,7 +4,7 @@
     "inherits": "fdmprinter",
     "metadata": {
         "visible": true,
-        "manufacturer": "Velleman",
+        "manufacturer": "Velleman N.V.",
         "file_formats": "text/x-gcode",
         "platform": "Vertex_build_panel.stl",
         "platform_offset": [0, -3, 0],