diff --git a/assets/js/tx-sender.js b/assets/js/tx-sender.js
index 514a26e3cb..705e530c1c 100644
--- a/assets/js/tx-sender.js
+++ b/assets/js/tx-sender.js
@@ -87,7 +87,7 @@ const set_up_tx_sender = async function() {
       dataType: 'json',
       success: faucet_response,
       error: function() {
-        errorNotif("There was an error with the XRP Ledger Test Net Faucet. Reload this page to try again.")
+        errorNotif("There was an error with the XRP Ledger Testnet Faucet. Reload this page to try again.")
       }
     })
   })
@@ -104,7 +104,7 @@ const set_up_tx_sender = async function() {
     $("#connection-status-item").text("Not connected")
     $("#connection-status-item").removeClass("active").addClass("disabled")
   })
-  console.log("Connecting to Test Net WebSocket...")
+  console.log("Connecting to Testnet WebSocket...")
   api.connect()
 
   //////////////////////////////////////////////////////////////////////////////
diff --git a/dactyl-config.yml b/dactyl-config.yml
index 9fa6ddeb6d..cc1d2022a0 100644
--- a/dactyl-config.yml
+++ b/dactyl-config.yml
@@ -3037,11 +3037,19 @@ pages:
 
     -   name: XRP Test Net Faucet
         funnel: Dev Tools
-        html: xrp-test-net-faucet.html
+        html: xrp-testnet-faucet.html
         targets:
             - local
         template: template-test-net.html
 
+    -   name: XRP Test Net Faucet # Redirect from old URL
+        funnel: Dev Tools
+        html: xrp-test-net-faucet.html
+        template: template-redirect.html
+        redirect_url: xrp-testnet-faucet.html
+        targets:
+            - local
+
     -   name: Transaction Sender
         funnel: Dev Tools
         html: tx-sender.html
diff --git a/tool/template-test-net.html b/tool/template-test-net.html
index cf581d069c..5e781ae5c5 100644
--- a/tool/template-test-net.html
+++ b/tool/template-test-net.html
@@ -5,13 +5,13 @@
 {% block right_sidebar %}
 <div id="test-net-servers" class="card">
   <div class="card-header">
-    <h4>Test Net Servers</h4>
+    <h4>Testnet Servers</h4>
   </div>
   <div class="card-body">
-    <p>Use the following URLs to connect to the XRP Test Net and send transactions, or <a href="connect-your-rippled-to-the-xrp-test-net.html">connect your own <code>rippled</code> server to the Test Net</a>.</p>
-    <h5>Websockets and Ripple API</h4>
+    <p>Use the following URLs to connect to the XRP Testnet and send transactions, or <a href="connect-your-rippled-to-the-xrp-test-net.html">connect your own <code>rippled</code> server to the Testnet</a>.</p>
+    <h5>Websockets and Ripple API</h5>
     <pre><code>wss://s.altnet.rippletest.net:51233</code></pre>
-    <h5>JSON-RPC</h4>
+    <h5>JSON-RPC</h5>
     <pre><code>https://s.altnet.rippletest.net:51234</code></pre>
   </div>
 </div>
@@ -19,11 +19,11 @@
 
 {% block main %}
 <section class="container-fluid pt-3 p-md-3">
-  <h1>XRP Test Net Faucet</h1>
+  <h1>XRP Testnet Faucet</h1>
 
   <div class="content">
-    <p>Ripple has created this alternative XRP Ledger test network with nodes in every region of the world to provide a testing platform for any software products built on the XRP Ledger without using real funds.</p>
-    <p>Test Net funds are intended for <strong>testing</strong> only. The Test Net ledger and balances will be reset on a regular basis.</p>
+    <p>Ripple runs this <a href="parallel-networks.html">parallel XRP Ledger test network</a>, or Testnet, to provide a testing platform for any software products built on the XRP Ledger without using real funds.</p>
+    <p>Testnet funds are intended for <strong>testing</strong> only. The Testnet ledger and balances will be reset approximately every 90 days, or when otherwise necessary.</p>
     <button id="generate-creds-button" class="btn btn-primary">Generate credentials</button>
     <div id='your-credentials'></div>
     <div id='loader' style="display: none;"><img class='throbber' src="assets/img/xrp-loader-96.png"> Generating Keys...</div>
diff --git a/tool/template-websocket-api-tool.html b/tool/template-websocket-api-tool.html
index eef76847d1..09bcb9b837 100644
--- a/tool/template-websocket-api-tool.html
+++ b/tool/template-websocket-api-tool.html
@@ -90,9 +90,9 @@
         <div class="modal-body">
 
           <div class="form-check">
-            <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-s1" value="wss://s1.ripple.com/" data-jsonrpcurl="https://s1.ripple.com:51234/" data-shortname="Main Net" checked>
+            <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-s1" value="wss://s1.ripple.com/" data-jsonrpcurl="https://s1.ripple.com:51234/" data-shortname="Mainnet" checked>
             <label class="form-check-label" for="wstool-1-connection-s1">
-              s1.ripple.com (Main Net Public Server)
+              s1.ripple.com (Mainnet Public Server)
             </label>
           </div>
           <div class="form-check">
@@ -102,9 +102,9 @@
             </label>
           </div>
           <div class="form-check">
-            <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-testnet" value="wss://s.altnet.rippletest.net:51233/" data-jsonrpcurl="https://s.altnet.rippletest.net:51234/" data-shortname="Test Net">
+            <input class="form-check-input" type="radio" name="wstool-1-connection" id="wstool-1-connection-testnet" value="wss://s.altnet.rippletest.net:51233/" data-jsonrpcurl="https://s.altnet.rippletest.net:51234/" data-shortname="Testnet">
             <label class="form-check-label" for="wstool-1-connection-testnet">
-              s.altnet.rippletest.net (Test Net Public Server)
+              s.altnet.rippletest.net (Testnet Public Server)
             </label>
           </div>
           <div class="form-check">