diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 8d19c7a72735e8669e36496f62fca57d8c59f30c..739412dc4851c05d79ccce3233aaab00f2671a29 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -20,7 +20,7 @@ jobs:
       AWS_DEFAULT_REGION: us-east-1
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      SMOOTHIE_REPO_KEYS: "${{ secrets.SMOOTHIE_REPO_KEYS }}"
+      SOFT_SERVE_REPO_KEYS: "${{ secrets.SOFT_SERVE_REPO_KEYS }}"
 
     steps:
     - name: Install Go
@@ -78,7 +78,7 @@ jobs:
         aws_region         = "$AWS_DEFAULT_REGION"
         app_image          = "$CONTAINER_REPO:$GITHUB_SHA-snapshot"
         authorization_keys = <<EOT
-        $SMOOTHIE_REPO_KEYS
+        $SOFT_SERVE_REPO_KEYS
         EOT
         EOF
         TF_VARS="-var-file=live.auto.tfvars"
diff --git a/.gitignore b/.gitignore
index 2ee7702b44ff48e73da1faf8a92fb5041644f837..afadd7767fc59b5be7cf7e842c28ebc8535e4d76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-smoothie
+soft-serve
 .ssh
 .repos
 dist
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 4f79421e038c2a90a3b9259d70be2f23081dfeb0..005e159ce09fd7f59d455bb4b9099d4753eb96cc 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,4 +1,4 @@
-project_name: smoothie
+project_name: soft-serve
 
 env:
   - GO111MODULE=on
@@ -9,8 +9,8 @@ before:
     - go mod download
 
 builds:
-  - id: "smoothie"
-    binary: "smoothie"
+  - id: "soft-serve"
+    binary: "soft-serve"
     ldflags: -s -w -X main.Version={{ .Commit }}-snapshot -X main.CommitSHA={{ .Commit }}
     goos:
       - linux
@@ -19,16 +19,16 @@ builds:
 
 dockers:
   - image_templates:
-      - "ghcr.io/charmbracelet/smoothie-internal:snapshot"
-      - "ghcr.io/charmbracelet/smoothie-internal:{{ .Commit }}-snapshot"
-    ids: [smoothie]
+      - "ghcr.io/charmbracelet/soft-serve-internal:snapshot"
+      - "ghcr.io/charmbracelet/soft-serve-internal:{{ .Commit }}-snapshot"
+    ids: [soft-serve]
     goarch: amd64
     build_flag_templates:
       - --platform=linux/amd64
       - --label=org.opencontainers.image.title={{ .ProjectName }}
       - --label=org.opencontainers.image.description={{ .ProjectName }}
-      - --label=org.opencontainers.image.url=https://github.com/charmbracelet/smoothie-internal
-      - --label=org.opencontainers.image.source=https://github.com/charmbracelet/smoothie-internal
+      - --label=org.opencontainers.image.url=https://github.com/charmbracelet/soft-serve-internal
+      - --label=org.opencontainers.image.source=https://github.com/charmbracelet/soft-serve-internal
       - --label=org.opencontainers.image.version={{ .Commit }}-snapshot
       - --label=org.opencontainers.image.created={{ .Date }}
       - --label=org.opencontainers.image.revision={{ .FullCommit }}
