diff --git a/bin/build-lib.js b/bin/build-lib.js
index ea8dc0465..edd0745c8 100644
--- a/bin/build-lib.js
+++ b/bin/build-lib.js
@@ -11,7 +11,7 @@ const writeFile = promisify(fs.writeFile)
 
 const SOURCE = 'packages/{*,@uppy/*}/src/**/*.js'
 // Files not to build (such as tests)
-const IGNORE = /\.test\.js$|__mocks__|companion/
+const IGNORE = /\.test\.js$|__mocks__|companion\//
 
 async function buildLib () {
   const files = await glob(SOURCE)
diff --git a/examples/custom-provider/client/MyCustomProvider.js b/examples/custom-provider/client/MyCustomProvider.js
index 62ba459c1..f4806497c 100644
--- a/examples/custom-provider/client/MyCustomProvider.js
+++ b/examples/custom-provider/client/MyCustomProvider.js
@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Provider } = require('@uppy/server-utils')
+const { Provider } = require('@uppy/companion-client')
 const ProviderViews = require('@uppy/provider-views')
 const { h } = require('preact')
 
diff --git a/packages/@uppy/aws-s3-multipart/package.json b/packages/@uppy/aws-s3-multipart/package.json
index a3a09eb39..56884185c 100644
--- a/packages/@uppy/aws-s3-multipart/package.json
+++ b/packages/@uppy/aws-s3-multipart/package.json
@@ -24,7 +24,7 @@
     "url": "git+https://github.com/transloadit/uppy.git"
   },
   "dependencies": {
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "resolve-url": "^0.2.1"
   },
diff --git a/packages/@uppy/aws-s3-multipart/src/index.js b/packages/@uppy/aws-s3-multipart/src/index.js
index b88f38615..09cf6c322 100644
--- a/packages/@uppy/aws-s3-multipart/src/index.js
+++ b/packages/@uppy/aws-s3-multipart/src/index.js
@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Socket, RequestClient } = require('@uppy/server-utils')
+const { Socket, RequestClient } = require('@uppy/companion-client')
 const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
 const getSocketHost = require('@uppy/utils/lib/getSocketHost')
 const limitPromises = require('@uppy/utils/lib/limitPromises')
diff --git a/packages/@uppy/server-utils/LICENSE b/packages/@uppy/companion-client/LICENSE
similarity index 100%
rename from packages/@uppy/server-utils/LICENSE
rename to packages/@uppy/companion-client/LICENSE
diff --git a/packages/@uppy/server-utils/README.md b/packages/@uppy/companion-client/README.md
similarity index 80%
rename from packages/@uppy/server-utils/README.md
rename to packages/@uppy/companion-client/README.md
index fea172a30..6b82043dd 100644
--- a/packages/@uppy/server-utils/README.md
+++ b/packages/@uppy/companion-client/README.md
@@ -1,8 +1,8 @@
-# @uppy/server-utils
+# @uppy/companion-client
 
 <img src="https://uppy.io/images/logos/uppy-dog-head-arrow.svg" width="120" alt="Uppy logo: a superman puppy in a pink suit" align="right">
 
-<a href="https://www.npmjs.com/package/@uppy/server-utils"><img src="https://img.shields.io/npm/v/@uppy/server-utils.svg?style=flat-square"></a>
+<a href="https://www.npmjs.com/package/@uppy/companion-client"><img src="https://img.shields.io/npm/v/@uppy/companion-client.svg?style=flat-square"></a>
 <a href="https://travis-ci.org/transloadit/uppy"><img src="https://img.shields.io/travis/transloadit/uppy/master.svg?style=flat-square" alt="Build Status"></a>
 
 Client library for communication with Uppy Server. Intended for use in Uppy plugins.
