diff --git a/game/overworld-town/loc-school/classes/swimming.twee b/game/overworld-town/loc-school/classes/swimming.twee
index 06b7560dcbf0930adf084a1a5453723d3b39e0e2..915a307cf5b0656bc4b23e94adf1c5b4b602c64d 100644
--- a/game/overworld-town/loc-school/classes/swimming.twee
+++ b/game/overworld-town/loc-school/classes/swimming.twee
@@ -6,20 +6,20 @@
 		<<if $swimmingattended is 1>>
 			You enter the swimming pool room.
 			<br><br>
-			The lessen has just ended. A few stragglers are still on their way to the changing rooms. Mason is gathering up towels that have been left behind.
+			The lesson has just ended. A few stragglers are still on their way to the changing rooms. Mason is gathering up towels that have been left behind.
 			<br><br>
 			<<if random(1,1000) is 1>>
 				Outside, someone is farting in the general direction of their enemies. They must be French.
 				<br><br>
 			<</if>>
 			<<if $exposed lte 0>>
-				<<maleicon>><<link [[Boy's Changing Room|School Boy Changing Room]]>><<pass 2>><</link>>
+				<<maleicon>><<link [[Boys' Changing Room|School Boy Changing Room]]>><<pass 2>><</link>>
 				<br>
-				<<femaleicon>><<link [[Girl's Changing Room|School Girl Changing Room]]>><<pass 2>><</link>>
+				<<femaleicon>><<link [[Girls' Changing Room|School Girl Changing Room]]>><<pass 2>><</link>>
 			<<elseif $exposed gte 1>>
-				<<maleicon>><<link [[Grab some towels and enter the boy's changing room|School Boy Changing Room]]>><<pass 2>><<towelupm>><</link>>
+				<<maleicon>><<link [[Grab some towels and enter the boys' changing room|School Boy Changing Room]]>><<pass 2>><<towelupm>><</link>>
 				<br>
-				<<femaleicon>><<link [[Grab some towels and enter the girl's changing room|School Girl Changing Room]]>><<pass 2>><<towelup>><</link>>
+				<<femaleicon>><<link [[Grab some towels and enter the girls' changing room|School Girl Changing Room]]>><<pass 2>><<towelup>><</link>>
 			<</if>>
 		<<else>>
 			<<include "School Swimming Late">>
@@ -169,9 +169,9 @@
 			<br>
 		<</if>>
 		<br>
-		<<maleicon>><<link [[Boy's changing room|School Boy Changing Room]]>><<endevent>><</link>>
+		<<maleicon>><<link [[Boys' changing room|School Boy Changing Room]]>><<endevent>><</link>>
 		<br>
-		<<femaleicon>><<link [[Girl's changing room|School Girl Changing Room]]>><<endevent>><</link>>
+		<<femaleicon>><<link [[Girls' changing room|School Girl Changing Room]]>><<endevent>><</link>>
 		<br><br>
 	<</if>>
 
@@ -187,9 +187,9 @@
 			<br><br>
 			<<detention 1>>
 
-			<<maleicon>><<link [[Boy's changing room|School Boy Changing Room]]>><<endevent>><</link>>
+			<<maleicon>><<link [[Boys' changing room|School Boy Changing Room]]>><<endevent>><</link>>
 			<br>
-			<<femaleicon>><<link [[Girl's changing room|School Girl Changing Room]]>><<endevent>><</link>>
+			<<femaleicon>><<link [[Girls' changing room|School Girl Changing Room]]>><<endevent>><</link>>
 			<br>
 		<<else>>
 			<<npc Mason>><<person1>>
@@ -212,9 +212,9 @@
 
 	<<exhibitionclassroom>>
 
-	<<maleicon>><<link [[Boy's changing room|School Boy Changing Room]]>><<endevent>><</link>>
+	<<maleicon>><<link [[Boys' changing room|School Boy Changing Room]]>><<endevent>><</link>>
 	<br>
-	<<femaleicon>><<link [[Girl's changing room|School Girl Changing Room]]>><<endevent>><</link>>
+	<<femaleicon>><<link [[Girls' changing room|School Girl Changing Room]]>><<endevent>><</link>>
 	<br>
 <</if>>
 
@@ -439,9 +439,9 @@ You speak in a low voice, so only the teacher will hear you.
 <<if _alreadyWearing>>
 	<<link [[Next|Swimming Lesson]]>><<endevent>><</link>>
 <<else>>
-	<<maleicon>><<link [[Boy's changing room|School Boy Changing Room]]>><<endevent>><</link>>
+	<<maleicon>><<link [[Boys' changing room|School Boy Changing Room]]>><<endevent>><</link>>
 	<br>
-	<<femaleicon>><<link [[Girl's changing room|School Girl Changing Room]]>><<endevent>><</link>>
+	<<femaleicon>><<link [[Girls' changing room|School Girl Changing Room]]>><<endevent>><</link>>
 	<br>
 <</if>>
 
@@ -516,9 +516,9 @@ You speak in a low voice, so only the teacher will hear you.
 Embarrassed, you apologise and leave.
 <br><br>
 
-<<maleicon>><<link [[Boy's changing room|School Boy Changing Room]]>><<endevent>><</link>>
+<<maleicon>><<link [[Boys' changing room|School Boy Changing Room]]>><<endevent>><</link>>
 <br>
-<<femaleicon>><<link [[Girl's changing room|School Girl Changing Room]]>><<endevent>><</link>>
+<<femaleicon>><<link [[Girls' changing room|School Girl Changing Room]]>><<endevent>><</link>>
 <br>
 
 :: Swimming Classroom Mock
@@ -532,9 +532,9 @@ Mason also blushes. "I-I'll pretend I didn't hear that." <<He>> points to the ch
 <<gdelinquency>>
 <br><br>
 <<detention 1>><<npcincr Mason love -1>>
-<<maleicon>><<link [[Boy's changing room|School Boy Changing Room]]>><<endevent>><</link>>
+<<maleicon>><<link [[Boys' changing room|School Boy Changing Room]]>><<endevent>><</link>>
 <br>
-<<femaleicon>><<link [[Girl's changing room|School Girl Changing Room]]>><<endevent>><</link>>
+<<femaleicon>><<link [[Girls' changing room|School Girl Changing Room]]>><<endevent>><</link>>
 <br>
 
 :: School Pool Nude
@@ -638,14 +638,14 @@ You manage to get beneath the flimsy protection of the water, but not before the
 		<br><br>
 	<</if>>
 	<<if $exposed lte 0>>
-		<<maleicon>><<link [[Boy's Changing Room|School Boy Changing Room]]>><</link>>
+		<<maleicon>><<link [[boys' changing room|School Boy Changing Room]]>><</link>>
 		<br>
-		<<femaleicon>><<link [[Girl's Changing Room|School Girl Changing Room]]>><</link>>
+		<<femaleicon>><<link [[Girls' Changing Room|School Girl Changing Room]]>><</link>>
 		<br><br>
 	<<elseif $exposed gte 1>>
-		<<link [[Grab some towels and enter the boy's changing room|School Boy Changing Room]]>><<towelupm>><</link>>
+		<<link [[Grab some towels and enter the Boys' changing room|School Boy Changing Room]]>><<towelupm>><</link>>
 		<br>
-		<<link [[Grab some towels and enter the girl's changing room|School Girl Changing Room]]>><<towelup>><</link>>
+		<<link [[Grab some towels and enter the girls' changing room|School Girl Changing Room]]>><<towelup>><</link>>
 		<br><br>
 	<</if>>
 <<else>>
@@ -729,14 +729,14 @@ Mason seems displeased by your choice of activity.
 		<br><br>
 	<</if>>
 	<<if $exposed lte 0>>
-		<<maleicon>><<link [[Boy's Changing Room|School Boy Changing Room]]>><</link>>
+		<<maleicon>><<link [[Boys' changing room|School Boy Changing Room]]>><</link>>
 		<br>
-		<<femaleicon>><<link [[Girl's Changing Room|School Girl Changing Room]]>><</link>>
+		<<femaleicon>><<link [[Girls' Changing Room|School Girl Changing Room]]>><</link>>
 		<br><br>
 	<<elseif $exposed gte 1>>
-		<<link [[Grab some towels and enter the boy's changing room|School Boy Changing Room]]>><<towelupm>><</link>>
+		<<link [[Grab some towels and enter the Boys' changing room|School Boy Changing Room]]>><<towelupm>><</link>>
 		<br>
-		<<link [[Grab some towels and enter the girl's changing room|School Girl Changing Room]]>><<towelup>><</link>>
+		<<link [[Grab some towels and enter the girls' changing room|School Girl Changing Room]]>><<towelup>><</link>>
 		<br><br>
 	<</if>>
 <<else>>
@@ -791,14 +791,14 @@ Mason seems displeased by your choice of activity.
 		<br><br>
 	<</if>>
 	<<if $exposed lte 0>>
-		<<maleicon>><<link [[Boy's Changing Room|School Boy Changing Room]]>><</link>>
+		<<maleicon>><<link [[Boys' changing room|School Boy Changing Room]]>><</link>>
 		<br>
-		<<femaleicon>><<link [[Girl's Changing Room|School Girl Changing Room]]>><</link>>
+		<<femaleicon>><<link [[Girls' Changing Room|School Girl Changing Room]]>><</link>>
 		<br><br>
 	<<elseif $exposed gte 1>>
-		<<link [[Grab some towels and enter the boy's changing room|School Boy Changing Room]]>><<towelupm>><</link>>
+		<<link [[Grab some towels and enter the boys' changing room|School Boy Changing Room]]>><<towelupm>><</link>>
 		<br>
-		<<link [[Grab some towels and enter the girl's changing room|School Girl Changing Room]]>><<towelup>><</link>>
+		<<link [[Grab some towels and enter the girls' changing room|School Girl Changing Room]]>><<towelup>><</link>>
 		<br><br>
 	<</if>>
 <<else>>
@@ -860,14 +860,14 @@ Mason seems displeased by your choice of activity.
 		<br><br>
 	<</if>>
 	<<if $exposed lte 0>>
-		<<maleicon>><<link [[Boy's Changing Room|School Boy Changing Room]]>><</link>>
+		<<maleicon>><<link [[Boys' changing room|School Boy Changing Room]]>><</link>>
 		<br>
-		<<femaleicon>><<link [[Girl's Changing Room|School Girl Changing Room]]>><</link>>
+		<<femaleicon>><<link [[Girls' Changing Room|School Girl Changing Room]]>><</link>>
 		<br><br>
 	<<elseif $exposed gte 1>>
-		<<link [[Grab some towels and enter the boy's changing room|School Boy Changing Room]]>><<towelupm>><</link>>
+		<<link [[Grab some towels and enter the Boys' changing room|School Boy Changing Room]]>><<towelupm>><</link>>
 		<br>
-		<<link [[Grab some towels and enter the girl's changing room|School Girl Changing Room]]>><<towelup>><</link>>
+		<<link [[Grab some towels and enter the girls' changing room|School Girl Changing Room]]>><<towelup>><</link>>
 		<br><br>
 	<</if>>
 <<else>>