diff --git a/Dockerfile b/Dockerfile
index dfed51d2242994d08c4d94ac655fd57b4381f24b..447d7c4cdb52e0b47f0a7dcdc6dfb050900f1fed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,22 +2,22 @@ FROM alpine:latest
 
 RUN apk update && apk add --update nfs-utils git && rm -rf /var/cache/apk/*
 
-COPY smoothie /usr/local/bin/smoothie
+COPY soft-serve /usr/local/bin/soft-serve
 
 # Create directories
-WORKDIR /smoothie
+WORKDIR /soft-serve
 # Expose data volume
-VOLUME /smoothie
+VOLUME /soft-serve
 
 # Environment variables
-ENV SMOOTHIE_KEY_PATH "/smoothie/ssh/smoothie_server_ed25519"
-ENV SMOOTHIE_REPO_KEYS ""
-ENV SMOOTHIE_REPO_KEYS_PATH "/smoothie/ssh/smoothie_git_authorized_keys"
-ENV SMOOTHIE_REPO_PATH "/smoothie/repos"
+ENV SOFT_SERVE_KEY_PATH "/soft-serve/ssh/soft_serve_server_ed25519"
+ENV SOFT_SERVE_REPO_KEYS ""
+ENV SOFT_SERVE_REPO_KEYS_PATH "/soft-serve/ssh/soft_serve_git_authorized_keys"
+ENV SOFT_SERVE_REPO_PATH "/soft-serve/repos"
 
 # Expose ports
 # SSH
 EXPOSE 23231/tcp
 
 # Set the default command
-ENTRYPOINT [ "/usr/local/bin/smoothie" ]
\ No newline at end of file
+ENTRYPOINT [ "/usr/local/bin/soft-serve" ]
\ No newline at end of file
diff --git a/README.md b/README.md
index 00a5006c308e81a6d310067297672c89a2a5d07b..b2ff40a1715682cb016e017b99febabfa68e6654 100644
--- a/README.md
+++ b/README.md
@@ -1,25 +1,25 @@
-# Smoothie
+# Soft-Serve
 
 Distribute your software on the command line with SSH and Git.
 
 ## What is it
 
-Smoothie is a SSH server that hosts a Git server and interactive TUI built from
-the repos you push to it. Authors can easily push their projects to Smoothie by
-adding it as a remote and users can clone repos from Smoothie and stay up to
+Soft-Serve is a SSH server that hosts a Git server and interactive TUI built from
+the repos you push to it. Authors can easily push their projects to Soft-Serve by
+adding it as a remote and users can clone repos from Soft-Serve and stay up to
 date with the TUI as you push commits.
 
 ## Pushing a repo
 
-1. Run `smoothie`
-2. Add smoothie as a remote on any git repo: `git remote add smoothie ssh://git@localhost:23231/smoothie`
-3. Push stuff: `git push smoothie main`
+1. Run `soft-serve`
+2. Add soft-serve as a remote on any git repo: `git remote add soft-serve ssh://git@localhost:23231/soft-serve`
+3. Push stuff: `git push soft-serve main`
 
 ## Cloning a repo
 
-1. You'll need to know the name (for now, it's not listed anywhere): `git clone ssh://git@localhost:23231/smoothie`
+1. You'll need to know the name (for now, it's not listed anywhere): `git clone ssh://git@localhost:23231/soft-serve`
 
-## Smoothie TUI
+## Soft-Serve TUI
 
 If you `ssh localhost -p 23231` you'll see a list of the latest commits to the repos you've pushed.
 
@@ -28,4 +28,4 @@ If you `ssh localhost -p 23231` you'll see a list of the latest commits to the r
 By default anyone can push or pull from the Git repositories. This is mainly
 for testing, you can also whitelist public keys that have Git write access by
 creating an authorized keys file with the public key for each author. By
-default this file is expected to be at `./.ssh/smoothie_git_authorized_keys`.
+default this file is expected to be at `./.ssh/soft_serve_git_authorized_keys`.
diff --git a/go.mod b/go.mod
index e3df4931fcf2e87e71f7faa7fe6749fe695bb689..4ec8a6b83088efeb2dd275ca196d0799df207177 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module smoothie
+module soft-serve
 
 go 1.16
 
diff --git a/main.go b/main.go
index c96174a789652f8672a753c6d161963857f3fd23..db24d054c0a7f3c5117f0193a7dbcde912522b68 100644
--- a/main.go
+++ b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"log"
-	"smoothie/tui"
+	"soft-serve/tui"
 	"time"
 
 	"github.com/charmbracelet/wish"
@@ -15,12 +15,12 @@ import (
 )
 
 type Config struct {
-	Port         int    `env:"SMOOTHIE_PORT" default:"23231"`
-	Host         string `env:"SMOOTHIE_HOST" default:""`
-	KeyPath      string `env:"SMOOTHIE_KEY_PATH" default:".ssh/smoothie_server_ed25519"`
-	RepoAuth     string `env:"SMOOTHIE_REPO_KEYS" default:""`
-	RepoAuthFile string `env:"SMOOTHIE_REPO_KEYS_PATH" default:".ssh/smoothie_git_authorized_keys"`
-	RepoPath     string `env:"SMOOTHIE_REPO_PATH" default:".repos"`
+	Port         int    `env:"SOFT_SERVE_PORT" default:"23231"`
+	Host         string `env:"SOFT_SERVE_HOST" default:""`
+	KeyPath      string `env:"SOFT_SERVE_KEY_PATH" default:".ssh/soft_serve_server_ed25519"`
+	RepoAuth     string `env:"SOFT_SERVE_REPO_KEYS" default:""`
+	RepoAuthFile string `env:"SOFT_SERVE_REPO_KEYS_PATH" default:".ssh/soft_serve_git_authorized_keys"`
+	RepoPath     string `env:"SOFT_SERVE_REPO_PATH" default:".repos"`
 }
 
 func main() {
diff --git a/main.tf b/main.tf
index cd895530eef674481bc3c3a5e3dd5774dbd9f8b0..488027521ca5c6f580d90fc4db2471362c4fdbf0 100644
--- a/main.tf
+++ b/main.tf
@@ -1,7 +1,7 @@
 terraform {
   backend "s3" {
     bucket = "charm-terraform-backend"
-    key    = "smoothie-development"
+    key    = "soft-serve-development"
     region = "us-east-1"
   }
 }
@@ -15,7 +15,7 @@ variable "aws_region" {
 }
 
 variable "app_image" {
-  default = "ghcr.io/charmbracelet/smoothie-internal:snapshot"
+  default = "ghcr.io/charmbracelet/soft-serve-internal:snapshot"
 }
 
 variable "force_new_deployment" {
@@ -26,14 +26,14 @@ variable "authorization_keys" {
   default = ""
 }
 
-module "smoothie" {
-  /* source = "../terraform-aws-smoothie" */
-  source  = "app.terraform.io/charm/smoothie/aws"
-  version = "0.2.1"
+module "soft_serve" {
+  # source = "../terraform-aws-soft-serve"
+  source  = "app.terraform.io/charm/soft-serve/aws"
+  version = "0.3.0"
 
   environment                  = var.environment
   aws_region                   = var.aws_region
-  ecs_task_execution_role_name = "smoothieEcsTaskExecutionRole-${var.environment}"
+  ecs_task_execution_role_name = "softServeEcsTaskExecutionRole-${var.environment}"
   app_image                    = var.app_image
   app_count                    = 2
   app_ssh_port                 = 23231
diff --git a/tui/bubble.go b/tui/bubble.go
index 3e78383144fa003d4316cfd4c96acc0f7b27837f..edc5f28cd038adc4d018025a1e5abb460c9ddaca 100644
--- a/tui/bubble.go
+++ b/tui/bubble.go
@@ -2,10 +2,10 @@ package tui
 
 import (
 	"fmt"
-	"smoothie/git"
-	"smoothie/tui/bubbles/repo"
-	"smoothie/tui/bubbles/selection"
-	"smoothie/tui/style"
+	"soft-serve/git"
+	"soft-serve/tui/bubbles/repo"
+	"soft-serve/tui/bubbles/selection"
+	"soft-serve/tui/style"
 	"strings"
 
 	tea "github.com/charmbracelet/bubbletea"
diff --git a/tui/bubbles/commits/bubble.go b/tui/bubbles/commits/bubble.go
index 1894a504dc3cdaa6d5a3103385b70a40c1908659..593bceb81f111459bbf5a57a0bd45babdd723a06 100644
--- a/tui/bubbles/commits/bubble.go
+++ b/tui/bubbles/commits/bubble.go
@@ -1,7 +1,7 @@
 package commits
 
 import (
-	"smoothie/git"
+	"soft-serve/git"
 	"strings"
 
 	"github.com/charmbracelet/bubbles/viewport"
diff --git a/tui/bubbles/repo/bubble.go b/tui/bubbles/repo/bubble.go
index fb7d6c0415ec3c6879e9d694b78328ac21f68923..fdc579ebbbdd567ad93e1abdd8f62d2301d18a3c 100644
--- a/tui/bubbles/repo/bubble.go
+++ b/tui/bubbles/repo/bubble.go
@@ -3,8 +3,8 @@ package repo
 import (
 	"bytes"
 	"fmt"
-	"smoothie/git"
-	"smoothie/tui/style"
+	"soft-serve/git"
+	"soft-serve/tui/style"
 	"strconv"
 	"text/template"
 
diff --git a/tui/bubbles/selection/bubble.go b/tui/bubbles/selection/bubble.go
index 13f94f12b59fea38d97d839681296c8cf98d85e6..d669007269ab744123ae8fa41e39fa8e8be3b16a 100644
--- a/tui/bubbles/selection/bubble.go
+++ b/tui/bubbles/selection/bubble.go
@@ -1,7 +1,7 @@
 package selection
 
 import (
-	"smoothie/tui/style"
+	"soft-serve/tui/style"
 
 	tea "github.com/charmbracelet/bubbletea"
 )
diff --git a/tui/commands.go b/tui/commands.go
index 6224cd8580446acd298e6ca938e9b0c699e8e26f..2675cb8634c9d06c722edb58051bc77565fa8bd9 100644
--- a/tui/commands.go
+++ b/tui/commands.go
@@ -2,8 +2,8 @@ package tui
 
 import (
 	"fmt"
-	"smoothie/tui/bubbles/repo"
-	"smoothie/tui/bubbles/selection"
+	"soft-serve/tui/bubbles/repo"
+	"soft-serve/tui/bubbles/selection"
 
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
diff --git a/tui/defaults.go b/tui/defaults.go
index eea8af3caa4c6d8e8d3f961f200fe51aeb63fce2..5b7427c6f0368a864e6f1be30e74aaf07a6e069a 100644
--- a/tui/defaults.go
+++ b/tui/defaults.go
@@ -3,16 +3,16 @@ package tui
 import (
 	"os"
 	"path/filepath"
-	"smoothie/git"
+	"soft-serve/git"
 
 	gg "github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
 )
 
-const defaultReadme = "# Smoothie\n\n Welcome! You can configure your Smoothie server by cloning this repo and pushing changes.\n\n## Repos\n\n{{ range .Menu }}* {{ .Name }}{{ if .Note }} - {{ .Note }} {{ end }}\n  - `git clone ssh://{{$.Host}}:{{$.Port}}/{{.Repo}}`\n{{ end }}"
+const defaultReadme = "# Soft-Serve\n\n Welcome! You can configure your Soft-Serve server by cloning this repo and pushing changes.\n\n## Repos\n\n{{ range .Menu }}* {{ .Name }}{{ if .Note }} - {{ .Note }} {{ end }}\n  - `git clone ssh://{{$.Host}}:{{$.Port}}/{{.Repo}}`\n{{ end }}"
 
 const defaultConfig = `{
-	"name": "Smoothie",
+	"name": "Soft-Serve",
 	"show_all_repos": true,
 	"host": "localhost",
 	"port": 23231,
@@ -73,7 +73,7 @@ func createDefaultConfigRepo(rs *git.RepoSource) error {
 		_, err = wt.Commit("Default init", &gg.CommitOptions{
 			All: true,
 			Author: &object.Signature{
-				Name:  "Smoothie Server",
+				Name:  "Soft-Serve Server",
 				Email: "vt100@charm.sh",
 			},
 		})
diff --git a/tui/session.go b/tui/session.go
index da41a8471e6d866f617794cbc59f1a48e1dcd73c..0110cc0e0bc71ddf3ca579d3f3e08a420935d45b 100644
--- a/tui/session.go
+++ b/tui/session.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
-	"smoothie/git"
+	"soft-serve/git"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"