diff --git a/src/openrpc/device.json b/src/openrpc/device.json
index 5db4834b6..5d918fd29 100644
--- a/src/openrpc/device.json
+++ b/src/openrpc/device.json
@@ -770,13 +770,13 @@
         {
           "name": "capabilities",
           "x-uses": [
-            "xrn:firebolt:capability:display:info"
+            "xrn:firebolt:capability:device:info"
           ]
         }
       ],
       "params": [],
       "result": {
-        "name": "resolution",
+        "name": "resolutions",
         "summary": "An array of valid resolutions that the device supports",
         "schema": {
           "type": "array",
diff --git a/src/openrpc/display.json b/src/openrpc/display.json
index 6751b3808..51e3d1ccb 100644
--- a/src/openrpc/display.json
+++ b/src/openrpc/display.json
@@ -98,7 +98,7 @@
         },
         {
             "name": "optimalResolution",
-            "summary": "Get the optimal resolution of the display device.  This value is provided from the HDMI EDID.",
+            "summary": "Get the optimal resolution of the display device.  This will return null if no display is present.",
             "tags": [
                 {
                     "name": "capabilities",
@@ -112,7 +112,14 @@
                 "name": "resolution",
                 "summary": "Optional resolution of the display device.",
                 "schema": {
-                    "$ref": "#/components/schemas/DisplayResolution"
+                    "anyOf": [
+                        {
+                            "type": "null"
+                        },
+                        {
+                            "$ref": "#/components/schemas/DisplayResolution"
+                        }
+                    ]
                 }
             },
             "examples": [
@@ -191,7 +198,7 @@
                 }
             ],
             "result": {
-                "name": "resolution",
+                "name": "HDR profiles",
                 "summary": "An array of valid HDR profiles that the display supports.",
                 "schema": {
                     "type": "array",