Changed generator call order to put name as second call