Fixed NPC name bug, and moved it to it's own entityState variable so it can't conflict.