This is 10th iteration of typo fixes
We rename all the VTC files to avoid name collisions when importing/backporting.