Rewrote how name is processed