Rework/rename CodeList to MatchList