diff --git a/openapi/machine-api.json b/openapi/machine-api.json
index d5a9238ec..464bc0b63 100644
--- a/openapi/machine-api.json
+++ b/openapi/machine-api.json
@@ -125,66 +125,143 @@
         "oneOf": [
           {
             "description": "polylactic acid based plastics",
-            "enum": [
-              "Pla"
+            "properties": {
+              "type": {
+                "enum": [
+                  "pla"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
             ],
-            "type": "string"
+            "type": "object"
           },
           {
             "description": "acrylonitrile butadiene styrene based plastics",
-            "enum": [
-              "Abs"
+            "properties": {
+              "type": {
+                "enum": [
+                  "abs"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
             ],
-            "type": "string"
+            "type": "object"
           },
           {
             "description": "polyethylene terephthalate glycol based plastics",
-            "enum": [
-              "Petg"
+            "properties": {
+              "type": {
+                "enum": [
+                  "petg"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
             ],
-            "type": "string"
+            "type": "object"
           },
           {
             "description": "unsuprisingly, nylon based",
-            "enum": [
-              "Nylon"
+            "properties": {
+              "type": {
+                "enum": [
+                  "nylon"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
             ],
-            "type": "string"
+            "type": "object"
           },
           {
             "description": "thermoplastic polyurethane based urethane material",
-            "enum": [
-              "Tpu"
+            "properties": {
+              "type": {
+                "enum": [
+                  "tpu"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
             ],
-            "type": "string"
+            "type": "object"
           },
           {
             "description": "polyvinyl alcohol based material",
-            "enum": [
-              "Pva"
+            "properties": {
+              "type": {
+                "enum": [
+                  "pva"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
             ],
-            "type": "string"
+            "type": "object"
           },
           {
             "description": "high impact polystyrene based material",
-            "enum": [
-              "Hips"
+            "properties": {
+              "type": {
+                "enum": [
+                  "hips"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
             ],
-            "type": "string"
+            "type": "object"
           },
           {
             "description": "composite material with stuff in other stuff, something like PLA mixed with carbon fiber, kevlar, or fiberglass",
-            "enum": [
-              "Composite"
+            "properties": {
+              "type": {
+                "enum": [
+                  "composite"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "type"
             ],
-            "type": "string"
+            "type": "object"
           },
           {
-            "description": "none of the above, buyer beware",
-            "enum": [
-              "Other"
+            "description": "None of the above, likely a custom material that we get directly from the printer.",
+            "properties": {
+              "name": {
+                "description": "The name of the material.",
+                "type": "string"
+              },
+              "type": {
+                "enum": [
+                  "other"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "name",
+              "type"
             ],
-            "type": "string"
+            "type": "object"
           }
         ]
       },
@@ -193,21 +270,40 @@
         "oneOf": [
           {
             "description": "No configuration is possible. This isn't the same conceptually as an `Option<HardwareConfiguration>`, because this indicates we positively know there is no possible configuration changes that are possible with this method of manufcture.",
-            "enum": [
-              "None"
-            ],
-            "type": "string"
-          },
-          {
-            "additionalProperties": false,
-            "description": "Hardware configuration specific to FDM based printers",
             "properties": {
-              "Fdm": {
-                "$ref": "#/components/schemas/FdmHardwareConfiguration"
+              "type": {
+                "enum": [
+                  "none"
+                ],
+                "type": "string"
               }
             },
             "required": [
-              "Fdm"
+              "type"
+            ],
+            "type": "object"
+          },
+          {
+            "description": "Hardware configuration specific to FDM based printers",
+            "properties": {
+              "config": {
+                "allOf": [
+                  {
+                    "$ref": "#/components/schemas/FdmHardwareConfiguration"
+                  }
+                ],
+                "description": "The configuration for the FDM printer."
+              },
+              "type": {
+                "enum": [
+                  "fdm"
+                ],
+                "type": "string"
+              }
+            },
+            "required": [
+              "config",
+              "type"
             ],
             "type": "object"
           }
@@ -422,21 +518,21 @@
           {
             "description": "Use light to cure a resin to build up layers.",
             "enum": [
-              "Stereolithography"
+              "stereolithography"
             ],
             "type": "string"
           },
           {
             "description": "Fused Deposition Modeling, layers of melted plastic.",
             "enum": [
-              "FusedDeposition"
+              "fused_deposition"
             ],
             "type": "string"
           },
           {
             "description": "\"Computer numerical control\" - machine that grinds away material from a hunk of material to construct a part.",
             "enum": [
-              "Cnc"
+              "cnc"
             ],
             "type": "string"
           }
diff --git a/src/lib/machine-api.d.ts b/src/lib/machine-api.d.ts
index 5ab0ceec2..5b8727f18 100644
--- a/src/lib/machine-api.d.ts
+++ b/src/lib/machine-api.d.ts
@@ -146,20 +146,55 @@ export interface components {
     }
     /** @description The material that the filament is made of. */
     FilamentMaterial:
-      | 'Pla'
-      | 'Abs'
-      | 'Petg'
-      | 'Nylon'
-      | 'Tpu'
-      | 'Pva'
-      | 'Hips'
-      | 'Composite'
-      | 'Other'
+      | {
+          /** @enum {string} */
+          type: 'pla'
+        }
+      | {
+          /** @enum {string} */
+          type: 'abs'
+        }
+      | {
+          /** @enum {string} */
+          type: 'petg'
+        }
+      | {
+          /** @enum {string} */
+          type: 'nylon'
+        }
+      | {
+          /** @enum {string} */
+          type: 'tpu'
+        }
+      | {
+          /** @enum {string} */
+          type: 'pva'
+        }
+      | {
+          /** @enum {string} */
+          type: 'hips'
+        }
+      | {
+          /** @enum {string} */
+          type: 'composite'
+        }
+      | {
+          /** @description The name of the material. */
+          name: string
+          /** @enum {string} */
+          type: 'other'
+        }
     /** @description The hardware configuration of a machine. */
     HardwareConfiguration:
-      | 'None'
       | {
-          Fdm: components['schemas']['FdmHardwareConfiguration']
+          /** @enum {string} */
+          type: 'none'
+        }
+      | {
+          /** @description The configuration for the FDM printer. */
+          config: components['schemas']['FdmHardwareConfiguration']
+          /** @enum {string} */
+          type: 'fdm'
         }
     /** @description Information regarding a connected machine. */
     MachineInfoResponse: {
@@ -224,7 +259,7 @@ export interface components {
           state: 'failed'
         }
     /** @description Specific technique by which this Machine takes a design, and produces a real-world 3D object. */
-    MachineType: 'Stereolithography' | 'FusedDeposition' | 'Cnc'
+    MachineType: 'stereolithography' | 'fused_deposition' | 'cnc'
     /** @description A nozzle diameter. */
     NozzleDiameter: '0.2' | '0.4' | '0.6' | '0.8'
     /** @description The response from the `/ping` endpoint. */