diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 1b9182b1875f5b0de8776ba8b325e283fc16a1cc..d1e7d8eac516ec41943269125a9de1a9e0d44632 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -769,9 +769,9 @@ will
 <<case "Spa">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Send her to the Spa|Assign][$i = _ssi]]
+		<<link "Send her to $spaName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Remove her from the Spa|Retrieve][$i = _ssi]]
+		<<link "Remove her from $spaName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove Attendant|Attendant Select]]
 		<<break>>
@@ -783,9 +783,9 @@ will
 <<case "Nursery">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Send her to the Nursery|Assign][$i = _ssi]]
+		<<link "Send her to $nurseryName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Remove her from the Nursery|Retrieve][$i = _ssi]]
+		<<link "Remove her from $nurseryName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove Matron|Matron Select]]
 		<<break>>
@@ -797,9 +797,9 @@ will
 <<case "Brothel">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Send her to the Brothel|Assign][$i = _ssi]]
+		<<link "Send her to $brothelName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Release her from the Brothel|Retrieve][$i = _ssi]]
+		<<link "Release her from $brothelName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove Madam|Madam Select]]
 		<<break>>
@@ -811,9 +811,9 @@ will
 <<case "Club">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Send her to the Club|Assign][$i = _ssi]]
+		<<link "Send her to $clubName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Remove her from the Club|Retrieve][$i = _ssi]]
+		<<link "Remove her from $clubName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove DJ|DJ Select]]
 		<<break>>
@@ -821,9 +821,9 @@ will
 <<case "Arcade">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Confine her in the Arcade|Assign][$i = _ssi]]
+		<<link "Confine her in $arcadeName" "Assign">><<set $i = _ssi>><</link>>
 	<<else>>
-		[[Release her from the Arcade|Retrieve][$i = _ssi]]
+		<<link "Release her from $arcadeName" "Retrieve">><<set $i = _ssi>><</link>>
 	<</if>>
 <<case "DJ Select">>
 	<<if setup.DJCareers.includes(_Slave.career) || (_Slave.skillDJ >= $masteredXP)>>
@@ -835,9 +835,9 @@ will
 		@@.cyan;Estimated DNA error value: <<print Math.ceil(_Slave.chem/10)>>@@
 	<</if>>
 	<<if $Flag == 0>>
-		[[Send her to the Clinic|Assign][$i = _ssi]]
+		<<link "Send her to $clinicName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Take her out of the Clinic|Retrieve][$i = _ssi]]
+		<<link "Take her out of $clinicName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove Nurse|Nurse Select]]
 		<<break>>
@@ -849,9 +849,9 @@ will
 <<case "Schoolroom">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Assign her to the Schoolroom|Assign][$i = _ssi]]
+		<<link "Assign her to $schoolroomName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Release her from the Schoolroom|Retrieve][$i = _ssi]]
+		<<link "Release her from $schoolroomName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove Schoolteacher|Schoolteacher Select]]
 		<<break>>
@@ -863,9 +863,9 @@ will
 <<case "Dairy">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Send her to the Dairy|Assign][$i = _ssi]]
+		<<link "Send her to $dairyName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Release her from the Dairy|Retrieve][$i = _ssi]]
+		<<link "Release her from $dairyName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove Milkmaid|Milkmaid Select]]
 		<<break>>
@@ -877,9 +877,9 @@ will
 <<case "Servants' Quarters">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Assign her to the Servants' Quarters|Assign][$i = _ssi]]
+		<<link "Assign her to $servantsQuartersName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Release her from the Servants' Quarters|Retrieve][$i = _ssi]]
+		<<link "Release her from $servantsQuartersName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove Stewardess|Stewardess Select]]
 		<<break>>
@@ -891,9 +891,9 @@ will
 <<case "Master Suite">>
 <br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Add her to the Suite|Assign][$i = _ssi]]
+		<<link "Add her to $masterSuiteName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Send her out of the Suite|Retrieve][$i = _ssi]]
+		<<link "Send her out of $masterSuiteName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove Concubine|Concubine Select]]
 		<<break>>
@@ -901,9 +901,9 @@ will
 <<case "Cellblock">>
 	<br><<if $seeImages != 1 || $seeSummaryImages != 1 || $imageChoice == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<</if>>
 	<<if $Flag == 0>>
-		[[Confine her in the cellblock|Assign][$i = _ssi]]
+		<<link "Confine her in $cellblockName" "Assign">><<set $i = _ssi>><</link>>
 	<<elseif $Flag == 1>>
-		[[Release her from the cellblock|Retrieve][$i = _ssi]]
+		<<link "Release her from $cellblockName" "Retrieve">><<set $i = _ssi>><</link>>
 	<<else>>
 		[[Change or remove Wardeness|Wardeness Select]]
 		<<break>>