Rename even more stuff for d2vzw