Reorganize name generator.