diff --git a/mix.exs b/mix.exs
index 57334ee8d..ed1810868 100644
--- a/mix.exs
+++ b/mix.exs
@@ -1,4 +1,4 @@
-defmodule FireguardUmbrella.MixProject do
+defmodule CloudfireUmbrella.MixProject do
   @moduledoc """
   Welcome to the CloudFire Elixir Umbrella Project
   """
diff --git a/pkg/ubuntu-20.04/lib/systemd/system/fireguard.service b/pkg/ubuntu-20.04/lib/systemd/system/cloudfire.service
similarity index 53%
rename from pkg/ubuntu-20.04/lib/systemd/system/fireguard.service
rename to pkg/ubuntu-20.04/lib/systemd/system/cloudfire.service
index 300254c51..f79151fbc 100644
--- a/pkg/ubuntu-20.04/lib/systemd/system/fireguard.service
+++ b/pkg/ubuntu-20.04/lib/systemd/system/cloudfire.service
@@ -6,13 +6,13 @@ After=postgresql.service
 [Service]
 Restart=on-failure
 RestartSec=1
-User=fireguard
+User=cloudfire
 AmbientCapabilities=CAP_NET_ADMIN CAP_NET_RAW CAP_DAC_READ_SEARCH
-EnvironmentFile=/opt/fireguard/config.env
-ExecStartPre=/opt/fireguard/bin/fireguard eval "CfHttp.Release.migrate"
-ExecStart=/opt/fireguard/bin/fireguard start
+EnvironmentFile=/opt/cloudfire/config.env
+ExecStartPre=/opt//bin/cloudfire eval "CfHttp.Release.migrate"
+ExecStart=/opt/cloudfire/bin/cloudfire start
 ExecStartPost=sleep 5
-ExecStartPost=/opt/fireguard/bin/fireguard rpc "CfHttp.Release.create_admin_user"
+ExecStartPost=/opt/cloudfire/bin/cloudfire rpc "CfHttp.Release.create_admin_user"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/bootstrap_cloudfire_dev.sql b/scripts/bootstrap_cloudfire_dev.sql
new file mode 100644
index 000000000..4004e791e
--- /dev/null
+++ b/scripts/bootstrap_cloudfire_dev.sql
@@ -0,0 +1,5 @@
+-- Execute this with your DB admin user
+create role cloudfire;
+alter role cloudfire with password 'postgres';
+alter role cloudfire with login;
+alter role cloudfire with superuser;
diff --git a/scripts/bootstrap_fireguard_dev.sql b/scripts/bootstrap_fireguard_dev.sql
deleted file mode 100644
index eb8ad3588..000000000
--- a/scripts/bootstrap_fireguard_dev.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Execute this with your DB admin user
-create role fireguard;
-alter role fireguard with password 'postgres';
-alter role firegurd with login;
-alter role fireguard with superuser;