Fix name switch