diff --git a/common/content/preferences.xul b/common/content/preferences.xul
index e42f99c7..4fd422b6 100644
--- a/common/content/preferences.xul
+++ b/common/content/preferences.xul
@@ -5,7 +5,7 @@
         let uri = Components.classes["@mozilla.org/network/io-service;1"]
                             .getService(Components.interfaces.nsIIOService)
                             .newURI("dactyl://help/options", null, null);
-        Application.activeWindow.open(uri).focus(); // TODO: generalise for Muttator et al.
+        Application.activeWindow.open(uri).focus(); // TODO: generalise for Teledactyl et al.
         window.close();
     </script>
 </window>
diff --git a/common/skin/dactyl.css b/common/skin/dactyl.css
index 21e8aeda..4f9aa144 100644
--- a/common/skin/dactyl.css
+++ b/common/skin/dactyl.css
@@ -184,7 +184,7 @@ statusbarpanel {
     padding: 0px 2px;
 }
 
-/* for muttator's composer */
+/* for Teledactyl's composer */
 #content-frame, #appcontent {
     border: 0px;
 }
diff --git a/teledactyl/AUTHORS b/teledactyl/AUTHORS
index 7a381185..f3cc6bb4 100644
--- a/teledactyl/AUTHORS
+++ b/teledactyl/AUTHORS
@@ -7,5 +7,5 @@ Inactive/former developers:
 Patches:
   * Christian Dietrich (too many to list)
 
-A lot of people contributed to Pentadactyl, which is the basis of Muttator, so please refer
+A lot of people contributed to Pentadactyl, which is the basis of Teledactyl, so please refer
 to that AUTHOR file for more contributors.
diff --git a/teledactyl/content/compose/compose.xul b/teledactyl/content/compose/compose.xul
index 6176be1f..b9af4c16 100644
--- a/teledactyl/content/compose/compose.xul
+++ b/teledactyl/content/compose/compose.xul
@@ -9,7 +9,7 @@
 
 <!--?xml-stylesheet href="chrome://browser/skin/" type="text/css"?-->
 
-<overlay id="muttator"
+<overlay id="teledactyl"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:nc="http://home.netscape.com/NC-rdf#"
     xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/teledactyl/content/compose/dactyl.dtd b/teledactyl/content/compose/dactyl.dtd
index f271bff9..67f3d328 100644
--- a/teledactyl/content/compose/dactyl.dtd
+++ b/teledactyl/content/compose/dactyl.dtd
@@ -1,5 +1,5 @@
 <!ENTITY dactyl.mainWindow "msgcomposeWindow">
-<!ENTITY dactyl.name "muttator">
+<!ENTITY dactyl.name "teledactyl">
 <!ENTITY dactyl.statusBefore "">
 <!ENTITY dactyl.statusAfter "statusText">
 
diff --git a/teledactyl/contrib/vim/Makefile b/teledactyl/contrib/vim/Makefile
index b1156448..c3a65aae 100644
--- a/teledactyl/contrib/vim/Makefile
+++ b/teledactyl/contrib/vim/Makefile
@@ -1,6 +1,6 @@
-VIMBALL = muttator.vba
+VIMBALL = teledactyl.vba
 
-vimball: mkvimball.txt syntax/muttator.vim ftdetect/muttator.vim
+vimball: mkvimball.txt syntax/teledactyl.vim ftdetect/teledactyl.vim
 	-echo '%MkVimball! ${VIMBALL} .' | vim -u NORC -N -e -s mkvimball.txt
 
 all: vimball
diff --git a/teledactyl/contrib/vim/mkvimball.txt b/teledactyl/contrib/vim/mkvimball.txt
index 484bb52f..20148df0 100644
--- a/teledactyl/contrib/vim/mkvimball.txt
+++ b/teledactyl/contrib/vim/mkvimball.txt
@@ -1,2 +1,2 @@
-syntax/muttator.vim
-ftdetect/muttator.vim
+syntax/teledactyl.vim
+ftdetect/teledactyl.vim
diff --git a/teledactyl/locale/en-US/Makefile b/teledactyl/locale/en-US/Makefile
index 065aaf7a..9bb4fb4a 100644
--- a/teledactyl/locale/en-US/Makefile
+++ b/teledactyl/locale/en-US/Makefile
@@ -1,3 +1,3 @@
-NAME = muttator
+NAME = teledactyl
 BASE = ../../../common
 include $(BASE)/Makefile.doc