diff --git a/Biotech/DefInjected/HediffDef/Hediffs_Mechanitor.xml b/Biotech/DefInjected/HediffDef/Hediffs_Mechanitor.xml
index 78d0beff..22642414 100644
--- a/Biotech/DefInjected/HediffDef/Hediffs_Mechanitor.xml
+++ b/Biotech/DefInjected/HediffDef/Hediffs_Mechanitor.xml
@@ -30,14 +30,14 @@
   <MechlinkImplant.descriptionShort>一种可以直接控制机械体的仿生植入物。只能在使用者死后才能移除。</MechlinkImplant.descriptionShort>
   
   <!-- EN: remote repairer -->
-  <RemoteRepairerImplant.label>远程维修</RemoteRepairerImplant.label>
+  <RemoteRepairerImplant.label>远程维修模块</RemoteRepairerImplant.label>
   <!-- EN: A mechlink upgrade which allows the mechanitor to repair mechs from a distance. The user links with the mechanoid and uses their own brain to psychically guide its self-repair mechanites.\n\nThis implant can be installed up to 3 times to increase its range. -->
   <RemoteRepairerImplant.description>一种允许机械师远程修理机械体的机控升级模块。使用者大脑可以与机械体建立直接精神链接，为机械体自我修复提供规划指引。\n\n这种植入物最多可以安装3次以增加效果距离。</RemoteRepairerImplant.description>
   <!-- EN: An implant which allows the user to repair mechs from a distance. This can be installed up to 3 times. -->
   <RemoteRepairerImplant.descriptionShort>一种可以让使用者远程维修机械体的植入物。最多可以安装3次。</RemoteRepairerImplant.descriptionShort>
   
   <!-- EN: remote shielder -->
-  <RemoteShielderImplant.label>远程护盾</RemoteShielderImplant.label>
+  <RemoteShielderImplant.label>远程护盾模块</RemoteShielderImplant.label>
   <!-- EN: An implant which allows the mechanitor to place a personal defense shield on a mech. The mechanitor must continuously focus on the mech in order to maintain the shield. It can be used to save a mech at a critical moment.\n\nThis implant can be installed up to 3 times to increase its range and shield energy. -->
   <RemoteShielderImplant.description>一种允许机械师为机械体投射护盾的升级模块。机械师必须持续聚焦目标机械体才能维持护盾存在。\n\n远程投射护盾需要消耗大量的聚焦能量。但是这可以在关键时刻救机械体一命。\n\n这种植入物最多可以安装3次以增加效果距离和护盾强度。</RemoteShielderImplant.description>
   
diff --git a/Biotech/DefInjected/RulePackDef/RulePacks_Namers_Xenohumans.xml b/Biotech/DefInjected/RulePackDef/RulePacks_Namers_Xenohumans.xml
index 7be3ecea..c902bf3e 100644
--- a/Biotech/DefInjected/RulePackDef/RulePacks_Namers_Xenohumans.xml
+++ b/Biotech/DefInjected/RulePackDef/RulePacks_Namers_Xenohumans.xml
@@ -36,7 +36,7 @@
     <li>End->drite</li>
   -->
   <NamerPersonDirtmole_Female.rulePack.rulesStrings>
-    <li>r_name->[firstName][Syl][End]</li>
+    <li>r_name->[firstName] [Syl][End]</li>
     <li>End->凯特</li>
     <li>End->琪蒂</li>
     <li>End->西黛</li>
@@ -170,7 +170,7 @@
     <li>nameEnd->nath</li>
   -->
   <NamerPersonImpid.rulePack.rulesStrings>
-    <li>r_name->[firstName][lastName]</li>
+    <li>r_name->[firstName] [lastName]</li>
     <li>firstName(p=0.5)->[SylI]</li>
     <li>firstName(p=2)->[SylI][nameEnd]</li>
     <li>firstName->[SylI][SylI][nameEnd]</li>
@@ -231,8 +231,8 @@
     <li>nameEnd->oin</li>
   -->
   <NamerPersonPigskin.rulePack.rulesStrings>
