Adjusting match and mapMatch names.