diff --git a/grammars/mediawiki.js b/grammars/mediawiki.js
index e03b967..30cfb36 100644
--- a/grammars/mediawiki.js
+++ b/grammars/mediawiki.js
@@ -294,17 +294,17 @@ mediawiki = rr.Parser({
       rr.ZeroOrMore(rr.Ref('paragraph')),
       rr.EndOfText()))
 }, [
-  rr.SplitTagAndNest('bi', ['b', 'i']),
+  rr.SplitElementAndNest('bi', ['b', 'i']),
   rr.GroupSiblings('ul', ['ulli1', 'ulli2', 'ulli3']),
   rr.GroupSiblings('ul', ['ulli2', 'ulli3']),
   rr.GroupSiblings('ul', ['ulli3']),
-  rr.RenameTag('ulli1', 'li'),
-  rr.RenameTag('ulli2', 'li'),
-  rr.RenameTag('ulli3', 'li'),
+  rr.RenameElement('ulli1', 'li'),
+  rr.RenameElement('ulli2', 'li'),
+  rr.RenameElement('ulli3', 'li'),
   rr.GroupSiblings('ol', ['olli1', 'olli2', 'olli3']),
   rr.GroupSiblings('ol', ['olli2', 'olli3']),
   rr.GroupSiblings('ol', ['olli3']),
-  rr.RenameTag('olli1', 'li'),
-  rr.RenameTag('olli2', 'li'),
-  rr.RenameTag('olli3', 'li')
+  rr.RenameElement('olli1', 'li'),
+  rr.RenameElement('olli2', 'li'),
+  rr.RenameElement('olli3', 'li')
 ]);
diff --git a/recentrunes.js b/recentrunes.js
index 90d9d87..5ca95ed 100644
--- a/recentrunes.js
+++ b/recentrunes.js
@@ -753,7 +753,7 @@ rr.GroupSiblings = function(parentName, childNames) {
  * @param {string} newName
  * @return {rr.typeFilter}
  */
-rr.RenameTag = function(oldName, newName) {
+rr.RenameElement = function(oldName, newName) {
   return function(node) {
     if (node.nodeName.toLowerCase() != oldName) {
       return;
@@ -772,7 +772,7 @@ rr.RenameTag = function(oldName, newName) {
  * @param {Array.<string>} newNames
  * @return {rr.typeFilter}
  */
-rr.SplitTagAndNest = function(originalName, newNames) {
+rr.SplitElementAndNest = function(originalName, newNames) {
   return function(node) {
     if (node.nodeName.toLowerCase() != originalName) {
       return;