diff --git a/sys/kern/vnode_if.c b/sys/kern/vnode_if.c
index 3d61bf84c8e2..8af219a63ae4 100644
--- a/sys/kern/vnode_if.c
+++ b/sys/kern/vnode_if.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: vnode_if.c,v 1.102 2017/04/16 17:18:55 riastradh Exp $	*/
+/*	$NetBSD: vnode_if.c,v 1.103 2017/04/26 03:04:24 riastradh Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	NetBSD: vnode_if.src,v 1.73 2017/04/16 16:48:08 riastradh Exp
+ *	NetBSD: vnode_if.src,v 1.74 2017/04/26 03:02:49 riastradh Exp
  * by the script:
  *	NetBSD: vnode_if.sh,v 1.64 2017/04/16 17:18:28 riastradh Exp
  */
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.102 2017/04/16 17:18:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.103 2017/04/26 03:04:24 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
@@ -777,18 +777,18 @@ VOP_SEEK(struct vnode *vp,
 }
 
 const int vop_remove_vp_offsets[] = {
-	VOPARG_OFFSETOF(struct vop_remove_args,a_dvp),
-	VOPARG_OFFSETOF(struct vop_remove_args,a_vp),
+	VOPARG_OFFSETOF(struct vop_remove_v2_args,a_dvp),
+	VOPARG_OFFSETOF(struct vop_remove_v2_args,a_vp),
 	VDESC_NO_OFFSET
 };
 const struct vnodeop_desc vop_remove_desc = {
 	VOP_REMOVE_DESCOFFSET,
 	"vop_remove",
-	0 | VDESC_VP0_WILLPUT | VDESC_VP1_WILLPUT,
+	0 | VDESC_VP1_WILLPUT,
 	vop_remove_vp_offsets,
 	VDESC_NO_OFFSET,
 	VDESC_NO_OFFSET,
-	VOPARG_OFFSETOF(struct vop_remove_args, a_cnp),
+	VOPARG_OFFSETOF(struct vop_remove_v2_args, a_cnp),
 };
 int
 VOP_REMOVE(struct vnode *dvp,
@@ -797,7 +797,7 @@ VOP_REMOVE(struct vnode *dvp,
 {
 	int error;
 	bool mpsafe;
-	struct vop_remove_args a;
+	struct vop_remove_v2_args a;
 	a.a_desc = VDESC(vop_remove);
 	a.a_dvp = dvp;
 	a.a_vp = vp;
@@ -926,18 +926,18 @@ VOP_MKDIR(struct vnode *dvp,
 }
 
 const int vop_rmdir_vp_offsets[] = {
-	VOPARG_OFFSETOF(struct vop_rmdir_args,a_dvp),
-	VOPARG_OFFSETOF(struct vop_rmdir_args,a_vp),
+	VOPARG_OFFSETOF(struct vop_rmdir_v2_args,a_dvp),
+	VOPARG_OFFSETOF(struct vop_rmdir_v2_args,a_vp),
 	VDESC_NO_OFFSET
 };
 const struct vnodeop_desc vop_rmdir_desc = {
 	VOP_RMDIR_DESCOFFSET,
 	"vop_rmdir",
-	0 | VDESC_VP0_WILLPUT | VDESC_VP1_WILLPUT,
+	0 | VDESC_VP1_WILLPUT,
 	vop_rmdir_vp_offsets,
 	VDESC_NO_OFFSET,
 	VDESC_NO_OFFSET,
-	VOPARG_OFFSETOF(struct vop_rmdir_args, a_cnp),
+	VOPARG_OFFSETOF(struct vop_rmdir_v2_args, a_cnp),
 };
 int
 VOP_RMDIR(struct vnode *dvp,
@@ -946,7 +946,7 @@ VOP_RMDIR(struct vnode *dvp,
 {
 	int error;
 	bool mpsafe;
-	struct vop_rmdir_args a;
+	struct vop_rmdir_v2_args a;
 	a.a_desc = VDESC(vop_rmdir);
 	a.a_dvp = dvp;
 	a.a_vp = vp;
diff --git a/sys/rump/include/rump/rumpvnode_if.h b/sys/rump/include/rump/rumpvnode_if.h
index c233a352571e..4d3bf9c7e7cc 100644
--- a/sys/rump/include/rump/rumpvnode_if.h
+++ b/sys/rump/include/rump/rumpvnode_if.h
@@ -1,11 +1,11 @@
-/*	$NetBSD: rumpvnode_if.h,v 1.26 2017/04/16 17:18:55 riastradh Exp $	*/
+/*	$NetBSD: rumpvnode_if.h,v 1.27 2017/04/26 03:04:24 riastradh Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	NetBSD: vnode_if.src,v 1.73 2017/04/16 16:48:08 riastradh Exp
+ *	NetBSD: vnode_if.src,v 1.74 2017/04/26 03:02:49 riastradh Exp
  * by the script:
  *	NetBSD: vnode_if.sh,v 1.64 2017/04/16 17:18:28 riastradh Exp
  */
diff --git a/sys/rump/librump/rumpvfs/rumpvnode_if.c b/sys/rump/librump/rumpvfs/rumpvnode_if.c
index b8ce1e8a2ad1..a6ad6c2f5fc1 100644
--- a/sys/rump/librump/rumpvfs/rumpvnode_if.c
+++ b/sys/rump/librump/rumpvfs/rumpvnode_if.c
@@ -1,11 +1,11 @@
-/*	$NetBSD: rumpvnode_if.c,v 1.26 2017/04/16 17:18:55 riastradh Exp $	*/
+/*	$NetBSD: rumpvnode_if.c,v 1.27 2017/04/26 03:04:24 riastradh Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	NetBSD: vnode_if.src,v 1.73 2017/04/16 16:48:08 riastradh Exp
+ *	NetBSD: vnode_if.src,v 1.74 2017/04/26 03:02:49 riastradh Exp
  * by the script:
  *	NetBSD: vnode_if.sh,v 1.64 2017/04/16 17:18:28 riastradh Exp
  */
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.26 2017/04/16 17:18:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.27 2017/04/26 03:04:24 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff --git a/sys/sys/vnode_if.h b/sys/sys/vnode_if.h
index e009a3980b16..19eca357c72c 100644
--- a/sys/sys/vnode_if.h
+++ b/sys/sys/vnode_if.h
@@ -1,11 +1,11 @@
-/*	$NetBSD: vnode_if.h,v 1.97 2017/04/16 17:18:54 riastradh Exp $	*/
+/*	$NetBSD: vnode_if.h,v 1.98 2017/04/26 03:04:24 riastradh Exp $	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	NetBSD: vnode_if.src,v 1.73 2017/04/16 16:48:08 riastradh Exp
+ *	NetBSD: vnode_if.src,v 1.74 2017/04/26 03:02:49 riastradh Exp
  * by the script:
  *	NetBSD: vnode_if.sh,v 1.64 2017/04/16 17:18:28 riastradh Exp
  */
@@ -270,7 +270,7 @@ extern const struct vnodeop_desc vop_seek_desc;
 int VOP_SEEK(struct vnode *, off_t, off_t, kauth_cred_t);
 
 #define VOP_REMOVE_DESCOFFSET 22
-struct vop_remove_args {
+struct vop_remove_v2_args {
 	const struct vnodeop_desc *a_desc;
 	struct vnode *a_dvp;
 	struct vnode *a_vp;
@@ -316,7 +316,7 @@ int VOP_MKDIR(struct vnode *, struct vnode **, struct componentname *,
     struct vattr *);
 
 #define VOP_RMDIR_DESCOFFSET 26
-struct vop_rmdir_args {
+struct vop_rmdir_v2_args {
 	const struct vnodeop_desc *a_desc;
 	struct vnode *a_dvp;
 	struct vnode *a_vp;