diff --git a/docker-compose.yml b/docker-compose.yml
index 52b0c43..6f19327 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
     # NOTE: export the DISTRIB_IMAGE and DISTRIB_RELEASE environment variables to change the base image during build and run.
     ###
 
-    image: selkies-gstreamer-example:latest-${DISTRIB_IMAGE:-ubuntu}${DISTRIB_RELEASE:-24.04}
+    image: selkies-example:latest-${DISTRIB_IMAGE:-ubuntu}${DISTRIB_RELEASE:-24.04}
     entrypoint: ["/tini", "--", "/bin/bash"]
     build:
       context: ./addons/example
@@ -35,12 +35,12 @@ services:
         # 1. (cd addons/gstreamer && docker build --build-arg DISTRIB_IMAGE=${DISTRIB_IMAGE?} --build-arg DISTRIB_RELEASE=${DISTRIB_RELEASE?} -t gstreamer:latest-${DISTRIB_IMAGE?}${DISTRIB_RELEASE?} .)
         # 2. export GSTREAMER_BASE_IMAGE=gstreamer
         # 3. docker-compose build test
-        GSTREAMER_BASE_IMAGE: ${GSTREAMER_BASE_IMAGE:-ghcr.io/selkies-project/selkies-gstreamer/gstreamer}
+        GSTREAMER_BASE_IMAGE: ${GSTREAMER_BASE_IMAGE:-ghcr.io/selkies-project/selkies/gstreamer}
         GSTREAMER_BASE_IMAGE_RELEASE: ${GSTREAMER_BASE_IMAGE_RELEASE:-main}
 
-        PY_BUILD_IMAGE: selkies-gstreamer-py-build:latest
+        PY_BUILD_IMAGE: selkies-py-build:latest
         WEB_IMAGE: gst-web:latest
-        PYPI_PACKAGE: selkies_gstreamer
+        PYPI_PACKAGE: selkies
         PACKAGE_VERSION: 0.0.0.dev0
     environment:
       # Basic authentication
@@ -72,9 +72,9 @@ services:
       - "8080:8080"
     volumes:
       - type: bind
-        source: ./src/selkies_gstreamer
+        source: ./src/selkies
         # Change Python version to system version
-        target: /usr/local/lib/python3.12/dist-packages/selkies_gstreamer
+        target: /usr/local/lib/python3.12/dist-packages/selkies
         read_only: true
 
     # Configure for interactive session
diff --git a/mkdocs.yml b/mkdocs.yml
index 9dba5d0..6d2fc10 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
-site_name: Selkies-GStreamer
-site_url: https://selkies-project.github.io/selkies-gstreamer
+site_name: Selkies
+site_url: https://selkies-project.github.io/selkies
 site_description: >-
   Open-Source Low-Latency Accelerated Linux WebRTC HTML5 Remote Desktop Streaming Platform for Self-Hosting, Containers, Kubernetes, or Cloud/HPC
 
@@ -7,11 +7,11 @@ theme:
   name: material
 
 # Repository
-repo_name: Selkies-GStreamer
-repo_url: https://github.com/selkies-project/selkies-gstreamer
+repo_name: Selkies
+repo_url: https://github.com/selkies-project/selkies
 
 # Copyright
-copyright: Copyright &copy; <script>document.write(new Date().getFullYear())</script> <a href="https://github.com/selkies-project/selkies-gstreamer" target="_blank" rel="noopener">Selkies Project</a>. All rights reserved.
+copyright: Copyright &copy; <script>document.write(new Date().getFullYear())</script> <a href="https://github.com/selkies-project/selkies" target="_blank" rel="noopener">Selkies Project</a>. All rights reserved.
 
 # Configuration
 theme:
@@ -84,7 +84,7 @@ extra:
   generator: false
   social:
     - icon: fontawesome/brands/github
-      link: https://github.com/selkies-project/selkies-gstreamer
+      link: https://github.com/selkies-project/selkies
     - icon: fontawesome/brands/discord
       link: https://discord.gg/wDNGDeSW5F
 
@@ -111,7 +111,7 @@ markdown_extensions:
 # Navigation
 nav:
   - Home: README.md
-  - 'What is Selkies-GStreamer?': design.md
+  - 'What is Selkies?': design.md
   - 'Getting Started': start.md
   - Usage: usage.md
   - 'Troubleshooting and FAQs': faq.md
diff --git a/pyproject.toml b/pyproject.toml
index faaf5d1..d9f8305 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -42,7 +42,8 @@ Homepage = "https://github.com/selkies-project/selkies-gstreamer"
 "Bug Tracker" = "https://github.com/selkies-project/selkies-gstreamer/issues"
 
 [project.scripts]
-selkies-gstreamer = "selkies_gstreamer.__main__:entrypoint"
+selkies-gstreamer = "selkies.__main__:entrypoint"
+# FIXME
 selkies-gstreamer-resize = "selkies_gstreamer.resize:entrypoint"
 
 [tool.setuptools.packages.find]