@@ -13,7 +13,7 @@ Uppy is being developed by the folks at [Transloadit](https://transloadit.com),
 
 ```js
 const Uppy = require('@uppy/core')
-const { Provider, RequestClient, Socket } = require('@uppy/server-utils')
+const { Provider, RequestClient, Socket } = require('@uppy/companion-client')
 
 const uppy = Uppy()
 
@@ -35,7 +35,7 @@ socket.on('progress', () => {})
 > Unless you are writing a custom provider plugin, you do not need to install this.
 
 ```bash
-$ npm install @uppy/server-utils --save
+$ npm install @uppy/companion-client --save
 ```
 
 <!-- Undocumented currently
diff --git a/packages/@uppy/server-utils/package.json b/packages/@uppy/companion-client/package.json
similarity index 94%
rename from packages/@uppy/server-utils/package.json
rename to packages/@uppy/companion-client/package.json
index fd8006e99..854b77337 100644
--- a/packages/@uppy/server-utils/package.json
+++ b/packages/@uppy/companion-client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@uppy/server-utils",
+  "name": "@uppy/companion-client",
   "description": "Client library for communication with Uppy Server. Intended for use in Uppy plugins.",
   "version": "0.26.0",
   "license": "MIT",
diff --git a/packages/@uppy/server-utils/src/Provider.js b/packages/@uppy/companion-client/src/Provider.js
similarity index 100%
rename from packages/@uppy/server-utils/src/Provider.js
rename to packages/@uppy/companion-client/src/Provider.js
diff --git a/packages/@uppy/server-utils/src/RequestClient.js b/packages/@uppy/companion-client/src/RequestClient.js
similarity index 100%
rename from packages/@uppy/server-utils/src/RequestClient.js
rename to packages/@uppy/companion-client/src/RequestClient.js
diff --git a/packages/@uppy/server-utils/src/RequestClient.test.js b/packages/@uppy/companion-client/src/RequestClient.test.js
similarity index 100%
rename from packages/@uppy/server-utils/src/RequestClient.test.js
rename to packages/@uppy/companion-client/src/RequestClient.test.js
diff --git a/packages/@uppy/server-utils/src/Socket.js b/packages/@uppy/companion-client/src/Socket.js
similarity index 100%
rename from packages/@uppy/server-utils/src/Socket.js
rename to packages/@uppy/companion-client/src/Socket.js
diff --git a/packages/@uppy/server-utils/src/Socket.test.js b/packages/@uppy/companion-client/src/Socket.test.js
similarity index 100%
rename from packages/@uppy/server-utils/src/Socket.test.js
rename to packages/@uppy/companion-client/src/Socket.test.js
diff --git a/packages/@uppy/server-utils/src/index.js b/packages/@uppy/companion-client/src/index.js
similarity index 100%
rename from packages/@uppy/server-utils/src/index.js
rename to packages/@uppy/companion-client/src/index.js
diff --git a/packages/@uppy/server-utils/types/index.d.ts b/packages/@uppy/companion-client/types/index.d.ts
similarity index 100%
rename from packages/@uppy/server-utils/types/index.d.ts
rename to packages/@uppy/companion-client/types/index.d.ts
diff --git a/packages/@uppy/dropbox/package.json b/packages/@uppy/dropbox/package.json
index c763b0d66..db7de819a 100644
--- a/packages/@uppy/dropbox/package.json
+++ b/packages/@uppy/dropbox/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@uppy/provider-views": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "preact": "^8.2.9"
   },
diff --git a/packages/@uppy/dropbox/src/index.js b/packages/@uppy/dropbox/src/index.js
index d74a7913b..d5ca40548 100644
--- a/packages/@uppy/dropbox/src/index.js
+++ b/packages/@uppy/dropbox/src/index.js
@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Provider } = require('@uppy/server-utils')
+const { Provider } = require('@uppy/companion-client')
 const ProviderViews = require('@uppy/provider-views')
 const icons = require('./icons')
 const { h } = require('preact')
diff --git a/packages/@uppy/dropbox/types/index.d.ts b/packages/@uppy/dropbox/types/index.d.ts
index 06d42375b..daa51b743 100644
--- a/packages/@uppy/dropbox/types/index.d.ts
+++ b/packages/@uppy/dropbox/types/index.d.ts
@@ -1,5 +1,5 @@
 import { Plugin, PluginOptions, Uppy } from '@uppy/core';
-import { ProviderOptions } from '@uppy/server-utils';
+import { ProviderOptions } from '@uppy/companion-client';
 
 export interface DropboxOptions extends PluginOptions, ProviderOptions {
   serverUrl: string;
diff --git a/packages/@uppy/google-drive/package.json b/packages/@uppy/google-drive/package.json
index 7a2e50626..5dac83def 100644
--- a/packages/@uppy/google-drive/package.json
+++ b/packages/@uppy/google-drive/package.json
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@uppy/provider-views": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "preact": "^8.2.9"
   },
diff --git a/packages/@uppy/google-drive/src/index.js b/packages/@uppy/google-drive/src/index.js
index de0525d55..9418273b5 100644
--- a/packages/@uppy/google-drive/src/index.js
+++ b/packages/@uppy/google-drive/src/index.js
@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Provider } = require('@uppy/server-utils')
+const { Provider } = require('@uppy/companion-client')
 const ProviderViews = require('@uppy/provider-views')
 const { h } = require('preact')
 
diff --git a/packages/@uppy/google-drive/types/index.d.ts b/packages/@uppy/google-drive/types/index.d.ts
index 4e0d11a5c..2c3c93af9 100644
--- a/packages/@uppy/google-drive/types/index.d.ts
+++ b/packages/@uppy/google-drive/types/index.d.ts
@@ -1,5 +1,5 @@
 import { Plugin, PluginOptions, Uppy } from '@uppy/core';
-import { ProviderOptions } from '@uppy/server-utils';
+import { ProviderOptions } from '@uppy/companion-client';
 
 export interface GoogleDriveOptions extends PluginOptions, ProviderOptions {
   serverUrl: string;
diff --git a/packages/@uppy/instagram/package.json b/packages/@uppy/instagram/package.json
index e0c0b16d4..3a0fa2a8e 100644
--- a/packages/@uppy/instagram/package.json
+++ b/packages/@uppy/instagram/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@uppy/provider-views": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "preact": "^8.2.9"
   },
diff --git a/packages/@uppy/instagram/src/index.js b/packages/@uppy/instagram/src/index.js
index f83163f7b..37ab22921 100644
--- a/packages/@uppy/instagram/src/index.js
+++ b/packages/@uppy/instagram/src/index.js
@@ -1,5 +1,5 @@
 const { Plugin } = require('@uppy/core')
-const { Provider } = require('@uppy/server-utils')
+const { Provider } = require('@uppy/companion-client')
 const ProviderViews = require('@uppy/provider-views')
 const { h } = require('preact')
 
diff --git a/packages/@uppy/instagram/types/index.d.ts b/packages/@uppy/instagram/types/index.d.ts
index 1b2d0adb9..c3ee2c819 100644
--- a/packages/@uppy/instagram/types/index.d.ts
+++ b/packages/@uppy/instagram/types/index.d.ts
@@ -1,5 +1,5 @@
 import { Plugin, PluginOptions, Uppy } from '@uppy/core';
-import { ProviderOptions } from '@uppy/server-utils';
+import { ProviderOptions } from '@uppy/companion-client';
 
 export interface InstagramOptions extends PluginOptions, ProviderOptions {
   serverUrl: string;
diff --git a/packages/@uppy/transloadit/package.json b/packages/@uppy/transloadit/package.json
index 51049d332..0be5659e7 100644
--- a/packages/@uppy/transloadit/package.json
+++ b/packages/@uppy/transloadit/package.json
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@uppy/provider-views": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/tus": "0.26.0",
     "@uppy/utils": "0.26.0",
     "namespace-emitter": "^2.0.1",
diff --git a/packages/@uppy/tus/package.json b/packages/@uppy/tus/package.json
index 729707233..61c70c18f 100644
--- a/packages/@uppy/tus/package.json
+++ b/packages/@uppy/tus/package.json
@@ -23,7 +23,7 @@
     "url": "git+https://github.com/transloadit/uppy.git"
   },
   "dependencies": {
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "tus-js-client": "^1.5.1"
   },
diff --git a/packages/@uppy/tus/src/index.js b/packages/@uppy/tus/src/index.js
index 380811be8..5fcc38711 100644
--- a/packages/@uppy/tus/src/index.js
+++ b/packages/@uppy/tus/src/index.js
@@ -1,6 +1,6 @@
 const { Plugin } = require('@uppy/core')
 const tus = require('tus-js-client')
-const { Provider, RequestClient, Socket } = require('@uppy/server-utils')
+const { Provider, RequestClient, Socket } = require('@uppy/companion-client')
 const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
 const getSocketHost = require('@uppy/utils/lib/getSocketHost')
 const settle = require('@uppy/utils/lib/settle')
diff --git a/packages/@uppy/url/package.json b/packages/@uppy/url/package.json
index f9e3737db..aa71d6b35 100644
--- a/packages/@uppy/url/package.json
+++ b/packages/@uppy/url/package.json
@@ -23,7 +23,7 @@
     "url": "git+https://github.com/transloadit/uppy.git"
   },
   "dependencies": {
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "preact": "^8.2.9"
   },
diff --git a/packages/@uppy/url/src/index.js b/packages/@uppy/url/src/index.js
index b3a554826..11270930e 100644
--- a/packages/@uppy/url/src/index.js
+++ b/packages/@uppy/url/src/index.js
@@ -1,7 +1,7 @@
 const { Plugin } = require('@uppy/core')
 const Translator = require('@uppy/utils/lib/Translator')
 const { h } = require('preact')
-const { RequestClient } = require('@uppy/server-utils')
+const { RequestClient } = require('@uppy/companion-client')
 const UrlUI = require('./UrlUI.js')
 const toArray = require('@uppy/utils/lib/toArray')
 
diff --git a/packages/@uppy/xhr-upload/package.json b/packages/@uppy/xhr-upload/package.json
index b8a441a7b..05a870de3 100644
--- a/packages/@uppy/xhr-upload/package.json
+++ b/packages/@uppy/xhr-upload/package.json
@@ -25,7 +25,7 @@
     "url": "git+https://github.com/transloadit/uppy.git"
   },
   "dependencies": {
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/utils": "0.26.0",
     "cuid": "^2.1.1"
   },
diff --git a/packages/@uppy/xhr-upload/src/index.js b/packages/@uppy/xhr-upload/src/index.js
index 110b049ee..76d521290 100644
--- a/packages/@uppy/xhr-upload/src/index.js
+++ b/packages/@uppy/xhr-upload/src/index.js
@@ -1,7 +1,7 @@
 const { Plugin } = require('@uppy/core')
 const cuid = require('cuid')
 const Translator = require('@uppy/utils/lib/Translator')
-const { Provider, Socket } = require('@uppy/server-utils')
+const { Provider, Socket } = require('@uppy/companion-client')
 const emitSocketProgress = require('@uppy/utils/lib/emitSocketProgress')
 const getSocketHost = require('@uppy/utils/lib/getSocketHost')
 const settle = require('@uppy/utils/lib/settle')
diff --git a/packages/uppy/index.js b/packages/uppy/index.js
index 618f2df15..0e59d5323 100644
--- a/packages/uppy/index.js
+++ b/packages/uppy/index.js
@@ -2,7 +2,7 @@
 exports.Core = require('@uppy/core')
 
 // Utilities
-exports.server = require('@uppy/server-utils')
+exports.server = require('@uppy/companion-client')
 exports.views = {
   ProviderView: require('@uppy/provider-views')
 }
diff --git a/packages/uppy/index.mjs b/packages/uppy/index.mjs
index 8537accfd..65a8ebcd9 100644
--- a/packages/uppy/index.mjs
+++ b/packages/uppy/index.mjs
@@ -2,7 +2,7 @@
 export { default as Core } from '@uppy/core'
 
 // Utilities
-export { default as server } from '@uppy/server-utils'
+export { default as server } from '@uppy/companion-client'
 import ProviderView from '@uppy/provider-views'
 export var views = { ProviderView: ProviderView }
 
diff --git a/packages/uppy/package.json b/packages/uppy/package.json
index 07e08675e..f63c20bdd 100644
--- a/packages/uppy/package.json
+++ b/packages/uppy/package.json
@@ -45,7 +45,7 @@
     "@uppy/progress-bar": "0.26.0",
     "@uppy/provider-views": "0.26.0",
     "@uppy/redux-dev-tools": "0.26.0",
-    "@uppy/server-utils": "0.26.0",
+    "@uppy/companion-client": "0.26.0",
     "@uppy/status-bar": "0.26.0",
     "@uppy/store-default": "0.26.0",
     "@uppy/store-redux": "0.26.0",