diff --git a/src/004-base/facility.js b/src/004-base/facility.js
index b633f983d19893abb54a501f5a7a6bc43e5478d2..09222e7fc6d80c208e91de8e2c6609ec6fff6fcc 100644
--- a/src/004-base/facility.js
+++ b/src/004-base/facility.js
@@ -262,7 +262,7 @@ App.Entity.Facilities.Facility = class {
 	/** Facility display name
 	 * @returns {string} */
 	get name() {
-		const res = V[this.desc.baseName + "Name"];
+		const res = V[this.desc.baseName].name || V[this.desc.baseName + "Name"];
 		return res !== undefined ? res : 'the ' + this.genericName;
 	}
 
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 8811d180bb4e11a676e86909a6942cf660be6f8e..67d3def729c63e7471c500599e37f32af8294be5 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -295,9 +295,9 @@ App.Update.globalVariables = function(node) {
 	}
 
 	// Pit
-	if (V.pit) {
-		V.pit = typeof V.pit === "object" ? V.pit : null;
+	V.pit = typeof V.pit === "object" ? V.pit : null;
 
+	if (V.pit) {
 		V.pit.name = V.pit.name || V.pitName || "the Pit";
 		V.pit.virginities = V.pit.virginities || V.pitVirginities || "neither";
 
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 1072455e4e08893216148597bb11d350087df2c5..0be7dfb3aaa6eefea99f8d80a9442f34ddb11df6 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1571,7 +1571,7 @@ globalThis.FacilityDatatypeCleanup = (function() {
 		V.cellblockName = V.cellblockName || "the Cellblock";
 		V.masterSuiteName = V.masterSuiteName || "the Master Suite";
 		V.HGSuiteName = V.HGSuiteName || "the Head Girl Suite";
-		V.pit ? V.pit.name = V.pit.name || "the Pit" : null;
+		V.pit.name = V.pit.name || "the Pit";
 		V.incubatorName = V.incubatorName || "the Incubator";
 		V.farmyardName = V.farmyardName || "the Farmyard";
 	}
diff --git a/src/facilities/pit/killSlave.js b/src/interaction/killSlave.js
similarity index 99%
rename from src/facilities/pit/killSlave.js
rename to src/interaction/killSlave.js
index 2ff8f34be259ebe7010def1ba8ceffd0b9ddef7c..5fc1b9abf013ab9762a5c5e3bc00ecab5ca4ee4e 100644
--- a/src/facilities/pit/killSlave.js
+++ b/src/interaction/killSlave.js
@@ -5,7 +5,7 @@
  *
  * @param {App.Entity.SlaveState} slave
  */
-App.Facilities.Pit.killSlave = function(slave) {
+App.UI.SlaveInteract.killSlave = function(slave) {
 	// MARK: Declarations
 
 	const frag = new DocumentFragment;
diff --git a/src/pregmod/killSlave.tw b/src/interaction/killSlave.tw
similarity index 100%
rename from src/pregmod/killSlave.tw
rename to src/interaction/killSlave.tw
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 6d179a872151c0b30aabc1dc161a183069c29c1e..a5443a2aeaf933f5a52d7d9592ffcf967e4ae149 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -760,7 +760,9 @@ globalThis.makeJobIdMap = function() {
 	}
 
 	// special cases
-	res[Job.PIT] = V.pit ? new Set(V.pit.fighterIDs) : null;
+	if (V.pit) {
+		res[Job.PIT] = new Set(V.pit.fighterIDs);
+	}
 	res[Job.LURCHER].add(V.LurcherID);
 
 	return res;