diff --git a/site.cfg b/site.cfg
index 16904def..438d048c 100644
--- a/site.cfg
+++ b/site.cfg
@@ -108,9 +108,9 @@ content: content-sitemap.tpl.html
 navigation: navigation-main.tpl.html
 content: content-tags.tpl.html
 
-[twat_episode]
+[twt_episode]
 navigation: navigation-get-shows.tpl.html
-content: content-twat_episode.tpl.html
+content: content-twt_episode.tpl.html
 multipage: true
 filename: eps/twt[id]/index.html
 
diff --git a/templates/content-about.tpl.html b/templates/content-about.tpl.html
index 37dfabca..d95f3551 100644
--- a/templates/content-about.tpl.html
+++ b/templates/content-about.tpl.html
@@ -43,7 +43,7 @@ You can copy and redistribute the shows for free provided you adhere to the
 <p>Hacker Public Radio (HPR) is an Internet Radio show (podcast) that releases shows every weekday Monday through Friday. 
 HPR has a long lineage going back to <a href="https://web.archive.org/web/20230323053905/http://www.oldskoolphreak.com/" >Radio FreeK America</a>, 
 <a href="https://web.archive.org/web/20220123174618/https://www.binrev.com/forums/" >Binary Revolution Radio</a> &amp; <a href="https://web.archive.org/web/20150208172826/http://www.nomicon.info/" >Infonomicon</a>, 
-and it is a rename of <a href="<!--% absolute_url(baseurl,'twat.html') %-->" >Today With a Techie</a> radio.
+and it is a rename of <a href="<!--% absolute_url(baseurl,'eps/index.html#twt_episodes') %-->" >Today With a Techie</a> radio.
 Please listen to StankDawg&#39;s &quot;<a href="<!--% media_path(1, 'hpr', 'mp3', baseurl, media_baseurl) %-->" >
 	Introduction to HPR</a>&quot; for more information.</p>
 
diff --git a/templates/content-correspondent.tpl.html b/templates/content-correspondent.tpl.html
index 60a924fd..d604db25 100644
--- a/templates/content-correspondent.tpl.html
+++ b/templates/content-correspondent.tpl.html
@@ -13,13 +13,13 @@
 	<!--% hpr_show_count = hpr_show_count +1; %-->
 	<!--% END %-->
 
