diff --git a/src/nix/ping-store.cc b/src/nix/store-info.cc
similarity index 91%
rename from src/nix/ping-store.cc
rename to src/nix/store-info.cc
index 247d9c6bb..a7c595761 100644
--- a/src/nix/ping-store.cc
+++ b/src/nix/store-info.cc
@@ -17,7 +17,7 @@ struct CmdPingStore : StoreCommand, MixJSON
     std::string doc() override
     {
         return
-          #include "ping-store.md"
+          #include "store-info.md"
           ;
     }
 
@@ -50,11 +50,11 @@ struct CmdInfoStore : CmdPingStore
 {
     void run(nix::ref<nix::Store> store) override
     {
-        warn("'nix store info' is a deprecated alias for 'nix store ping'");
+        warn("'nix store ping' is a deprecated alias for 'nix store info'");
         CmdPingStore::run(store);
     }
 };
 
 
-static auto rCmdPingStore = registerCommand2<CmdPingStore>({"store", "ping"});
-static auto rCmdInfoStore = registerCommand2<CmdInfoStore>({"store", "info"});  
+static auto rCmdPingStore = registerCommand2<CmdPingStore>({"store", "info"});
+static auto rCmdInfoStore = registerCommand2<CmdInfoStore>({"store", "ping"});
diff --git a/src/nix/ping-store.md b/src/nix/store-info.md
similarity index 82%
rename from src/nix/ping-store.md
rename to src/nix/store-info.md
index 8c846791b..f86efd722 100644
--- a/src/nix/ping-store.md
+++ b/src/nix/store-info.md
@@ -5,19 +5,19 @@ R""(
 * Test whether connecting to a remote Nix store via SSH works:
 
   ```console
-  # nix store ping --store ssh://mac1
+  # nix store info --store ssh://mac1
   ```
 
 * Test whether a URL is a valid binary cache:
 
   ```console
-  # nix store ping --store https://cache.nixos.org
+  # nix store info --store https://cache.nixos.org
   ```
 
 * Test whether the Nix daemon is up and running:
 
   ```console
-  # nix store ping --store daemon
+  # nix store info --store daemon
   ```
 
 # Description
diff --git a/tests/functional/store-ping.sh b/tests/functional/store-info.sh
similarity index 69%
rename from tests/functional/store-ping.sh
rename to tests/functional/store-info.sh
index 9846c7d3d..c002e50be 100644
--- a/tests/functional/store-ping.sh
+++ b/tests/functional/store-info.sh
@@ -1,7 +1,7 @@
 source common.sh
 
-STORE_INFO=$(nix store ping 2>&1)
-STORE_INFO_JSON=$(nix store ping --json)
+STORE_INFO=$(nix store info 2>&1)
+STORE_INFO_JSON=$(nix store info --json)
 
 echo "$STORE_INFO" | grep "Store URL: ${NIX_REMOTE}"
 
@@ -11,7 +11,7 @@ if [[ -v NIX_DAEMON_PACKAGE ]] && isDaemonNewer "2.7.0pre20220126"; then
     [[ "$(echo "$STORE_INFO_JSON" | jq -r ".version")" == "$DAEMON_VERSION" ]]
 fi
 
-expect 127 NIX_REMOTE=unix:$PWD/store nix store ping || \
-    fail "nix store ping on a non-existent store should fail"
+expect 127 NIX_REMOTE=unix:$PWD/store nix store info || \
+    fail "nix store info on a non-existent store should fail"
 
 [[ "$(echo "$STORE_INFO_JSON" | jq -r ".url")" == "${NIX_REMOTE:-local}" ]]