Names moved to subtitles

Because if you have a subtitle, you freakin' use it