diff --git a/Cargo.toml b/Cargo.toml
index 9440a1a28..bf63064c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,8 +18,8 @@ authors = [
 license = "Apache-2.0"
 
 [[bin]]
-name = "solana-client-demo"
-path = "src/bin/client-demo.rs"
+name = "solana-bench-tps"
+path = "src/bin/bench-tps.rs"
 
 [[bin]]
 name = "solana-wallet"
diff --git a/ci/testnet-sanity.sh b/ci/testnet-sanity.sh
index 79735c8f8..72dfd9386 100755
--- a/ci/testnet-sanity.sh
+++ b/ci/testnet-sanity.sh
@@ -30,7 +30,7 @@ else
   if [[ -n "$USE_SNAP" ]]; then
     # TODO: Merge client.sh functionality into solana-client-demo proper and
     #       remove this USE_SNAP case
-    cmd=$solana_client_demo
+    cmd=$solana_bench_tps
   else
     cmd=multinode-demo/client.sh
   fi
diff --git a/multinode-demo/client.sh b/multinode-demo/client.sh
index b304f0b80..d6af6b86b 100755
--- a/multinode-demo/client.sh
+++ b/multinode-demo/client.sh
@@ -46,7 +46,7 @@ while true; do
     client_json="$SOLANA_CONFIG_CLIENT_DIR"/client.json
     [[ -r $client_json ]] || $solana_keygen -o "$client_json"
 
-    $solana_client_demo \
+    $solana_bench_tps \
       -n "$count" \
       -l "$SOLANA_CONFIG_CLIENT_DIR"/leader.json \
       -k "$SOLANA_CONFIG_CLIENT_DIR"/client.json \
diff --git a/multinode-demo/common.sh b/multinode-demo/common.sh
index d9a9655a8..0b003d5cd 100644
--- a/multinode-demo/common.sh
+++ b/multinode-demo/common.sh
@@ -24,7 +24,7 @@ fi
 if [[ -d $SNAP ]]; then # Running inside a Linux Snap?
   solana_program() {
     declare program="$1"
-    if [[ "$program" = wallet || "$program" = client-demo ]]; then
+    if [[ "$program" = wallet || "$program" = bench-tps ]]; then
       # TODO: Merge wallet.sh/client.sh functionality into
       #       solana-wallet/solana-demo-client proper and remove this special case
       printf "%s/bin/solana-%s" "$SNAP" "$program"
@@ -84,7 +84,7 @@ else
   fi
 fi
 
-solana_client_demo=$(solana_program client-demo)
+solana_bench_tps=$(solana_program bench-tps)
 solana_wallet=$(solana_program wallet)
 solana_drone=$(solana_program drone)
 solana_fullnode=$(solana_program fullnode)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 5bd307603..07470b3ee 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -44,10 +44,10 @@ apps:
     command: solana-keygen
     plugs:
       - home
-  client-demo:
-    # TODO: Merge client.sh functionality into solana-client-demo proper
+  bench-tps:
+    # TODO: Merge client.sh functionality into solana-bench-tps proper
     command: client.sh
-    #command: solana-client-demo
+    #command: solana-bench-tps
     plugs:
       - network
       - network-bind
diff --git a/src/bin/client-demo.rs b/src/bin/bench-tps.rs
similarity index 99%
rename from src/bin/client-demo.rs
rename to src/bin/bench-tps.rs
index 133ca41d8..b982d3bce 100644
--- a/src/bin/client-demo.rs
+++ b/src/bin/bench-tps.rs
@@ -162,7 +162,7 @@ fn main() {
     let mut num_nodes = 1usize;
     let mut time_sec = 90;
 
-    let matches = App::new("solana-client-demo")
+    let matches = App::new("solana-bench-tps")
         .arg(
             Arg::with_name("leader")
                 .short("l")