diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json
index 8a638a0e77..9aae3d6dc4 100644
--- a/resources/settings/fdmprinter.json
+++ b/resources/settings/fdmprinter.json
@@ -1,6 +1,7 @@
 {
     "visible": false,
     "manufacturer": "other",
+    "author": "other",
 
     "add_pages": [{"page": "AddMachine", "title": "Add new printer"}],
 
diff --git a/resources/settings/grr_neo.json b/resources/settings/grr_neo.json
index fa6daa1054..cb8898f2ff 100644
--- a/resources/settings/grr_neo.json
+++ b/resources/settings/grr_neo.json
@@ -1,6 +1,8 @@
 {
-    "id": "German RepRap Neo",
+    "id": "grr_neo",
     "name": "German RepRap Neo",
+    "manufacturer": "German RepRap",
+    "author": "other",
     "icon": "icon_ultimaker.png",
     "platform": "grr_neo_platform.stl",
 
diff --git a/resources/settings/hephestos.json b/resources/settings/hephestos.json
index bd702ffd0c..69af6b87ec 100644
--- a/resources/settings/hephestos.json
+++ b/resources/settings/hephestos.json
@@ -1,6 +1,8 @@
 {
-    "id": "BQ Prusa i3 Hephestos",
+    "id": "hephestos",
     "name": "BQ Prusa i3 Hephestos",
+    "manufacturer": "BQ",
+    "author": "other",
     "platform": "hephestos_platform.stl",
     "inherits": "fdmprinter.json",
 
diff --git a/resources/settings/hephestos_XL.json b/resources/settings/hephestos_xl.json
similarity index 98%
rename from resources/settings/hephestos_XL.json
rename to resources/settings/hephestos_xl.json
index f9b5ee5240..9c4538ede0 100644
--- a/resources/settings/hephestos_XL.json
+++ b/resources/settings/hephestos_xl.json
@@ -1,6 +1,8 @@
 {
-    "id": "BQ Prusa i3 Hephestos XL",
+    "id": "hephestos_xl",
     "name": "BQ Prusa i3 Hephestos XL",
+    "manufacturer": "BQ",
+    "author": "other",
     "platform": "hephestos_platform.stl",
     "inherits": "fdmprinter.json",
 
diff --git a/resources/settings/prusai3.json b/resources/settings/prusa_i3.json
similarity index 96%
rename from resources/settings/prusai3.json
rename to resources/settings/prusa_i3.json
index ca626976f1..af90a6f80f 100644
--- a/resources/settings/prusai3.json
+++ b/resources/settings/prusa_i3.json
@@ -1,8 +1,9 @@
 {
-    "id": "Prusa i3",
-    "manufacturer": "ultimaker",
-    "icon": "icon_ultimaker2.png",
+    "id": "prusa_i3",
     "name": "Prusa i3",
+    "manufacturer": "Prusa",
+    "author": "other",
+    "icon": "icon_ultimaker2.png",
     "platform": "prusai3_platform.stl",
 
     "inherits": "fdmprinter.json",
diff --git a/resources/settings/ultimaker2.json b/resources/settings/ultimaker2.json
index 7d35d349da..f74b208cc8 100644
--- a/resources/settings/ultimaker2.json
+++ b/resources/settings/ultimaker2.json
@@ -1,7 +1,8 @@
 {
-    "id": "Ultimaker 2",
-    "manufacturer": "ultimaker",
+    "id": "ultimaker2",
     "name": "Ultimaker 2",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
     "icon": "icon_ultimaker2.png",
     "platform": "ultimaker2_platform.obj",
     "platform_texture": "Ultimaker2backplate.png",
diff --git a/resources/settings/ultimaker2extended.json b/resources/settings/ultimaker2_extended.json
similarity index 84%
rename from resources/settings/ultimaker2extended.json
rename to resources/settings/ultimaker2_extended.json
index 720deebfd2..b6156ec18e 100644
--- a/resources/settings/ultimaker2extended.json
+++ b/resources/settings/ultimaker2_extended.json
@@ -1,6 +1,5 @@
 {
-    "id": "Ultimaker 2 Extended",
-    "manufacturer": "ultimaker",
+    "id": "ultimaker2_extended",
     "name": "Ultimaker 2 Extended",
     "icon": "icon_ultimaker2.png",
     "platform": "ultimaker2_platform.obj",
diff --git a/resources/settings/ultimaker2go.json b/resources/settings/ultimaker2_go.json
similarity index 93%
rename from resources/settings/ultimaker2go.json
rename to resources/settings/ultimaker2_go.json
index c173cb5f8e..4d7a535553 100644
--- a/resources/settings/ultimaker2go.json
+++ b/resources/settings/ultimaker2_go.json
@@ -1,6 +1,5 @@
 {
-    "id": "Ultimaker 2 Go",
-    "manufacturer": "ultimaker",
+    "id": "ultimaker2_go",
     "name": "Ultimaker 2 Go",
     "icon": "icon_ultimaker2.png",
     "platform": "ultimaker2go_platform.obj",
diff --git a/resources/settings/ultimaker_original.json b/resources/settings/ultimaker_original.json
index a517e6e244..14e9b9348a 100644
--- a/resources/settings/ultimaker_original.json
+++ b/resources/settings/ultimaker_original.json
@@ -1,7 +1,8 @@
 {
-    "id": "Ultimaker Original",
-    "manufacturer": "ultimaker",
+    "id": "ultimaker_original",
     "name": "Ultimaker Original",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
     "icon": "icon_ultimaker.png",
     "platform": "ultimaker_platform.stl",
 
diff --git a/resources/settings/ultimaker_original_plus.json b/resources/settings/ultimaker_original_plus.json
index 4e002f6d2a..9e5cf6370d 100644
--- a/resources/settings/ultimaker_original_plus.json
+++ b/resources/settings/ultimaker_original_plus.json
@@ -1,5 +1,5 @@
 {
-    "id": "Ultimaker Original",
+    "id": "ultimaker_original_plus",
     "name": "Ultimaker Original+",
     "icon": "icon_ultimaker.png",
     "platform": "ultimaker2_platform.obj",
diff --git a/resources/settings/witbox.json b/resources/settings/witbox.json
index 9a8c1ed9ea..aee1030219 100644
--- a/resources/settings/witbox.json
+++ b/resources/settings/witbox.json
@@ -1,6 +1,8 @@
 {
-    "id": "BQ Witbox",
+    "id": "bq_witbox",
     "name": "BQ Witbox",
+    "manufacturer": "BQ",
+    "author": "other",
     "platform": "witbox_platform.stl",
     "inherits": "fdmprinter.json",