diff --git a/test/testTaskAddOldXfd.js b/test/testTaskAddOldXfd.js
index 655ea8c..a792950 100644
--- a/test/testTaskAddOldXfd.js
+++ b/test/testTaskAddOldXfd.js
@@ -83,7 +83,7 @@ describe("AddBeingDeleted", function() {
 	it("makes old xfd wikitext", function() {
 		assert.deepStrictEqual(
 			task.makeOldxfdWikitext(),
-			"{{oldtfdfull|date= 18 March 2020 |result=merge |disc=Foo and bar}}\n"
+			"{{old tfd|date= 18 March 2020 |result=merge |disc=Foo and bar}}\n"
 		);
 	});
 	it("makes new wikitext (no page content)", function() {
@@ -105,7 +105,7 @@ describe("AddBeingDeleted", function() {
 				"|Wikipedia:Templates for discussion/Log/2019 June 18#Template:Foo}}";
 		assert.strictEqual(
 			task.makeNewWikitext(wikitext, "Template talk:Foo"),
-			"{{Old AfD multi |date1=18 June 2019 |result1='''Keep''' |page1=" +page1 +
+			"{{Old XfD multi |date1=18 June 2019 |result1='''Keep''' |page1=" +page1 +
 				" |date2=18 March 2020 |result2='''Merge''' |page2=Wikipedia:Templates for discussion/2020 March 18#Foo and bar}}\n"
 		);
 	});
@@ -116,26 +116,26 @@ describe("AddBeingDeleted", function() {
 				"|Wikipedia:Templates for discussion/Log/2019 June 18#Template:Foo}}";
 		assert.strictEqual(
 			task.makeNewWikitext(wikitext, "Template talk:Foo"),
-			"{{Old AfD multi |date1=18 June 2019 |result1='''Keep''' |page1=" +page1 +
+			"{{Old XfD multi |date1=18 June 2019 |result1='''Keep''' |page1=" +page1 +
 				" |date2=18 March 2020 |result2='''Merge''' |page2=Wikipedia:Templates for discussion/2020 March 18#Foo and bar}}\nLoremipsum"
 		);
 	});
-	it("makes new wikitext (Old Afd multi)", function() {
-		const wikitext = "{{Old AfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}}}";	
+	it("makes new wikitext (Old XfD multi)", function() {
+		const wikitext = "{{Old XfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}}}";	
 		assert.strictEqual(
 			task.makeNewWikitext(wikitext, "Template talk:Foo"),
-			"{{Old AfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}"+
+			"{{Old XfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}"+
 				" |date2=18 March 2020 |result2='''Merge''' |page2=Wikipedia:Templates for discussion/2020 March 18#Foo and bar}}"
 		);
 	});
-	it("makes new wikitext (Old Afd multi and old TFD banner)", function() {
-		const wikitext = "{{Old AfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}}}\n{{Old TfD|date=2019 June 18|result=keep}}\nLoremipsum";
+	it("makes new wikitext (Old XfD multi and old TFD banner)", function() {
+		const wikitext = "{{Old XfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}}}\n{{Old TfD|date=2019 June 18|result=keep}}\nLoremipsum";
 		const page2 = "{{subst:#ifexist:Wikipedia:Templates for deletion/Log/2019 June 18"+
 			"|Wikipedia:Templates for deletion/Log/2019 June 18#Template:Foo"+
 			"|Wikipedia:Templates for discussion/Log/2019 June 18#Template:Foo}}";
 		assert.strictEqual(
 			task.makeNewWikitext(wikitext, "Template talk:Foo"),
-			"{{Old AfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}"+
+			"{{Old XfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}"+
 				" |date2=18 June 2019 |result2='''Keep''' |page2=" + page2 +
 				" |date3=18 March 2020 |result3='''Merge''' |page3=Wikipedia:Templates for discussion/2020 March 18#Foo and bar}}\nLoremipsum"
 		);
@@ -172,4 +172,4 @@ describe("AddBeingDeleted", function() {
 			redirect: false,
 		});
 	});
-});
\ No newline at end of file
+});
diff --git a/xfdcloser-src/Controllers/Tasks/AddOldXfd.js b/xfdcloser-src/Controllers/Tasks/AddOldXfd.js
index 931d33a..2d1a9b7 100644
--- a/xfdcloser-src/Controllers/Tasks/AddOldXfd.js
+++ b/xfdcloser-src/Controllers/Tasks/AddOldXfd.js
@@ -41,7 +41,7 @@ export default class AddOldXfdTask extends TaskItemController {
 		const titleObject = mw.Title.newFromText(pageTitle);
 		const PAGENAME = titleObject.getMain();
 		const SUBJECTPAGENAME = titleObject.getSubjectPage().getNamespacePrefix() +	PAGENAME; 
-		let oldafdmulti = "{{Old AfD multi";
+		let oldafdmulti = "{{Old XfD multi";
 		let count = 0;
 		let oldAfdTemplate;
 
@@ -222,4 +222,4 @@ export default class AddOldXfdTask extends TaskItemController {
 		);
 	}
 }
-// </nowiki>
\ No newline at end of file
+// </nowiki>
diff --git a/xfdcloser-src/Venue.js b/xfdcloser-src/Venue.js
index d74d109..e0066aa 100644
--- a/xfdcloser-src/Venue.js
+++ b/xfdcloser-src/Venue.js
@@ -70,8 +70,8 @@ Venue.Mfd = () => new Venue("mfd", {
 		closeBottom:	"{{subst:Mfd bottom}}",
 		oldXfd:			"{{Old MfD |date=__DATE__ |result='''__RESULT__''' |page=__SUBPAGE__}}"+
             "\n",
-		mergeFrom:		"{{mfd-mergefrom|__NOMINATED__|__DEBATE__|__DATE__}}\n",
-		mergeTo:		"{{mfd-mergeto|__TARGET__|__DEBATE__|__DATE__|__TARGETTALK__}}\n",
+		mergeFrom:		"{{mfd-merge from|__NOMINATED__|__DEBATE__|__DATE__}}\n",
+		mergeTo:		"{{mfd-merge to|__TARGET__|__DEBATE__|__DATE__|__TARGETTALK__}}\n",
 		alreadyClosed:	"{{#ifeq:{{FULLPAGENAME}}|Wikipedia:Miscellany for deletion|"+
             "{{collapse bottom}}|}}"
 	},
@@ -194,7 +194,7 @@ Venue.Tfd = () => {
 		wikitext: {
 			closeTop:		"{{subst:Tfd top|'''__RESULT__'''}}__TO_TARGET____RATIONALE__ __SIG__",
 			closeBottom:	"{{subst:Tfd bottom}}",
-			oldXfd:			"{{oldtfdfull|date= __DATE__ |result=__RESULT__ |disc=__SECTION__}}\n",
+			oldXfd:			"{{old tfd|date= __DATE__ |result=__RESULT__ |disc=__SECTION__}}\n",
 			pagelinks:		"* {{tfd links|__PAGE__}}\n",
 			relistReplace:	"Wikipedia:Templates for discussion/Log/__TODAY__#",
 			alreadyClosed:	"<!-- Tfd top -->"
@@ -369,4 +369,4 @@ Venue.newFromPageName = function(pageName) {
 };
 
 export default Venue;
-// </nowiki>
\ No newline at end of file
+// </nowiki>
diff --git a/xfdcloser-src/data.js b/xfdcloser-src/data.js
index 41d1fb2..4cc6f84 100644
--- a/xfdcloser-src/data.js
+++ b/xfdcloser-src/data.js
@@ -270,7 +270,7 @@ const rcats = [
 			"R from fictional character",
 			"R from fictional element",
 			"R from fictional location",
-			"R to TV episode list entry"
+			"R from television episode"
 		]
 	},
 	{