diff --git a/src/societies/aztec/slaveSacrifice.tw b/src/futureSocieties/aztec/slaveSacrifice.tw
similarity index 100%
rename from src/societies/aztec/slaveSacrifice.tw
rename to src/futureSocieties/aztec/slaveSacrifice.tw
diff --git a/src/facilities/fsDecoration.js b/src/futureSocieties/fsDecoration.js
similarity index 100%
rename from src/facilities/fsDecoration.js
rename to src/futureSocieties/fsDecoration.js
diff --git a/src/facilities/fsPassage.js b/src/futureSocieties/fsPassage.js
similarity index 99%
rename from src/facilities/fsPassage.js
rename to src/futureSocieties/fsPassage.js
index 831f3c0d8507c19518990f6853c56ea60d8c627c..aff7357e7035d8ba70f40604bc003c607d1ba35a 100644
--- a/src/facilities/fsPassage.js
+++ b/src/futureSocieties/fsPassage.js
@@ -199,7 +199,9 @@ App.UI.fsPassage = function() {
 					"Give all your lactating slaves cow names",
 					() => {
 						for (const slave of V.slaves) {
-							slave.slaveName = App.Data.misc.cowSlaveNames.random();
+							if (slave.lactation) {
+								slave.slaveName = App.Data.misc.cowSlaveNames.random();
+							}
 						}
 						refresh();
 					}
@@ -213,7 +215,9 @@ App.UI.fsPassage = function() {
 					"Give all your idiotic slaves stripper names",
 					() => {
 						for (const slave of V.slaves) {
-							slave.slaveName = App.Data.misc.bimboSlaveNames.random();
+							if (slave.intelligence < -15) {
+								slave.slaveName = App.Data.misc.bimboSlaveNames.random();
+							}
 						}
 						refresh();
 					}
diff --git a/src/js/futureSocietyJS.js b/src/futureSocieties/futureSociety.js
similarity index 100%
rename from src/js/futureSocietyJS.js
rename to src/futureSocieties/futureSociety.js