Additional match types added for keywords.
Adjusted name settings according to new match types.