Another switch to name matcher