Add 2-line support to name generator