Fix back XML files with new naming