diff --git a/src/facilities/farmyard/farmyard.js b/src/facilities/farmyard/farmyard.js
index ffa1bdeb539e4bc911e7611fa2b9115a153e1659..0d843c23caaf99217aaa67e2c255008ccca352fb 100644
--- a/src/facilities/farmyard/farmyard.js
+++ b/src/facilities/farmyard/farmyard.js
@@ -1,12 +1,6 @@
 App.Facilities.Farmyard.farmyard = function() {
 	const
-		frag = new DocumentFragment(),
-
-		renameDiv = document.createElement("div"),
-		renameNote = document.createElement("span");
-
-	renameDiv.classList.add("farmyard-rename");
-	renameNote.classList.add("note");
+		frag = new DocumentFragment();
 
 	V.nextButton = "Back to Main";
 	V.nextLink = "Main";
@@ -24,17 +18,7 @@ App.Facilities.Farmyard.farmyard = function() {
 	App.UI.DOM.appendNewElement("div", frag, upgrades(), "farmyard-upgrades");
 	App.UI.DOM.appendNewElement("div", frag, animals(), "farmyard-animals");
 	App.UI.DOM.appendNewElement("div", frag, App.UI.SlaveList.stdFacilityPage(App.Entity.facilities.farmyard), "farmyard-slaves");
-
-	renameDiv.append(`Rename ${V.farmyardName}: `);
-	renameNote.append(`Use a noun or similar short phrase`);
-
-	renameDiv.append(App.UI.DOM.makeTextBox(V.farmyardName, newName => {
-		V.farmyardName = newName;
-	}));
-
-	renameDiv.append(renameNote);
-
-	frag.append(renameDiv);
+	App.UI.DOM.appendNewElement("div", frag, rename(), "farmyard-rename");
 
 	App.UI.SlaveList.ScrollPosition.restore();
 
@@ -948,6 +932,30 @@ App.Facilities.Farmyard.farmyard = function() {
 		return frag;
 	}
 
+	function rename() {
+		const
+			frag = new DocumentFragment(),
+
+			renameDiv = document.createElement("div"),
+			renameNote = document.createElement("span");
+
+		renameDiv.classList.add("farmyard-rename");
+		renameNote.classList.add("note");
+
+		renameDiv.append(`Rename ${V.farmyardName}: `);
+		renameNote.append(` Use a noun or similar short phrase`);
+
+		renameDiv.append(App.UI.DOM.makeTextBox(V.farmyardName, newName => {
+			V.farmyardName = newName;
+		}));
+
+		renameDiv.append(renameNote);
+
+		frag.append(renameDiv);
+
+		return frag;
+	}
+
 	function clearAnimalsBought() {
 		for (const i in V.animalsBought) {
 			V.animalsBought[i] = 0;