diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ef558e7ce..d3741e109 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,7 +38,7 @@
 ## Building and Running
 
 1. Run `npm install` in the project root directory to install dependencies.
-1. Run `npm run start:dev` to start a local dev server on port 5000. It will watch for changes and rebuild when you edit files in `src/` or `static/`. Use ctrl+c to stop it.
+1. Run `npm run start:dev` to start a local dev server on port 5000. It will watch for changes and rebuild when you edit files in `src/` or `public/`. Use ctrl+c to stop it.
    - Run `firebase use default` if you run into any errors for this.
 
 ## Standards and Conventions
diff --git a/firebase.json b/firebase.json
index 01211d9e9..b902ce9a9 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,6 +1,6 @@
 {
   "hosting": {
-    "public": "public",
+    "public": "dist",
     "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
     "rewrites": [
       {
diff --git a/gulpfile.js b/gulpfile.js
index 0e084244d..2a44cea2c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -20,27 +20,27 @@ const gulpSrc = [
 ];
 
 task("cat", function () {
-  return src(gulpSrc).pipe(concat("monkeytype.js")).pipe(dest("./public/js"));
+  return src(gulpSrc).pipe(concat("monkeytype.js")).pipe(dest("./dist/js"));
 });
 
 task("sass", function () {
   return src("./src/sass/*.scss")
     .pipe(sass({ outputStyle: "compressed" }).on("error", sass.logError))
-    .pipe(dest("public/css"));
+    .pipe(dest("dist/css"));
 });
 
-task("dist", function () {
-  return src("./static/**/*").pipe(dest("./public/"));
+task("static", function () {
+  return src("./public/**/*").pipe(dest("./dist/"));
 });
 
 task("clean", function () {
-  return src("./public/", { allowEmpty: true }).pipe(vinylPaths(del));
+  return src("./dist/", { allowEmpty: true }).pipe(vinylPaths(del));
 });
 
-task("build", series("dist", "sass", "cat"));
+task("build", series("static", "sass", "cat"));
 
 task("watch", function () {
-  watch(["./static/**/*", "./src/**/*"], series("build"));
+  watch(["./public/**/*", "./src/**/*"], series("build"));
 });
 
 task("rebuild", series("clean", "build"));