diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp
index ff8cf68f9..124dc768b 100644
--- a/plugins/manipulator.cpp
+++ b/plugins/manipulator.cpp
@@ -97,7 +97,7 @@ const SkillColumn columns[] = {
     {profession::STONEWORKER, unit_labor::MASON, job_skill::MASONRY, "Ma"},
     {profession::STONEWORKER, unit_labor::DETAIL, job_skill::DETAILSTONE, "En"},
 // Hunting/Related
-    {profession::RANGER, unit_labor::ANIMALTRAIN, job_skill::ANIMALTRAIN, "Tr"},
+    {profession::RANGER, unit_labor::ANIMALTRAIN, job_skill::ANIMALTRAIN, "Tn"},
     {profession::RANGER, unit_labor::ANIMALCARE, job_skill::ANIMALCARE, "Ca"},
     {profession::RANGER, unit_labor::HUNT, job_skill::SNEAK, "Hu", true},
     {profession::RANGER, unit_labor::TRAPPER, job_skill::TRAPPING, "Tr"},
@@ -190,19 +190,19 @@ const SkillColumn columns[] = {
     {profession::WRESTLER, unit_labor::NONE, job_skill::ARMOR, "Ar"},
     {profession::WRESTLER, unit_labor::NONE, job_skill::SHIELD, "Sh"},
     {profession::WRESTLER, unit_labor::NONE, job_skill::BITE, "Bi"},
-    {profession::WRESTLER, unit_labor::NONE, job_skill::GRASP_STRIKE, "Pu"},
+    {profession::WRESTLER, unit_labor::NONE, job_skill::GRASP_STRIKE, "St"},
     {profession::WRESTLER, unit_labor::NONE, job_skill::STANCE_STRIKE, "Ki"},
     {profession::WRESTLER, unit_labor::NONE, job_skill::DODGING, "Do"},
     {profession::WRESTLER, unit_labor::NONE, job_skill::MISC_WEAPON, "Mi"},
-    {profession::WRESTLER, unit_labor::NONE, job_skill::MELEE_COMBAT, "Fi"},
-    {profession::WRESTLER, unit_labor::NONE, job_skill::RANGED_COMBAT, "Ar"},
+    {profession::WRESTLER, unit_labor::NONE, job_skill::MELEE_COMBAT, "Fg"},
+    {profession::WRESTLER, unit_labor::NONE, job_skill::RANGED_COMBAT, "Ac"},
 
-    {profession::RECRUIT, unit_labor::NONE, job_skill::LEADERSHIP, "Le"},
+    {profession::RECRUIT, unit_labor::NONE, job_skill::LEADERSHIP, "Ld"},
     {profession::RECRUIT, unit_labor::NONE, job_skill::TEACHING, "Te"},
-    {profession::RECRUIT, unit_labor::NONE, job_skill::KNOWLEDGE_ACQUISITION, "Lr"},
+    {profession::RECRUIT, unit_labor::NONE, job_skill::KNOWLEDGE_ACQUISITION, "St"},
     {profession::RECRUIT, unit_labor::NONE, job_skill::DISCIPLINE, "Di"},
     {profession::RECRUIT, unit_labor::NONE, job_skill::CONCENTRATION, "Co"},
-    {profession::RECRUIT, unit_labor::NONE, job_skill::SITUATIONAL_AWARENESS, "Aw"},
+    {profession::RECRUIT, unit_labor::NONE, job_skill::SITUATIONAL_AWARENESS, "Ob"},
     {profession::RECRUIT, unit_labor::NONE, job_skill::COORDINATION, "Cr"},
     {profession::RECRUIT, unit_labor::NONE, job_skill::BALANCE, "Ba"},
 
@@ -210,13 +210,15 @@ const SkillColumn columns[] = {
     {profession::STANDARD, unit_labor::NONE, job_skill::PERSUASION, "Pe"},
     {profession::STANDARD, unit_labor::NONE, job_skill::NEGOTIATION, "Ne"},
     {profession::STANDARD, unit_labor::NONE, job_skill::JUDGING_INTENT, "Ju"},
-    {profession::STANDARD, unit_labor::NONE, job_skill::LYING, "Ly"},
+    {profession::STANDARD, unit_labor::NONE, job_skill::LYING, "Li"},
     {profession::STANDARD, unit_labor::NONE, job_skill::INTIMIDATION, "In"},
     {profession::STANDARD, unit_labor::NONE, job_skill::CONVERSATION, "Cn"},
     {profession::STANDARD, unit_labor::NONE, job_skill::COMEDY, "Cm"},
     {profession::STANDARD, unit_labor::NONE, job_skill::FLATTERY, "Fl"},
     {profession::STANDARD, unit_labor::NONE, job_skill::CONSOLE, "Cs"},
     {profession::STANDARD, unit_labor::NONE, job_skill::PACIFY, "Pc"},
+
+// Noble
     {profession::ADMINISTRATOR, unit_labor::NONE, job_skill::APPRAISAL, "Ap"},
     {profession::ADMINISTRATOR, unit_labor::NONE, job_skill::ORGANIZATION, "Or"},
     {profession::ADMINISTRATOR, unit_labor::NONE, job_skill::RECORD_KEEPING, "RK"},