Nicknames

* Unified naming convention for nicknames as per writer's request
* Fixed dum lack of dynamic name flag

game/scripts/characters.rpy

@@ -74,8 +74,8 @@ define nar = Character("Narrator", show_side_image=Image("characters/misc/narrat
 define anon = Character("???")
 
 # Dumbledore
-define dum1 = Character("[dumbledore_name]", show_side_image=Image("characters/misc/dumbledore/dum_1.webp"), show_icon="dumbledore")
+define dum1 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_1.webp"), show_icon="dumbledore", dynamic=True)
-define dum2 = Character("[dumbledore_name]", show_side_image=Image("characters/misc/dumbledore/dum_2.webp"), show_icon="dumbledore")
+define dum2 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_2.webp"), show_icon="dumbledore", dynamic=True)
-define dum3 = Character("[dumbledore_name]", show_side_image=Image("characters/misc/dumbledore/dum_3.webp"), show_icon="dumbledore")
+define dum3 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_3.webp"), show_icon="dumbledore", dynamic=True)
-define dum4 = Character("[dumbledore_name]", show_side_image=Image("characters/misc/dumbledore/dum_4.webp"), show_icon="dumbledore")
+define dum4 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_4.webp"), show_icon="dumbledore", dynamic=True)
-define dum5 = Character("[dumbledore_name]", show_side_image=Image("characters/misc/dumbledore/dum_5.webp"), show_icon="dumbledore")
+define dum5 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_5.webp"), show_icon="dumbledore", dynamic=True)

game/scripts/characters/astoria/common.rpy

@@ -44,11 +44,11 @@ label update_astoria:
 
     $ random_number = renpy.random.randint(0, 5)
     if random_number in [1,5]:
-        $ ast_susan_name = renpy.random.choice(["Suzy","Cow","Cow Tits","Milk Bag","Slut","Whore","Piggy","Pig","Bessie","Moo Moo"])
+        $ name_susan_astoria = renpy.random.choice(["Suzy","Cow","Cow Tits","Milk Bag","Slut","Whore","Piggy","Pig","Bessie","Moo Moo"])
     if random_number in [2,5]:
-        $ ast_tonks_name = renpy.random.choice(["Hag","Old Hag","Punk","Dyke","Lesbo"])
+        $ name_tonks_astoria = renpy.random.choice(["Hag","Old Hag","Punk","Dyke","Lesbo"])
     if random_number in [3,5]:
-        $ ton_astoria_name = renpy.random.choice(["Cutie","Kitty","Princess","Cupcake","Honey"])
+        $ name_astoria_tonks = renpy.random.choice(["Cutie","Kitty","Princess","Cupcake","Honey"])
 
     # Chibi Update
     $ astoria_chibi.update()
@@ -73,7 +73,7 @@ label end_astoria_event:
     call music_block
     jump main_room_menu
 
-define character.astoria_say = Character("astoria_name", show_icon="astoria", dynamic=True)
+define character.astoria_say = Character("name_astoria_genie", show_icon="astoria", dynamic=True)
 
 init python:
     def ast(what, mouth=False, eyes=False, eyebrows=False, pupils=False, cheeks=None, tears=None,

game/scripts/characters/astoria/events/clothing.rpy

@@ -21,13 +21,13 @@ label astoria_summon_setup:
 
     if ast_mood > 0:
         if 5 > ast_mood >= 1:
-            ast "[ast_genie_name]?" ("annoyed", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
+            ast "[name_genie_astoria]?" ("annoyed", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
         elif 10 > ast_mood >= 5:
             ast "What now?" ("annoyed", "base", "worried", "mid", xpos="base", ypos="base", trans=d3)
         elif 20 > ast_mood >= 10:
-            ast "What is it, [ast_genie_name]?" ("annoyed", "base", "angry", "R", xpos="base", ypos="base", trans=d3)
+            ast "What is it, [name_genie_astoria]?" ("annoyed", "base", "angry", "R", xpos="base", ypos="base", trans=d3)
         elif 30 > ast_mood >= 20:
-            ast "What do you want, [ast_genie_name]?" ("angry", "base", "angry", "mid", xpos="base", ypos="base", trans=d3)
+            ast "What do you want, [name_genie_astoria]?" ("angry", "base", "angry", "mid", xpos="base", ypos="base", trans=d3)
         elif 40 > ast_mood >= 30:
             ast "*Hmph*..." ("annoyed", "narrow", "worried", "L", xpos="base", ypos="base", trans=d3)
         elif 50 > ast_mood >= 40:
@@ -40,7 +40,7 @@ label astoria_summon_setup:
         call tutorial("moodngifts")
     else:
         if game.daytime:
-            ast "Mornin', [ast_genie_name]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
+            ast "Mornin', [name_genie_astoria]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
         else:
-            ast "Evenin', [ast_genie_name]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
+            ast "Evenin', [name_genie_astoria]." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=d3)
     return

game/scripts/characters/astoria/events/imperio_training.rpy

@@ -810,7 +810,7 @@ label ag_st_imperio_E3:
     gen "That I do!" ("grin", xpos="far_left", ypos="head")
     ton "I should get going. It's getting late..." ("normal", "base", "shocked", "down")
     gen "Until next time..." ("base", xpos="far_left", ypos="head")
-    ton "Have a good night, [ton_genie_name]." ("soft", "base", "base", "mid")
+    ton "Have a good night, [name_genie_tonks]." ("soft", "base", "base", "mid")
 
     # Tonks leaves.
     call ton_walk(action="leave")
@@ -1126,7 +1126,7 @@ label ag_st_imperio_E4:
     gen "A very \"talented\" one at that!" ("base", xpos="far_left", ypos="head")
     ton "Are you just praising my tits, Sir?" ("soft", "narrow", "annoyed", "mid")
     gen "Every part of your body is worthy of praise!" ("grin", xpos="far_left", ypos="head")
-    ton "Well... thank you, [ton_genie_name]." ("base", "happyCl", "shocked", "mid")
+    ton "Well... thank you, [name_genie_tonks]." ("base", "happyCl", "shocked", "mid")
 
     # Screenshake
     with hpunch
@@ -1141,7 +1141,7 @@ label ag_st_imperio_E4:
     gen "Are we going to see more of your... talents?" ("grin", xpos="far_left", ypos="head")
     ton "How would you like to see {b}all{/b} this Auror has to offer?" ("horny", "closed", "annoyed", "mid") # horny
     gen "Looking forward to it!" ("grin", xpos="far_left", ypos="head")
-    ton "Have a good night, [ton_genie_name]!" ("base", "base", "angry", "mid")
+    ton "Have a good night, [name_genie_tonks]!" ("base", "base", "angry", "mid")
 
     # Tonks leaves.
     call ton_walk(action="leave")
@@ -1319,7 +1319,7 @@ label ag_st_imperio_E5:
 
     ast "Look, Professor!" ("smile", "narrow", "angry", "L")
     ast "I got her to be completely naked!" ("smile", "base", "angry", "mid")
-    gen "Excellent work, [astoria_name]!" ("grin", xpos="far_left", ypos="head")
+    gen "Excellent work, [name_astoria_genie]!" ("grin", xpos="far_left", ypos="head")
     ast "Thank you, Sir!" ("smile", "closed", "base", "mid")
     ton "............." ("silly", "happyCl", "base", "stare", cheeks="blush")
 
@@ -1640,7 +1640,7 @@ label ag_st_imperio_E5:
             ton "She's such an uptight and oppressed cute little...{w=0.4} girl." ("upset", "closed", "raised", "down", cheeks="blush")
             ton "..." ("mad", "narrow", "base", "downR", cheeks="blush")
             ton "How can I not help her, even if she's a Slytherin." ("upset", "closed", "base", "mid", cheeks="blush")
-            gen "[tonks_name]... You aren't convincing anyone." ("base", xpos="far_left", ypos="head")
+            gen "[name_tonks_genie]... You aren't convincing anyone." ("base", xpos="far_left", ypos="head")
             ton "To think such an innocent girl could be the victim of such an--" ("open", "closed", "base", "down", cheeks="blush")
             gen "Tonks!" ("base", xpos="far_left", ypos="head")
             ton "Alright..." ("annoyed", "base", "annoyed", "down") #exasperated
@@ -1763,7 +1763,7 @@ label ag_st_imperio_E5:
     ton "If you know what I mean..." ("grin", "narrow", "raised", "down", hair="horny")
     ton "I suppose I should wish you good luck with the training..." ("soft", "base", "shocked", "L")
     gen "Have a good night." ("grin", xpos="far_left", ypos="head")
-    ton "Oh - I will, [ton_genie_name]!" ("base", "base", "raised", "R")
+    ton "Oh - I will, [name_genie_tonks]!" ("base", "base", "raised", "R")
     ton "I sure will!" ("horny", "base", "raised", "downR")
 
     call ton_walk(action="leave")

game/scripts/characters/astoria/gifts.rpy

@@ -36,7 +36,7 @@ label give_ast_gift(gift_item):
         elif ast_whoring > 5 and ast_whoring < 12:
             ast "Some chocolate?" (mouth="open", face="neutral")
             call give_gift(">You give the chocolate to Astoria...", gift_item)
-            ast "Thank you, [ast_genie_name]." (mouth="open", face="neutral")
+            ast "Thank you, [name_genie_astoria]." (mouth="open", face="neutral")
             ast "I don't know what I did to deserve it." (mouth="annoyed", pupils="R", face="neutral")
             ast "But I'm not going to say no..." (face="happy")
             call ast_mood(-1)
@@ -109,7 +109,7 @@ label give_ast_gift(gift_item):
             ast "(...)" (pupils="down", face="annoyed")
             ast "Creating your own itch powder using household ingredients?" (mouth="open", pupils="down", face="annoyed")
             ast "Is the kitchen even open to students?" (pupils="down", face="annoyed")
-            ast "What am I supposed to do with this, [ast_genie_name]?" (face="annoyed")
+            ast "What am I supposed to do with this, [name_genie_astoria]?" (face="annoyed")
             call ast_mood(0)
         elif ast_whoring > 5 and ast_whoring < 12:
             ast "Magazines?" (mouth="open", face="annoyed")
@@ -147,7 +147,7 @@ label give_ast_gift(gift_item):
         else:
             ast "Girl magazines?" (face="annoyed")
             call give_gift(">You give an assortment of rather girly magazines to Astoria...", gift_item)
-            ast "Don't I look hot enough for you [ast_genie_name]?" (mouth="open", eyes="closed", face="annoyed")
+            ast "Don't I look hot enough for you [name_genie_astoria]?" (mouth="open", eyes="closed", face="annoyed")
             ast "I'm just teasing you, I'll have it." (face="happy")
             call ast_mood(-1)
 
@@ -174,7 +174,7 @@ label give_ast_gift(gift_item):
             call give_gift(">You give an assortment of pornographic magazines to Astoria...", gift_item)
             ast "I'll take it!" (mouth="grin", face="happy")
             ast "I'll put one in Susan's bag when she's not looking. Can't wait to see that cows face when her friends notice." (mouth="open", face="angry")
-            ast "Thank you, [ast_genie_name]." (face="happy")
+            ast "Thank you, [name_genie_astoria]." (face="happy")
             call ast_mood(-1)
         elif ast_whoring > 5 and ast_whoring < 12:
             ast "Porn magazines?" (face="annoyed")
@@ -267,7 +267,7 @@ label give_ast_gift(gift_item):
             ast "Yeah, no... I'll take them but there's not going to be any dick going near these bad boys..." (face="annoyed")
             ast "These will be the perfect thing to fill with water and drop down the staircase..." (mouth="smile", face="angry")
             call give_gift(">You give the pack of Condoms to Astoria...", gift_item)
-            ast "Cheers for the ammo, [ast_genie_name]." (face="happy")
+            ast "Cheers for the ammo, [name_genie_astoria]." (face="happy")
             call ast_mood(-2)
         elif ast_whoring > 5 and ast_whoring < 12:
             ast "Condoms?" (face="neutral")
@@ -315,7 +315,7 @@ label give_ast_gift(gift_item):
             ast "Lube?" (mouth="open", face="neutral")
             ast "I know the perfect staircase for this!" (face="happy")
             call give_gift(">You give the jar of lube to Astoria...", gift_item)
-            ast "Thank you, [ast_genie_name]." (face="happy")
+            ast "Thank you, [name_genie_astoria]." (face="happy")
             call ast_mood(-1)
         elif ast_whoring > 5 and ast_whoring < 12:
             ast "Anal Lube?" (mouth="smile", face="happy")
@@ -431,7 +431,7 @@ label give_ast_gift(gift_item):
     elif gift_item == sexdoll_ITEM:
         if ast_whoring < 6:
             ast "A sex doll?" (face="disgusted")
-            ast "That's gross [ast_genie_name]!" (face="angry")
+            ast "That's gross [name_genie_astoria]!" (face="angry")
             ast "Yuck, it smells gross too!" (face="angry")
             call ast_mood(2)
         elif ast_whoring > 5 and ast_whoring < 12:

game/scripts/characters/astoria/vars.rpy

@@ -7,10 +7,10 @@ default astoria_chatted = False
 default astoria_outfits_schedule = True
 
 # Names
-default astoria_name   = "Astoria"
+default name_astoria_genie   = "Astoria"
-default ast_genie_name = "Sir"
+default name_genie_astoria = "Sir"
-default ast_susan_name = "Cow"
+default name_susan_astoria = "Cow"
-default ast_tonks_name = "Old Hag"
+default name_tonks_astoria = "Old Hag"
 
 # Stats
 default ast_whoring = 0 # Affection level

game/scripts/characters/astoria/wardrobe_reactions.rpy

@@ -93,7 +93,7 @@ label ast_reaction_touch_fail(what):
         if random_number == 1:
             ast "Hey!" ("annoyed", "base", "angry", "mid")
         elif random_number == 2:
-            ast "I'm not your pet, [ast_genie_name]..." ("clench", "base", "base", "mid")
+            ast "I'm not your pet, [name_genie_astoria]..." ("clench", "base", "base", "mid")
         elif random_number == 3:
             ast "Oh sorry, my hand slipped." ("annoyed", "closed", "angry", "mid")
         elif random_number == 4:
@@ -140,7 +140,7 @@ label ast_reaction_touch_fail(what):
         if random_number == 1:
             ast "Hey, that's private property." ("base", "narrow", "angry", "down")
         elif random_number == 2:
-            ast "Get your filthy hands off me, [ast_genie_name]." ("upset", "narrow", "base", "mid")
+            ast "Get your filthy hands off me, [name_genie_astoria]." ("upset", "narrow", "base", "mid")
         elif random_number == 3:
             ast "Stop it, you creep." ("annoyed", "narrow", "angry", "R")
         elif random_number == 4:
@@ -148,7 +148,7 @@ label ast_reaction_touch_fail(what):
         elif random_number == 5:
             ast "Don't touch me..." ("clench", "base", "base", "mid")
         elif random_number == 6:
-            ast "Don't be gross, [ast_genie_name]." ("base", "base", "base", "mid")
+            ast "Don't be gross, [name_genie_astoria]." ("base", "base", "base", "mid")
         elif random_number == 7:
             ast "..." ("clench", "closed", "base", "mid")
     return
@@ -182,7 +182,7 @@ label ast_reaction_unequip(item):
     # if item.type == "panties":
     #    if ast_whoring > 15:
     #        ast "You want to see my snatch?"
-    #        ast "You got it [genie_name]!"
+    #        ast "You got it [name_genie_hermione]!"
     #
     return
 
@@ -245,7 +245,7 @@ label ast_reaction_equip_outfit_fail(item):
     return
 
 label ast_reaction_blacklist(item):
-    ast "Aren't you demanding too much, [ast_genie_name]?" ("annoyed", "narrow", "base", "R")
+    ast "Aren't you demanding too much, [name_genie_astoria]?" ("annoyed", "narrow", "base", "R")
 
     if "top" in item.blacklist and astoria.is_worn("top"):
         ast "My topmost garment won't work with that." ("upset", "base", "base", "mid")

game/scripts/characters/cho/chitchats.rpy

@@ -35,11 +35,11 @@ label cho_chitchat:
         elif random_number == 6:
             cho "I wish I would've been born when the Tutshill Tornadoes won the British and Irish league five times in a row." ("soft", "narrow", "base", "down")
             cho "Hold on, you were alive when--" ("angry", "base", "base", "down")
-            cho "[cho_genie_name], please tell me all you know about it!" ("smile", "wide", "base", "mid")
+            cho "[name_genie_cho], please tell me all you know about it!" ("smile", "wide", "base", "mid")
             cho "" ("base", "base", "base", "mid")
 
         elif random_number == 7:
-            cho "[cho_genie_name], could you please have a talk with Professor McGonagall." ("annoyed", "base", "base", "mid")
+            cho "[name_genie_cho], could you please have a talk with Professor McGonagall." ("annoyed", "base", "base", "mid")
             cho "She took ten points off Ravenclaw when I arrived late to her class after practice the other day." ("disgust", "base", "base", "R")
             cho "But she's never taken any points off Gryffindor even though some of their team members have arrived late multiple times." ("annoyed", "narrow", "base", "mid")
 
@@ -115,7 +115,7 @@ label cho_chitchat:
             cho "*Hmph*... Jealousy, no doubt." ("open", "closed", "base", "mid", cheeks="blush")
 
         elif random_number == 2:
-            cho "[cho_genie_name], can you do anything about those Slytherins?" ("angry", "closed", "base", "mid")
+            cho "[name_genie_cho], can you do anything about those Slytherins?" ("angry", "closed", "base", "mid")
             cho "Ever since my match against them they don't seem to be able to take their eyes off my ass!" ("disgust", "narrow", "base", "mid")
 
         elif random_number == 3:

game/scripts/characters/cho/common.rpy

@@ -66,7 +66,7 @@ label end_cho_event:
     call music_block
     jump main_room_menu
 
-define character.cho_say = Character("cho_name", show_icon="cho", dynamic=True)
+define character.cho_say = Character("name_cho_genie", show_icon="cho", dynamic=True)
 
 init python in character:
     # Cho's name is short, therefore it needs to be initialised in character scope,

game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy

@@ -282,7 +282,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             gen "There." ("angry", xpos="far_left", ypos="head")
             cho "(Pervert...)" ("annoyed", "narrow", "angry", "R", cheeks="blush")
             cho "I think it's time for me to go now." ("soft", "closed", "angry", "mid")
-            cho "Until next time, [cho_genie_name]." ("soft", "narrow", "angry", "mid")
+            cho "Until next time, [name_genie_cho]." ("soft", "narrow", "angry", "mid")
 
             # Cho leaves.
             call cho_walk(action="leave")
@@ -367,7 +367,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
             with d3
 
             hide screen blkfade
-            cho "I have to say, [cho_genie_name], doing these favours is fun!" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", flip=False, trans=fade)
+            cho "I have to say, [name_genie_cho], doing these favours is fun!" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", flip=False, trans=fade)
             gen "I'm glad you're enjoying yourself." ("base", xpos="far_left", ypos="head")
             cho "Believe me, Sir. I am." ("smile", "narrow", "angry", "mid")
             cho "" ("horny", "narrow", "angry", "mid")
@@ -385,11 +385,11 @@ label cc_pf_strip_T2_E3_hermione_choices:
             if game.daytime:
                 cho "I have to head back to classes." ("soft", "base", "base", "R")
                 gen "I still got your--" ("base", xpos="far_left", ypos="head")
-                cho "See ya next time, [cho_genie_name]!" ("smile", "narrow", "angry", "mid")
+                cho "See ya next time, [name_genie_cho]!" ("smile", "narrow", "angry", "mid")
             else:
                 cho "I have to head back to my dorms." ("soft", "base", "base", "R")
                 gen "Don't you want your--" ("base", xpos="far_left", ypos="head")
-                cho "Sweet dreams, [cho_genie_name]!" ("smile", "narrow", "angry", "mid")
+                cho "Sweet dreams, [name_genie_cho]!" ("smile", "narrow", "angry", "mid")
 
             call cho_walk(action="leave")
 
@@ -432,7 +432,7 @@ label cc_pf_strip_T2_E3_hermione_repeat:
     her "*glare*" ("angry", "base", "angry", "mid")
     cho "Maybe then you'd have a chance to win against me!{w} And earn some useless Gryffindor points while you're at it." ("soft", "base", "base", "L")
     her "I don't think that will be necessary..." ("soft", "closed", "base", "mid")
-    cho "Well, we all already know how this is going to turn out don't we, [cho_genie_name]?" ("soft", "base", "base", "mid")
+    cho "Well, we all already know how this is going to turn out don't we, [name_genie_cho]?" ("soft", "base", "base", "mid")
     cho "My body is still better than Miss Granger's, isn't it?" ("smile", "narrow", "angry", "L")
     her "" ("annoyed", "base", "angry", "mid")
     call ctc

game/scripts/characters/cho/events/intro.rpy

@@ -729,7 +729,7 @@ label cho_intro_E3:
 
     # Repeat (This won't happen anymore)
     else:
-        gen "[hermione_name], there is something we need to talk about." ("base", xpos="far_left", ypos="head")
+        gen "[name_hermione_genie], there is something we need to talk about." ("base", xpos="far_left", ypos="head")
         her "Is it about Cho again?" ("annoyed", "squint", "base", "mid")
         gen "Yes indeed." ("base", xpos="far_left", ypos="head")
         gen "I'd like you to stop your..." ("base", xpos="far_left", ypos="head")
@@ -800,11 +800,11 @@ label cho_intro_E3:
         her "I might consider dropping it." ("base", "base", "base", "R")
         her "Even though it would take away the immense pleasure of seeing Cho getting all worked up about it..." ("grin", "base", "base", "mid")
         gen "(...)" ("base", xpos="far_left", ypos="head")
-        her "There is something I'd like from you in return, [genie_name].{w=0.8} Or else I'll just continue with it!" ("base", "narrow", "base", "mid_soft")
+        her "There is something I'd like from you in return, [name_genie_hermione].{w=0.8} Or else I'll just continue with it!" ("base", "narrow", "base", "mid_soft")
         gen "Go on girl." ("base", xpos="far_left", ypos="head")
         gen "Tell me what you want." ("base", xpos="far_left", ypos="head")
         gen "What you really{w}, really want..." ("base", xpos="far_left", ypos="head")
-        her "Very well, [genie_name]." ("soft", "base", "base", "R")
+        her "Very well, [name_genie_hermione]." ("soft", "base", "base", "R")
         her "I'll tell you what I want!" ("open", "closed", "base", "mid")
         her "What I really, really want!" ("grin", "narrow", "base", "mid_soft")
         gen "{size=-4}Nice!{/size}" ("grin", xpos="far_left", ypos="head")
@@ -819,7 +819,7 @@ label cho_intro_E3:
         her "Very well then." ("soft", "closed", "base", "mid")
         gen "Fifty points, to the Gryffindor house..." ("base", xpos="far_left", ypos="head")
         $ gryffindor += 50
-        her "Thank you, [genie_name]." ("base", "base", "base", "mid")
+        her "Thank you, [name_genie_hermione]." ("base", "base", "base", "mid")
 
     else:
         her "My what?" ("open", "narrow", "base", "mid_soft")
@@ -832,14 +832,14 @@ label cho_intro_E3:
         gen "Yes?" ("base", xpos="far_left", ypos="head")
         her "I want a seat in the teacher stands during the Quidditch matches!" ("grin", "narrow", "base", "mid_soft")
         gen "I'm sure that could be arranged..." ("base", xpos="far_left", ypos="head")
-        her "Thank you, [genie_name]." ("base", "narrow", "base", "mid_soft")
+        her "Thank you, [name_genie_hermione]." ("base", "narrow", "base", "mid_soft")
 
-    her "[genie_name], may I ask...{w=0.6} What exactly were you and Cho talking about when I entered your office?" ("open", "base", "base", "R")
+    her "[name_genie_hermione], may I ask...{w=0.6} What exactly were you and Cho talking about when I entered your office?" ("open", "base", "base", "R")
     gen "Oh. She just wanted my help with Quidditch." ("base", xpos="far_left", ypos="head")
     her "*Pffff*-{w=0.4} Why doesn't it surprise me that she'd need your help with it." ("grin", "narrow", "base", "R_soft")
     her "How else could she possibly win that stupid Quidditch cup..." ("soft", "closed", "angry", "mid")
     gen "I thought that cup was important to you?" ("base", xpos="far_left", ypos="head")
-    her "I couldn't care less about it, [genie_name]." ("open", "closed", "base", "mid")
+    her "I couldn't care less about it, [name_genie_hermione]." ("open", "closed", "base", "mid")
     her "The only cup that is worth winning is the {i}house cup{/i}." ("open", "narrow", "base", "R_soft")
     her "They're completely different..." ("annoyed", "base", "angry", "mid")
     gen "Totally different..." ("base", xpos="far_left", ypos="head")

game/scripts/characters/cho/events/panties.rpy

@@ -9,13 +9,13 @@ label cho_panties_response_T2:
     with d3
 
     call play_music("cho")
-    cho "Hello, [cho_genie_name]." ("soft", "narrow", "worried", "mid", xpos="right", ypos="base")
+    cho "Hello, [name_genie_cho]." ("soft", "narrow", "worried", "mid", xpos="right", ypos="base")
     gen "Sup..." ("base", xpos="far_left", ypos="head")
     cho "*Uhm*..." ("annoyed", "narrow", "worried", "R")
     cho "I forgot to take my underwear with me the last time I was here." ("soft", "narrow", "worried", "downR", cheeks="blush")
 
     if cho_panties_soaked:
-        gen "Your panties! Of course, [cho_name]!{w} I've got them right here..." ("grin", xpos="far_left", ypos="head")
+        gen "Your panties! Of course, [name_cho_genie]!{w} I've got them right here..." ("grin", xpos="far_left", ypos="head")
         call cho_walk("desk", "base")
         pause .8
 
@@ -105,8 +105,8 @@ label cho_panties_response_T3:
     with d3
 
     call play_music("cho")
-    cho "Hello, [cho_genie_name]." ("base", "narrow", "base", "downR", cheeks="blush", xpos="right", ypos="base")
+    cho "Hello, [name_genie_cho]." ("base", "narrow", "base", "downR", cheeks="blush", xpos="right", ypos="base")
-    gen "[cho_name]..." ("base", xpos="far_left", ypos="head")
+    gen "[name_cho_genie]..." ("base", xpos="far_left", ypos="head")
     cho "I believe I left you something of mine..." ("open", "narrow", "base", "down", cheeks="blush")
     gen "Ah, yes... Your panties, I've got them right here." ("grin", xpos="far_left", ypos="head")
     cho "Great!" ("base", "base", "base", "mid")