More usage improvements
Rename "edit" -> "match"