diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 74e2c0cd7..5c98e7d11 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,4 +27,4 @@ jobs:
       run: npm install
 
     - name: Run tests
-      run: npm build
+      run: npm run build
diff --git a/package-lock.json b/package-lock.json
index 4639f7450..b26a8f44f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3392,7 +3392,7 @@
         "jsep": "^0.4.0||^1.0.0"
       }
     },
-    "node_modules/@kite9/client": {
+    "node_modules/@kite9/fdc3-get-agent": {
       "resolved": "packages/client",
       "link": true
     },
@@ -16391,7 +16391,7 @@
     "toolbox/fdc3-for-web/demo": {
       "version": "2.2.0-beta.6",
       "dependencies": {
-        "@kite9/client": "2.2.0-beta.6",
+        "@kite9/fdc3-get-agent": "2.2.0-beta.6",
         "@kite9/da-server": "2.2.0-beta.6",
         "@kite9/fdc3-core": "2.2.0-beta.6",
         "@types/uuid": "^10.0.0",
@@ -16419,7 +16419,7 @@
         "@apidevtools/json-schema-ref-parser": "^9.0.9",
         "@fontsource/roboto": "^4.4.5",
         "@fontsource/source-code-pro": "^4.5.0",
-        "@kite9/client": "2.2.0-beta.6",
+        "@kite9/fdc3-get-agent": "2.2.0-beta.6",
         "@kite9/fdc3": "2.2.0-beta.6",
         "@material-ui/core": "^4.11.4",
         "@material-ui/icons": "^4.11.2",
@@ -16455,4 +16455,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 9db58c5d7..83653ca62 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "packages/testing",
     "packages/da-proxy",
     "toolbox/fdc3-for-web/da-server",
-    "packages/client",
+    "packages/fdc3-get-agent",
     "toolbox/fdc3-for-web/demo",
     "toolbox/fdc3-workbench"
   ],
diff --git a/packages/client/cucumber.yml b/packages/fdc3-get-agent/cucumber.yml
similarity index 100%
rename from packages/client/cucumber.yml
rename to packages/fdc3-get-agent/cucumber.yml
diff --git a/packages/client/package.json b/packages/fdc3-get-agent/package.json
similarity index 96%
rename from packages/client/package.json
rename to packages/fdc3-get-agent/package.json
index 2a24c7eff..6bce122b5 100644
--- a/packages/client/package.json
+++ b/packages/fdc3-get-agent/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@kite9/client",
+  "name": "@kite9/fdc3-get-agent",
   "version": "2.2.0-beta.6",
   "files": [
     "dist"
diff --git a/packages/client/src/apps/NoopAppSupport.ts b/packages/fdc3-get-agent/src/apps/NoopAppSupport.ts
similarity index 100%
rename from packages/client/src/apps/NoopAppSupport.ts
rename to packages/fdc3-get-agent/src/apps/NoopAppSupport.ts
diff --git a/packages/client/src/index.ts b/packages/fdc3-get-agent/src/index.ts
similarity index 100%
rename from packages/client/src/index.ts
rename to packages/fdc3-get-agent/src/index.ts
diff --git a/packages/client/src/messaging/AbstractWebMessaging.ts b/packages/fdc3-get-agent/src/messaging/AbstractWebMessaging.ts
similarity index 100%
rename from packages/client/src/messaging/AbstractWebMessaging.ts
rename to packages/fdc3-get-agent/src/messaging/AbstractWebMessaging.ts
diff --git a/packages/client/src/messaging/MessagePortMessaging.ts b/packages/fdc3-get-agent/src/messaging/MessagePortMessaging.ts
similarity index 100%
rename from packages/client/src/messaging/MessagePortMessaging.ts
rename to packages/fdc3-get-agent/src/messaging/MessagePortMessaging.ts
diff --git a/packages/client/src/messaging/message-port.ts b/packages/fdc3-get-agent/src/messaging/message-port.ts
similarity index 100%
rename from packages/client/src/messaging/message-port.ts
rename to packages/fdc3-get-agent/src/messaging/message-port.ts
diff --git a/packages/client/src/strategies/ElectronEventLoader.ts b/packages/fdc3-get-agent/src/strategies/ElectronEventLoader.ts
similarity index 100%
rename from packages/client/src/strategies/ElectronEventLoader.ts
rename to packages/fdc3-get-agent/src/strategies/ElectronEventLoader.ts
diff --git a/packages/client/src/strategies/Loader.ts b/packages/fdc3-get-agent/src/strategies/Loader.ts
similarity index 100%
rename from packages/client/src/strategies/Loader.ts
rename to packages/fdc3-get-agent/src/strategies/Loader.ts
diff --git a/packages/client/src/strategies/PostMessageLoader.ts b/packages/fdc3-get-agent/src/strategies/PostMessageLoader.ts
similarity index 100%
rename from packages/client/src/strategies/PostMessageLoader.ts
rename to packages/fdc3-get-agent/src/strategies/PostMessageLoader.ts
diff --git a/packages/client/src/strategies/TimeoutLoader.ts b/packages/fdc3-get-agent/src/strategies/TimeoutLoader.ts
similarity index 100%
rename from packages/client/src/strategies/TimeoutLoader.ts
rename to packages/fdc3-get-agent/src/strategies/TimeoutLoader.ts
diff --git a/packages/client/src/strategies/post-message.ts b/packages/fdc3-get-agent/src/strategies/post-message.ts
similarity index 100%
rename from packages/client/src/strategies/post-message.ts
rename to packages/fdc3-get-agent/src/strategies/post-message.ts
diff --git a/packages/client/src/ui/AbstractUIComponent.ts b/packages/fdc3-get-agent/src/ui/AbstractUIComponent.ts
similarity index 100%
rename from packages/client/src/ui/AbstractUIComponent.ts
rename to packages/fdc3-get-agent/src/ui/AbstractUIComponent.ts
diff --git a/packages/client/src/ui/DefaultDesktopAgentChannelSelector.ts b/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentChannelSelector.ts
similarity index 100%
rename from packages/client/src/ui/DefaultDesktopAgentChannelSelector.ts
rename to packages/fdc3-get-agent/src/ui/DefaultDesktopAgentChannelSelector.ts
diff --git a/packages/client/src/ui/DefaultDesktopAgentIntentResolver.ts b/packages/fdc3-get-agent/src/ui/DefaultDesktopAgentIntentResolver.ts
similarity index 100%
rename from packages/client/src/ui/DefaultDesktopAgentIntentResolver.ts
rename to packages/fdc3-get-agent/src/ui/DefaultDesktopAgentIntentResolver.ts
diff --git a/packages/client/src/ui/NullChannelSelector.ts b/packages/fdc3-get-agent/src/ui/NullChannelSelector.ts
similarity index 100%
rename from packages/client/src/ui/NullChannelSelector.ts
rename to packages/fdc3-get-agent/src/ui/NullChannelSelector.ts
diff --git a/packages/client/src/ui/NullIIntentResolver.ts b/packages/fdc3-get-agent/src/ui/NullIIntentResolver.ts
similarity index 100%
rename from packages/client/src/ui/NullIIntentResolver.ts
rename to packages/fdc3-get-agent/src/ui/NullIIntentResolver.ts
diff --git a/packages/client/test/features/default-channel-selector.feature b/packages/fdc3-get-agent/test/features/default-channel-selector.feature
similarity index 100%
rename from packages/client/test/features/default-channel-selector.feature
rename to packages/fdc3-get-agent/test/features/default-channel-selector.feature
diff --git a/packages/client/test/features/default-intent-resolver.feature b/packages/fdc3-get-agent/test/features/default-intent-resolver.feature
similarity index 100%
rename from packages/client/test/features/default-intent-resolver.feature
rename to packages/fdc3-get-agent/test/features/default-intent-resolver.feature
diff --git a/packages/client/test/features/desktop-agent-strategy.feature b/packages/fdc3-get-agent/test/features/desktop-agent-strategy.feature
similarity index 100%
rename from packages/client/test/features/desktop-agent-strategy.feature
rename to packages/fdc3-get-agent/test/features/desktop-agent-strategy.feature
diff --git a/packages/client/test/step-definitions/channel-selector.steps.ts b/packages/fdc3-get-agent/test/step-definitions/channel-selector.steps.ts
similarity index 100%
rename from packages/client/test/step-definitions/channel-selector.steps.ts
rename to packages/fdc3-get-agent/test/step-definitions/channel-selector.steps.ts
diff --git a/packages/client/test/step-definitions/desktop-agent.steps.ts b/packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts
similarity index 100%
rename from packages/client/test/step-definitions/desktop-agent.steps.ts
rename to packages/fdc3-get-agent/test/step-definitions/desktop-agent.steps.ts
diff --git a/packages/client/test/step-definitions/intent-resolver.steps.ts b/packages/fdc3-get-agent/test/step-definitions/intent-resolver.steps.ts
similarity index 100%
rename from packages/client/test/step-definitions/intent-resolver.steps.ts
rename to packages/fdc3-get-agent/test/step-definitions/intent-resolver.steps.ts
diff --git a/packages/client/test/step-definitions/port-creation.steps.ts b/packages/fdc3-get-agent/test/step-definitions/port-creation.steps.ts
similarity index 100%
rename from packages/client/test/step-definitions/port-creation.steps.ts
rename to packages/fdc3-get-agent/test/step-definitions/port-creation.steps.ts
diff --git a/packages/client/test/support/FrameTypes.ts b/packages/fdc3-get-agent/test/support/FrameTypes.ts
similarity index 100%
rename from packages/client/test/support/FrameTypes.ts
rename to packages/fdc3-get-agent/test/support/FrameTypes.ts
diff --git a/packages/client/test/support/MockDocument.ts b/packages/fdc3-get-agent/test/support/MockDocument.ts
similarity index 100%
rename from packages/client/test/support/MockDocument.ts
rename to packages/fdc3-get-agent/test/support/MockDocument.ts
diff --git a/packages/client/test/support/MockFDC3Server.ts b/packages/fdc3-get-agent/test/support/MockFDC3Server.ts
similarity index 100%
rename from packages/client/test/support/MockFDC3Server.ts
rename to packages/fdc3-get-agent/test/support/MockFDC3Server.ts
diff --git a/packages/client/test/support/MockStorage.ts b/packages/fdc3-get-agent/test/support/MockStorage.ts
similarity index 100%
rename from packages/client/test/support/MockStorage.ts
rename to packages/fdc3-get-agent/test/support/MockStorage.ts
diff --git a/packages/client/test/support/TestServerContext.ts b/packages/fdc3-get-agent/test/support/TestServerContext.ts
similarity index 100%
rename from packages/client/test/support/TestServerContext.ts
rename to packages/fdc3-get-agent/test/support/TestServerContext.ts
diff --git a/packages/client/test/support/responses/AutomaticResponses.ts b/packages/fdc3-get-agent/test/support/responses/AutomaticResponses.ts
similarity index 100%
rename from packages/client/test/support/responses/AutomaticResponses.ts
rename to packages/fdc3-get-agent/test/support/responses/AutomaticResponses.ts
diff --git a/packages/client/test/support/responses/CurrentChannel.ts b/packages/fdc3-get-agent/test/support/responses/CurrentChannel.ts
similarity index 100%
rename from packages/client/test/support/responses/CurrentChannel.ts
rename to packages/fdc3-get-agent/test/support/responses/CurrentChannel.ts
diff --git a/packages/client/test/support/responses/FindIntent.ts b/packages/fdc3-get-agent/test/support/responses/FindIntent.ts
similarity index 100%
rename from packages/client/test/support/responses/FindIntent.ts
rename to packages/fdc3-get-agent/test/support/responses/FindIntent.ts
diff --git a/packages/client/test/support/responses/Handshake.ts b/packages/fdc3-get-agent/test/support/responses/Handshake.ts
similarity index 100%
rename from packages/client/test/support/responses/Handshake.ts
rename to packages/fdc3-get-agent/test/support/responses/Handshake.ts
diff --git a/packages/client/test/support/responses/RaiseIntent.ts b/packages/fdc3-get-agent/test/support/responses/RaiseIntent.ts
similarity index 100%
rename from packages/client/test/support/responses/RaiseIntent.ts
rename to packages/fdc3-get-agent/test/support/responses/RaiseIntent.ts
diff --git a/packages/client/test/support/responses/UserChannels.ts b/packages/fdc3-get-agent/test/support/responses/UserChannels.ts
similarity index 100%
rename from packages/client/test/support/responses/UserChannels.ts
rename to packages/fdc3-get-agent/test/support/responses/UserChannels.ts
diff --git a/packages/client/test/world/index.ts b/packages/fdc3-get-agent/test/world/index.ts
similarity index 100%
rename from packages/client/test/world/index.ts
rename to packages/fdc3-get-agent/test/world/index.ts
diff --git a/packages/client/tsconfig.json b/packages/fdc3-get-agent/tsconfig.json
similarity index 100%
rename from packages/client/tsconfig.json
rename to packages/fdc3-get-agent/tsconfig.json
diff --git a/toolbox/fdc3-for-web/demo/package.json b/toolbox/fdc3-for-web/demo/package.json
index 857dd1f36..fa662d4e7 100644
--- a/toolbox/fdc3-for-web/demo/package.json
+++ b/toolbox/fdc3-for-web/demo/package.json
@@ -13,7 +13,7 @@
     "vite": "^5.2.0"
   },
   "dependencies": {
-    "@kite9/client": "2.2.0-beta.6",
+    "@kite9/fdc3-get-agent": "2.2.0-beta.6",
     "@kite9/da-server": "2.2.0-beta.6",
     "@kite9/fdc3-core": "2.2.0-beta.6",
     "@types/uuid": "^10.0.0",
diff --git a/toolbox/fdc3-for-web/demo/src/client/apps/ag-grid.ts b/toolbox/fdc3-for-web/demo/src/client/apps/ag-grid.ts
index 2dc7e9346..2e514a710 100644
--- a/toolbox/fdc3-for-web/demo/src/client/apps/ag-grid.ts
+++ b/toolbox/fdc3-for-web/demo/src/client/apps/ag-grid.ts
@@ -1,4 +1,4 @@
-import { getAgent } from "@kite9/client";
+import { getAgent } from "@kite9/fdc3-get-agent";
 import "./ag-grid.css";
 
 // DATA
diff --git a/toolbox/fdc3-for-web/demo/src/client/apps/app1.ts b/toolbox/fdc3-for-web/demo/src/client/apps/app1.ts
index 5bbd70800..9dfeb8ebd 100644
--- a/toolbox/fdc3-for-web/demo/src/client/apps/app1.ts
+++ b/toolbox/fdc3-for-web/demo/src/client/apps/app1.ts
@@ -1,4 +1,4 @@
-import { getAgent } from '@kite9/client'
+import { getAgent } from '@kite9/fdc3-get-agent'
 
 function createContext(i: number) {
     return {
diff --git a/toolbox/fdc3-for-web/demo/src/client/apps/app2.ts b/toolbox/fdc3-for-web/demo/src/client/apps/app2.ts
index cb34c73be..7e95699d6 100644
--- a/toolbox/fdc3-for-web/demo/src/client/apps/app2.ts
+++ b/toolbox/fdc3-for-web/demo/src/client/apps/app2.ts
@@ -1,4 +1,4 @@
-import { getAgent } from '@kite9/client'
+import { getAgent } from '@kite9/fdc3-get-agent'
 
 /**
  * This demonstrates using the API via a promise
diff --git a/toolbox/fdc3-for-web/demo/src/client/apps/app4.ts b/toolbox/fdc3-for-web/demo/src/client/apps/app4.ts
index 2dbc9028a..1cec789ef 100644
--- a/toolbox/fdc3-for-web/demo/src/client/apps/app4.ts
+++ b/toolbox/fdc3-for-web/demo/src/client/apps/app4.ts
@@ -1,4 +1,4 @@
-import { getAgent } from '@kite9/client'
+import { getAgent } from '@kite9/fdc3-get-agent'
 
 /**
  * This demonstrates using the API via a promise
diff --git a/toolbox/fdc3-for-web/demo/src/client/apps/app5.ts b/toolbox/fdc3-for-web/demo/src/client/apps/app5.ts
index af0c0edb7..6294f381a 100644
--- a/toolbox/fdc3-for-web/demo/src/client/apps/app5.ts
+++ b/toolbox/fdc3-for-web/demo/src/client/apps/app5.ts
@@ -1,4 +1,4 @@
-import { getAgent } from '@kite9/client'
+import { getAgent } from '@kite9/fdc3-get-agent'
 
 /**
  * This demonstrates using the API via a promise
diff --git a/toolbox/fdc3-for-web/demo/src/client/apps/app6.ts b/toolbox/fdc3-for-web/demo/src/client/apps/app6.ts
index 70db1f4d5..3c543b192 100644
--- a/toolbox/fdc3-for-web/demo/src/client/apps/app6.ts
+++ b/toolbox/fdc3-for-web/demo/src/client/apps/app6.ts
@@ -1,4 +1,4 @@
-import { getAgent } from '@kite9/client'
+import { getAgent } from '@kite9/fdc3-get-agent'
 
 /**
  * This demonstrates using the API via a promise
diff --git a/toolbox/fdc3-for-web/demo/src/client/apps/app7.ts b/toolbox/fdc3-for-web/demo/src/client/apps/app7.ts
index d98d14f95..01a8442ec 100644
--- a/toolbox/fdc3-for-web/demo/src/client/apps/app7.ts
+++ b/toolbox/fdc3-for-web/demo/src/client/apps/app7.ts
@@ -1,4 +1,4 @@
-import { getAgent } from '@kite9/client'
+import { getAgent } from '@kite9/fdc3-get-agent'
 
 /**
  * This demonstrates using the API via a promise
diff --git a/toolbox/fdc3-for-web/demo/src/client/apps/chartiq.ts b/toolbox/fdc3-for-web/demo/src/client/apps/chartiq.ts
index 513217733..6d90c0c5e 100644
--- a/toolbox/fdc3-for-web/demo/src/client/apps/chartiq.ts
+++ b/toolbox/fdc3-for-web/demo/src/client/apps/chartiq.ts
@@ -1,4 +1,4 @@
-import { getAgent } from "@kite9/client";
+import { getAgent } from "@kite9/fdc3-get-agent";
 
 const init = async () => {
     const fdc3 = await getAgent();
diff --git a/toolbox/fdc3-workbench/package-lock.json b/toolbox/fdc3-workbench/package-lock.json
index d92f74469..d469ddfa5 100644
--- a/toolbox/fdc3-workbench/package-lock.json
+++ b/toolbox/fdc3-workbench/package-lock.json
@@ -12,7 +12,7 @@
         "@apidevtools/json-schema-ref-parser": "^9.0.9",
         "@fontsource/roboto": "^4.4.5",
         "@fontsource/source-code-pro": "^4.5.0",
-        "@kite9/client": "0.0.41",
+        "@kite9/fdc3-get-agent": "0.0.41",
         "@material-ui/core": "^4.11.4",
         "@material-ui/icons": "^4.11.2",
         "@material-ui/lab": "^4.0.0-alpha.59",
@@ -961,9 +961,9 @@
       "integrity": "sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==",
       "dev": true
     },
-    "node_modules/@kite9/client": {
+    "node_modules/@kite9/fdc3-get-agent": {
       "version": "0.0.41",
-      "resolved": "https://registry.npmjs.org/@kite9/client/-/client-0.0.41.tgz",
+      "resolved": "https://registry.npmjs.org/@kite9/fdc3-get-agent/-/client-0.0.41.tgz",
       "integrity": "sha512-t92usxhnTXe+J5Nihshx3CBJP5OclVMIp3GBaQrlPXp9bFHZ4SIIMGbBgf4WsrGzBqlfNNvZkasU0KyuoEEieQ==",
       "dev": true,
       "dependencies": {
@@ -974,7 +974,7 @@
         "uuid": "^9.0.1"
       }
     },
-    "node_modules/@kite9/client/node_modules/@types/uuid": {
+    "node_modules/@kite9/fdc3-get-agent/node_modules/@types/uuid": {
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
       "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==",
@@ -6574,4 +6574,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/toolbox/fdc3-workbench/package.json b/toolbox/fdc3-workbench/package.json
index c79eee4a8..559b1a01f 100644
--- a/toolbox/fdc3-workbench/package.json
+++ b/toolbox/fdc3-workbench/package.json
@@ -30,7 +30,7 @@
     ]
   },
   "devDependencies": {
-    "@kite9/client": "2.2.0-beta.6",
+    "@kite9/fdc3-get-agent": "2.2.0-beta.6",
     "@types/jsoneditor": "^8.6.1",
     "@typescript-eslint/eslint-plugin": "7.1.1",
     "@typescript-eslint/parser": "7.1.0",
@@ -76,4 +76,4 @@
     "*.js": "eslint --cache --fix",
     "*.{js,css,md}": "prettier --write"
   }
-}
+}
\ No newline at end of file
diff --git a/toolbox/fdc3-workbench/src/utility/Fdc3Api.ts b/toolbox/fdc3-workbench/src/utility/Fdc3Api.ts
index 313ef8145..a1ed2cc98 100644
--- a/toolbox/fdc3-workbench/src/utility/Fdc3Api.ts
+++ b/toolbox/fdc3-workbench/src/utility/Fdc3Api.ts
@@ -5,7 +5,7 @@
 import * as fdc3_2 from "@kite9/fdc3-core";
 import * as fdc3_1 from "fdc3-1.2";
 import { group } from "console";
-import { fdc3Ready } from '@kite9/client'
+import { fdc3Ready } from '@kite9/fdc3-get-agent'
 
 const fdc3ReadyPromise = fdc3Ready()
 interface fdc3_1IntentResolution extends fdc3_1.IntentResolution {