- Rename more vnsw* files