Make scenario-name matching work