Check and update renamed/removed collection items

Check and update renamed/removed collection items #20962