add capture name to returned matches

OK, that is fair. I agree it is better to be consistent with existing style.