fix name switch