diff --git a/.ci/build_ubuntu_18.04.sh b/.ci/build_ubuntu_18.04.sh
index 519992384..91958805a 100755
--- a/.ci/build_ubuntu_18.04.sh
+++ b/.ci/build_ubuntu_18.04.sh
@@ -17,4 +17,4 @@ docker build \
 
 CID=$(docker create $IMAGE)
 mkdir -p _build
-docker cp $CID:/build/pkg/$PKG_FILE ./_build/cloudfire_$PKG_FILE
+docker cp $CID:/build/pkg/$PKG_FILE ./_build/firezone_$PKG_FILE
diff --git a/.ci/build_ubuntu_20.04.sh b/.ci/build_ubuntu_20.04.sh
index e702ea62b..9428d3cf1 100755
--- a/.ci/build_ubuntu_20.04.sh
+++ b/.ci/build_ubuntu_20.04.sh
@@ -17,4 +17,4 @@ docker build \
 
 CID=$(docker create $IMAGE)
 mkdir -p _build
-docker cp $CID:/build/pkg/$PKG_FILE ./_build/cloudfire_$PKG_FILE
+docker cp $CID:/build/pkg/$PKG_FILE ./_build/firezone_$PKG_FILE
diff --git a/.ci/functional_test.sh b/.ci/functional_test.sh
index 5039d4c4e..628e6c1b8 100755
--- a/.ci/functional_test.sh
+++ b/.ci/functional_test.sh
@@ -8,16 +8,16 @@ sudo systemctl start postgresql
 sudo dpkg -i *.deb
 
 echo "Enabling service..."
-sudo systemctl start cloudfire
+sudo systemctl start firezone
 
 # Wait for app to start
 sleep 10
 
 echo "Service status..."
-sudo systemctl status cloudfire.service
+sudo systemctl status firezone.service
 
 echo "Printing service logs..."
-sudo journalctl -u cloudfire.service
+sudo journalctl -u firezone.service
 
 echo "Trying to load homepage..."
 curl -i -vvv -k https://$(hostname):8800/
diff --git a/.ci/install_dependencies.sh b/.ci/install_dependencies.sh
index e1d01a59b..3e79f579b 100755
--- a/.ci/install_dependencies.sh
+++ b/.ci/install_dependencies.sh
@@ -3,6 +3,6 @@ set -e
 
 mix local.hex --force && mix local.rebar --force
 mix deps.get --only test
-cd apps/cf_http/assets
+cd apps/fz_http/assets
 npm install
 ./node_modules/.bin/webpack --mode development
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ab549e2a7..a2880e034 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
         if: ${{ always() }}
         with:
           name: test screenshots
-          path: apps/cf_http/screenshots
+          path: apps/fz_http/screenshots
 
   build:
     needs: unit-integration-test
@@ -129,8 +129,8 @@ jobs:
 
       - uses: actions/upload-artifact@v2
         with:
-          name: cloudfire_${{ matrix.os }}_${{ matrix.arch }}.deb
-          path: _build/cloudfire_${{ matrix.os }}_${{ matrix.arch }}.deb
+          name: firezone_${{ matrix.os }}_${{ matrix.arch }}.deb
+          path: _build/firezone_${{ matrix.os }}_${{ matrix.arch }}.deb
 
   functional-test:
     needs: build
@@ -157,7 +157,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v2
         with:
-          name: cloudfire_${{ matrix.os }}_${{ matrix.arch }}.deb
+          name: firezone_${{ matrix.os }}_${{ matrix.arch }}.deb
           path: ./
       - name: Test Install package
         run: .ci/functional_test.sh
@@ -193,7 +193,7 @@ jobs:
           prerelease: true
       - uses: actions/download-artifact@v2
         with:
-          name: cloudfire_${{ matrix.os }}_${{ matrix.arch }}
+          name: firezone_${{ matrix.os }}_${{ matrix.arch }}
           path: ./
       - name: Upload Release Asset
         id: upload-release-asset
@@ -202,6 +202,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./cloudfire_${{ matrix.os }}_${{ matrix.arch }}.deb
+          asset_path: ./firezone_${{ matrix.os }}_${{ matrix.arch }}.deb
           asset_name: ${{ matrix.os }}_${{ matrix.arch }}
           asset_content_type: application/vnd.debian.binary-package