diff --git a/.gitignore b/.gitignore
index 6173d1f2..815302b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,10 @@ node_modules/
 
 # Build related
 /report.html
-/openeo.js
-/openeo.min.js
-/openeo.node.js
-/openeo.node.min.js
+/client.js
+/client.min.js
+/client.node.js
+/client.node.min.js
 
 # Reports
 coverage/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 480e4474..b89b5f9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Class `OpenEO` renamed to `Client` (i.e. use `Client.connect` instead of `OpenEO.connect`)
+- Moved `makeLinksAbsolute` and `getLinKHref` to `Utils` class
+
 ## [2.6.0] - 2024-07-11
 
 ### Added
diff --git a/README.md b/README.md
index 441727b6..de529670 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ To use it in a browser environment simply add the following code to your HTML fi
 <script src="https://cdn.jsdelivr.net/npm/axios@0.21/dist/axios.min.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/oidc-client@1/dist/oidc-client.min.js"></script> <!-- Only required if you'd like to enable authentication via OpenID Connect -->
 <script src="https://cdn.jsdelivr.net/npm/multihashes@3/src/index.min.js"></script> <!-- Only required if you have checksums in the STAC metadata -->
-<script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@2/openeo.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@3/client.min.js"></script>
 ```
 
 ### NodeJS
@@ -30,7 +30,7 @@ To install it in a NodeJS environment run:
 `npm install @openeo/js-client`
 
 Afterwards, you can import the package:
-`const { OpenEO } = require('@openeo/js-client');`
+`const { Client } = require('@openeo/js-client');`
 
 ### TypeScript 
 
@@ -40,7 +40,7 @@ To install it in a TypeScript environment run:
 `npm install @openeo/js-client`
 
 Afterwards, you can import the package:
-`import { OpenEO } from '@openeo/js-client';`
+`import { Client } from '@openeo/js-client';`
 
 ### Examples
 
@@ -63,7 +63,7 @@ More information can be found in the [documentation](https://open-eo.github.io/o
 Always make sure to adapt changes in the *.js files to the openeo.d.ts file.
 If changes are larger you may want to run `npm run tsd` and regenerate the declaration file and cherry-pick your changes from there.
 
-Generate a build: `npm run build` (generates `openeo.js` and `openeo.min.js`)
+Generate a build: `npm run build` (generates `client.js` and `client.min.js`)
 
 Generate the documentation to the `docs/` folder: `npm run docs`
 
diff --git a/examples/node/discovery.js b/examples/node/discovery.js
index 2453287f..ecd7f9cb 100644
--- a/examples/node/discovery.js
+++ b/examples/node/discovery.js
@@ -1,13 +1,13 @@
 // Import the JS client
-const { OpenEO } = require('@openeo/js-client');
+const { Client } = require('@openeo/js-client');
 
 const url = "https://earthengine.openeo.org"; // Insert the openEO server URL here
 let connection = null;
 
 console.log('URL: ' + url);
-console.log('Client Version: ' + OpenEO.clientVersion());
+console.log('Client Version: ' + Client.clientVersion());
 
-OpenEO.connect(url)
+Client.connect(url)
 	.then(c => {
 		connection = c;
 		return connection.capabilities();
diff --git a/examples/oidc/openid-connect-popup.html b/examples/oidc/openid-connect-popup.html
index 652f27f2..38843886 100644
--- a/examples/oidc/openid-connect-popup.html
+++ b/examples/oidc/openid-connect-popup.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <script src="https://cdn.jsdelivr.net/npm/axios@1/dist/axios.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/oidc-client@1/dist/oidc-client.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@2/openeo.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@2/client.min.js"></script>
   <script type="text/javascript">
     const BACKEND = "https://example.openeo.org"; // TODO: Set the back-end to authenticate against
     const CLIENT_ID = ""; // TODO: Set the client id
@@ -22,7 +22,7 @@
 
       try {
         // Connect to the back-end
-        con = await OpenEO.connect(BACKEND);
+        con = await Client.connect(BACKEND);
 
         // Show whether OIDC is supported by the back-end
         var capabilities = con.capabilities();
diff --git a/examples/oidc/openid-connect-redirect.html b/examples/oidc/openid-connect-redirect.html
index 4f2275b7..e9bb496a 100644
--- a/examples/oidc/openid-connect-redirect.html
+++ b/examples/oidc/openid-connect-redirect.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <script src="https://cdn.jsdelivr.net/npm/axios@1/dist/axios.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/oidc-client@1/dist/oidc-client.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@2/openeo.min.js"></script>
+	<script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@2/client.min.js"></script>
   <script type="text/javascript">
     const BACKEND = "https://example.openeo.org"; // TODO: Set the back-end to authenticate against
     const CLIENT_ID = ""; // TODO: Set the client id
@@ -20,7 +20,7 @@
 
       try {
         // Connect to the back-end
-        con = await OpenEO.connect(BACKEND);
+        con = await Client.connect(BACKEND);
 
         // Show whether OIDC is supported by the back-end
         var capabilities = con.capabilities();
diff --git a/examples/typescript/discovery.ts b/examples/typescript/discovery.ts
index 822bccc3..13429763 100644
--- a/examples/typescript/discovery.ts
+++ b/examples/typescript/discovery.ts
@@ -1,14 +1,14 @@
-// import the JS client main part (OpenEO) for the actual functionality
+// import the JS client main part (Client) for the actual functionality
 // and some classes (Connection, Capabilities) and types (Collections, Processes) for TypeScript stuff
-import { OpenEO, Connection, Capabilities, Collections, Processes } from '@openeo/js-client';
+import { Client, Connection, Capabilities, Collections, Processes } from '@openeo/js-client';
 
 let url: string = "https://earthengine.openeo.org";   // Insert the openEO server URL here
 let connection: Connection = null;   // Reserve a variable for the connection and specify its type
 
 console.log('URL: ' + url);
-console.log('Client Version: ' + OpenEO.clientVersion());
+console.log('Client Version: ' + Client.clientVersion());
 
-OpenEO.connect(url)
+Client.connect(url)
 .then((c: Connection): Capabilities => {   // specify parameter type and return type
 	connection = c;
 	return connection.capabilities();
diff --git a/examples/web/discovery.html b/examples/web/discovery.html
index 0f412582..c42b62f3 100644
--- a/examples/web/discovery.html
+++ b/examples/web/discovery.html
@@ -6,16 +6,16 @@
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<script src="https://cdn.jsdelivr.net/npm/axios@1/dist/axios.min.js"></script>
-	<script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@2/openeo.min.js"></script>
+	<script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@3/client.min.js"></script>
 	<script type="text/javascript">
 		var url = "https://earthengine.openeo.org"; // Insert the openEO server URL here
 		var connection = null;
 
 		window.onload = function () {
 			document.getElementById('url').innerText = url;
-			document.getElementById('clientVersion').innerText = OpenEO.clientVersion();
+			document.getElementById('clientVersion').innerText = Client.clientVersion();
 
-			OpenEO.connect(url)
+			Client.connect(url)
 				.then(c => {
 					connection = c;
 					return connection.capabilities();
diff --git a/examples/web/workflow.html b/examples/web/workflow.html
index bf815fb0..ff0370d6 100644
--- a/examples/web/workflow.html
+++ b/examples/web/workflow.html
@@ -6,15 +6,15 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <script src="https://cdn.jsdelivr.net/npm/axios@1/dist/axios.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@2/openeo.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@openeo/js-client@3/client.min.js"></script>
   <script type="text/javascript">
     async function run() {
       // Show the client version
-      log("Client Version: " + OpenEO.clientVersion());
+      log("Client Version: " + Client.clientVersion());
 
       try {
         // Connect to the back-end
-        var con = await OpenEO.connect("https://earthengine.openeo.org");
+        var con = await Client.connect("https://earthengine.openeo.org");
 
         // Show implemented API version of the back-end
         var capabilities = con.capabilities();
diff --git a/openeo.d.ts b/openeo.d.ts
index 2aaee0fd..f61e3309 100644
--- a/openeo.d.ts
+++ b/openeo.d.ts
@@ -4,7 +4,7 @@ import { User, UserManager } from 'oidc-client';
 import { ProcessRegistry } from '@openeo/js-commons';
 import { Readable } from 'stream';
 
-declare module OpenEO {
+declare module Client {
     /**
      * The base class for authentication providers such as Basic and OpenID Connect.
      *
@@ -347,12 +347,6 @@ declare module OpenEO {
          * @throws {Error}
          */
         protected validate(): void;
-        /**
-         * Initializes the class.
-         *
-         * @protected
-         */
-        protected init(): void;
         /**
          * Returns the capabilities response as a JSON serializable representation of the data that is API compliant.
          *
@@ -1922,15 +1916,6 @@ declare module OpenEO {
          * @type {ProcessRegistry}
          */
         protected processes: ProcessRegistry;
-        /**
-         * Initializes the connection by requesting the capabilities.
-         *
-         * @async
-         * @protected
-         * @returns {Promise<Capabilities>} Capabilities
-         * @throws {Error}
-         */
-        protected init(): Promise<Capabilities>;
         /**
          * Refresh the cache for processes.
          *
@@ -2298,13 +2283,11 @@ declare module OpenEO {
          *
          * @async
          * @param {Process} process - A user-defined process.
-         * @param {?string} [plan=null] - The billing plan to use for this computation.
-         * @param {?number} [budget=null] - The maximum budget allowed to spend for this computation.
          * @param {?AbortController} [abortController=null] - An AbortController object that can be used to cancel the processing request.
          * @param {object.<string, *>} [additional={}] - Other parameters to pass for the batch job, e.g. `log_level`.
          * @returns {Promise<SyncResult>} - An object with the data and some metadata.
          */
-        computeResult(process: Process, plan?: string | null, budget?: number | null, abortController?: AbortController | null, additional?: object<string, any>): Promise<SyncResult>;
+        computeResult(process: Process, abortController?: AbortController | null, additional?: object<string, any>): Promise<SyncResult>;
         /**
          * Executes a process synchronously and downloads to result the given path.
          *
@@ -2401,24 +2384,6 @@ declare module OpenEO {
          * @returns {ResponseArray}
          */
         protected _toResponseArray(arr: Array<any>, response: object<string, any>): ResponseArray;
-        /**
-         * Get the a link with the given rel type.
-         *
-         * @protected
-         * @param {Array.<Link>} links - An array of links.
-         * @param {string|Array.<string>} rel - Relation type(s) to find.
-         * @returns {string | null}
-         * @throws {Error}
-         */
-        protected _getLinkHref(links: Array<Link>, rel: string | Array<string>): string | null;
-        /**
-         * Makes all links in the list absolute.
-         * 
-         * @param {Array.<Link>} links - An array of links.
-         * @param {?string|AxiosResponse} [base=null] - The base url to use for relative links, or an response to derive the url from.
-         * @returns {Array.<Link>}
-         */
-        makeLinksAbsolute(links: Array<Link>, base?: (string | AxiosResponse) | null): Array<Link>;
         /**
          * Sends a GET request.
          *
@@ -2538,7 +2503,7 @@ declare module OpenEO {
      *
      * @hideconstructor
      */
-    export class OpenEO {
+    export class Client {
         /**
          * Connect to a back-end with version discovery (recommended).
          *
@@ -2575,7 +2540,7 @@ declare module OpenEO {
          */
         static clientVersion(): string;
     }
-    export namespace OpenEO {
+    export namespace Client {
         const Environment: Environment;
     }
 
@@ -2918,4 +2883,4 @@ declare module OpenEO {
 
 }
 
-export = OpenEO;
\ No newline at end of file
+export = Client;
\ No newline at end of file
diff --git a/package.json b/package.json
index ac99c512..bbcca0cb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openeo/js-client",
-  "version": "2.6.0",
+  "version": "3.0.0-alpha.1",
   "author": "openEO Consortium",
   "contributors": [
     {
@@ -27,12 +27,12 @@
     "type": "github",
     "url": "https://github.com/sponsors/m-mohr"
   },
-  "main": "src/openeo.js",
-  "types": "openeo.d.ts",
+  "main": "src/client.js",
+  "types": "client.d.ts",
   "files": [
-    "openeo.js",
-    "openeo.d.ts",
-    "openeo.min.js",
+    "client.js",
+    "client.d.ts",
+    "client.min.js",
     "src/*"
   ],
   "devDependencies": {
diff --git a/src/basicprovider.js b/src/basicprovider.js
index 32e2e7ab..08face79 100644
--- a/src/basicprovider.js
+++ b/src/basicprovider.js
@@ -1,5 +1,5 @@
 const Environment = require('./env');
-const Utils = require('@openeo/js-commons/src/utils');
+const Utils = require('./utils');
 const AuthProvider = require('./authprovider');
 
 /**
diff --git a/src/builder/builder.js b/src/builder/builder.js
index 3a44e4a0..4bc9fcc1 100644
--- a/src/builder/builder.js
+++ b/src/builder/builder.js
@@ -1,7 +1,7 @@
 const BuilderNode = require('./node');
 const Parameter = require('./parameter');
 const axios = require('axios');
-const Utils = require('@openeo/js-commons/src/utils');
+const Utils = require('../utils');
 const ProcessUtils = require("@openeo/js-commons/src/processUtils");
 const ProcessRegistry = require('@openeo/js-commons/src/processRegistry');
 
diff --git a/src/builder/node.js b/src/builder/node.js
index 8d3e603b..63fe0866 100644
--- a/src/builder/node.js
+++ b/src/builder/node.js
@@ -1,4 +1,4 @@
-const Utils = require("@openeo/js-commons/src/utils");
+const Utils = require("../utils");
 const Parameter = require("./parameter");
 
 /**
diff --git a/src/capabilities.js b/src/capabilities.js
index cd7cd0c2..3e16d842 100644
--- a/src/capabilities.js
+++ b/src/capabilities.js
@@ -1,76 +1,15 @@
-const Utils = require('@openeo/js-commons/src/utils');
-
-const FEATURE_MAP = {
-	// Discovery
-	capabilities: true,
-	listFileTypes: 'get /file_formats',
-	listServiceTypes: 'get /service_types',
-	listUdfRuntimes: 'get /udf_runtimes',
-	// Collections
-	listCollections: 'get /collections',
-	describeCollection: 'get /collections/{}',
-	listCollectionItems: 'get /collections/{}/items',
-	describeCollectionItem: 'get /collections/{}/items/{}',
-	describeCollectionQueryables: 'get /collections/{}/queryables',
-	// Processes
-	listProcesses: 'get /processes',
-	describeProcess: 'get /processes',
-	// Auth / Account
-	listAuthProviders: true,
-	authenticateOIDC: 'get /credentials/oidc',
-	authenticateBasic: 'get /credentials/basic',
-	describeAccount: 'get /me',
-	// Files
-	listFiles: 'get /files',
-	getFile: 'get /files', // getFile is a virtual function and doesn't request an endpoint, but get /files should be available nevertheless.
-	uploadFile: 'put /files/{}',
-	downloadFile: 'get /files/{}',
-	deleteFile: 'delete /files/{}',
-	// User-Defined Processes
-	validateProcess: 'post /validation',
-	listUserProcesses: 'get /process_graphs',
-	describeUserProcess: 'get /process_graphs/{}',
-	getUserProcess: 'get /process_graphs/{}',
-	setUserProcess: 'put /process_graphs/{}',
-	replaceUserProcess: 'put /process_graphs/{}',
-	deleteUserProcess: 'delete /process_graphs/{}',
-	// Processing
-	computeResult: 'post /result',
-	listJobs: 'get /jobs',
-	createJob: 'post /jobs',
-	listServices: 'get /services',
-	createService: 'post /services',
-	getJob: 'get /jobs/{}',
-	describeJob: 'get /jobs/{}',
-	updateJob: 'patch /jobs/{}',
-	deleteJob: 'delete /jobs/{}',
-	estimateJob: 'get /jobs/{}/estimate',
-	debugJob: 'get /jobs/{}/logs',
-	startJob: 'post /jobs/{}/results',
-	stopJob: 'delete /jobs/{}/results',
-	listResults: 'get /jobs/{}/results',
-	downloadResults: 'get /jobs/{}/results',
-	// Web services
-	describeService: 'get /services/{}',
-	getService: 'get /services/{}',
-	updateService: 'patch /services/{}',
-	deleteService: 'delete /services/{}',
-	debugService: 'get /services/{}/logs',
-};
-
 /**
  * Capabilities of a back-end.
  */
 class Capabilities {
 
 	/**
-	 * Creates a new Capabilities object from an API-compatible JSON response.
+	 * Creates a new Capabilities object.
 	 * 
 	 * @param {object.<string, *>} data - A capabilities response compatible to the API specification for `GET /`.
 	 * @throws {Error}
 	 */
 	constructor(data) {
-
 		/**
 		 * @private
 		 * @type {object.<string, *>}
@@ -82,60 +21,61 @@ class Capabilities {
 		 * @ignore
 		 * @type {object.<string, string>}
 		 */
-		this.featureMap = FEATURE_MAP;
+		this.featureMap = {
+			capabilities: true,
+			// Auth
+			listAuthProviders: true,
+			authenticateOIDC: 'get /credentials/oidc',
+			authenticateBasic: 'get /credentials/basic',
+			// Collections
+			listCollections: 'get /collections',
+			describeCollection: 'get /collections/{}',
+			listCollectionItems: 'get /collections/{}/items',
+			describeCollectionItem: 'get /collections/{}/items/{}',
+			describeCollectionQueryables: 'get /collections/{}/queryables',
+			getCoverage: 'get /collections/{}/coverage',
+			// Processes
+			listProcesses: 'get /processes',
+			// Jobs
+			listJobs: 'get /jobs',
+			createJob: 'post /jobs',
+			getJob: 'get /jobs/{}',
+			describeJob: 'get /jobs/{}',
+			updateJob: 'patch /jobs/{}',
+			deleteJob: 'delete /jobs/{}',
+			estimateJob: 'get /jobs/{}/estimate',
+			debugJob: 'get /jobs/{}/logs',
+			startJob: 'post /jobs/{}/results',
+			stopJob: 'delete /jobs/{}/results',
+			listResults: 'get /jobs/{}/results',
+			downloadResults: 'get /jobs/{}/results',
+		};
 
 		/**
 		 * @private
 		 * @type {Array.<string>}
 		 */
 		this.features = [];
-
-		this.validate();
-		this.init();
 	}
 
 	/**
-	 * Validates the capabilities.
-	 * 
-	 * Throws an error in case of an issue, otherwise just passes.
+	 * Returns the capabilities response as a JSON serializable representation of the data that is API compliant.
 	 * 
-	 * @protected
-	 * @throws {Error}
+	 * @returns {object.<string, *>} - A reference to the capabilities response.
 	 */
-	validate() {
-		if(!Utils.isObject(this.data)) {
-			throw new Error("No capabilities retrieved.");
-		}
-		else if(!this.data.api_version) {
-			throw new Error("Invalid capabilities: No API version retrieved");
-		}
-		else if(!Array.isArray(this.data.endpoints)) {
-			throw new Error("Invalid capabilities: No endpoints retrieved");
-		}
+	toJSON() {
+		return this.data;
 	}
 
 	/**
-	 * Initializes the class.
+	 * Returns the API type.
 	 * 
-	 * @protected
-	 */
-	init() {
-		this.features = this.data.endpoints
-			// Flatten features and simplify variables to be compatible with the feature map.
-			.map(e => e.methods.map(method => {
-				const path = e.path.replace(/\{[^}]+\}/g, '{}');
-				return `${method} ${path}`.toLowerCase();
-			}))
-			.reduce((flat, next) => flat.concat(next), []); // .flat(1) once browser support for ECMAscript 10/2019 gets better
-	}
-
-	/**
-	 * Returns the capabilities response as a JSON serializable representation of the data that is API compliant.
+	 * Either `openeo` or `ogcapi`.
 	 * 
-	 * @returns {object.<string, *>} - A reference to the capabilities response.
+	 * @returns {string} API type
 	 */
-	toJSON() {
-		return this.data;
+	apiType() {
+		return undefined;
 	}
 
 	/**
@@ -144,16 +84,23 @@ class Capabilities {
 	 * @returns {string} openEO API version number.
 	 */
 	apiVersion() {
-		return this.data.api_version;
+		return undefined;
 	}
 
+	/**
+	 * Checks whether the back-end supports the required API version for this client.
+	 * 
+	 * @throws {Error} If the back-end does not support the required API version.
+	 */
+	checkVersion() {}
+
 	/**
 	 * Returns the back-end version number.
 	 * 
 	 * @returns {string} openEO back-end version number.
 	 */
 	backendVersion() {
-		return this.data.backend_version;
+		return undefined;
 	}
 
 	/**
@@ -180,7 +127,7 @@ class Capabilities {
 	 * @returns {boolean} true = stable/production, false = unstable
 	 */
 	isStable() {
-		return this.data.production === true;
+		return true;
 	}
 
 	/**
@@ -198,7 +145,7 @@ class Capabilities {
 	 * @returns {Array.<FederationBackend>} Array of backends
 	 */
 	listFederation() {
-		return Array.isArray(this.data.federation) ? this.data.federation : [];
+		return [];
 	}
 
 	/**
@@ -223,6 +170,9 @@ class Capabilities {
 	 * @returns {boolean} `true` if the feature is supported, otherwise `false`.
 	 */
 	hasFeature(methodName) {
+		if (!(methodName in this.featureMap)) {
+			return false;
+		}
 		let feature = this.featureMap[methodName];
 		if (typeof feature === 'string') {
 			feature = feature.toLowerCase();
@@ -231,44 +181,56 @@ class Capabilities {
 	}
 
 	/**
-	 * Get the billing currency.
+	 * Returns the conformance classes.
 	 * 
-	 * @returns {string | null} The billing currency or `null` if not available.
+	 * @returns {Array.<string>} An array of supported features.
 	 */
-	currency() {
-		return (Utils.isObject(this.data.billing) && typeof this.data.billing.currency === 'string' ? this.data.billing.currency : null);
+	getConformanceClasses() {
+		if(!Array.isArray(this.data.conformsTo)) {
+			return [];
+		}
+		return this.data.conformsTo;
 	}
 
 	/**
-	 * List all billing plans.
+	 * Check whether a conformance class is supported by the back-end.
 	 * 
-	 * @returns {Array.<BillingPlan>} Billing plans
+	 * @param {string|Array.<string>} uris - Conformance class URI(s) - one of must match.
+	 * @returns {boolean} `true` if the conformance class is supported, otherwise `false`.
 	 */
-	listPlans() {
-		if (Utils.isObject(this.data.billing) && Array.isArray(this.data.billing.plans)) {
-			let defaultPlan = typeof this.data.billing.default_plan === 'string' ? this.data.billing.default_plan.toLowerCase() : null;
-			return this.data.billing.plans.map(plan => {
-				let addition = {
-					default: (defaultPlan === plan.name.toLowerCase())
-				};
-				return Object.assign({}, plan, addition);
-			});
+	hasConformance(uris) {
+		if(!Array.isArray(this.data.conformsTo)) {
+			return false;
+		}
+		if (typeof uris === 'string') {
+			return this.data.conformsTo.includes(uris);
+		}
+		else if (Array.isArray(uris)) {
+			return uris.some(uri => this.data.conformsTo.includes(uri));
 		}
 		else {
-			return [];
+			return false;
 		}
 	}
 
 	/**
-	 * Migrates a response, if required.
+	 * Get the billing currency.
+	 * 
+	 * @returns {string | null} The billing currency or `null` if not available.
+	 */
+	currency() {
+		return null;
+	}
+
+	/**
+	 * List all billing plans.
 	 * 
-	 * @param {AxiosResponse} response 
-	 * @protected
-	 * @returns {AxiosResponse}
+	 * @returns {Array.<BillingPlan>} Billing plans
 	 */
-	migrate(response) { // eslint-disable-line no-unused-vars
-		return response;
+	listPlans() {
+		return [];
 	}
+
 }
 
 module.exports = Capabilities;
diff --git a/src/openeo.js b/src/client.js
similarity index 53%
rename from src/openeo.js
rename to src/client.js
index 9ef90fee..8bf99897 100644
--- a/src/openeo.js
+++ b/src/client.js
@@ -1,9 +1,10 @@
 const axios = require('axios');
-const Utils = require('@openeo/js-commons/src/utils');
+const Utils = require('./utils');
 const Versions = require('@openeo/js-commons/src/versions');
 
 // API wrapper
-const Connection = require('./connection');
+const Connection = require('./openeo/connection');
+const OgcConnection = require('./ogc/connection');
 const Job = require('./job');
 const Logs = require('./logs');
 const UserFile = require('./userfile');
@@ -24,22 +25,20 @@ const Builder = require('./builder/builder');
 const BuilderNode = require('./builder/node');
 const Parameter = require('./builder/parameter');
 const Formula = require('./builder/formula');
-
-const MIN_API_VERSION = '1.0.0-rc.2';
-const MAX_API_VERSION = '1.x.x';
+const { CLIENT_VERSION, MIN_OPENEO_API_VERSION, MAX_OPENEO_API_VERSION, CONFORMANCE_RELS } = require('./const');
 
 /**
- * Main class to start with openEO. Allows to connect to a server.
+ * Main class to start with openEO or OGC APIs. Allows to connect to a server.
  * 
  * @hideconstructor
  */
-class OpenEO {
+class Client {
 
 	/**
-	 * Connect to a back-end with version discovery (recommended).
+	 * Connect to a back-end with version discovery (recommended for openEO).
 	 * 
-	 * Includes version discovery (request to `GET /well-known/openeo`) and connects to the most suitable version compatible to this JS client version.
-	 * Requests the capabilities and authenticates where required.
+	 * For openEO: Handles version discovery (request to `GET /well-known/openeo`).
+	 * Connects to the most suitable version compatible to this JS client version.
 	 * 
 	 * @async
 	 * @param {string} url - The server URL to connect to.
@@ -49,38 +48,37 @@ class OpenEO {
 	 * @static
 	 */
 	static async connect(url, options = {}) {
-		let wellKnownUrl = Utils.normalizeUrl(url, '/.well-known/openeo');
+		const wellKnownUrl = Utils.normalizeUrl(url, '/.well-known/openeo');
 		let versionedUrl = url;
 		let response = null;
 		try {
 			response = await axios.get(wellKnownUrl, {timeout: 5000});
-
 			if (!Utils.isObject(response.data) || !Array.isArray(response.data.versions)) {
 				throw new Error("Well-Known Document doesn't list any versions.");
 			}
 		} catch(error) {
-			console.warn("Can't read well-known document, connecting directly to the specified URL as fallback mechanism. Reason: " + error.message);
+			console.warn("Can't read well-known document, connecting directly to the specified URL. Reason: " + error.message);
 		}
 	
 		if (Utils.isObject(response)) {
-			let version = Versions.findLatest(response.data.versions, true, MIN_API_VERSION, MAX_API_VERSION);
+			const version = Versions.findLatest(response.data.versions, true, MIN_OPENEO_API_VERSION, MAX_OPENEO_API_VERSION);
 			if (version !== null) {
 				versionedUrl = version.url;
 			}
 			else {
-				throw new Error("Server not supported. Client only supports the API versions between " + MIN_API_VERSION + " and " + MAX_API_VERSION);
+				throw new Error("Server not supported. Client only supports the API versions between " + MIN_OPENEO_API_VERSION + " and " + MAX_OPENEO_API_VERSION);
 			}
 		}
 
-		let connection = await OpenEO.connectDirect(versionedUrl, options);
+		const connection = await Client.connectDirect(versionedUrl, options);
 		connection.url = url;
 		return connection;
 	}
 
 	/**
-	 * Connects directly to a back-end instance, without version discovery (NOT recommended).
+	 * Connects directly to a back-end instance, without version discovery.
 	 * 
-	 * Doesn't do version discovery, therefore a URL of a versioned API must be specified. Requests the capabilities and authenticates where required.
+	 * Doesn't do version discovery, therefore a URL of a versioned API must be specified.
 	 * 
 	 * @async
 	 * @param {string} versionedUrl - The server URL to connect to.
@@ -90,13 +88,37 @@ class OpenEO {
 	 * @static
 	 */
 	static async connectDirect(versionedUrl, options = {}) {
-		let connection = new Connection(versionedUrl, options);
+		const capabiltiesResponse = await axios.get(versionedUrl, {timeout: 5000});
+		if (!Utils.isObject(capabiltiesResponse.data)) {
+			throw new Error("Capabilities are invalid (not an object)");
+		}
+
+		const data = Object.assign({}, capabiltiesResponse.data);
+		data.links = Utils.makeLinksAbsolute(data.links, capabiltiesResponse);
+
+		// For OGC APIs: Request conformance classes from separate endpoint
+		if (!Array.isArray(data.conformsTo) && Array.isArray(data.links)) {
+			const conformanceLink = Utils.getLinkHref(data.links, CONFORMANCE_RELS);
+			if (conformanceLink) {
+				const conformanceResponse = await axios.get(conformanceLink, {timeout: 5000});
+				if (Utils.isObject(conformanceResponse.data) && Array.isArray(conformanceResponse.data.conformsTo)) {
+					data.conformsTo = conformanceResponse.data.conformsTo;
+				}
+			}
+		}
 
-		// Check whether back-end is accessible and supports a compatible version.
-		let capabilities = await connection.init();
-		if (Versions.compare(capabilities.apiVersion(), MIN_API_VERSION, "<") || Versions.compare(capabilities.apiVersion(), MAX_API_VERSION, ">")) {
-			throw new Error("Client only supports the API versions between " + MIN_API_VERSION + " and " + MAX_API_VERSION);
+		let connection;
+		if (data.api_version && data.endpoints) {
+			// openEO API
+			connection = new Connection(data, versionedUrl, options);
 		}
+		else {
+			// OGC API
+			connection = new OgcConnection(data, versionedUrl, options);
+		}
+
+		const capabilities = connection.capabilities();
+		capabilities.checkVersion();
 
 		return connection;
 	}
@@ -109,24 +131,24 @@ class OpenEO {
 	 * @returns {string} Version number (according to SemVer).
 	 */
 	static clientVersion() {
-		return "2.6.0";
+		return CLIENT_VERSION;
 	}
 
 }
 
-OpenEO.Environment = require('./env');
+Client.Environment = require('./env');
 
 module.exports = {
 	AbortController,
 	AuthProvider,
 	BasicProvider,
 	Capabilities,
+	Client,
 	Connection,
 	FileTypes,
 	Job,
 	Logs,
 	OidcProvider,
-	OpenEO,
 	Service,
 	UserFile,
 	UserProcess,
diff --git a/src/connection.js b/src/connection.js
index e2c249ed..578318c4 100644
--- a/src/connection.js
+++ b/src/connection.js
@@ -1,5 +1,5 @@
 const Environment = require('./env');
-const Utils = require('@openeo/js-commons/src/utils');
+const Utils = require('./utils');
 const ProcessRegistry = require('@openeo/js-commons/src/processRegistry');
 const axios = require('axios');
 const StacMigrate = require('@radiantearth/stac-migrate');
@@ -8,7 +8,6 @@ const AuthProvider = require('./authprovider');
 const BasicProvider = require('./basicprovider');
 const OidcProvider = require('./oidcprovider');
 
-const Capabilities = require('./capabilities');
 const FileTypes = require('./filetypes');
 const UserFile = require('./userfile');
 const Job = require('./job');
@@ -18,13 +17,8 @@ const Service = require('./service');
 const Builder = require('./builder/builder');
 const BuilderNode = require('./builder/node');
 
-const CONFORMANCE_RELS = [
-	'conformance',
-	'http://www.opengis.net/def/rel/ogc/1.0/conformance'
-];
-
 /**
- * A connection to a back-end.
+ * A connection to an openEO back-end.
  */
 class Connection {
 
@@ -97,33 +91,6 @@ class Connection {
 		this.processes.listeners.push((...args) => this.emit('processesChanged', ...args));
 	}
 
-	/**
-	 * Initializes the connection by requesting the capabilities.
-	 * 
-	 * @async
-	 * @protected
-	 * @returns {Promise<Capabilities>} Capabilities
-	 * @throws {Error}
-	 */
-	async init() {
-		let response = await this._get('/');
-		let data = Object.assign({}, response.data);
-		data.links = this.makeLinksAbsolute(data.links, response);
-
-		if (!Array.isArray(data.conformsTo) && Array.isArray(data.links)) {
-			let conformanceLink = this._getLinkHref(data.links, CONFORMANCE_RELS);
-			if (conformanceLink) {
-				let response2 = await this._get(conformanceLink);
-				if (Utils.isObject(response2.data) && Array.isArray(response2.data.conformsTo)) {
-					data.conformsTo = response2.data.conformsTo;
-				}
-			}
-		}
-
-		this.capabilitiesObject = new Capabilities(data);
-		return this.capabilitiesObject;
-	}
-
 	/**
 	 * Refresh the cache for processes.
 	 * 
@@ -321,8 +288,8 @@ class Connection {
 			yield response.data;
 
 			page++;
-			let links = this.makeLinksAbsolute(response.data.links);
-			nextUrl = this._getLinkHref(links, 'next');
+			let links = Utils.makeLinksAbsolute(response.data.links);
+			nextUrl = Utils.getLinkHref(links, 'next');
 		}
 	}
 
@@ -809,19 +776,14 @@ class Connection {
 	 * 
 	 * @async
 	 * @param {Process} process - A user-defined process.
-	 * @param {?string} [plan=null] - The billing plan to use for this computation.
-	 * @param {?number} [budget=null] - The maximum budget allowed to spend for this computation.
 	 * @param {?AbortController} [abortController=null] - An AbortController object that can be used to cancel the processing request.
-	 * @param {object.<string, *>} [additional={}] - Other parameters to pass for the batch job, e.g. `log_level`.
+	 * @param {object.<string, *>} [additional={}] - Other parameters to pass for processing, e.g. `plan`, `budget`, and `log_level`.
 	 * @returns {Promise<SyncResult>} - An object with the data and some metadata.
 	 */
-	async computeResult(process, plan = null, budget = null, abortController = null, additional = {}) {
+	async computeResult(process, abortController = null, additional = {}) {
 		let requestBody = this._normalizeUserProcess(
 			process,
-			Object.assign({}, additional, {
-				plan: plan,
-				budget: budget
-			})
+			Object.assign({}, additional)
 		);
 		let response = await this._post('/result', requestBody, Environment.getResponseType(), abortController);
 		let syncResult = {
@@ -872,13 +834,12 @@ class Connection {
 	 * @async
 	 * @param {Process} process - A user-defined process.
 	 * @param {string} targetPath - The target, see method description for details.
-	 * @param {?string} [plan=null] - The billing plan to use for this computation.
-	 * @param {?number} [budget=null] - The maximum budget allowed to spend for this computation.
 	 * @param {?AbortController} [abortController=null] - An AbortController object that can be used to cancel the processing request.
+	 * @param {object.<string, *>} [additional={}] - Other parameters to pass for processing, e.g. `plan`, `budget`, and `log_level`.
 	 * @throws {Error}
 	 */
-	async downloadResult(process, targetPath, plan = null, budget = null, abortController = null) {
-		let response = await this.computeResult(process, plan, budget, abortController);
+	async downloadResult(process, targetPath, abortController = null, additional = {}) {
+		let response = await this.computeResult(process, abortController, additional);
 		// @ts-ignore
 		await Environment.saveToFile(response.data, targetPath);
 	}
@@ -910,18 +871,14 @@ class Connection {
 	 * @param {Process} process - A user-define process to execute.
 	 * @param {?string} [title=null] - A title for the batch job.
 	 * @param {?string} [description=null] - A description for the batch job.
-	 * @param {?string} [plan=null] - The billing plan to use for this batch job.
-	 * @param {?number} [budget=null] - The maximum budget allowed to spend for this batch job.
-	 * @param {object.<string, *>} [additional={}] - Other parameters to pass for the batch job, e.g. `log_level`.
+	 * @param {object.<string, *>} [additional={}] - Other parameters to pass for the batch job, e.g. `plan`, `budget`, and `log_level`.
 	 * @returns {Promise<Job>} The stored batch job.
 	 * @throws {Error}
 	 */
-	async createJob(process, title = null, description = null, plan = null, budget = null, additional = {}) {
+	async createJob(process, title = null, description = null, additional = {}) {
 		additional = Object.assign({}, additional, {
 			title: title,
-			description: description,
-			plan: plan,
-			budget: budget
+			description: description
 		});
 		let requestBody = this._normalizeUserProcess(process, additional);
 		let response = await this._post('/jobs', requestBody);
@@ -980,21 +937,17 @@ class Connection {
 	 * @param {?string} [description=null] - A description for the service.
 	 * @param {boolean} [enabled=true] - Enable the service (`true`, default) or not (`false`).
 	 * @param {object.<string, *>} [configuration={}] - Configuration parameters to pass to the service.
-	 * @param {?string} [plan=null] - The billing plan to use for this service.
-	 * @param {?number} [budget=null] - The maximum budget allowed to spend for this service.
-	 * @param {object.<string, *>} [additional={}] - Other parameters to pass for the service, e.g. `log_level`.
+	 * @param {object.<string, *>} [additional={}] - Other parameters to pass for the web service, e.g. `plan`, `budget`, and `log_level`.
 	 * @returns {Promise<Service>} The stored service.
 	 * @throws {Error}
 	 */
-	async createService(process, type, title = null, description = null, enabled = true, configuration = {}, plan = null, budget = null, additional = {}) {
+	async createService(process, type, title = null, description = null, enabled = true, configuration = {}, additional = {}) {
 		let requestBody = this._normalizeUserProcess(process, Object.assign({
 			title: title,
 			description: description,
 			type: type,
 			enabled: enabled,
 			configuration: configuration,
-			plan: plan,
-			budget: budget
 		}, additional));
 		let response = await this._post('/services', requestBody);
 		if (typeof response.headers['openeo-identifier'] !== 'string') {
@@ -1038,65 +991,6 @@ class Connection {
 		return arr;
 	}
 
-	/**
-	 * Get the a link with the given rel type.
-	 * 
-	 * @protected
-	 * @param {Array.<Link>} links - An array of links.
-	 * @param {string|Array.<string>} rel - Relation type(s) to find.
-	 * @returns {string | null}
-	 * @throws {Error}
-	 */
-	_getLinkHref(links, rel) {
-		if (!Array.isArray(rel)) {
-			rel = [rel];
-		}
-		if (Array.isArray(links)) {
-			let link = links.find(l => Utils.isObject(l) && rel.includes(l.rel) && typeof l.href === 'string');
-			if (link) {
-				return link.href;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Makes all links in the list absolute.
-	 * 
-	 * @param {Array.<Link>} links - An array of links.
-	 * @param {?string|AxiosResponse} [base=null] - The base url to use for relative links, or an response to derive the url from.
-	 * @returns {Array.<Link>}
-	 */
-	makeLinksAbsolute(links, base = null) {
-		if (!Array.isArray(links)) {
-			return links;
-		}
-		let baseUrl = null;
-		if (Utils.isObject(base) && base.headers && base.config && base.request) { // AxiosResponse
-			baseUrl = base.config.baseURL + base.config.url;
-		}
-		else if (typeof base !== 'string') {
-			baseUrl = this._getLinkHref(links, 'self');
-		}
-		else {
-			baseUrl = base;
-		}
-		if (!baseUrl) {
-			return links;
-		}
-		return links.map((link) => {
-			if (!Utils.isObject(link) || typeof link.href !== 'string') {
-				return link;
-			}
-			try {
-				let url = new URL(link.href, baseUrl);
-				return Object.assign({}, link, {href: url.toString()});
-			} catch(error) {
-				return link;
-			}
-		});
-	}
-
 	/**
 	 * Sends a GET request.
 	 * 
@@ -1131,16 +1025,18 @@ class Connection {
 	 * @param {*} body 
 	 * @param {string} responseType - Response type according to axios, defaults to `json`.
 	 * @param {?AbortController} [abortController=null] - An AbortController object that can be used to cancel the request.
+	 * @param {Array.<object.<string, string>>} [headers={}] - Headers
 	 * @returns {Promise<AxiosResponse>}
 	 * @throws {Error}
 	 * @see https://github.com/axios/axios#request-config
 	 */
-	async _post(path, body, responseType, abortController = null) {
+	async _post(path, body, responseType, abortController = null, headers = {}) {
 		let options = {
 			method: 'post',
-			responseType: responseType,
+			responseType,
 			url: path,
-			data: body
+			data: body,
+			headers
 		};
 		return await this._send(options, abortController);
 	}
@@ -1268,10 +1164,7 @@ class Connection {
 
 		try {
 			let response = await axios(options);
-			let capabilities = this.capabilities();
-			if (capabilities) {
-				response = capabilities.migrate(response);
-			}
+			response = this._migrate(response);
 			return response;
 		} catch(error) {
 			if (axios.isCancel(error)) {
@@ -1305,6 +1198,18 @@ class Connection {
 			throw error;
 		}
 	}
+
+	/**
+	 * Applies some common migrations to the response.
+	 * 
+	 * For example to update between versions or API flavours.
+	 * 
+	 * @param {AxiosResponse} response 
+	 * @returns {AxiosResponse}
+	 */
+	_migrate(response) {
+		return response;
+	}
 }
 
 module.exports = Connection;
diff --git a/src/const.js b/src/const.js
new file mode 100644
index 00000000..fcbf4aa2
--- /dev/null
+++ b/src/const.js
@@ -0,0 +1,22 @@
+const CLIENT_VERSION = "3.0.0-alpha.1";
+
+const MIN_OPENEO_API_VERSION = '1.0.0-rc.2';
+const MAX_OPENEO_API_VERSION = '1.x.x';
+
+const CONFORMANCE_RELS = [
+	'conformance',
+	'http://www.opengis.net/def/rel/ogc/1.0/conformance'
+];
+
+const DATA_RELS = [
+  'data',
+  'http://www.opengis.net/def/rel/ogc/1.0/data'
+];
+
+module.exports = {
+  CLIENT_VERSION,
+  CONFORMANCE_RELS,
+  DATA_RELS,
+  MIN_OPENEO_API_VERSION,
+  MAX_OPENEO_API_VERSION
+};
\ No newline at end of file
diff --git a/src/filetypes.js b/src/filetypes.js
index e15f493e..9f60f1d6 100644
--- a/src/filetypes.js
+++ b/src/filetypes.js
@@ -1,4 +1,4 @@
-const Utils = require('@openeo/js-commons/src/utils');
+const Utils = require('./utils');
 
 /**
  * Manages the files types supported by the back-end.
diff --git a/src/job.js b/src/job.js
index 41e95b9e..4be8edaa 100644
--- a/src/job.js
+++ b/src/job.js
@@ -1,7 +1,7 @@
 const Environment = require('./env');
 const BaseEntity = require('./baseentity');
 const Logs = require('./logs');
-const Utils = require('@openeo/js-commons/src/utils');
+const Utils = require('./utils');
 const StacMigrate = require('@radiantearth/stac-migrate');
 
 const STOP_STATUS = ['finished', 'canceled', 'error'];
diff --git a/src/logs.js b/src/logs.js
index bb67b889..409e7805 100644
--- a/src/logs.js
+++ b/src/logs.js
@@ -1,4 +1,4 @@
-const Utils = require('@openeo/js-commons/src/utils');
+const Utils = require('./utils');
 
 /**
  * Interface to loop through the logs.
diff --git a/src/ogc/capabilities.js b/src/ogc/capabilities.js
new file mode 100644
index 00000000..6dd388ed
--- /dev/null
+++ b/src/ogc/capabilities.js
@@ -0,0 +1,90 @@
+const Capabilities = require("../capabilities");
+const OpenEOCapabilities = require("../openeo/capabilities");
+const { DATA_RELS } = require("../const");
+const Utils = require("../utils");
+
+/**
+ *
+ */
+class OgcCapabilities extends Capabilities {
+
+	/**
+	 * Creates a new Capabilities object from an OGC API compatible JSON response.
+	 * 
+	 * @param {object.<string, *>} data - A capabilities response compatible to the API specification for `GET /`.
+	 * @throws {Error}
+	 */
+	constructor(data) {
+		super(data);
+
+		Object.assign(this.featureMap, {
+			// OGC API
+			describeProcess: 'get /processes/{}',
+			describeCollectionSchema: 'get /collections/{}/schema',
+			// Sync Processing
+			computeResult: 'post /processes/{}/execution',
+		});
+
+		const links = this.data.links;
+
+		// Temporarily parse endpoint list for authentication
+		if (Array.isArray(this.data.endpoints)) {
+			this.features = OpenEOCapabilities.endpointsToFeatures(this.data.endpoints);
+		}
+
+		const hasCollections = Utils.getLinkHref(links, DATA_RELS);
+		if (hasCollections) {
+			this.features.push('get /collections');
+			this.features.push('get /collections/{}');
+		}
+		
+		const isFeatures = this.hasConformance([
+			'http://www.opengis.net/spec/ogcapi-features-1/1.0/req/core',
+			'https://api.stacspec.org/v1.0.0/ogcapi-features'
+		]);
+		if (isFeatures) {
+			this.features.push('get /collections/{}/items');
+			this.features.push('get /collections/{}/items/{}');
+		}
+
+		const isCoverage = this.hasConformance('http://www.opengis.net/spec/ogcapi-coverages-1/1.0/conf/core');
+		if (isCoverage) {
+			this.features.push('get /collections/{}/coverage');
+			this.features.push('get /collections/{}/schema');
+		}
+
+		const isProcessApi = this.hasConformance('http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/core');
+		const processLink = Utils.getLinkHref(links, 'https://www.opengis.net/def/rel/ogc/1.0/processes');
+		if (isProcessApi || processLink) {
+			this.features.push('get /processes');
+			this.features.push('get /processes/{}');
+			this.features.push('post /processes/{}/execution');
+
+			const processJobList = this.hasConformance('http://www.opengis.net/spec/ogcapi-processes-1/1.0/req/job-list');
+			const jobLink = Utils.getLinkHref(links, 'https://www.opengis.net/def/rel/ogc/1.0/job-list');
+			if (processJobList || jobLink) {
+				this.features.push('get /jobs');
+				this.features.push('get /jobs/{}');
+			}
+			
+			const processDismiss = this.hasConformance('http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/dismiss');
+			if (processDismiss) { // @todo Is dismiss equivalent to openEO job cancellation or deletion?
+				this.features.push('delete /jobs/{}');
+			}
+		}
+	}
+
+	/**
+	 * Returns the API type.
+	 * 
+	 * Either `openeo` or `ogcapi`.
+	 * 
+	 * @returns {string} API type
+	 */
+	apiType() {
+		return 'ogcapi';
+	}
+}
+
+
+module.exports = OgcCapabilities;
\ No newline at end of file
diff --git a/src/ogc/connection.js b/src/ogc/connection.js
new file mode 100644
index 00000000..efd5c0fb
--- /dev/null
+++ b/src/ogc/connection.js
@@ -0,0 +1,120 @@
+const Connection = require("../connection");
+const OgcCapabilities = require("./capabilities");
+const Environment = require('../env');
+const Migrate = require("./migrate");
+
+/**
+ * A connection to an OGC API back-end.
+ */
+class OgcConnection extends Connection {
+
+	/**
+	 * Creates a new Connection.
+	 * 
+	 * @param {string} data - The contents of the landing page.
+	 * @param {string} baseUrl - The versioned URL or the back-end instance.
+	 * @param {Options} [options={}] - Additional options for the connection.
+	 */
+	constructor(data, baseUrl, options = {}) {
+		super(baseUrl, options);
+		this.capabilitiesObject = new OgcCapabilities(data);
+	}
+
+	/**
+	 * Executes a process synchronously and returns the result as the response.
+	 * 
+	 * Please note that requests can take a very long time of several minutes or even hours.
+	 * 
+	 * @async
+	 * @param {Process} process - A user-defined process.
+	 * @param {?AbortController} [abortController=null] - An AbortController object that can be used to cancel the processing request.
+	 * @param {object.<string, *>} [additional={}] - Other parameters to pass for processing, e.g. `plan`, `budget`, and `log_level`.
+	 * @returns {Promise<SyncResult>} - An object with the data and some metadata.
+	 */
+	async computeResult(process, abortController = null, additional = {}) {
+		let openEO = this._normalizeUserProcess(
+			process,
+			Object.assign({}, additional)
+		);
+		let mode = null;
+		let p = Object.values(openEO.process.process_graph).find(v => {
+			let spec = this.processes.get(v.process_id);
+			if (Array.isArray(spec.jobControlOptions) && spec.jobControlOptions.includes("async-execute")) {
+				mode = 'async';
+			}
+			return Boolean(spec && spec.ogcapi);
+		});
+		let requestBody = Migrate.executeSync(openEO);
+		let headers = {};
+		if (mode === 'async') {
+			headers.Prefer = 'respond-async';
+		}
+		let response = await this._post(`/processes/${p.process_id}/execution`, requestBody, Environment.getResponseType(), abortController, headers);
+		let syncResult = {
+			data: response.data,
+			costs: null,
+			type: null,
+			logs: []
+		};
+		
+		if (typeof response.headers['content-type'] === 'string') {
+			syncResult.type = response.headers['content-type'];
+		}
+
+		return syncResult;
+	}
+
+	/**
+	 * Checks whether the axios response is for a specific endpoint and method.
+	 *
+	 * @param {AxiosResponse} response 
+	 * @param {string} method - Lower-cased HTTP method, e.g. `get`
+	 * @param {string} endpoint - Endpoint path, e.g. `/collections`
+	 * @returns {boolean}
+	 * @private
+	 */
+	_isEndpoint(response, method, endpoint) {
+		if (response.config.method !== method) {
+			return false;
+		}
+		if (endpoint.includes('{}')) {
+			let pattern = '^' + endpoint.replace('{}', '[^/]+') + '$';
+			let regex = new RegExp(pattern);
+			return regex.test(response.config.url);
+		}
+		return endpoint === response.config.url;
+	}
+
+	/**
+	 * Applies some common migrations to the response.
+	 * 
+	 * For example to update between versions or API flavours.
+	 * 
+	 * @param {AxiosResponse} response 
+	 * @returns {AxiosResponse}
+	 */
+	_migrate(response) {
+		if (this._isEndpoint(response, 'get', '/collections')) {
+			response.data.collections = response.data.collections.map(collection => Migrate.collection(collection, response));
+		}
+		else if (this._isEndpoint(response, 'get', '/collections/{}')) {
+			response.data = Migrate.collection(response.data, response);
+		}
+		else if (this._isEndpoint(response, 'get', '/processes')) {
+			response.data.processes = response.data.processes.map(process => Migrate.process(process, response));
+		}
+		else if (this._isEndpoint(response, 'get', '/jobs')) {
+			response.data.jobs = response.data.jobs.map(job => Migrate.job(job, response));
+		}
+		else if (this._isEndpoint(response, 'get', '/jobs/{}')) {
+			response.data = Migrate.job(response.data, response);
+		}
+
+		response = Migrate.all(response);
+		
+		return response;
+	}
+
+}
+
+module.exports = OgcConnection;
\ No newline at end of file
diff --git a/src/ogc/migrate.js b/src/ogc/migrate.js
new file mode 100644
index 00000000..03a0cc9e
--- /dev/null
+++ b/src/ogc/migrate.js
@@ -0,0 +1,183 @@
+const Utils = require('../utils');
+const StacMigrate = require('@radiantearth/stac-migrate');
+const PgParser = require('./parser');
+
+const JobStatusMap = {
+  accepted: 'created',
+  running: 'running',
+  successful: 'finished',
+  failed: 'error',
+  dismissed: 'canceled'
+};
+
+/**
+ * Migrate OGC API responses to openEO API responses.
+ */
+class OgcMigrate {
+
+  /**
+   * Migrations that potentially apply to all endpoints.
+   * 
+   * @param {AxiosResponse} response
+   * @returns {AxiosResponse}
+   */
+  static all(response) {
+    if (Array.isArray(response.data.links)) {
+      response.data.links = Utils.makeLinksAbsolute(response.data.links, response);
+    }
+    return response;
+  }
+
+  /**
+   * Migrates a collection.
+   * 
+   * @param {object} collection
+   * @param {AxiosResponse} response
+   * @returns {Collection}
+   */
+  static collection(collection, response) {
+    if (collection.stac_version) {
+      return collection;
+    }
+  
+    // Make sure the required properties are present
+    collection = StacMigrate.collection(collection);
+    collection.ogcapi = true;
+    // Make links absolute
+    if (Array.isArray(collection.links)) {
+      collection.links = Utils.makeLinksAbsolute(collection.links, response);
+    }
+    
+    return collection;
+  }
+
+  /**
+   * Migrates a process.
+   * 
+   * @param {object} process
+   * @param {AxiosResponse} response
+   * @returns {Process}
+   */
+  static process(process, response) {
+    if (process.parameters || process.returns) {
+      return process;
+    }
+  
+    process.ogcapi = true;
+    process.summary = process.title;
+  
+    process.parameters = [];
+    for(let name in process.inputs) {
+      let input = process.inputs[name];
+      process.parameters.push({
+        name,
+        description: [input.title, input.description].filter(v => Boolean(v)).join("\n\n"),
+        schema: input.schema,
+        optional: typeof input.schema.default !== 'undefined' || input.minOccurs === 0
+      });
+    }
+
+    let addOutputParam = (p, name, output) => {
+      output = Object.assign({}, output);
+      if (Array.isArray(output.schema.oneOf) && output.schema.oneOf.every(s => s.type === 'string' && Boolean(s.contentMediaType))) {
+        output.schema = {
+          type: 'string',
+          enum: output.schema.oneOf.map(s => s.contentMediaType)
+        };
+      }
+      p.parameters.push(Object.assign({name: `output:${name}`}, output));
+    };
+
+    if (Utils.size(process.outputs) === 1) {
+      let [name, output] = Object.entries(process.outputs)[0];
+      process.returns = {
+        description: [output.title, output.description].filter(v => Boolean(v)).join("\n\n"),
+        schema: output.schema
+      };
+      // @todo workaround for now
+      addOutputParam(process, name, output);
+    }
+    else {
+      process.returns = {
+        description: 'see process description',
+        schema: []
+      };
+      for(let name in process.outputs) {
+        let output = process.outputs[name];
+        let schema = Object.assign({}, output.schema, {title: output.title, description: output.description});
+        process.returns.schema.push(schema);
+        // @todo workaround for now
+        addOutputParam(process, name, output);
+      }
+    }
+  
+    // Make links absolute
+    if (Array.isArray(process.links)) {
+      process.links = Utils.makeLinksAbsolute(process.links, response);
+    }
+  
+    return process;
+  }
+
+  /**
+   * Migrates a job.
+   * 
+   * @param {object} job
+   * @param {AxiosResponse} response
+   * @returns {Job}
+   */
+  static job(job, response) {
+    if (!job.jobID) {
+      return job;
+    }
+
+    job.ogcapi = true;
+    job.id = job.jobID;
+    if (job.processID) {
+      job.process = {
+        process_graph: {
+          [job.processID]: {
+            process_id: job.processID,
+            arguments: {},
+            description: "Process description incomplete as the information is missing in OGC API responses.",
+            result: true
+          }
+        }
+      };
+    }
+    job.status = JobStatusMap[job.status];
+    job.created = job.created || job.started;
+    job.updated = job.updated || job.finished;
+    job.description = job.message;
+
+    if (Array.isArray(job.links)) {
+      job.links = Utils.makeLinksAbsolute(job.links, response);
+    }
+    
+    return job;
+  }
+
+  /**
+   * Executes an OGC API process synchronously.
+   * 
+   * @todo Check whether implementation still works
+   * @param {object} requestBody
+   * @returns {object}
+   */
+  static executeSync(requestBody) {
+    const graph = Object.values(requestBody.process.process_graph);
+    const valid = graph.every(node => {
+      let spec = OgcMigrate.connection.processes.get(node.process_id);
+      return Boolean(spec && (spec.ogcapi || spec.id === 'load_collection'));
+    });
+    if (!valid) {
+			throw new Error('Process must consist only of OGC Processes and Collections');
+    }
+
+    const parser = new PgParser(requestBody.process, OgcMigrate.connection.getBaseUrl());
+    return parser.parse();
+  }
+
+}
+
+module.exports = OgcMigrate;
\ No newline at end of file
diff --git a/src/ogc/parser.js b/src/ogc/parser.js
new file mode 100644
index 00000000..3d19c2f4
--- /dev/null
+++ b/src/ogc/parser.js
@@ -0,0 +1,132 @@
+const Utils = require('../utils');
+
+/**
+ * Parser for OGC API - Workflows (MOAW).
+ */
+class OgcProcessParser {
+
+  /**
+   * A new parser instance.
+   * 
+   * @param {object} process
+   * @param {string} baseUrl
+   */
+  constructor(process, baseUrl) {
+    this.process = process;
+    this.url = baseUrl;
+  }
+
+  /**
+   * Converts an openEO process into an OGC API process workflow.
+   * 
+   * @param {Process} process
+   * @returns {object}
+   */
+  parse(process = null) {
+    if (process === null) {
+      process = Utils.deepClone(this.process);
+    }
+
+    for(const key in process.process_graph) {
+      const node = process.process_graph[key];
+      node.arguments = this.parseArgs(node.arguments, process.process_graph);
+    }
+
+    const resultNode = Object.values(process.process_graph)
+      .find(node => node.result);
+    return this.toOgcProcess(resultNode);
+  }
+
+  /**
+   * Converts a process graph node into an OGC API workflow node.
+   * 
+   * @param {ProcessNode} node
+   * @returns {object}
+   */
+  toOgcProcess(node) {
+    // Get output parameters from arguments
+    // @todo This is just a workaround for now
+    let outputs;
+    for(let key in node.arguments) {
+      if (key.startsWith('output:')) {
+        const mediaType = node.arguments[key];
+        delete node.arguments[key];
+        if (node.result) {
+          if (!outputs) {
+            outputs = {};
+          }
+          let name = key.substring(7);
+          outputs[name] = {
+            format: { mediaType }
+          };
+        }
+      }
+    }
+    
+    return {
+      "process": `${this.url}/processes/${node.process_id}`,
+      inputs: node.arguments,
+      outputs
+    }
+  }
+
+  /**
+   * Parse Arguments (deeply).
+   * 
+   * @param {object} args
+   * @param {object} graph
+   * @returns {object}
+   */
+  parseArgs(args, graph) {
+    for(let key in args) {
+      args[key] = this.parseDeep(args[key], args, graph);
+    }
+    return args;
+  }
+
+  /**
+   * Recusively parse the process graph.
+   * 
+   * @param {*} value
+   * @param {*} parent
+   * @param {object} graph
+   * @returns {*}
+   */
+  parseDeep(value, parent, graph) {
+    const isObject = Utils.isObject(value);
+    if (isObject && typeof value.from_node === 'string') {
+      const refNode = graph[value.from_node];
+      if (refNode.process_id === 'load_collection') {
+        const c = refNode.arguments;
+        const url = new URL(`${this.url}/collections/${c.id}/coverage`);
+        if (Utils.isObject(c.spatial_extent) && typeof c.spatial_extent.west !== 'undefined') {
+          const bbox = c.spatial_extent;
+          const subset = `Lat(${bbox.south}:${bbox.north}),Lon(${bbox.west}:${bbox.east})`;
+          url.searchParams.append('subset', subset);
+        }
+        value = {
+          href: url.toString() 
+        };
+        // @todo: Just needed for GNOSIS?
+        if (!Array.isArray(parent)) {
+          value = [value];
+        }
+      }
+      else {
+        value = this.toOgcProcess(graph[value.from_node]);
+      }
+    }
+    else if (isObject && Utils.isObject(value.process_graph)) {
+      value = this.parse(value);
+    }
+    else if (isObject || Array.isArray(value)) {
+      for(let key in value) {
+        value[key] = this.parseDeep(value[key], value, graph);
+      }
+    }
+    return value;
+  }
+
+}
+
+module.exports = OgcProcessParser;
\ No newline at end of file
diff --git a/src/oidcprovider.js b/src/oidcprovider.js
index d9c0ab1d..024919c4 100644
--- a/src/oidcprovider.js
+++ b/src/oidcprovider.js
@@ -1,4 +1,4 @@
-const Utils = require('@openeo/js-commons/src/utils');
+const Utils = require('./utils');
 const AuthProvider = require('./authprovider');
 const Environment = require('./env');
 const Oidc = require('oidc-client');
diff --git a/src/openeo/capabilities.js b/src/openeo/capabilities.js
new file mode 100644
index 00000000..9bbcdc3c
--- /dev/null
+++ b/src/openeo/capabilities.js
@@ -0,0 +1,177 @@
+const { MIN_OPENEO_API_VERSION, MAX_OPENEO_API_VERSION } = require('../const');
+const Utils = require('../utils');
+const BaseCapabilties = require('../capabilities');
+const Versions = require('@openeo/js-commons/src/versions');
+
+const OPENEO_FEATURE_MAP = {
+	// Discovery
+	listFileTypes: 'get /file_formats',
+	listServiceTypes: 'get /service_types',
+	listUdfRuntimes: 'get /udf_runtimes',
+	// Processes
+	describeProcess: 'get /processes',
+	// Account
+	describeAccount: 'get /me',
+	// Files
+	listFiles: 'get /files',
+	getFile: 'get /files', // getFile is a virtual function and doesn't request an endpoint, but get /files should be available nevertheless.
+	uploadFile: 'put /files/{}',
+	downloadFile: 'get /files/{}',
+	deleteFile: 'delete /files/{}',
+	// User-Defined Processes
+	validateProcess: 'post /validation',
+	listUserProcesses: 'get /process_graphs',
+	describeUserProcess: 'get /process_graphs/{}',
+	getUserProcess: 'get /process_graphs/{}',
+	setUserProcess: 'put /process_graphs/{}',
+	replaceUserProcess: 'put /process_graphs/{}',
+	deleteUserProcess: 'delete /process_graphs/{}',
+	// Sync Processing
+	computeResult: 'post /result',
+	// Web services
+	listServices: 'get /services',
+	createService: 'post /services',
+	describeService: 'get /services/{}',
+	getService: 'get /services/{}',
+	updateService: 'patch /services/{}',
+	deleteService: 'delete /services/{}',
+	debugService: 'get /services/{}/logs',
+};
+
+/**
+ * Capabilities of a back-end from an openEO API compatible JSON response.
+ */
+class Capabilities extends BaseCapabilties {
+
+	/**
+	 * Creates a new Capabilities object from an API-compatible JSON response.
+	 * 
+	 * @param {object.<string, *>} data - A capabilities response compatible to the API specification for `GET /`.
+	 * @throws {Error}
+	 */
+	constructor(data) {
+		super(data);
+
+		/**
+		 * @private
+		 * @ignore
+		 * @type {object.<string, string>}
+		 */
+		Object.assign(this.featureMap, OPENEO_FEATURE_MAP);
+
+		/**
+		 * @private
+		 * @type {Array.<string>}
+		 */
+		this.features = Capabilities.endpointsToFeatures(this.data.endpoints);
+	}
+
+	/**
+	 * Flatten features and simplify variables to be compatible with the feature map.
+	 * 
+	 * @param {Array.<object>} endpoints 
+	 * @returns {Array.<string>}
+	 */
+	static endpointsToFeatures(endpoints) {
+		return endpoints
+			.map(e => e.methods.map(method => {
+				const path = e.path.replace(/\{[^}]+\}/g, '{}');
+				return `${method} ${path}`.toLowerCase();
+			}))
+			.flat(1);
+	}
+
+	/**
+	 * Returns the API type.
+	 * 
+	 * Either `openeo` or `ogcapi`.
+	 * 
+	 * @returns {string} API type
+	 */
+	apiType() {
+		return 'openeo';
+	}
+
+	/**
+	 * Returns the openEO API version implemented by the back-end.
+	 * 
+	 * @returns {string} openEO API version number.
+	 */
+	apiVersion() {
+		return this.data.api_version;
+	}
+
+	/**
+	 * Checks whether the back-end supports the required API version for this client.
+	 * 
+	 * @throws {Error} If the back-end does not support the required API version.
+	 */
+	checkVersion() {
+		const apiVersion = this.apiVersion();
+		if (apiVersion && (Versions.compare(apiVersion, MIN_OPENEO_API_VERSION, "<") || Versions.compare(apiVersion, MAX_OPENEO_API_VERSION, ">"))) {
+			throw new Error("Client only supports the API versions between " + MIN_OPENEO_API_VERSION + " and " + MAX_OPENEO_API_VERSION);
+		}
+	}
+
+	/**
+	 * Returns the back-end version number.
+	 * 
+	 * @returns {string} openEO back-end version number.
+	 */
+	backendVersion() {
+		return this.data.backend_version;
+	}
+
+	/**
+	 * Is the back-end suitable for use in production?
+	 * 
+	 * @returns {boolean} true = stable/production, false = unstable
+	 */
+	isStable() {
+		return this.data.production === true;
+	}
+
+	/**
+	 * Returns list of backends in the federation.
+	 * 
+	 * @returns {Array.<FederationBackend>} Array of backends
+	 */
+	listFederation() {
+		return Array.isArray(this.data.federation) ? this.data.federation : [];
+	}
+
+	/**
+	 * Get the billing currency.
+	 * 
+	 * @returns {string | null} The billing currency or `null` if not available.
+	 */
+	currency() {
+		return (Utils.isObject(this.data.billing) && typeof this.data.billing.currency === 'string' ? this.data.billing.currency : null);
+	}
+
+	/**
+	 * List all billing plans.
+	 * 
+	 * @returns {Array.<BillingPlan>} Billing plans
+	 */
+	listPlans() {
+		if (Utils.isObject(this.data.billing) && Array.isArray(this.data.billing.plans)) {
+			let defaultPlan = typeof this.data.billing.default_plan === 'string' ? this.data.billing.default_plan.toLowerCase() : null;
+			return this.data.billing.plans.map(plan => {
+				let addition = {
+					default: (defaultPlan === plan.name.toLowerCase())
+				};
+				return Object.assign({}, plan, addition);
+			});
+		}
+		else {
+			return [];
+		}
+	}
+
+	// @todo Generate conformance classes in getConformanceClasses() method
+	// according to https://github.com/Open-EO/openeo-api/issues/506
+
+}
+
+module.exports = Capabilities;
diff --git a/src/openeo/connection.js b/src/openeo/connection.js
new file mode 100644
index 00000000..467ca311
--- /dev/null
+++ b/src/openeo/connection.js
@@ -0,0 +1,22 @@
+const BaseConnection = require('../connection');
+const Capabilities = require('./capabilities');
+
+/**
+ * A connection to an openEO back-end.
+ */
+class Connection extends BaseConnection {
+
+	/**
+	 * Creates a new Connection.
+	 * 
+	 * @param {string} data - The contents of the landing page.
+	 * @param {string} url - The base URL of the back-end.
+	 * @param {object} options - Additional options.
+	 */
+	constructor(data, url, options = {}) {
+		super(url, options);
+		this.capabilitiesObject = new Capabilities(data);
+	}
+}
+
+module.exports = Connection;
\ No newline at end of file
diff --git a/src/typedefs.js b/src/typedefs.js
index fb0d39fe..aadc03aa 100644
--- a/src/typedefs.js
+++ b/src/typedefs.js
@@ -199,7 +199,7 @@
  * An array of backends in the federation.
  * 
  * @typedef FederationBackend
- * @type {Object}
+ * @type {object}
  * @property {string} url URL to the versioned API endpoint of the back-end.
  * @property {string} title Name of the back-end.
  * @property {string} description A description of the back-end and its specifics.
diff --git a/src/userprocess.js b/src/userprocess.js
index d1ecdc62..90aeaddc 100644
--- a/src/userprocess.js
+++ b/src/userprocess.js
@@ -1,5 +1,5 @@
 const BaseEntity = require('./baseentity');
-const Utils = require('@openeo/js-commons/src/utils');
+const Utils = require('./utils');
 
 /**
  * A Stored Process Graph.
diff --git a/src/utils.js b/src/utils.js
new file mode 100644
index 00000000..f2934d24
--- /dev/null
+++ b/src/utils.js
@@ -0,0 +1,73 @@
+const CommonUtils = require('@openeo/js-commons/src/utils');
+
+/**
+ * General utility functions.
+ */
+class Utils extends CommonUtils {
+
+	/**
+	 * Get the a link with the given rel type.
+	 * 
+	 * @protected
+	 * @param {Array.<Link>} links - An array of links.
+	 * @param {string|Array.<string>} rel - Relation type(s) to find.
+	 * @param {Array.<string>} [types=['application/json']] - The expected types of the link.
+	 * @returns {string | null}
+	 * @throws {Error}
+	 */
+	static getLinkHref(links, rel, types = ['application/json']) {
+		if (!Array.isArray(rel)) {
+			rel = [rel];
+		}
+		if (Array.isArray(links)) {
+			let link = links.find(l => Utils.isObject(l) && rel.includes(l.rel) && typeof l.href === 'string' && (!l.type || types.includes(l.type)));
+			if (link) {
+				return link.href;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Makes all links in the list absolute.
+	 * 
+	 * @param {Array.<Link>} links - An array of links.
+	 * @param {?string|AxiosResponse} [base=null] - The base url to use for relative links, or an response to derive the url from.
+	 * @returns {Array.<Link>}
+	 */
+	static makeLinksAbsolute(links, base = null) {
+		if (!Array.isArray(links)) {
+			return links;
+		}
+		let baseUrl = '';
+		if (Utils.isObject(base) && base.headers && base.config && base.request) { // AxiosResponse
+			if (base.config.baseURL) {
+				baseUrl = base.config.baseURL;
+			}
+			baseUrl += base.config.url;
+		}
+		else if (typeof base !== 'string') {
+			baseUrl = Utils.getLinkHref(links, 'self');
+		}
+		else {
+			baseUrl = base;
+		}
+		if (!baseUrl) {
+			return links;
+		}
+		return links.map((link) => {
+			if (!Utils.isObject(link) || typeof link.href !== 'string') {
+				return link;
+			}
+			try {
+				let url = new URL(link.href, baseUrl);
+				return Object.assign({}, link, {href: url.toString()});
+			} catch(error) {
+				return link;
+			}
+		});
+	}
+
+}
+
+module.exports = Utils;
\ No newline at end of file
diff --git a/tests/basic.test.js b/tests/basic.test.js
index a2d8217f..c532fae9 100644
--- a/tests/basic.test.js
+++ b/tests/basic.test.js
@@ -1,10 +1,10 @@
 // @ts-nocheck
-const { OpenEO, OidcProvider } = require('../src/openeo');
+const { Client, OidcProvider } = require('../src/client');
 const packageInfo = require('../package.json');
 
 describe('Client Basics', () => {
 	test('Check version number', () => {
-		expect(OpenEO.clientVersion()).toBe(packageInfo.version);
+		expect(Client.clientVersion()).toBe(packageInfo.version);
 	});
 
 	describe('OIDC', () => {
diff --git a/tests/builder.array_create.test.js b/tests/builder.array_create.test.js
index db89e2f6..40e2bbc5 100644
--- a/tests/builder.array_create.test.js
+++ b/tests/builder.array_create.test.js
@@ -1,7 +1,7 @@
 // @ts-nocheck
 describe('Process Graph Builder (array_create)', () => {
 
-	const { Builder } = require('../src/openeo');
+	const { Builder } = require('../src/client');
 	const expectedProcess = require('./data/builder.array_create.example.json');
 	const array_create = {
 		"id": "array_create",
diff --git a/tests/builder.evi.test.js b/tests/builder.evi.test.js
index b3aea299..84101656 100644
--- a/tests/builder.evi.test.js
+++ b/tests/builder.evi.test.js
@@ -4,11 +4,11 @@ describe('Process Graph Builder (EVI)', () => {
 	const { TESTBACKEND } = require('./config.js');
 	const FROM_URL = TESTBACKEND + '/v1.0/processes';
 
-	const { OpenEO, Connection, Builder, Parameter, Formula } = require('../src/openeo');
+	const { Client, Connection, Builder, Parameter, Formula } = require('../src/client');
 
 	var con;
 	test('Connect', async () => {
-		con = await OpenEO.connect(TESTBACKEND);
+		con = await Client.connect(TESTBACKEND);
 		expect(con instanceof Connection).toBeTruthy();
 	});
 
diff --git a/tests/builder.misc.test.js b/tests/builder.misc.test.js
index 6f1c0d16..9c2fdc1a 100644
--- a/tests/builder.misc.test.js
+++ b/tests/builder.misc.test.js
@@ -1,7 +1,7 @@
 // @ts-nocheck
 describe('Process Graph Builder (S1)', () => {
 
-	const { Builder, Parameter } = require('../src/openeo');
+	const { Builder, Parameter } = require('../src/client');
 	test('No write access to array elements', async () => {
 		var builder = await Builder.fromVersion('1.0.0');
 		var mean = function(data) {
diff --git a/tests/builder.namespaces.test.js b/tests/builder.namespaces.test.js
index 10c685a8..12e56089 100644
--- a/tests/builder.namespaces.test.js
+++ b/tests/builder.namespaces.test.js
@@ -1,7 +1,7 @@
 // @ts-nocheck
 describe('Process Graph Builder (EVI)', () => {
 
-	const { Builder, Formula } = require('../src/openeo');
+	const { Builder, Formula } = require('../src/client');
 
 	test('Namespaces processes in builder', async () => {
 		const builder = await Builder.fromVersion('1.1.0');	
diff --git a/tests/builder.s1.test.js b/tests/builder.s1.test.js
index cd896d01..118308c2 100644
--- a/tests/builder.s1.test.js
+++ b/tests/builder.s1.test.js
@@ -1,7 +1,7 @@
 // @ts-nocheck
 describe('Process Graph Builder (S1)', () => {
 
-	const { Builder, Formula } = require('../src/openeo');
+	const { Builder, Formula } = require('../src/client');
 	const expectedProcess = require('./data/builder.s1.example.json');
 
 	test('S1 with callback (function)', async () => build(false));
diff --git a/tests/earthengine.test.js b/tests/earthengine.test.js
index a4ef72f5..c42bb058 100644
--- a/tests/earthengine.test.js
+++ b/tests/earthengine.test.js
@@ -1,5 +1,5 @@
 // @ts-nocheck
-const { OpenEO, Connection, FileTypes, Capabilities, UserProcess, Job, Service, UserFile, BasicProvider, Logs } = require('../src/openeo');
+const { Client, Connection, FileTypes, Capabilities, UserProcess, Job, Service, UserFile, BasicProvider, Logs } = require('../src/client');
 const { Utils } = require('@openeo/js-commons');
 const waitForExpect = require("wait-for-expect");
 
@@ -18,22 +18,22 @@ describe('GEE back-end', () => {
 	const isBrowserEnv = (typeof Blob !== 'undefined');
 
 	async function connectWithoutAuth() {
-		return await OpenEO.connect(TESTBACKEND);
+		return await Client.connect(TESTBACKEND);
 	}
 
 	async function connectWithBasicAuth() {
-		let con = await OpenEO.connect(TESTBACKEND);
+		let con = await Client.connect(TESTBACKEND);
 		await con.authenticateBasic(TESTUSERNAME, TESTPASSWORD);
 		return con;
 	}
 
 	describe('Connecting', () => {
 		test('Connect with wrong Server URL', async () => {
-			await expect(OpenEO.connect("http://invalid.openeo.org")).rejects.toThrow();
+			await expect(Client.connect("http://invalid.openeo.org")).rejects.toThrow();
 		});
 
 		test('Connect', async () => {
-			let con = await OpenEO.connect(TESTBACKEND);
+			let con = await Client.connect(TESTBACKEND);
 			expect(con instanceof Connection).toBeTruthy();
 			expect(con.isAuthenticated()).toBeFalsy();
 			expect(con.getUrl()).toBe(TESTBACKEND);
@@ -43,7 +43,7 @@ describe('GEE back-end', () => {
 		});
 
 		test('Connect directly to a known version via connect', async () => {
-			let con = await OpenEO.connect(TESTBACKENDDIRECT);
+			let con = await Client.connect(TESTBACKENDDIRECT);
 			expect(con instanceof Connection).toBeTruthy();
 			expect(con.isAuthenticated()).toBeFalsy();
 			expect(con.getUrl()).toBe(TESTBACKENDDIRECT);
@@ -53,7 +53,7 @@ describe('GEE back-end', () => {
 		});
 
 		test('Connect directly to a known version via connectDirect', async () => {
-			let con = await OpenEO.connectDirect(TESTBACKENDDIRECT);
+			let con = await Client.connectDirect(TESTBACKENDDIRECT);
 			expect(con.isAuthenticated()).toBeFalsy();
 			expect(con.getUrl()).toBe(TESTBACKENDDIRECT);
 			expect(con.getBaseUrl()).toBe(TESTBACKENDDIRECT);
diff --git a/tests/eodc.test.js b/tests/eodc.test.js
index 84e3a63d..21720401 100644
--- a/tests/eodc.test.js
+++ b/tests/eodc.test.js
@@ -1,5 +1,5 @@
 // @ts-nocheck
-const { OpenEO, Connection, Capabilities } = require('../src/openeo');
+const { Client, Connection, Capabilities } = require('../src/client');
 const { Utils } = require('@openeo/js-commons');
 
 jest.setTimeout(30*1000);
@@ -13,7 +13,7 @@ describe('EODC back-end', () => {
 
 		let con;
 		test.skip('Connect', async () => {
-			con = await OpenEO.connect(TESTBACKEND);
+			con = await Client.connect(TESTBACKEND);
 			expect(con instanceof Connection).toBeTruthy();
 			let cap = con.capabilities();
 			expect(cap instanceof Capabilities).toBeTruthy();
@@ -23,7 +23,7 @@ describe('EODC back-end', () => {
 			let col = await con.describeCollection(TESTCOLLECTION);
 			expect(col.id).toBe(TESTCOLLECTION);
 			expect(col).toHaveProperty("links");
-			expect(typeof con._getLinkHref(col.links, 'items')).toBe("string");
+			expect(typeof Utils.getLinkHref(col.links, 'items')).toBe("string");
 		});
 
 		// Skip this test for now, EODC back-end is not responding
diff --git a/tests/vito.test.js b/tests/vito.test.js
index 41559e19..d38f7cf7 100644
--- a/tests/vito.test.js
+++ b/tests/vito.test.js
@@ -1,5 +1,5 @@
 // @ts-nocheck
-const { OpenEO, Connection, Capabilities, BasicProvider, OidcProvider } = require('../src/openeo');
+const { Client, Connection, Capabilities, BasicProvider, OidcProvider } = require('../src/client');
 const { Utils } = require('@openeo/js-commons');
 
 jest.setTimeout(30*1000);
@@ -9,7 +9,7 @@ describe('VITO back-end', () => {
 
 	let con;
 	test('Connect', async () => {
-		con = await OpenEO.connect(TESTBACKEND, {addNamespaceToProcess: true});
+		con = await Client.connect(TESTBACKEND, {addNamespaceToProcess: true});
 		expect(con instanceof Connection).toBeTruthy();
 		expect(con.options.addNamespaceToProcess).toBeTruthy();
 		let cap = con.capabilities();
diff --git a/tsconfig.json b/tsconfig.json
index 8fe07982..e1e4f957 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,7 @@
 		// see https://github.com/babel/babel/issues/10237#issuecomment-513028440
 		"moduleResolution": "node",
 		// Emit the declaration into a single file. The generated file is invalid and needs some manual adoptions.
-		"outFile": "openeo.d.ts",
+		"outFile": "client.d.ts",
 		// See https://stackoverflow.com/questions/38209699/error-ts2403-subsequent-variable-declarations-must-have-the-same-type
 		"skipLibCheck": true
 	}
diff --git a/webpack.config.js b/webpack.config.js
index e741b540..6384d362 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -7,9 +7,9 @@ module.exports = [
   {
     target: "web",
     mode: 'production',
-    entry: './src/openeo.js',
+    entry: './src/client.js',
     output: {
-      filename: 'openeo.min.js',
+      filename: 'client.min.js',
       path: path.resolve(__dirname),
       libraryTarget: 'umd'
     },