diff --git a/Cargo.toml b/Cargo.toml
index 69bb25c3..98c6e7d6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,13 +60,13 @@ depends = "$auto"
 license-file = ["LICENSE.md", "4"]
 assets = [
   # TODO?
-  # ["assets/man/mosaic.1", "usr/share/man/man1/mosaic.1", "644"],
-  ["target/release/mosaic", "usr/bin/mosaic", "755"],
-  ["GOVERNANCE.md", "usr/share/doc/mosaic/GOVERNANCE.md", "644"],
-  ["README.md", "usr/share/doc/mosaic/README.md", "644"],
-  ["assets/layouts/*", "usr/share/mosaic/layouts/", "644"],
-  ["assets/plugins/*", "usr/share/mosaic/plugins/", "644"],
-  ["assets/completions/mosaic.bash", "usr/share/bash-completion/completions/mosaic.bash", "644"],
-  ["assets/completions/mosaic.fish", "usr/share/fish/vendor_completions.d/mosaic.fish", "644"],
-  ["assets/completions/_mosaic", "usr/share/zsh/vendor-completions/_mosaic", "644"],
+  # ["assets/man/zellij.1", "usr/share/man/man1/zellij.1", "644"],
+  ["target/release/zellij", "usr/bin/zellij", "755"],
+  ["GOVERNANCE.md", "usr/share/doc/zellij/GOVERNANCE.md", "644"],
+  ["README.md", "usr/share/doc/zellij/README.md", "644"],
+  ["assets/layouts/*", "usr/share/zellij/layouts/", "644"],
+  ["assets/plugins/*", "usr/share/zellij/plugins/", "644"],
+  ["assets/completions/zellij.bash", "usr/share/bash-completion/completions/zellij.bash", "644"],
+  ["assets/completions/zellij.fish", "usr/share/fish/vendor_completions.d/zellij.fish", "644"],
+  ["assets/completions/_zellij", "usr/share/zsh/vendor-completions/_zellij", "644"],
 ]
diff --git a/assets/completions/_zellij b/assets/completions/_zellij
index d2f67e56..64bd538c 100644
--- a/assets/completions/_zellij
+++ b/assets/completions/_zellij
@@ -15,15 +15,15 @@ _zellij() {
 
     local context curcontext="$curcontext" state line
     _arguments "${_arguments_options[@]}" \
-'-s+[Send "split (direction h == horizontal / v == vertical)" to active mosaic session]' \
-'--split=[Send "split (direction h == horizontal / v == vertical)" to active mosaic session]' \
-'-o+[Send "open file in new pane" to active mosaic session]' \
-'--open-file=[Send "open file in new pane" to active mosaic session]' \
+'-s+[Send "split (direction h == horizontal / v == vertical)" to active zellij session]' \
+'--split=[Send "split (direction h == horizontal / v == vertical)" to active zellij session]' \
+'-o+[Send "open file in new pane" to active zellij session]' \
+'--open-file=[Send "open file in new pane" to active zellij session]' \
 '--max-panes=[Maximum panes on screen, caution: opening more panes will close old ones]' \
 '-l+[Path to a layout yaml file]' \
 '--layout=[Path to a layout yaml file]' \
-'-m[Send "move focused pane" to active mosaic session]' \
-'--move-focus[Send "move focused pane" to active mosaic session]' \
+'-m[Send "move focused pane" to active zellij session]' \
+'--move-focus[Send "move focused pane" to active zellij session]' \
 '-d[]' \
 '--debug[]' \
 '-h[Prints help information]' \
diff --git a/assets/completions/zellij.fish b/assets/completions/zellij.fish
index ee5c9ccb..e902823f 100644
--- a/assets/completions/zellij.fish
+++ b/assets/completions/zellij.fish
@@ -1,8 +1,8 @@
-complete -c zellij -n "__fish_use_subcommand" -s s -l split -d 'Send "split (direction h == horizontal / v == vertical)" to active mosaic session'
-complete -c zellij -n "__fish_use_subcommand" -s o -l open-file -d 'Send "open file in new pane" to active mosaic session'
+complete -c zellij -n "__fish_use_subcommand" -s s -l split -d 'Send "split (direction h == horizontal / v == vertical)" to active zellij session'
+complete -c zellij -n "__fish_use_subcommand" -s o -l open-file -d 'Send "open file in new pane" to active zellij session'
 complete -c zellij -n "__fish_use_subcommand" -l max-panes -d 'Maximum panes on screen, caution: opening more panes will close old ones'
 complete -c zellij -n "__fish_use_subcommand" -s l -l layout -d 'Path to a layout yaml file'
-complete -c zellij -n "__fish_use_subcommand" -s m -l move-focus -d 'Send "move focused pane" to active mosaic session'
+complete -c zellij -n "__fish_use_subcommand" -s m -l move-focus -d 'Send "move focused pane" to active zellij session'
 complete -c zellij -n "__fish_use_subcommand" -s d -l debug
 complete -c zellij -n "__fish_use_subcommand" -s h -l help -d 'Prints help information'
 complete -c zellij -n "__fish_use_subcommand" -s V -l version -d 'Prints version information'
diff --git a/build.rs b/build.rs
index 8e0dfa7c..1628636c 100644
--- a/build.rs
+++ b/build.rs
@@ -112,7 +112,7 @@ fn main() {
         "layouts/default.yaml",
         "layouts/strider.yaml",
     ];
-    let project_dirs = ProjectDirs::from("org", "Mosaic Contributors", "Mosaic").unwrap();
+    let project_dirs = ProjectDirs::from("org", "Zellij Contributors", "Zellij").unwrap();
     let data_dir = project_dirs.data_dir();
     fs::create_dir_all(data_dir.join("plugins")).unwrap();
     fs::create_dir_all(data_dir.join("layouts")).unwrap();
diff --git a/default-tiles/status-bar/src/main.rs b/default-tiles/status-bar/src/main.rs
index b0468a8e..ba1868ea 100644
--- a/default-tiles/status-bar/src/main.rs
+++ b/default-tiles/status-bar/src/main.rs
@@ -23,7 +23,7 @@ impl Display for LinePart {
 }
 
 fn prefix(help: &Help) -> LinePart {
-    let prefix_text = " Mosaic ";
+    let prefix_text = " Zellij ";
     let part = match (&help.mode, help.mode_is_persistent) {
         (InputMode::Command, false) => {
             let prefix = prefix_text.bold().white().on_black();