-    <li>r_name->[firstName][lastName]</li>
-    <li>r_name(p=2)->[firstName][nickName][lastName]</li>
+    <li>r_name->[firstName] [lastName]</li>
+    <li>r_name(p=2)->[firstName] '[nickName]' [lastName]</li>
     <li>maybeHyphen(p=4)-></li>
     <li>maybeHyphen->-</li>
     <li>firstName(p=1)->[SylP][nameEnd]</li>
@@ -296,8 +296,8 @@
     <li>End->y</li>
   -->
   <NamerPersonWaster.rulePack.rulesStrings>
-    <li>r_name->[firstName][lastName]</li>
-    <li>r_name->[firstName][nicknameWaster][lastName]</li>
+    <li>r_name->[firstName] [lastName]</li>
+    <li>r_name->[firstName] '[nicknameWaster]' [lastName]</li>
     <li>firstName->[Syl][Syl]</li>
     <li>firstName->[Syl]</li>
     <li>lastName->[Syl][End]</li>
@@ -356,7 +356,7 @@
     <li>nameEnd->yn</li>
   -->
   <NamerPersonYttakin.rulePack.rulesStrings>
-    <li>r_name->[firstName][lastName]</li>
+    <li>r_name->[firstName] [lastName]</li>
     <li>firstName(p=0.5)->[SylY]</li>
     <li>firstName(p=2)->[SylY][nameEnd]</li>
     <li>firstName->[SylY][SylY][nameEnd]</li>
diff --git a/Biotech/DefInjected/ThingDef/Hediffs_Mechanitor.xml b/Biotech/DefInjected/ThingDef/Hediffs_Mechanitor.xml
index 93acbb15..6e5ac0f1 100644
--- a/Biotech/DefInjected/ThingDef/Hediffs_Mechanitor.xml
+++ b/Biotech/DefInjected/ThingDef/Hediffs_Mechanitor.xml
@@ -30,14 +30,14 @@
   <Mechlink.comps.CompUsableImplant.useLabel>安装{0_label}成为机械师</Mechlink.comps.CompUsableImplant.useLabel>
   
   <!-- EN: remote repairer -->
-  <RemoteRepairer.label>远程维修</RemoteRepairer.label>
+  <RemoteRepairer.label>远程维修模块</RemoteRepairer.label>
   <!-- EN: A mechlink upgrade which allows the mechanitor to repair mechs from a distance. The user links with the mechanoid and uses their own brain to psychically guide its self-repair mechanites.\n\nThis implant can be self-installed without surgery.\n\nThis implant can be installed up to 3 times to increase its range. -->
   <RemoteRepairer.description>一种允许机械师远程修理机械体的机控升级模块。使用者大脑可以与机械体建立直接精神链接，为机械体自我修复提供规划指引。\n\n这种植入物可以不用手术直接安装。\n\n最多可以安装3次以增加效果距离。</RemoteRepairer.description>
   <!-- EN: Implant {0_label} -->
   <RemoteRepairer.comps.CompUsableImplant.useLabel>植入{0_label}</RemoteRepairer.comps.CompUsableImplant.useLabel>
   
   <!-- EN: remote shielder -->
-  <RemoteShielder.label>远程护盾</RemoteShielder.label>
+  <RemoteShielder.label>远程护盾模块</RemoteShielder.label>
   <!-- EN: An implant which allows the mechanitor to place a personal defense shield on a mech. The mechanitor must continuously focus on the mech in order to maintain the shield.\n\nPlacing a shield at a distance requires a substantial amount of focused energy. It can be used to save a mech at a critical moment.\n\nThis implant can be self-installed in the same way as the mechlink.\n\nThis implant can be installed up to 3 times to increase its range and shield energy. -->
   <RemoteShielder.description>一种允许机械师为机械体投射护盾的升级模块。机械师必须持续聚焦目标机械体才能维持护盾存在。\n\n远程投射护盾需要消耗大量的聚焦能量。但是这可以在关键时刻救机械体一命。\n\n这种植入物可以不用手术直接安装。\n\n最多可以安装3次以增加效果距离和护盾强度。</RemoteShielder.description>
   <!-- EN: Implant {0_label} -->