Use preferred name instead of default name in name editor

Use preferred name instead of default name in name editor #2179