diff --git a/deployments/README.md b/deployments/README.md
index e0bc43bdd9..31449e82fa 100644
--- a/deployments/README.md
+++ b/deployments/README.md
@@ -53,7 +53,7 @@ a run of the full deploy logic.
 There are several DNS records that are not handled
 by the automation in this repo. Each testnet should have:
 
-* `rpc.<fqdn>` # the tendermint rpc service
+* `rpc.<fqdn>` # the cometbft rpc service
 * `grpc.<fqdn>` # the pd grpc service
 * `grafana.<fqdn>` # web interface for metrics dashboards
 
diff --git a/deployments/charts/penumbra-network/templates/deployment.yaml b/deployments/charts/penumbra-network/templates/deployment.yaml
index cce17c62c4..9155b34fe4 100644
--- a/deployments/charts/penumbra-network/templates/deployment.yaml
+++ b/deployments/charts/penumbra-network/templates/deployment.yaml
@@ -33,7 +33,7 @@ spec:
         app.kubernetes.io/component: genesis-validator
         {{- include "penumbra-network.selectorLabels" $ | nindent 8 }}
     spec:
-      # Force the pods to different k8s nodes, so that egress ip is unique per Tendermint node.
+      # Force the pods to different k8s nodes, so that egress ip is unique per CometBFT node.
       # Effectively limits the number of Penumbra nodes to the number of k8s nodes in the cluster.
       affinity:
         podAntiAffinity:
diff --git a/deployments/charts/penumbra-node/templates/NOTES.txt b/deployments/charts/penumbra-node/templates/NOTES.txt
index 425a7cdc55..2566e3b5f3 100644
--- a/deployments/charts/penumbra-node/templates/NOTES.txt
+++ b/deployments/charts/penumbra-node/templates/NOTES.txt
@@ -4,7 +4,7 @@ You can access the pd gRPC service here:
 
   https://{{.Values.ingressRoute.hosts.pd }}
 
-You can access the Tendermint RPC service here:
+You can access the CometBFT RPC service here:
 
   https://{{.Values.ingressRoute.hosts.tm }}
 
@@ -15,7 +15,7 @@ run this command locally:
 
 {{- else }}
 You have not enabled an ingress (via `ingressRoute.enabled=true`),
-so consult the logs to ensure that Tendermint is processing blocks
+so consult the logs to ensure that CometBFT is processing blocks
 to catch up with the network. Even without an HTTPS ingress,
 your node is still able to interact with the network.
 {{- end }}
diff --git a/deployments/scripts/relayer-local-devnet b/deployments/scripts/relayer-local-devnet
index f5af6bcb86..03e9581185 100755
--- a/deployments/scripts/relayer-local-devnet
+++ b/deployments/scripts/relayer-local-devnet
@@ -17,9 +17,9 @@ fi
 echo "Generating new local devnet..."
 cargo run --release --bin pd -- testnet generate --chain-id penumbra-devnet-local
 
-echo "Starting Tendermint..."
-tendermint start --log_level=error --home "${HOME}/.penumbra/testnet_data/node0/tendermint" &
-tendermint_pid="$!"
+echo "Starting CometBFT..."
+cometbft start --log_level=error --home "${HOME}/.penumbra/testnet_data/node0/cometbft" &
+cometbft_pid="$!"
 
 export RUST_LOG="info,[CheckTx]=debug"
 echo "Starting pd..."
@@ -27,7 +27,7 @@ cargo run --release --bin pd -- start --home "${HOME}/.penumbra/testnet_data/nod
 pd_pid="$!"
 
 # Ensure processes are cleaned up after script exits, regardless of status.
-trap 'kill -9 "$tendermint_pid" "$pd_pid"' EXIT
+trap 'kill -9 "$cometbft_pid" "$pd_pid"' EXIT
 
 echo "Waiting a bit for network to start..."
 sleep 10
diff --git a/deployments/scripts/smoke-test.sh b/deployments/scripts/smoke-test.sh
index feae5a25e2..5033791abc 100755
--- a/deployments/scripts/smoke-test.sh
+++ b/deployments/scripts/smoke-test.sh
@@ -38,7 +38,7 @@ echo "Generating testnet config..."
 EPOCH_DURATION="${EPOCH_DURATION:-100}"
 cargo run --quiet --release --bin pd -- testnet generate --epoch-duration "$EPOCH_DURATION" --timeout-commit 500ms
 
-echo "Starting Tendermint..."
+echo "Starting CometBFT..."
 cometbft start --log_level=error --home "${HOME}/.penumbra/testnet_data/node0/cometbft" &
 cometbft_pid="$!"
 
diff --git a/deployments/systemd/README.md b/deployments/systemd/README.md
index bd0613ff27..cd7b8e0d91 100644
--- a/deployments/systemd/README.md
+++ b/deployments/systemd/README.md
@@ -1,6 +1,6 @@
 # systemd unit files for Penumbra
 
-Here are example unit files for running Penumbra (and the required Tendermint instance)
+Here are example unit files for running Penumbra (and the required CometBFT instance)
 via systemd. *You'll need to customize the the service files*, particularly the `User` declaration
 and binary fullpath in `ExecStart`, and possibly the path to the home directory, depending on your system.
 
@@ -10,19 +10,19 @@ Copy the service files to a system-wide location:
 ```bash
 # use 'envsubst' to replace `$USER` with your local username
 envsubst < penumbra.service | sudo tee /etc/systemd/system/penumbra.service
-envsubst < tendermint.service | sudo tee /etc/systemd/system/tendermint.service
+envsubst < cometbft.service | sudo tee /etc/systemd/system/cometbft.service
 sudo systemctl daemon-reload
-sudo systemctl restart penumbra tendermint
+sudo systemctl restart penumbra cometbft
 
 # view logs to monitor for errors
-sudo journalctl -af -u penumbra -u tendermint
+sudo journalctl -af -u penumbra -u cometbft
 ```
 
 ## Uninstalling
 To remove the configs, run:
 
 ```bash
-sudo systemctl disable --now penumbra tendermint
-sudo rm /etc/systemd/system/{penumbra,tendermint}.service
+sudo systemctl disable --now penumbra cometbft
+sudo rm /etc/systemd/system/{penumbra,cometbft}.service
 sudo systemctl daemon-reload
 ```
diff --git a/deployments/systemd/penumbra.service b/deployments/systemd/penumbra.service
index 7b51b0013e..b958a9cfc1 100644
--- a/deployments/systemd/penumbra.service
+++ b/deployments/systemd/penumbra.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Penumbra pd
-Wants=tendermint.service
+Wants=cometbft.service
 
 [Service]
 ExecStart=/usr/local/bin/pd start --home $HOME/.penumbra/testnet_data/node0/pd