diff --git a/scorn/taverns/goths b/scorn/taverns/goths
index 61955480f..b74949761 100644
--- a/scorn/taverns/goths
+++ b/scorn/taverns/goths
@@ -605,6 +605,7 @@ name drunk
 msg
 @match name
 My name is Dilek.
+@identify
 @match job
 Oh...  I just sit here and watch.
 @reply watch What do you watch?
@@ -624,6 +625,7 @@ x 3
 y 8
 friendly 1
 unaggressive 0
+identified_name Dilek
 end
 arch altar
 slaying booze
@@ -666,11 +668,12 @@ x 3
 y 12
 end
 arch merchant
-name Bragh O'Leary
+name upset merchant
 msg
 @match bragh|o'leary|name
 Aye, I be BRAGH O'LEARY, former OWNER of the Scorn TRAININ' CENTER. You be some whelp here to gloat over my loss of me TRAININ' CENTER?
 Away wit' ye! Bartender! Another Booze! (hic)
+@identify
 @reply train Yes, what a sorry loss of the Training Center...
 @match train|center
 You liked me TRAININ' CENTER did ye?  Well good for ye!
@@ -692,6 +695,7 @@ endmsg
 x 3
 y 12
 friendly 1
+identified_name Bragh O'Leary
 end
 arch woodfloor
 x 3
@@ -2361,6 +2365,7 @@ name lumberjack
 msg
 @match name
 Limyat.
+@identify
 @match hi|hello|job
 I chop down trees in the forest.
 @reply forest Where is this forest?
@@ -2374,6 +2379,7 @@ x 11
 y 14
 friendly 1
 unaggressive 0
+identified_name Limyat
 end
 arch woodfloor
 x 11
@@ -2694,8 +2700,7 @@ x 12
 y 18
 end
 arch courier
-name Joey
-title the scribe
+name scribe
 msg
 @match mark
 Mark loves to gamble... owes me a bunch.  Always first in line to the bingo.
@@ -2720,6 +2725,7 @@ y 18
 monster 0
 friendly 1
 stand_still 1
+identified_name Joey
 end
 arch woodfloor
 x 12
@@ -2882,8 +2888,10 @@ x 13
 y 6
 end
 arch elf_1
-name Silinar
 msg
+@match name
+My name is Silinar.
+@identify
 @match hi|hello
 Greetings. Just having a drink after I visited the Valley of the Three Sisters.
 @reply valley The Valley of the Three Sisters?
@@ -2898,6 +2906,7 @@ x 13
 y 6
 friendly 1
 unaggressive 0
+identified_name Silinar
 end
 arch woodfloor
 x 13
@@ -3573,6 +3582,7 @@ msg
 Umm... professional adventurer?
 @match name
 Palidor. Pleased to meet you.
+@identify
 @match hi|hello
 Ho, travelers. Seek ye the blood of foul monsters?
 @reply yes Yes... the blood of... foul monsters.
@@ -3583,6 +3593,7 @@ x 16
 y 13
 friendly 1
 unaggressive 0
+identified_name Palidor
 end
 arch woodfloor
 x 16
@@ -4537,14 +4548,16 @@ I'll be with you in a sec.
 I'm really busy here...
 @match name
 Samantha.  (wink)
+@identify
 @match *
 Have a seat anywhere...
 endmsg
 x 20
 y 6
-speed 0.200000
+speed 0.2
 friendly 1
 unaggressive 0
+identified_name Samantha
 end
 arch woodfloor
 x 20
@@ -4790,6 +4803,7 @@ arch dwarf
 msg
 @match name
 Darag...  And yours?
+@identify
 @match hi|hello
 Yes?  What do you want?
 Have you nothing better to do than molest an old dwarf who's been driven from his mines?
@@ -4806,6 +4820,7 @@ x 21
 y 11
 friendly 1
 unaggressive 0
+identified_name Darag
 end
 arch woodfloor
 x 21
@@ -4944,11 +4959,13 @@ x 21
 y 33
 end
 arch c_man
+title the bingo caller
 msg
 @match job
 We're playing Bingo here!  I am the Bingo Master!
 @match name
 Jack.  Just call me Jack...  A - 3
+@identify
 @match bingo
 Yes!  A great contest today, I am going to be rich, just look at this crowd!  SUCKERS! ... C - 3
 @match crowd
@@ -4960,6 +4977,7 @@ x 21
 y 33
 friendly 1
 unaggressive 0
