diff --git a/packages/ide/src/client.ts b/packages/ide/src/client.ts
index 1c31b4d1f..384002129 100644
--- a/packages/ide/src/client.ts
+++ b/packages/ide/src/client.ts
@@ -1,7 +1,7 @@
 import { exec } from "child_process";
 import { promisify } from "util";
 import { field, logger, time, Time } from "@coder/logger";
-import { escapePath } from "@coder/server";
+import { escapePath } from "@coder/protocol";
 import { retry } from "./retry";
 
 export interface IClientOptions {
diff --git a/packages/ide/src/fill/child_process.ts b/packages/ide/src/fill/child_process.ts
index c5b6ce707..dbe950a79 100644
--- a/packages/ide/src/fill/child_process.ts
+++ b/packages/ide/src/fill/child_process.ts
@@ -1,4 +1,4 @@
-import { CP } from "@coder/server";
+import { CP } from "@coder/protocol";
 import { client } from "./client";
 
 export = new CP(client);
diff --git a/packages/ide/src/fill/client.ts b/packages/ide/src/fill/client.ts
index 23213de33..dd8ff765d 100644
--- a/packages/ide/src/fill/client.ts
+++ b/packages/ide/src/fill/client.ts
@@ -1,6 +1,6 @@
 import { Emitter } from "@coder/events";
 import { logger, field } from "@coder/logger";
-import { Client, ReadWriteConnection } from "@coder/server";
+import { Client, ReadWriteConnection } from "@coder/protocol";
 import { retry } from "../retry";
 
 /**
diff --git a/packages/ide/src/fill/fs.ts b/packages/ide/src/fill/fs.ts
index badf0214e..f93c5ceae 100644
--- a/packages/ide/src/fill/fs.ts
+++ b/packages/ide/src/fill/fs.ts
@@ -1,4 +1,4 @@
-import { FS } from "@coder/server";
+import { FS } from "@coder/protocol";
 import { client } from "./client";
 
 export = new FS(client);
diff --git a/packages/ide/src/fill/net.ts b/packages/ide/src/fill/net.ts
index ae484ce3b..ab534f6a7 100644
--- a/packages/ide/src/fill/net.ts
+++ b/packages/ide/src/fill/net.ts
@@ -1,3 +1,3 @@
-import { Net } from "@coder/server";
+import { Net } from "@coder/protocol";
 
 export = new Net();
diff --git a/packages/ide/src/upload.ts b/packages/ide/src/upload.ts
index 56411bff6..9bb62343f 100644
--- a/packages/ide/src/upload.ts
+++ b/packages/ide/src/upload.ts
@@ -2,7 +2,7 @@ import { exec } from "child_process";
 import { appendFile } from "fs";
 import { promisify } from "util";
 import { logger, Logger } from "@coder/logger";
-import { escapePath } from "@coder/server";
+import { escapePath } from "@coder/protocol";
 import { IURI } from "./uri";
 
 /**
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 73fbb53f6..c8fff6063 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -1,5 +1,5 @@
 {
-    "name": "@coder/server",
+    "name": "@coder/protocol",
     "main": "src/index.ts",
     "dependencies": {
         "express": "^4.16.4",
diff --git a/webpack.config.app.js b/webpack.config.app.js
index bff8a0a44..5dfa11c2a 100644
--- a/webpack.config.app.js
+++ b/webpack.config.app.js
@@ -22,7 +22,7 @@ const vscodeFills = path.join(root, "packages", "vscode", "src", "fill");
 module.exports = {
 	context: root,
 	devtool: "source-map",
-	entry: "./packages/app/src/index.ts",
+	entry: "./packages/web/src/index.ts",
 	mode: isCi ? "production" : "development",
 	output: {
 		chunkFilename: "[name]-[hash:6].bundle.js",
@@ -119,7 +119,7 @@ module.exports = {
 	},
 	plugins: [
 		new HtmlWebpackPlugin({
-			template: "packages/app/src/index.html",
+			template: "packages/web/src/index.html",
 		}),
 		new HappyPack({
 			id: "ts",