diff --git a/NewHorizons/Schemas/body_schema.json b/NewHorizons/Schemas/body_schema.json
index 1cb51aec..39da4c40 100644
--- a/NewHorizons/Schemas/body_schema.json
+++ b/NewHorizons/Schemas/body_schema.json
@@ -4,14 +4,10 @@
   "type": "object",
   "description": "Describes a celestial body to generate",
   "additionalProperties": false,
-  "required": [
-    "name"
-  ],
   "properties": {
     "name": {
       "type": "string",
-      "description": "Unique name of your planet",
-      "minLength": 1
+      "description": "Unique name of your planet. If not specified, the file name (without the extension) is used."
     },
     "starSystem": {
       "type": "string",
diff --git a/NewHorizons/Schemas/star_system_schema.json b/NewHorizons/Schemas/star_system_schema.json
index 0cba8563..047e7dd1 100644
--- a/NewHorizons/Schemas/star_system_schema.json
+++ b/NewHorizons/Schemas/star_system_schema.json
@@ -5,6 +5,10 @@
   "description": "Configuration for a specific star system",
   "additionalProperties": false,
   "properties": {
+    "name": {
+      "type": "string",
+      "description": "Unique name of your system. If not specified, the file name (without the extension) is used."
+    },
     "freeMapAngle": {
       "type": "boolean",
       "description": "In this system should the player be able to rotate their map camera freely or be stuck above the plane of the solar system?"