+identified_name Jack
 end
 arch woodfloor
 x 21
@@ -5098,6 +5116,7 @@ name wounded fighter
 msg
 @match name
 Apanu...  Aaeeia! ...ugak
+@identify
 @match wound|pain
 I got injured trying to kill the monsters in Castle Aaaarg.
 @reply castle What castle?
@@ -5116,6 +5135,7 @@ y 19
 level 12
 friendly 1
 unaggressive 0
+identified_name Apanu Aaeeia
 end
 arch woodfloor
 x 22
@@ -5680,6 +5700,7 @@ msg
 @match mark
 Ya, that's me. Bugger off, I'm on a roll here.
 O 47
+@identify
 @match amy
 Ya, my old lady, she's kind of mad at me right now... When I hit it big she'll sing a different tune though.
 @match goose|esmeralda
@@ -5697,6 +5718,7 @@ endmsg
 x 24
 y 30
 friendly 1
+identified_name Mark
 arch npc_dialog
 name scorn/taverns/mark.msg
 end
@@ -5789,6 +5811,7 @@ arch beholder
 msg
 @match name
 Atxtoc... (smile)
+@identify
 @match who|here|what
 I am a beholder.  I came here because I was tired of being cooped up in Barad Dur with all the other beholders.
 @reply barad What is Barad Dur?
@@ -5803,6 +5826,7 @@ endmsg
 x 25
 y 6
 friendly 1
+identified_name Atxtoc
 end
 arch woodfloor
 x 25
@@ -6041,6 +6065,7 @@ name sailor
 msg
 @match name
 Maurycy. Arrrr.
+@identify
 @match seen|things|voyage
 I've seen a tower at the southwest edge of the continent, south of Navar City. I've also seen an island nearby.
 @reply tower What tower?
@@ -6061,6 +6086,7 @@ endmsg
 x 26
 y 13
 friendly 1
+identified_name Maurycy
 end
 arch woodfloor
 x 26
@@ -6334,6 +6360,7 @@ arch elf_1
 msg
 @match name
 Amras Telrunya, and that's Anie...
+@identify
 @match anie
 She's a sight for sore eyes, eh?
 @match yes
@@ -6360,6 +6387,7 @@ x 27
 y 17
 friendly 1
 unaggressive 0
+identified_name Amras Telrunya
 end
 arch woodfloor
 x 27
@@ -6531,10 +6559,12 @@ x 28
 y 9
 end
 arch guildmaster
-name Brum the Ancient
+name man
+title the Ancient
 msg
 @match name
 My name is Brum.
+@identify
 @match job
 I used to wander the lands.
 @match story|yes
@@ -6559,6 +6589,7 @@ x 28
 y 9
 friendly 1
 unaggressive 0
+identified_name Brum
 end
 arch woodfloor
 x 28
@@ -7161,6 +7192,7 @@ name old man
 msg
 @match name
 Sonny...  please... this is important...
+@identify
 @match no
 Well, I am, and it's important.
 @match studying|important|yes
@@ -7182,6 +7214,7 @@ x 31
 y 12
 friendly 1
 unaggressive 0
+identified_name Sonny
 end
 arch woodfloor
 x 31
@@ -7347,6 +7380,7 @@ name slightly drunken apprentice conjurer
 msg
 @match name
 Awiergan Cynricson at your service!
+@identify
 @match hello|hi
 Hi!  I'm studying Summoning at the Tower of Demonology and Summoning up north.  Are you interested in studying Summoning also?
 @match yes
@@ -7362,6 +7396,7 @@ hp 90
 x 32
 y 4
 friendly 1
+identified_name Awiergan Cynricson
 end
 arch woodfloor
 x 32
@@ -7831,10 +7866,12 @@ x 34
 y 19
 end
 arch faerie_dragon
-name Dragon Emissary
+name scary-looking dragon
+title the dragon emissary
 msg
 @match name
 Gramzon, Bringer-of-Ashes.
+@identify
 @match hi|hello|job
 I am the Emissary of the Dragonlords to the City of Scorn. I have come to present the Demands of my masters. However, your King is less than cooperative. I should tell my masters that the city is ripe for conquering.
 @match demand
@@ -7858,6 +7895,7 @@ x 34
 y 19
 friendly 1
 unaggressive 0
+identified_name Gramzon
 arch npc_dialog
 name /scorn/taverns/dragon_emissary.msg
 end