fix matcher names