diff --git a/Makefile b/Makefile
index eb514cd..996cbd3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Raccoon Mission: OpenedAI Speech Development Makefile
+# Raccoon Mission: UncloseAI Speech Development Makefile
 # Deploy to remote server with ease
 # Configuration is loaded from vars.sh (copy vars.sh.example to vars.sh)
 
@@ -11,8 +11,8 @@ endif
 # Fallback defaults if vars.sh is not found
 REMOTE_HOST ?= localhost
 REMOTE_USER ?= $(USER)
-REMOTE_PATH ?= ~/openedai-speech-fresh
-CONTAINER_NAME ?= openedai-speech-fresh-server-1
+REMOTE_PATH ?= ~/uncloseai-speech-fresh
+CONTAINER_NAME ?= uncloseai-speech-fresh-server-1
 
 .PHONY: help deploy sync restart logs test clean stop start voices
 
diff --git a/README.md b/README.md
index 13cb8ad..25d8be0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# OpenedAI Speech
+# UncloseAI Speech
 
 Notice: This software is mostly obsolete and will no longer be updated.
 
@@ -219,7 +219,7 @@ docker compose -f docker-compose.min.yml up
 usage: speech.py [-h] [--xtts_device XTTS_DEVICE] [--preload PRELOAD] [--unload-timer UNLOAD_TIMER] [--use-deepspeed] [--no-cache-speaker] [-P PORT] [-H HOST]
                  [-L {DEBUG,INFO,WARNING,ERROR,CRITICAL}]
 
-OpenedAI Speech API Server
+UncloseAI Speech API Server
 
 options:
   -h, --help            show this help message and exit
@@ -405,7 +405,7 @@ Adding a custom xtts model is simple. Here is an example of how to add a custom
 
 1) Save the model folder under `voices/` (all 4 files are required, including the vocab.json from the model)
 ```
-openedai-speech$ ls voices/halo/
+uncloseai-speech$ ls voices/halo/
 config.json  vocab.json  model.pth  sample.wav
 ```
 2) Add the custom voice entry under the `tts-1-hd` section of `config/voice_to_speaker.yaml`:
diff --git a/docker-compose.min.yml b/docker-compose.min.yml
index eea131e..53f9ea6 100644
--- a/docker-compose.min.yml
+++ b/docker-compose.min.yml
@@ -2,7 +2,7 @@ services:
   server:
     build:
       dockerfile: Dockerfile.min # piper for all models, no gpu/nvidia required, ~1GB
-    image: ghcr.io/matatonic/openedai-speech-min
+    image: ghcr.io/matatonic/uncloseai-speech-min
     env_file: speech.env
     ports:
       - "8000:8000"
diff --git a/docker-compose.rocm.yml b/docker-compose.rocm.yml
index 8f3bf4e..9957380 100644
--- a/docker-compose.rocm.yml
+++ b/docker-compose.rocm.yml
@@ -4,7 +4,7 @@ services:
       dockerfile: Dockerfile
       args:
         - USE_ROCM=1
-    image: ghcr.io/matatonic/openedai-speech-rocm
+    image: ghcr.io/matatonic/uncloseai-speech-rocm
     env_file: speech.env
     ports:
       - "8000:8000"
diff --git a/docker-compose.yml b/docker-compose.yml
index 76a8c60..a162deb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   server:
     build:
       dockerfile: Dockerfile
-    image: ghcr.io/matatonic/openedai-speech
+    image: ghcr.io/matatonic/uncloseai-speech
     env_file: speech.env
     ports:
       - "8000:8000"
diff --git a/requirements.txt b/requirements.txt
index f8e6873..137d12b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,8 @@ loguru
 # OHF-Voice fork doesn't have installable Python package yet
 # Stick with PyPI piper-tts but use absolute paths in config
 piper-tts>=1.2.0
+# 🦝 RACCOON TODO: Create our own PyPI package from OHF-Voice fork
+# git+https://github.com/OHF-Voice/piper1-gpl.git@v1.3.0#subdirectory=src/python_run
 coqui-tts[languages]
 langdetect
 pyyaml
diff --git a/speech.py b/speech.py
index 6092d84..a8508a8 100755
--- a/speech.py
+++ b/speech.py
@@ -425,7 +425,7 @@ def auto_torch_device():
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description='OpenedAI Speech API Server',
+        description='UncloseAI Speech API Server',
         formatter_class=argparse.ArgumentDefaultsHelpFormatter)
 
     parser.add_argument('--xtts_device', action='store', default=auto_torch_device(), help="Set the device for the xtts model. The special value of 'none' will use piper for all models.")
diff --git a/vars.sh.example b/vars.sh.example
index b1ec82d..1cc2c62 100644
--- a/vars.sh.example
+++ b/vars.sh.example
@@ -4,5 +4,5 @@
 
 export REMOTE_HOST="your.server.hostname"
 export REMOTE_USER="your_username"
-export REMOTE_PATH="~/openedai-speech-fresh"
-export CONTAINER_NAME="openedai-speech-fresh-server-1"
+export REMOTE_PATH="~/uncloseai-speech-fresh"
+export CONTAINER_NAME="uncloseai-speech-fresh-server-1"