diff --git a/schemas/api/WCP1Hello.schema.json b/schemas/api/WCP1Hello.schema.json
index 04db3d4cd..7698986f7 100644
--- a/schemas/api/WCP1Hello.schema.json
+++ b/schemas/api/WCP1Hello.schema.json
@@ -41,7 +41,7 @@
               "description": "The version of FDC3 API that the app supports.",
               "type": "string"
             },
-            "resolver": {
+            "intentResolver": {
               "title": "Intent Resolver Required",
               "description": "A flag that may be used to indicate that an intent resolver is or is not required. Set to false if no intents, or only targeted intents, are raised",
               "type": "boolean"
diff --git a/schemas/api/WCP3Handshake.schema.json b/schemas/api/WCP3Handshake.schema.json
index 07816b085..cbcedb5e8 100644
--- a/schemas/api/WCP3Handshake.schema.json
+++ b/schemas/api/WCP3Handshake.schema.json
@@ -29,7 +29,7 @@
               "type": "string",
               "description": "The version of FDC3 API that the Desktop Agent will provide support for."
             },
-            "resolver": {
+            "intentResolverUrl": {
               "title": "Resolver URL",
               "description": "Indicates whether an intent resolver UI is required and the URL to use to do so. Set to `true` to use the default or `false` to disable the intent resolver (as the Desktop Agent will handle another way)",
               "oneOf": [
@@ -42,7 +42,7 @@
                 }
               ]
             },
-            "channelSelector": {
+            "channelSelectorUrl": {
               "title": "Channel Selector URL",
               "description": "Indicates whether a channel selector UI is required and the URL to use to do so. Set to `true` to use the default or `false` to disable the channel selector (as the Desktop Agent will handle another way)",
               "oneOf": [
@@ -59,8 +59,8 @@
           "additionalProperties": false,
           "required": [
             "fdc3Version",
-            "resolver",
-            "channelSelector"
+            "intentResolverUrl",
+            "channelSelectorUrl"
           ]
         },
         "meta": true
diff --git a/src/api/BrowserTypes.ts b/src/api/BrowserTypes.ts
index 72d2e62d8..03ebc2804 100644
--- a/src/api/BrowserTypes.ts
+++ b/src/api/BrowserTypes.ts
@@ -3599,7 +3599,7 @@ export interface WebConnectionProtocol1HelloPayload {
      * A flag that may be used to indicate that an intent resolver is or is not required. Set to
      * false if no intents, or only targeted intents, are raised
      */
-    resolver?: boolean;
+    intentResolver?: boolean;
     [property: string]: any;
 }
 
@@ -3672,7 +3672,7 @@ export interface WebConnectionProtocol3HandshakePayload {
      * `true` to use the default or `false` to disable the channel selector (as the Desktop
      * Agent will handle another way)
      */
-    channelSelector: boolean | string;
+    channelSelectorUrl: boolean | string;
     /**
      * The version of FDC3 API that the Desktop Agent will provide support for.
      */
@@ -3682,7 +3682,7 @@ export interface WebConnectionProtocol3HandshakePayload {
      * `true` to use the default or `false` to disable the intent resolver (as the Desktop Agent
      * will handle another way)
      */
-    resolver: boolean | string;
+    intentResolverUrl: boolean | string;
 }
 
 /**
@@ -5416,7 +5416,7 @@ const typeMap: any = {
         { json: "channelSelector", js: "channelSelector", typ: u(undefined, true) },
         { json: "fdc3Version", js: "fdc3Version", typ: "" },
         { json: "identityUrl", js: "identityUrl", typ: "" },
-        { json: "resolver", js: "resolver", typ: u(undefined, true) },
+        { json: "intentResolver", js: "intentResolver", typ: u(undefined, true) },
     ], "any"),
     "WebConnectionProtocol2LoadURL": o([
         { json: "meta", js: "meta", typ: r("ConnectionStepMetadata") },
@@ -5432,9 +5432,9 @@ const typeMap: any = {
         { json: "type", js: "type", typ: r("WebConnectionProtocol3HandshakeType") },
     ], false),
     "WebConnectionProtocol3HandshakePayload": o([
-        { json: "channelSelector", js: "channelSelector", typ: u(true, "") },
+        { json: "channelSelectorUrl", js: "channelSelectorUrl", typ: u(true, "") },
         { json: "fdc3Version", js: "fdc3Version", typ: "" },
-        { json: "resolver", js: "resolver", typ: u(true, "") },
+        { json: "intentResolverUrl", js: "intentResolverUrl", typ: u(true, "") },
     ], false),
     "WebConnectionProtocol4ValidateAppIdentity": o([
         { json: "meta", js: "meta", typ: r("ConnectionStepMetadata") },
diff --git a/src/index.ts b/src/index.ts
index 48631ed93..5b50b6abe 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -10,6 +10,7 @@ import * as BrowserTypes from './api/BrowserTypes';
 import * as AppIdentifier from './api/AppIdentifier';
 
 export * from './context/ContextTypes';
+
 export { AppIdentifier };
 export * from './api/AppIntent';
 export * from './api/AppMetadata';
@@ -34,7 +35,6 @@ export * from './context/ContextType';
 
 export * from './intents/Intents';
 
-
 /* Workaround for conflicts between bridging types, browser type and API types
    and prettier issue with `export * as`. */
 export { BridgingTypes };