Rework array complextype generation: name are more standard