Merge "Rename ComponentMatcher to ComponentNameMatcher"