Rename MatchData typedefs

make it easier for me...