rename Match type fields to account for lens bug