diff --git a/CHANGELOG b/CHANGELOG
index 2b42c0af..27c5e0b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 Version 2.8
 
 	New ponies: airheart, bastionyorsets, peppermoon, shiningarmorwedding, starlight,
-	            sunnyrays, tenderheart, tomtherock
+	            sunnyrays, tenderheart, tom
 
 	Pony symlink added: georgewachingtony → bastionyorsets
 
diff --git a/manuals/ponysay.texinfo b/manuals/ponysay.texinfo
index d34b5034..cca39319 100644
--- a/manuals/ponysay.texinfo
+++ b/manuals/ponysay.texinfo
@@ -1868,7 +1868,7 @@ sequences.
 @itemize @bullet
 @item
 New ponies: @file{airheart}, @file{bastionyorsets}, @file{peppermoon}, @file{shiningarmorwedding},
-@file{starlight}, @file{sunnyrays}, @file{tenderheart}, @file{tomtherock}
+@file{starlight}, @file{sunnyrays}, @file{tenderheart}, @file{tom}
 @item
 Pony symlink added:
 @itemize @bullet
diff --git a/ponies/tomtherock.pony b/ponies/tom.pony
similarity index 100%
rename from ponies/tomtherock.pony
rename to ponies/tom.pony
diff --git a/ttyponies/tomtherock.pony b/ttyponies/tom.pony
similarity index 100%
rename from ttyponies/tomtherock.pony
rename to ttyponies/tom.pony