-	<!--% query_twat_show_count = DBI.prepare('
+	<!--% query_twt_show_count = DBI.prepare('
 		SELECT id
 		FROM twat_eps AS eps
 		WHERE eps.hostid = ?
 		')
 		%-->
-		<!--% query_twat_shows = DBI.prepare('
+		<!--% query_twt_shows = DBI.prepare('
 			SELECT
 			eps.id,
 			CASE eps.explicit WHEN 1 THEN \'Explicit\' ELSE \'Clean\' END AS explicit ,
@@ -37,11 +37,11 @@
 			ORDER BY eps.id DESC
 			')
 			%-->
-			<!--% twat_shows_to_count = query_twat_show_count.execute(id); %-->
-			<!--% twat_shows = query_twat_shows.execute(id); %-->
-			<!--% twat_show_count = 0 %-->
-			<!--% FOREACH show IN twat_shows_to_count %-->
-			<!--% twat_show_count = twat_show_count +1; %-->
+			<!--% twt_shows_to_count = query_twt_show_count.execute(id); %-->
+			<!--% twt_shows = query_twt_shows.execute(id); %-->
+			<!--% twt_show_count = 0 %-->
+			<!--% FOREACH show IN twt_shows_to_count %-->
+			<!--% twt_show_count = twt_show_count +1; %-->
 			<!--% END %-->
 
 			<!--% hosts = DBI.tie('hosts', 'hostid') %-->
@@ -57,7 +57,7 @@
 				<div id="host_meta">
 					<p><label>email:</label> <u><!--% this_host.email %--></u></p>
 					<div><label>profile:</label> <!--% this_host.profile %--></div>
-					<p><label>episodes:</label> <strong><!--% hpr_show_count + twat_show_count %--></strong></p>
+					<p><label>episodes:</label> <strong><!--% hpr_show_count + twt_show_count %--></strong></p>
 				</div>
 			</div>
 			<div class="lane stack">
@@ -67,11 +67,11 @@
 					<p class="listen-in"><!--% display_listen_in(hpr_show.id) %--></p>
 				</article>
 				<!--% END %-->
-				<!--% FOREACH twat_show IN twat_shows; %-->
+				<!--% FOREACH twt_show IN twt_shows; %-->
 				<article>
 
-					<!--% twat_show_summary(twat_show, 'hide_host') %-->
-					<p class="listen-in"><!--% display_listen_in(twat_show.id,"twat") %--></p>
+					<!--% twt_show_summary(twt_show, 'hide_host') %-->
+					<p class="listen-in"><!--% display_listen_in(twt_show.id,"twt") %--></p>
 				</article>
 				<!--% END %-->
 			</div>
diff --git a/templates/content-episodes.tpl.html b/templates/content-episodes.tpl.html
index 8c9d3f97..d822044e 100644
--- a/templates/content-episodes.tpl.html
+++ b/templates/content-episodes.tpl.html
@@ -20,7 +20,7 @@
 		<a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/"><img alt="Creative Commons License" border="0" src="https://creativecommons.org/images/public/somerights20.png" width="88" height="31" /></a><br>The following work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/2.5/">Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License</a>.</p>
 	<p>Today With a Techie Radio was brought to you by <a href="https://en.wikipedia.org/wiki/Infonomicon">The Infonomicon Computer Club</a></p>
 	<div class="lane stack">
-	<!--% FOREACH twat_episode IN DBI.query('
+	<!--% FOREACH twt_episode IN DBI.query('
 	SELECT 
         eps.id, 
         eps.explicit, 
@@ -36,7 +36,7 @@
 	') 
 %-->
 	<article>
-	<!--% twat_show_summary(twat_episode) %-->
+	<!--% twt_show_summary(twt_episode) %-->
  </article>
 <!--% END %-->
 	</div>
diff --git a/templates/content-twt_episode.tpl.html b/templates/content-twt_episode.tpl.html
index a5607407..9b008e20 100644
--- a/templates/content-twt_episode.tpl.html
+++ b/templates/content-twt_episode.tpl.html
@@ -55,8 +55,8 @@
 <p><!--% show_avatar(episode.hostid, episode.host) %-->
 Hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(episode.hostid) %-->.html"><!--% episode.host %--></a> on <span><!--% day_and_date(episode.date) %--></span> is flagged as <span><!--% display_explicit(episode.explicit) %--></span> and is released under a <span><!--% episode.license %--> license</span>. <br>
 <!--% display_tags(episode.tags) %--> <br>
-<!--% listen_now(episode, "twat", baseurl, media_baseurl) %-->
-<!--% display_listen_in(episode.id, "twat") %-->  
+<!--% listen_now(episode, "twt", baseurl, media_baseurl) %-->
+<!--% display_listen_in(episode.id, "twt") %-->  
 </p>
 <h3><!--% show_series(episode.series, episode.seriesid, "Part of the series") %--></h3> 
 <p><em><!--% episode.series_description %--></em></p>
diff --git a/templates/shared-episode-summary.tpl.html b/templates/shared-episode-summary.tpl.html
index 2dcf07b6..6d472e2f 100644
--- a/templates/shared-episode-summary.tpl.html
+++ b/templates/shared-episode-summary.tpl.html
@@ -56,7 +56,7 @@ or
 	<p class="summary"><!--% show.summary %--></p>
 <!--% END %-->
 
-<!--% MACRO twat_show_summary(show, hide_host) BLOCK %-->
+<!--% MACRO twt_show_summary(show, hide_host) BLOCK %-->
 
 	<h3 class="title"><a href="<!--% absolute_path(baseurl) %-->eps/twt<!--% zero_pad_left(show.id) %-->/index.html">Today with a Techie Ep.<!--% show.id %--> :: <!--% show.title %--></a> <!--% IF hide_host == "" %--> 
 		hosted by <a href="<!--% absolute_path(baseurl) %-->correspondents/<!--% zero_pad_left(show.hostid) %-->.html"><!--% show.host %--></a>
diff --git a/templates/shared-utils.tpl.html b/templates/shared-utils.tpl.html
index 5ff3660d..2082c7d8 100644
--- a/templates/shared-utils.tpl.html
+++ b/templates/shared-utils.tpl.html
@@ -93,7 +93,7 @@
 <!--% END %-->
 
 <!--% MACRO media_path(episode_id, episode_type, media_type, baseurl, media_baseurl) BLOCK %-->
-        <!--% IF episode_type == "twat" %-->
+        <!--% IF episode_type == "twt" %-->
                 <!--% episode_type = "twt" %-->
                 <!--% padding = 3 %-->
                 <!--% media_folder = "eps/"; padding = 3 %-->