diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 96800272..4253207a 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -361,7 +361,7 @@ softwareGroups:
     - watchexec
     # - watchman
     - wget
-    - whalebrew
+    - docker-whalebrew
     - wifi-password
     - yq
     - zoxide
@@ -685,7 +685,7 @@ softwareGroups:
     - yarnhook
   Go: &Go
     # - delve
-    - go
+    - golang
     - goreleaser
     # - go-outline
     - gomodifytags
@@ -702,7 +702,7 @@ softwareGroups:
     # - kdash
     # - kn
     # TODO: Check if some of these are installed by Krew and remove if they are
-    # - krew
+    # - kubectl-krew
     # - kubectx
     # - kubekey
     # - kubenav
@@ -936,7 +936,7 @@ softwareGroups:
     - php
   Package-Management: &Package-Management
     # - homebrew
-    - whalebrew
+    - docker-whalebrew
     - eget
     - gup
     - mise
@@ -959,6 +959,7 @@ softwareGroups:
     - flake8
     - isort
     # - mambaforge
+    - python-pipx
     - poetry
     - python
     - virtualenv
@@ -1306,7 +1307,7 @@ softwareGroups:
     # - gitlab-runner
     - gitomatic
     - glusterfs
-    - go
+    - golang
     - gomplate
     # - goofys
     # - gradle
diff --git a/software.yml b/software.yml
index b8e46916..c78cbdda 100644
--- a/software.yml
+++ b/software.yml
@@ -30,7 +30,7 @@ installerPreference:
     - ansible
     - binary
     - whalebrew
-  dnf:
+  fedora:
     - dnf
     - brew
     - go
@@ -53,7 +53,7 @@ installerPreference:
     - npm
     - gem
     - script
-  pacman:
+  arch:
     - pacman
     - yay
     - brew
@@ -98,7 +98,7 @@ installerPreference:
     - script
     - ansible
     - binary
-  zypper:
+  openSUSE:
     - zypper
     - brew
     - go
@@ -3795,7 +3795,7 @@ softwarePackages:
     _bin: gnutls-certtool
     _github: false
     brew: gnutls
-  go:
+  golang:
     _bin: go
     _desc: "Go is an open source programming language that makes it easy to build simple, reliable, and efficient software."
     _docs: https://go.dev/doc/
@@ -5068,7 +5068,7 @@ softwarePackages:
     _github: https://github.com/oguzhaninan/korkut
     _name: Korkut
     npm: korkut
-  krew:
+  kubctl-krew:
     _bin: kubectl-krew
     _desc: "📦 Find and install kubectl plugins"
     _github: https://github.com/kubernetes-sigs/krew
@@ -7517,7 +7517,7 @@ softwarePackages:
     _name: Pipelight
     cargo:linux: --git https://github.com/pipelight/pipelight
     yay: pipelight
-  pipx:
+  python-pipx:
     _bin: pipx
     _deprecated: The `pipx` installation is handled by the `install-program` program bundled with Install Doctor.
     _desc: "Install and Run Python Applications in Isolated Environments"
@@ -10704,7 +10704,7 @@ softwarePackages:
     apt: wget
     brew: wget
     dnf: wget
-  whalebrew:
+  docker-whalebrew:
     _bin: whalebrew
     _desc: "Homebrew, but with Docker images"
     _docs: https://github.com/whalebrew/whalebrew#usage