Changed naming convention for match types