Ooops! Feel your pain. As an aside, all the moved channels CITV, ITV2/3/4/Be are now in their places in the Freesat bouquet and named correctly and have full EPG data.
What is puzzling me (but not a big issue) is that ITV2/3/4 are not in the correct place in the SKY bouquet (around 117/8/9 or thereabouts) as per @dsayers posts #7 and #8. I'm only seeing them in the secondary bouquet at position 816/7/8. I've tried the SKY London SD and HD settings in ABM.