diff --git a/layout.sty b/layout.sty
index 93c904ba45ef1d691a80ea931a5a654d8a0df105..62d79e17892d7e33672eef2cdbcb9af3ba5776d0 100644
--- a/layout.sty
+++ b/layout.sty
@@ -640,8 +640,8 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west)
 \newcommand{\mannerism}{}
 \newcommand{\archetype}{}
 \newcommand{\npcsymbol}{}
-\newcommand{\npc}[3][1]{\settoggle{personality}{false}\renewcommand{\name}{#2 #3}\renewcommand{\npcsymbol}{#2}}
-\newcommand{\NPC}[5]{\renewcommand{\name}{#1 #2}
+\newcommand{\npc}[2]{\settoggle{personality}{false}\renewcommand{\name}{#2}\renewcommand{\npcsymbol}{#1}}
+\newcommand{\NPC}[5]{\renewcommand{\name}{#2}
 \renewcommand{\npcsymbol}{#1}
 \settoggle{personality}{true}
 \renewcommand{\NPCdescription}{#3}
diff --git a/stats.sty b/stats.sty
index 5485bdae04bec7499a17e5f92bffc495705772bd..f5b4eddbe7772f12d17f98792ae31de87f4d3355 100644
--- a/stats.sty
+++ b/stats.sty
@@ -457,7 +457,7 @@
 
   \iftoggle{verbose}{
     \begin{tcolorbox}[
-      title={\name},
+      title={\npcsymbol\ \name},
       before upper={\parindent0pt},
       ornamented,
       fontupper=\small,
@@ -477,7 +477,7 @@
     \vspace{2em}
     \noindent
     \begin{minipage}{\linewidth}
-    \hrulefill
+    \hrulefill\hspace{-0.15em}\raisebox{-0.2em}{\npcsymbol}
 
     \begin{center}\textbf{\large\name}\end{center}
     \mods
@@ -526,7 +526,7 @@
 	\clean
 
   \iftoggle{verbose}{
-    \begin{tcolorbox}[title={\name},
+    \begin{tcolorbox}[title={\npcsymbol\ \name},
       before upper={\parindent0pt},
       ornamented,
       halign=flush left,