diff --git a/alacritty/toolbox-ephemeral.toml b/alacritty/fedora-ephemeral.toml
similarity index 56%
rename from alacritty/toolbox-ephemeral.toml
rename to alacritty/fedora-ephemeral.toml
index e94181745..e18a72655 100644
--- a/alacritty/toolbox-ephemeral.toml
+++ b/alacritty/fedora-ephemeral.toml
@@ -1,15 +1,15 @@
-import = ["/var/home/jpm/.dotfiles/alacritty/alacritty.toml", "/var/home/jpm/.dotfiles/alacritty/toolbox.toml"]
+import = ["/var/home/jpm/.dotfiles/alacritty/alacritty.toml", "/var/home/jpm/.dotfiles/alacritty/fedora.toml"]
 
 [env]
 TERM_TITLE = "Alacritty (Fedora Ephemeral)"
 
 [shell]
-args = ["ephemeral", "-i", "fedora:37"]
+args = ["ephemeral", "-i", "fedora:39"]
 program = "/usr/bin/distrobox"
 
 [window]
 title = "Alacritty - Fedora (Ephemeral)"
 
 [window.class]
-general = "Alacritty-toolbox-ephemeral"
-instance = "Alacritty-toolbox-ephemeral"
+general = "Alacritty-fedora-ephemeral"
+instance = "Alacritty-fedora-ephemeral"
diff --git a/alacritty/toolbox.toml b/alacritty/fedora.toml
similarity index 90%
rename from alacritty/toolbox.toml
rename to alacritty/fedora.toml
index 52ce76e86..b0601d368 100644
--- a/alacritty/toolbox.toml
+++ b/alacritty/fedora.toml
@@ -47,12 +47,12 @@ family = "Anonymice Nerd Font"
 style = "Regular"
 
 [shell]
-args = ["enter", "toolbox"]
+args = ["enter", "fedora"]
 program = "/usr/bin/distrobox"
 
 [window]
 title = "Alacritty - Fedora (Distrobox)"
 
 [window.class]
-general = "Alacritty-toolbox"
-instance = "Alacritty-toolbox"
+general = "Alacritty-fedora"
+instance = "Alacritty-fedora"
diff --git a/bash/bash_aliases.distrobox b/bash/bash_aliases.distrobox
index e18dcec7b..1760efb00 100644
--- a/bash/bash_aliases.distrobox
+++ b/bash/bash_aliases.distrobox
@@ -1,4 +1,2 @@
 # vim: ft=sh
 
-# Already in a toolbox
-alias toolbox="echo You are already in a toolbox"
diff --git a/bash/bash_aliases.host b/bash/bash_aliases.host
index 0383a1db3..fc7c93bc1 100644
--- a/bash/bash_aliases.host
+++ b/bash/bash_aliases.host
@@ -1,7 +1,5 @@
 # vim: ft=sh
 
-# Script to restore toolbox after it was replaced with distrobox and removed the default 'toolbox' name
-alias toolbox="$HOME/scripts/toolbox.sh"
 alias butane='podman run --rm --interactive       \
               --security-opt label=disable        \
               --volume ${PWD}:/pwd --workdir /pwd \
diff --git a/fastfetch/toolbox.jsonc b/fastfetch/fedora.jsonc
similarity index 100%
rename from fastfetch/toolbox.jsonc
rename to fastfetch/fedora.jsonc
diff --git a/sway/bindings b/sway/bindings
index f4b52495c..0376d10f8 100644
--- a/sway/bindings
+++ b/sway/bindings
@@ -48,8 +48,8 @@ bindsym $mod+u exec ${HOME}/scripts/tofi/tofi-drun.sh
 # Add Shift: Alternative launcher for literal commands
 bindsym $mod+Shift+u exec ${HOME}/.local/bin/gmrun
 
-# Middle: Fedora distrobox ('toolbox' is a legacy naming convention)
-bindsym $mod+e exec /usr/bin/alacritty --config-file ${HOME}/.dotfiles/alacritty/toolbox.toml
+# Middle: Fedora distrobox
+bindsym $mod+e exec /usr/bin/alacritty --config-file ${HOME}/.dotfiles/alacritty/fedora.toml
 # Add Shift: start a remote shell
 # TODO: bindsym $mod+Shift+e exec ${HOME}/scripts/wofi/wofi-ssh-menu.sh
 bindsym $mod+Shift+e exec ${HOME}/scripts/rofi/rofi-ssh-menu.sh
@@ -74,7 +74,7 @@ bindsym $mod+Shift+a exec ${HOME}/scripts/send-to-kodi.sh
 # Index: Host terminal (should be rarely used)
 bindsym $mod+p exec /usr/bin/alacritty --config-file ${HOME}/.dotfiles/alacritty/host.toml
 # Add Shift: Fedora Ephemeral
-bindsym $mod+Shift+p exec /usr/bin/alacritty --config-file ${HOME}/.dotfiles/alacritty/toolbox-ephemeral.toml
+bindsym $mod+Shift+p exec /usr/bin/alacritty --config-file ${HOME}/.dotfiles/alacritty/fedora-ephemeral.toml
 
 # Middle: Debian (Testing)
 bindsym $mod+period exec /usr/bin/alacritty --config-file ${HOME}/.dotfiles/alacritty/debian.toml