* For #10374, Define selectors and related components * Add unit test * Update NamingSelectorWrapperTest * Update selectors and related components * Update NamingSelectorWrapper