Add names to generator