Renamed files to remove vw_ prefix