diff --git a/Makefile.am b/Makefile.am
index 9b791cc0e..31525e2c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \
 	       $(top_srcdir)/contrib/rpm
 DIST_SHARE = \
   $(top_srcdir)/share/genbuild.sh \
-  $(top_srcdir)/share/rpcuser
+  $(top_srcdir)/share/rpcauth
 
 BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
            $(top_srcdir)/contrib/devtools/security-check.py
diff --git a/contrib/debian/examples/bitcoin.conf b/contrib/debian/examples/bitcoin.conf
index 14a59fdf6..4dd73162a 100644
--- a/contrib/debian/examples/bitcoin.conf
+++ b/contrib/debian/examples/bitcoin.conf
@@ -77,9 +77,9 @@
 #rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
 #
 # The second method `rpcauth` can be added to server startup argument. It is set at initialization time
-# using the output from the script in share/rpcuser/rpcuser.py after providing a username:
+# using the output from the script in share/rpcauth/rpcauth.py after providing a username:
 #
-# ./share/rpcuser/rpcuser.py alice
+# ./share/rpcauth/rpcauth.py alice
 # String to be appended to bitcoin.conf:
 # rpcauth=alice:f7efda5c189b999524f151318c0c86$d5b51b3beffbc02b724e5d095828e0bc8b2456e9ac8757ae3211a5d9b16a22ae
 # Your password:
diff --git a/share/rpcauth/README.md b/share/rpcauth/README.md
new file mode 100644
index 000000000..389278a12
--- /dev/null
+++ b/share/rpcauth/README.md
@@ -0,0 +1,10 @@
+RPC Tools
+---------------------
+
+### [RPCAuth](/share/rpcauth) ###
+
+Create login credentials for a JSON-RPC user.
+
+Usage:
+
+    ./rpcauth.py <username>
diff --git a/share/rpcuser/rpcuser.py b/share/rpcauth/rpcauth.py
similarity index 100%
rename from share/rpcuser/rpcuser.py
rename to share/rpcauth/rpcauth.py
diff --git a/share/rpcuser/README.md b/share/rpcuser/README.md
deleted file mode 100644
index 12a8e6fb0..000000000
--- a/share/rpcuser/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-RPC Tools
----------------------
-
-### [RPCUser](/share/rpcuser) ###
-
-Create an RPC user login credential.
-
-Usage:
-
-    ./rpcuser.py <username>