Match renaming of VC_x to XCoordinator etc.