From ad149ed8f3935bb85bfb48467f771bb9463da0e0 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 5 Apr 2018 00:10:23 -0500
Subject: [PATCH] Commit

---
 src/init/setupVars.tw           | 10 +++++-----
 src/uncategorized/reNickname.tw | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 617acfcf01e..865b2fd26e2 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -273,13 +273,13 @@
 
 <<set setup.youngCareers = ["a babysitter", "a ballerina", "a barista", "a bartender", "a beggar", "a camgirl", "a camp counselor", "a camwhore", "a cashier", "a cheerleader", "a cocktail waitress", "a cook", "a courier", "a criminal", "a cum dump", "a factory worker", "a farm laborer", "a farm laborer", "a farmer's daughter", "a gang member", "a gang member", "a handmaiden", "a housesitter", "a housewife", "a lifeguard", "a magician's assistant", "a maid", "a meat toilet", "a medical student", "a model", "a nurse", "a paramedic", "a party girl", "a political activist", "a prisoner", "a prostitute", "a racing driver", "a reality show star", "a refugee", "a ride attendant", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shrine maiden", "a soldier", "a street performer", "a stripper", "a student", "a student", "a student", "a teaching assistant", "a truck driver", "a video game streamer", "a waitress", "a yoga instructor", "an air hostess", "an apprentice", "an arcade attendant", "an artist", "an aspiring pop star", "an assassin", "an escort", "an exotic dancer", "an intern", "an office worker", "homeless", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
 
-<<set setup.educatedCareers = ["a ballerina", "a banker", "a business owner", "a chemist", "a child actress", "a classical dancer", "a classical musician", "a coach", "a college scout", "a coroner", "a corporate executive", "a counselor", "a criminal", "a cult leader", "a dean", "a dentist", "a director", "a dispatch officer", "a doctor", "a historian", "a journalist", "a journalist", "a judge", "a lawyer", "a librarian", "a lobbyist", "a madam", "a manager", "a mechanic", "a mediator", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a painter", "a paramedic", "a pharmacist", "a photographer", "a pilot", "a poet", "a police detective", "a police negotiator", "a political activist", "a politician", "a principal", "a prison warden", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a prostitute", "a psychologist", "a refugee", "a scholar", "a scientist", "a sculptor", "a secretary", "a serial divorcee", "a shut-in", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a transporter", "a veterinarian", "a wedding planner", "a writer", "a zookeeper", "an actress", "an air hostess", "an animator", "an archaeologist", "an artist", "an assassin", "an astronaut", "an economist", "an editor", "an engineer", "an escort", "an estate agent", "an investor", "an MS pilot", "an office worker", "unemployed"]>>
+<<set setup.educatedCareers = ["a ballerina", "a banker", "a business owner", "a chemist", "a child actress", "a classical dancer", "a classical musician", "a coach", "a college scout", "a coroner", "a corporate executive", "a counselor", "a criminal", "a cult leader", "a dean", "a dentist", "a director", "a dispatch officer", "a doctor", "a historian", "a journalist", "a journalist", "a judge", "a lawyer", "a librarian", "a lobbyist", "a madam", "a manager", "a mechanic", "a mediator", "a medical student", "a mercenary", "a military officer", "a military recruiter", "a nun", "a painter", "a paramedic", "a pharmacist", "a photographer", "a pilot", "a poet", "a police detective", "a police negotiator", "a political activist", "a politician", "a principal", "a prison warden", "a private detective", "a private instructor", "a procuress", "a producer", "a professional bartender", "a professor", "a programmer", "a prostitute", "a psychologist", "a refugee", "a scholar", "a scientist", "a sculptor", "a secretary", "a serial divorcee", "a shut-in", "a surgeon", "a teacher", "a teaching assistant", "a therapist", "a train conductor", "a transporter", "a veterinarian", "a wedding planner", "a writer", "a zookeeper", "an actress", "an air hostess", "an animator", "an archaeologist", "an artist", "an assassin", "an astronaut", "an economist", "an editor", "an engineer", "an escort", "an estate agent", "an investor", "an MS pilot", "an office worker", "retired", "unemployed"]>>
 
-<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beekeeper", "a beggar", "a bodyguard", "a bouncer", "a bounty hunter", "a brewer", "a bus driver", "a butcher", "a butler", "a camgirl", "a camp counselor", "a camwhore", "a candlestick maker", "a caregiver", "a carpenter", "a cashier", "a charity worker", "a chauffeur", "a cheerleader", "a chiropractor", "a clown", "a cocktail waitress", "a con artist", "a construction worker", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a florist", "a fortune teller", "a gang leader", "a gang member", "a gardener", "a groomer", "a handmaiden", "a hotel manager", "a house DJ", "a housewife", "a hunter", "a janitor", "a landlady", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a magician's assistant", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a milkmaid", "a mime", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a roadie", "a rodeo star", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shepherd", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a stripper", "a student", "a stuntwoman", "a switchboard operator", "a talent scout", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a whaler", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an artist", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an exterminator", "an innkeeper", "an office worker", "homeless", "in a militia", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
+<<set setup.uneducatedCareers = ["a baker", "a barber", "a barista", "a bartender", "a beekeeper", "a beggar", "a bodyguard", "a bouncer", "a bounty hunter", "a brewer", "a bus driver", "a butcher", "a butler", "a camgirl", "a camp counselor", "a camwhore", "a candlestick maker", "a caregiver", "a carpenter", "a cashier", "a charity worker", "a chauffeur", "a cheerleader", "a chiropractor", "a clown", "a cocktail waitress", "a con artist", "a construction worker", "a cook", "a criminal", "a croupier", "a cum dump", "a dairy worker", "a dancer", "a delivery woman", "a driller", "a factory worker", "a farm laborer", "a farmer's daughter", "a farmer", "a firefighter", "a fisherwoman", "a florist", "a fortune teller", "a gang leader", "a gang member", "a gardener", "a groomer", "a handmaiden", "a hotel manager", "a house DJ", "a housewife", "a hunter", "a janitor", "a landlady", "a launderer", "a law enforcement officer", "a lifeguard", "a local news anchor", "a lumberjack", "a magician's assistant", "a maid", "a mail carrier", "a masseuse", "a masseuse", "a meat toilet", "a medic", "a medic", "a medium", "a messenger", "a milkmaid", "a mime", "a miner", "a missionary", "a mistress", "a model", "a mortician", "a musician", "a nurse", "a paramedic", "a park ranger", "a party girl", "a peddler", "a pimp", "a pirate", "a plumber", "a political activist", "a prison guard", "a prisoner", "a procuress", "a prostitute", "a racing driver", "a radio show host", "a rancher", "a refugee", "a revolutionary", "a ride attendant", "a roadie", "a rodeo star", "a sailor", "a saleswoman", "a secretary", "a security guard", "a service worker", "a shepherd", "a shrine maiden", "a soldier", "a stage magician", "a street performer", "a street vendor", "a stripper", "a student", "a stuntwoman", "a switchboard operator", "a tailor", "a talent scout", "a taxi driver", "a teacher", "a trophy wife", "a truck driver", "a waitress", "a weathergirl", "a welder", "a whaler", "a zookeeper", "an acrobat", "an actress", "an arcade attendant", "an artist", "an aspiring pop star", "an athlete", "an electrician", "an enforcer", "an enforcer", "an escort", "an exotic dancer", "an exterminator", "an innkeeper", "an office worker", "homeless", "in a militia", "retired", "unemployed", "unemployed", "unemployed", "unemployed", "unemployed"]>>
 
 <<set setup.gratefulCareers = ["a beggar", "a peddler", "a pick-pocket", "a prisoner", "a refugee", "a shut-in", "a street urchin", "a student from a boarding school", "a sweatshop worker", "an orphan", "from a lower class family", "homeless", "unemployed"]>>
 
-<<set setup.menialCareers = ["a babysitter", "a bus driver", "a butler", "a cashier", "a chauffeur", "a construction worker", "a cook", "a courier", "a delivery woman", "a dropout", "a factory worker", "a farm laborer", "a fisherwoman", "a handmaiden", "a housesitter", "a housewife", "a maid", "a mail carrier", "a mechanic", "a messenger", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a producer", "a programmer", "a ride attendant", "a roadie", "a service worker", "a student from a private school", "a student from a public school", "a student", "a taxi driver", "a truck driver", "an apprentice", "an arcade attendant", "an athlete", "an engineer", "an intern", "being homeschooled by her parents", "from a middle class family", "from an upper class family"]>>
+<<set setup.menialCareers = ["a babysitter", "a bus driver", "a butler", "a cashier", "a chauffeur", "a construction worker", "a cook", "a courier", "a delivery woman", "a dropout", "a factory worker", "a farm laborer", "a fisherwoman", "a handmaiden", "a housesitter", "a housewife", "a maid", "a mail carrier", "a mechanic", "a messenger", "a miner", "a nun", "a paper girl", "a part-time farm laborer", "a pilot", "a producer", "a programmer", "a ride attendant", "a roadie", "a service worker", "a student from a private school", "a student from a public school", "a student", "a taxi driver", "a truck driver", "an apprentice", "an arcade attendant", "an athlete", "an engineer", "an intern", "being homeschooled by her parents", "from a middle class family", "from an upper class family"]>>
 
 <<set setup.entertainmentCareers = ["a camgirl", "a camwhore", "a cheerleader", "a child actress", "a cocktail waitress", "a journalist", "a local news anchor", "a magician's assistant", "a party girl", "a racing driver", "a rodeo star", "a stage magician", "a street performer", "a stuntwoman", "a video game streamer", "a waitress", "a weathergirl", "a writer", "an actress", "an artist"]>>
 
@@ -558,8 +558,8 @@
 <<set setup.jamaicanSlaveNames = ["Abigail", "Amelia", "Anah", "Asenath", "Ashley", "Atarah", "Athalia", "Brianna", "Candace", "Chloe", "Damaris", "Danielle", "Deborah", "Dominique", "Eden", "Emily", "Farrah", "Felicia", "Fiona", "Gabrielle", "Gale", "Haley", "Jada", "Jade", "Jessica", "Jillian", "Kayla", "Nadia", "Rahima", "Reta", "Rihanna", "Sadiki", "Samiha", "Serafina", "Tamasha", "Tiana", "Tianna", "Tisha", "Zalika", "Zawadi"]>>
 <<set setup.jamaicanSlaveSurnames = ["Allen", "Anderson", "Atkinson", "Bailey", "Baker", "Barnes", "Barnett", "Barrett", "Bartley", "Beckford", "Bell", "Benjamin", "Bennett", "Bent", "Bernard", "Black", "Blackwood", "Blair", "Blake", "Bowen", "Brooks", "Brown", "Bryan", "Buchanan", "Burke", "Burrell", "Burton", "Cameron", "Campbell", "Carter", "Chambers", "Chin", "Christie", "Chung", "Clarke", "Cole", "Collins", "Cooper", "Crawford", "Crooks", "Cummings", "Cunningham", "Dacosta", "Daley", "Davidson", "Davis", "Dawkins", "Dennis", "Dixon", "Donaldson", "Douglas", "Duncan", "Dunkley", "Ebanks", "Edwards", "Elliott", "Ellis", "Evans", "Facey", "Farquharson", "Fearon", "Ferguson", "Fletcher", "Forbes", "Foster", "Francis", "Fraser", "Gayle", "Gooden", "Gordon", "Graham", "Grant", "Gray", "Green", "Grey", "Griffiths", "Hall", "Hamilton", "Hanson", "Harris", "Harrison", "Harvey", "Haughton", "Henry", "Hewitt", "Hibbert", "Higgins", "Hill", "Hinds", "Hines", "Holness", "Howell", "Hudson", "Hunter", "Hutchinson", "Hylton", "Jackson", "James", "Jarrett", "Johnson", "Jones", "Kelly", "Kerr", "King", "Knight", "Lawrence", "Lee", "Leslie", "Levy", "Lewis", "Lindo", "Lindsay", "Linton", "Lynch", "Malcolm", "Marley", "Marshall", "Martin", "Matthews", "Maxwell", "McCalla", "McDonald", "McFarlane", "McIntosh", "McKenzie", "McLean", "McLeod", "McPherson", "Miller", "Mills", "Mitchell", "Moore", "Morgan", "Morris", "Morrison", "Mullings", "Murray", "Myers", "Myrie", "Nelson", "Nembhard", "Newman", "Palmer", "Patterson", "Peart", "Phillips", "Pinnock", "Plummer", "Powell", "Pryce", "Ramsay", "Reid", "Reynolds", "Rhoden", "Richards", "Ricketts", "Riley", "Roberts", "Robinson", "Rose", "Rowe", "Russell", "Salmon", "Samuels", "Scarlett", "Scott", "Senior", "Shaw", "Simmonds", "Simms", "Simpson", "Sinclair", "Small", "Smith", "Spence", "Spencer", "Stephens", "Stephenson", "Sterling", "Stewart", "Sutherland", "Swaby", "Taylor", "Thomas", "Thompson", "Tomlinson", "Tulloch", "Turner", "Vassell", "Walker", "Wallace", "Walters", "Watson", "White", "Whyte", "Williams", "Williamson", "Wilson", "Wright", "Wynter", "Young"]>>
 
-<<set setup.malaysianSlaveNames = ["Adriana", "Aishah", "Alicia", "Alya", "Amani", "Arianna", "Arissa", "Azalina", "Balqis", "Batrisyia", "Betty", "Chloe", "Damia", "Dhia", "Dyana", "Fatimah", "Hannah", "Humaira", "Iris", "Keisha", "Khalisha", "Marissa", "Mia", "Michelle", "Nor", "Nur", "Nurul", "Puteri", "Qaisara", "Qistina", "Rosnah", "Safiyyah", "Sakinah", "Sara", "Sarah", "Siti", "Sofya", "Sophia", "Zara"]>>
-<<set setup.malaysianSlaveSurnames = ["Abd", "Abdul", "Abdullah", "Abu", "Adnan", "Ahmad", "Ali", "Alias", "Amin", "Ang", "Anuar", "Ariffin", "Arumugam", "Awang", "Aziz", "Azman", "Azmi", "Bakar", "Bee", "Boon", "Chai", "Chan", "Chang", "Che", "Cheah", "Chee", "Chen", "Cheng", "Cheong", "Chew", "Chia", "Chin", "Ching", "Chong", "Choo", "Choong", "Chow", "Chua", "Chuah", "Chung", "Daud", "Devi", "Din", "Fauzi", "Firdaus", "Fong", "Foo", "Foong", "Gan", "Ghazali", "Goh", "Haji", "Hakim", "Halim", "Hamdan", "Hamid", "Hamzah", "Han", "Harun", "Hasan", "Hashim", "Hassan", "Heng", "Ho", "Hong", "Hui", "Hussain", "Hussin", "Ibrahim", "Idris", "Ishak", "Ismail", "Jaafar", "Jamaludin", "Johari", "Kamal", "Kamaruddin", "Kamarudin", "Kassim", "Kaur", "Kee", "Keng", "Khalid", "Khan", "Khoo", "Khor", "Koh", "Kok", "Kong", "Krishnan", "Kuan", "Kumar", "Lai", "Lam", "Lau", "Law", "Lee", "Leong", "Li", "Liew", "Lim", "Lin", "Ling", "Loh", "Loke", "Loo", "Low", "Mahmud", "Man", "Mansor", "Mat", "Mohamad", "Mohamed", "Mohammad", "Mohammed", "Mokhtar", "Muhamad", "Muhammad", "Muniandy", "Musa", "Mustafa", "Nair", "Nasir", "Ng", "Nik", "Nizam", "Noor", "Nor", "Nordin", "Oh", "Omar", "Ong", "Ooi", "Osman", "Othman", "Pang", "Phang", "Poh", "Rahim", "Rahman", "Raj", "Raja", "Ramasamy", "Ramli", "Rashid", "Razak", "Razali", "Rosli", "Said", "Salleh", "Samsudin", "Saw", "See", "Seng", "Shah", "Siew", "Sim", "Sin", "Singh", "Soh", "Soo", "Soon", "Subramaniam", "Sulaiman", "Syed", "Tai", "Tan", "Tang", "Tay", "Tee", "Teh", "Teng", "Teo", "Teoh", "Tham", "Ting", "Toh", "Tong", "Wahab", "Wan", "Wee", "Wei", "Wong", "Woo", "Yaacob", "Yahaya", "Yahya", "Yap", "Yeap", "Yee", "Yen", "Yeo", "Yeoh", "Yew", "Yong", "Yusof", "Yusoff", "Zainal", "Zainuddin", "Zakaria", "Zulkifli"]>>
+<<set setup.malaysianSlaveNames = ["Adibah", "Adriana", "Aida", "Aini", "Aishah", "Alicia", "Alya", "Amani", "Amy", "Anis", "Anisah", "Anu", "Arfah", "Arianna", "Arissa", "Asyiqin", "Ayu", "Azalina", "Balqis", "Batrisyia", "Betty", "Cempaka", "Ché", "Chloe", "Damia", "Dayang", "Delima", "Dewi", "Dhia", "Dyana", "Esme", "Farhanna", "Fatimah", "Fazira", "Geok", "Hannah", "Haslina", "Hasliza", "Hasmah", "Hawa", "Hayati", "Humaira", "Ida", "Intan", "Iris", "Ismah", "Janet", "Keisha", "Khairulnisa", "Khalisha", "Lela", "Lina", "Lyana", "Marissa", "Masnah", "Mastura", "Mazlin", "Mazlina", "Maznah", "Melati", "Melur", "Mia", "Michelle", "Misha", "Mutiara", "Nik", "Nithya", "Noor", "Nor", "Nora", "Noraini", "Norazah", "Norhasnize", "Norhenaza", "Norlaili", "Norlina", "Normah", "Normi", "Norsiah", "Nur", "Nurul", "Puteri", "Qaisara", "Qistina", "Queenzy", "Radin", "Rafeah", "Rosnah", "Rosnani", "Rosni", "Ruhil", "Safiyyah", "Sakinah", "Saleha", "Samantha", "Sangeeta", "Sanisah", "Sara", "Sarah", "Sarimah", "Seri", "Sharifah", "Siti", "Sofea", "Sofya", "Soopia", "Sophia", "Suhana", "Suriani", "Suriati", "Syafika", "Syahidah", "Syamala", "Syamira", "Syarifah", "Tongoo", "Vanida", "Venita", "Vera", "Wan", "Wati", "Zahreen", "Zaini", "Zainon", "Zaiton", "Zaliha", "Zara", "Zeti", "Zetty", "Zuhal"]>>
+<<set setup.malaysianSlaveSurnames = ["Abd", "Abdul", "Abdullah", "Abu", "Adnan", "Ahmad", "Ali", "Alias", "Amin", "Ang", "Anuar", "Ariffin", "Arumugam", "Awang", "Aziz", "Azman", "Azmi", "Bakar", "Bee", "Beng", "Bob", "Boon", "Chai", "Chan", "Chang", "Che", "Cheah", "Chee", "Chen", "Cheng", "Cheong", "Chew", "Chhoa", "Chia", "Chieng", "Chiew", "Chin", "Ching", "Chong", "Choo", "Chooi", "Choong", "Chow", "Chua", "Chuah", "Chung", "Daud", "Devi", "Din", "Fauzi", "Firdaus", "Fong", "Foo", "Foon", "Foong", "Gan", "Ghazali", "Ghee", "Gnanalingam", "Goh", "Haji", "Hakim", "Halim", "Hamdan", "Hamid", "Hamzah", "Han", "Har", "Harun", "Hasan", "Hashim", "Hassan", "Heah", "Heng", "Ho", "Hong", "Hooi", "Hui", "Hussain", "Hussin", "Hwa", "Ibrahim", "Idris", "Ishak", "Ismail", "Jaafar", "Jamaludin", "Johari", "Jusoh", "Kamal", "Kamaruddin", "Kamarudin", "Kassim", "Kaur", "Kaw", "Kee", "Keng", "Khalid", "Khan", "Khaw", "Khoo", "Khor", "Koh", "Kok", "Kong", "Krishnan", "Krishnasamy", "Kuan", "Kumar", "Lai", "Lam", "Lau", "Law", "Lee", "Leong", "Li", "Liew", "Lim", "Lin", "Ling", "Loh", "Loke", "Loo", "Loong", "Low", "Mahmud", "Man", "Mansor", "Mat", "Megat", "Merican", "Mohamad", "Mohamed", "Mohammad", "Mohammed", "Moi", "Mokhtar", "Moo", "Muhamad", "Muhammad", "Muniandy", "Munsi", "Musa", "Mustafa", "Nair", "Nasir", "Neoh", "Ng", "Ngooi", "Nik", "Nizam", "Noor", "Nor", "Nordin", "Oh", "Omar", "Ong", "Ooi", "Osman", "Othman", "Pang", "Pee", "Phang", "Pillay", "Poh", "Rahim", "Rahman", "Raj", "Raja", "Ramamoorthy", "Ramasamy", "Ramli", "Rashid", "Razak", "Razali", "Rosli", "Said", "Salleh", "Samsudin", "Saw", "See", "Seng", "Shah", "Shamsudin", "Shanmughalingam", "Sharifuddin", "Siew", "Sim", "Sin", "Singh", "Siow", "Soh", "Soo", "Soon", "Subramaniam", "Suhaimi", "Sulaiman", "Sulong", "Syed", "Tai", "Tan", "Tang", "Tay", "Tee", "Teh", "Ten", "Teng", "Tengku", "Tenn", "Teo", "Teoh", "Tet", "Tham", "Ting", "Toh", "Tong", "Tortajada", "Voo", "Wahab", "Wan Chek", "Wan", "Wee", "Wei", "Wong", "Woo", "Yaacob", "Yahaya", "Yahya", "Yap", "Yeap", "Yee", "Yen", "Yeo", "Yeoh", "Yew", "Yong", "Yusof", "Yusoff", "Zainal", "Zainuddin", "Zakaria", "Zulkifli"]>>
 
 <<set setup.guatemalanSlaveNames = ["Aida", "Akna", "Alcina", "Ana", "Arabella", "Chimalmat", "Colel", "Cristina", "Daphne", "Elisa", "Gabriela", "Iris", "Irma", "Itzel", "Ixazaluoh", "Jessica", "Josefa", "Julia", "Karina", "Leonora", "Lillian", "Luisa", "Luz", "María", "Mercedes", "Myrna", "Petrona", "Rigoberta", "Sacniete", "Shery", "Soluna", "Thelma", "Xmucane", "Xoc", "Xpiayoc", "Yassmin", "Zury"]>>
 <<set setup.guatemalanSlaveSurnames = ["Aguilar", "Aguirre", "Aldana", "Alfaro", "Alonzo", "Alvarado", "Alvarez", "Aquino", "Arana", "Árbenz", "Archila", "Arevalo", "Argueta", "Arias", "Arriaza", "Arriola", "Avila", "Ayala", "Barillas", "Barrera", "Barrientos", "Barrios", "Batres", "Bautista", "Blanco", "Bonilla", "Bran", "Caal", "Cabrera", "Caceres", "Calderon", "Campos", "Cano", "Cardona", "Carranza", "Carrera", "Carrillo", "Castañeda", "Castellanos", "Castillo", "Castro", "Catalan", "Chacon", "Chavez", "Chinchilla", "Cifuentes", "Colindres", "Contreras", "Corado", "Cordon", "Coronado", "Cruz", "Dardon", "Davila", "de la Cruz", "de Len", "de Leon", "de Paz", "del Cid", "Diaz", "Dominguez", "Donis", "Duarte", "Echeverria", "Enriquez", "Escobar", "Espinoza", "Estrada", "Fajardo", "Fernandez", "Figueroa", "Flores", "Franco", "Fuentes", "Galindo", "Galvez", "Garca", "Garcia", "Gil", "Giron", "Godinez", "Godoy", "Gomez", "Gonzales", "Gonzalez", "Gramajo", "Gudiel", "Guerra", "Guevara", "Gutierrez", "Guzman", "Hernandez", "Herrera", "Jimenez", "Juarez", "Lara", "Leal", "Leiva", "Lemus", "Leon", "Lima", "Linares", "Lopez", "Luna", "Maldonado", "Marroquin", "Martinez", "Mayen", "Mazariegos", "Medina", "Mejia", "Melgar", "Mendez", "Mendoza", "Menendez", "Merida", "Miranda", "Molina", "Monroy", "Montenegro", "Monterroso", "Montufar", "Monzon", "Morales", "Moran", "Morataya", "Moreno", "Muñoz", "Muralles", "Najera", "Noriega", "Ochoa", "Oliva", "Orantes", "Ordoñez", "Orellana", "Orozco", "Ortega", "Ortiz", "Osorio", "Ovalle", "Pacheco", "Padilla", "Paiz", "Palacios", "Palencia", "Palma", "Paredes", "Paz", "Perez", "Pineda", "Pinto", "Polanco", "Ponce", "Portillo", "Quiñonez", "Ramirez", "Ramos", "Recinos", "Reyes", "Rios", "Rivas", "Rivera", "Rodas", "Rodriguez", "Rojas", "Roldan", "Romero", "Rosales", "Ruano", "Ruiz", "Sagastume", "Salazar", "Salguero", "Samayoa", "Sanchez", "Sandoval", "Santizo", "Santos", "Scheel", "Sierra", "Solares", "Solis", "Solorzano", "Sosa", "Soto", "Tobar", "Toledo", "Torres", "Urizar", "Valdez", "Valenzuela", "Valladares", "Valle", "Vargas", "Vasquez", "Vega", "Velasquez", "Veliz", "Villagran", "Villatoro", "Zamora"]>>
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index eba40f444ea..bbfe65976e8 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -785,7 +785,7 @@
 <<case "implants">>
 	<<set $nickname = either("'Balloons'", "'Blowup Doll'", "'Bolted-On'", "'Implants'", "'Plastic'", "'Plastique'", "'Silicone'")>>
 	<<set $situationDesc = "is full of breast implants. They're so large it's quite obvious they're fake, and the implications are clear: She's a plastic slut, and the other slaves never tire of letting her know it.">>
-	<<set $applyDesc = "accepts the implicit mockery, knowing that her bimbo-esque body is what appeals to <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title isnot 0>>her master<<else>>her mistress<</if>>.">>
+	<<set $applyDesc = "accepts the implicit mockery, knowing that her bimbo-esque body is what appeals to <<if def $PC.customTitle>>her $PC.customTitle<<elseif $PC.title != 0>>her master<<else>>her mistress<</if>>.">>
 	<<set $notApplyDesc = "is relieved to be protected from the other slaves' mockery over her implants, though she's also a little sad she can't take them as a kind of trademark.">>
 
 <<case "bimbo">>
@@ -855,7 +855,7 @@
 	<<set $notApplyDesc = "understands that she's a sex slave first, and must fuck in private like she were fucking in public.">>
 
 <<case "veteran">>
-	<<set $nickname = either("'Cumdump'", "'Dirty'", "'Easy'", "'Public Favorite'", "'Tired-Out'", "'Village Bicycle'", "'Whore Queen'", "'Worn'")>>
+	<<set $nickname = either("'Cumdump'", "'Dirty'", "'Easy'", "'Public Favorite'", "'Tired-Out'", "'Veteran'", "'Village Bicycle'", "'Whore Queen'", "'Worn'")>>
 	<<set $situationDesc = "has been with you for a while, and she's gotten fucked a lot. Hundreds and hundreds of times over many weeks. Though she does her best, at times it can be obvious that there's very little that surprises her any more. She's forgotten more sexual experience than many of your other slaves remember.">>
 	<<set $applyDesc = "knows that you've noticed all her hard work. Getting fucked day in and day out is harder than digging ditches, and she's a veteran ditchdigger.">>
 	<<set $notApplyDesc = "understands that even though she's been fucked so much, she's still just meat; she isn't special.">>
@@ -1062,7 +1062,7 @@
 	<<set $notApplyDesc = "understands that she must do her best to fuck like the teenager she isn't.">>
 
 <<case "reallyold">>
-	<<set $nickname = either("'Aged'", "'Generation X'", "'GMILF'", "'Grandma'", "'Granny'", "'Nanna'", "'Obā-chan'", "'Senior Citizen'", "'Senior'")>>
+	<<set $nickname = either("'Aged'", "'Generation X'", "'GILF'", "'GMILF'", "'Grandma'", "'Grandmother'", "'Granny'", "'Nanna'", "'Obā-chan'", "'Senior Citizen'", "'Senior'")>>
 	<<set $situationDesc = "is old. Really old. Old enough to be a grandmother. This, naturally, makes her one of the most experienced sluts in the arcology, a desirable quality in and of itself. Many of the younger slaves mock her relentlessly for her age.">>
 	<<set $applyDesc = "accepts her new nickname with pride. This acknowledgement of her age has her ready to show these young sluts a thing or two.">>
 	<<set $notApplyDesc = "understands that she must do her best to fuck like the teenager she once was.	">>
@@ -1126,7 +1126,7 @@
 	<<set $notApplyDesc = "realizes that she'll just have to reach higher to make up for her height, since you don't consider it special.">>
 
 <<case "tall">>
-	<<set $nickname = either("'B-Baller'", "'Basketballer'", "'Beanpole'", "'Beanstalk'", "'Everest'", "'Giant'", "'Giraffe'", "'Redwood'", "'Skyscraper'", "'Slim'", "'Stretch'", "'Tower'")>>
+	<<set $nickname = either("'B-Baller'", "'Basketballer'", "'Beanpole'", "'Beanstalk'", "'Everest'", "'Giant'", "'Giantess'", "'Giraffe'", "'Redwood'", "'Skyscraper'", "'Slim'", "'Stretch'", "'Tower'")>>
 	<<set $situationDesc = "is impressively tall for a girl. This makes her sexually convenient, since her holes are at convenient cock height. She spends many of her sexual encounters bent slightly at the waist to allow herself to be taken from behind.">>
 	<<set $applyDesc = "is quite proud of her impressive height, even more so than before. She resolves to tower over other slaves sexually as well as literally.">>
 	<<set $notApplyDesc = "realizes that being tall doesn't make her special, and understands that it's her holes that make her, not how high they are.">>
@@ -1144,7 +1144,7 @@
 	<<set $notApplyDesc = "accepts that having a massive ass does not make her special, since what's important is her holes, not her buttocks.">>
 
 <<case "virgin">>
-	<<set $nickname = either("'Chaste'", "'Chastity'", "'Doomed'", "'Flower'", "'Innocent'", "'Pristine'", "'Pure'", "'Unbroken'", "'Unspoilt'", "'Vestal'")>>
+	<<set $nickname = either("'Chaste'", "'Chastity'", "'Doomed'", "'Flower'", "'Innocent'", "'Pristine'", "'Pure'", "'Unbroken'", "'Unspoilt'", "'Vestal'", "'Virgin'")>>
 	<<set $situationDesc = "has never had vanilla sex. This is not unusual in the Free Cities, since many slaveowners value and preserve virginity. Virgins form a separate class of sorts among slaves. Some of them even dislike their status, as having a virgin pussy can often result in a tired tongue or a sore butt.">>
 	<<set $applyDesc = "understands that it's her fate to remain unspoiled a while longer, and redoubles her efforts to do better with her other parts.">>
 	<<set $notApplyDesc = "dreads and anticipates the day when she'll lose her pearl of great price and gain another way to please a man.">>
-- 
GitLab