Ensures matches are not partial in case of overlapping naming schemes
assigned to @erik.reid
merged
mentioned in commit 3464f37f