Trapping the remaining name change knock-ons