diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index f5b246bfd061..d1072da1aeb0 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -129,7 +129,7 @@ struct vop_vector coda_vnodeops = {
     .vop_readlink = coda_readlink,	/* readlink */
     .vop_inactive = coda_inactive,	/* inactive */
     .vop_reclaim = coda_reclaim,	/* reclaim */
-    ._vop_lock = coda_lock,		/* lock */
+    .vop_lock1 = coda_lock,		/* lock */
     .vop_unlock = coda_unlock,		/* unlock */
     .vop_bmap = coda_bmap,		/* bmap */
     .vop_print = VOP_PANIC,	/* print */
@@ -1627,7 +1627,7 @@ coda_reclaim(struct vop_reclaim_args *ap)
 }
 
 int
-coda_lock(struct _vop_lock_args *ap)
+coda_lock(struct vop_lock1_args *ap)
 {
 /* true args */
     struct vnode *vp = ap->a_vp;
diff --git a/sys/coda/coda_vnops.h b/sys/coda/coda_vnops.h
index fb79a1802700..5ea009183319 100644
--- a/sys/coda/coda_vnops.h
+++ b/sys/coda/coda_vnops.h
@@ -72,7 +72,7 @@ vop_readdir_t coda_readdir;
 vop_bmap_t coda_bmap;
 vop_strategy_t coda_strategy;
 vop_reclaim_t coda_reclaim;
-_vop_lock_t coda_lock;
+vop_lock1_t coda_lock;
 vop_unlock_t coda_unlock;
 vop_islocked_t coda_islocked;
 int coda_vop_error(void *);
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index f5b246bfd061..d1072da1aeb0 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -129,7 +129,7 @@ struct vop_vector coda_vnodeops = {
     .vop_readlink = coda_readlink,	/* readlink */
     .vop_inactive = coda_inactive,	/* inactive */
     .vop_reclaim = coda_reclaim,	/* reclaim */
-    ._vop_lock = coda_lock,		/* lock */
+    .vop_lock1 = coda_lock,		/* lock */
     .vop_unlock = coda_unlock,		/* unlock */
     .vop_bmap = coda_bmap,		/* bmap */
     .vop_print = VOP_PANIC,	/* print */
@@ -1627,7 +1627,7 @@ coda_reclaim(struct vop_reclaim_args *ap)
 }
 
 int
-coda_lock(struct _vop_lock_args *ap)
+coda_lock(struct vop_lock1_args *ap)
 {
 /* true args */
     struct vnode *vp = ap->a_vp;
diff --git a/sys/fs/coda/coda_vnops.h b/sys/fs/coda/coda_vnops.h
index fb79a1802700..5ea009183319 100644
--- a/sys/fs/coda/coda_vnops.h
+++ b/sys/fs/coda/coda_vnops.h
@@ -72,7 +72,7 @@ vop_readdir_t coda_readdir;
 vop_bmap_t coda_bmap;
 vop_strategy_t coda_strategy;
 vop_reclaim_t coda_reclaim;
-_vop_lock_t coda_lock;
+vop_lock1_t coda_lock;
 vop_unlock_t coda_unlock;
 vop_islocked_t coda_islocked;
 int coda_vop_error(void *);
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index fb2066776fd9..9e9895c004d7 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -510,7 +510,7 @@ null_rename(struct vop_rename_args *ap)
  * vnodes below us on the stack.
  */
 static int
-null_lock(struct _vop_lock_args *ap)
+null_lock(struct vop_lock1_args *ap)
 {
 	struct vnode *vp = ap->a_vp;
 	int flags = ap->a_flags;
@@ -728,7 +728,7 @@ struct vop_vector null_vnodeops = {
 	.vop_getwritemount =	null_getwritemount,
 	.vop_inactive =		null_inactive,
 	.vop_islocked =		null_islocked,
-	._vop_lock =		null_lock,
+	.vop_lock1 =		null_lock,
 	.vop_lookup =		null_lookup,
 	.vop_open =		null_open,
 	.vop_print =		null_print,
diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c
index eb78b98974d3..45703be25f6b 100644
--- a/sys/fs/umapfs/umap_vnops.c
+++ b/sys/fs/umapfs/umap_vnops.c
@@ -57,7 +57,7 @@ SYSCTL_INT(_debug, OID_AUTO, umapfs_bug_bypass, CTLFLAG_RW,
 static vop_generic_t	umap_bypass;
 static vop_getattr_t	umap_getattr;
 static vop_inactive_t	umap_inactive;
-static vop_lock_t	umap_lock;
+static vop_lock1_t	umap_lock;
 static vop_print_t	umap_print;
 static vop_reclaim_t	umap_reclaim;
 static vop_rename_t	umap_rename;
@@ -353,7 +353,7 @@ umap_getattr(ap)
  */
 static int
 umap_lock(ap)
-	struct vop_lock_args /* {
+	struct vop_lock1_args /* {
 		struct vnode *a_vp;
 		int a_flags;
 		struct thread *a_td;
@@ -525,7 +525,7 @@ static struct vop_vector umap_vnodeops = {
 
 	.vop_getattr =		umap_getattr,
 	.vop_inactive =		umap_inactive,
-	.vop_lock =		umap_lock,
+	.vop_lock1 =		umap_lock,
 	.vop_print =		umap_print,
 	.vop_reclaim =		umap_reclaim,
 	.vop_rename =		umap_rename,
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 42d6dcec9634..134fe1c50f2c 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -1630,7 +1630,7 @@ unionfs_get_llt_revlock(int flags)
 }
 
 static int
-unionfs_lock(struct _vop_lock_args *ap)
+unionfs_lock(struct vop_lock1_args *ap)
 {
 	int		error;
 	int		flags;
@@ -2256,7 +2256,7 @@ struct vop_vector unionfs_vnodeops = {
 	.vop_lease =		unionfs_lease,
 	.vop_link =		unionfs_link,
 	.vop_listextattr =	unionfs_listextattr,
-	._vop_lock =		unionfs_lock,
+	.vop_lock1 =		unionfs_lock,
 	.vop_lookup =		unionfs_lookup,
 	.vop_mkdir =		unionfs_mkdir,
 	.vop_mknod =		unionfs_mknod,
diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index cc636a2bc55e..171ac20136a5 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -86,7 +86,7 @@ struct vop_vector default_vnodeops = {
 	.vop_kqfilter =		vop_stdkqfilter,
 	.vop_islocked =		vop_stdislocked,
 	.vop_lease =		VOP_NULL,
-	._vop_lock =		vop_stdlock,
+	.vop_lock1 =		vop_stdlock,
 	.vop_lookup =		vop_nolookup,
 	.vop_open =		VOP_NULL,
 	.vop_pathconf =		VOP_EINVAL,
@@ -253,7 +253,7 @@ vop_stdpathconf(ap)
  */
 int
 vop_stdlock(ap)
-	struct _vop_lock_args /* {
+	struct vop_lock1_args /* {
 		struct vnode *a_vp;
 		int a_flags;
 		struct thread *a_td;
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index ce010b401d5d..c65838ff6c01 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -3048,7 +3048,7 @@ static struct vop_vector sync_vnodeops = {
 	.vop_fsync =	sync_fsync,		/* fsync */
 	.vop_inactive =	sync_inactive,	/* inactive */
 	.vop_reclaim =	sync_reclaim,	/* reclaim */
-	._vop_lock =	vop_stdlock,	/* lock */
+	.vop_lock1 =	vop_stdlock,	/* lock */
 	.vop_unlock =	vop_stdunlock,	/* unlock */
 	.vop_islocked =	vop_stdislocked,	/* islocked */
 };
@@ -3555,7 +3555,7 @@ void
 vop_lock_pre(void *ap)
 {
 #ifdef DEBUG_VFS_LOCKS
-	struct _vop_lock_args *a = ap;
+	struct vop_lock1_args *a = ap;
 
 	if ((a->a_flags & LK_INTERLOCK) == 0)
 		ASSERT_VI_UNLOCKED(a->a_vp, "VOP_LOCK");
@@ -3568,7 +3568,7 @@ void
 vop_lock_post(void *ap, int rc)
 {
 #ifdef DEBUG_VFS_LOCKS
-	struct _vop_lock_args *a = ap;
+	struct vop_lock1_args *a = ap;
 
 	ASSERT_VI_UNLOCKED(a->a_vp, "VOP_LOCK");
 	if (rc == 0)
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 64c0a4efd0a6..c0f179cfb8c2 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -820,7 +820,7 @@ _vn_lock(struct vnode *vp, int flags, struct thread *td, char *file, int line)
 		 * lockmgr drops interlock before it will return for
 		 * any reason.  So force the code above to relock it.
 		 */
-		error = _VOP_LOCK(vp, flags | LK_INTERLOCK, td, file, line);
+		error = VOP_LOCK1(vp, flags | LK_INTERLOCK, td, file, line);
 		flags &= ~LK_INTERLOCK;
 		KASSERT((flags & LK_RETRY) == 0 || error == 0,
 		    ("LK_RETRY set with incompatible flags %d\n", flags));
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index d29043e16c62..373b988e956f 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -362,10 +362,10 @@ vop_reclaim {
 };
 
 
-%! lock		pre	vop_lock_pre
-%! lock		post	vop_lock_post
+%! lock1	pre	vop_lock_pre
+%! lock1	post	vop_lock_post
 
-_vop_lock {
+vop_lock1 {
 	IN struct vnode *vp;
 	IN int flags;
 	IN struct thread *td;
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index ea9708bc0666..1f1faa0278f7 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -650,7 +650,7 @@ int	vop_stdgetpages(struct vop_getpages_args *);
 int	vop_stdinactive(struct vop_inactive_args *);
 int	vop_stdislocked(struct vop_islocked_args *);
 int	vop_stdkqfilter(struct vop_kqfilter_args *);
-int	vop_stdlock(struct _vop_lock_args *);
+int	vop_stdlock(struct vop_lock1_args *);
 int	vop_stdputpages(struct vop_putpages_args *);
 int	vop_stdunlock(struct vop_unlock_args *);
 int	vop_nopoll(struct vop_poll_args *);
@@ -704,7 +704,7 @@ void	vop_unlock_pre(void *a);
 		    | (noffset > osize ? NOTE_EXTEND : 0));		\
 	}
 
-#define VOP_LOCK(vp, flags, td) _VOP_LOCK(vp, flags, td, __FILE__, __LINE__)
+#define VOP_LOCK(vp, flags, td) VOP_LOCK1(vp, flags, td, __FILE__, __LINE__)
 
 
 void	vput(struct vnode *vp);
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index a562db033e00..80892f39320a 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -104,7 +104,7 @@ __FBSDID("$FreeBSD$");
 extern int	ffs_rawread(struct vnode *vp, struct uio *uio, int *workdone);
 #endif
 static vop_fsync_t	ffs_fsync;
-static _vop_lock_t	ffs_lock;
+static vop_lock1_t	ffs_lock;
 static vop_getpages_t	ffs_getpages;
 static vop_read_t	ffs_read;
 static vop_write_t	ffs_write;
@@ -126,7 +126,7 @@ struct vop_vector ffs_vnodeops1 = {
 	.vop_default =		&ufs_vnodeops,
 	.vop_fsync =		ffs_fsync,
 	.vop_getpages =		ffs_getpages,
-	._vop_lock =		ffs_lock,
+	.vop_lock1 =		ffs_lock,
 	.vop_read =		ffs_read,
 	.vop_reallocblks =	ffs_reallocblks,
 	.vop_write =		ffs_write,
@@ -145,7 +145,7 @@ struct vop_vector ffs_vnodeops2 = {
 	.vop_default =		&ufs_vnodeops,
 	.vop_fsync =		ffs_fsync,
 	.vop_getpages =		ffs_getpages,
-	._vop_lock =		ffs_lock,
+	.vop_lock1 =		ffs_lock,
 	.vop_read =		ffs_read,
 	.vop_reallocblks =	ffs_reallocblks,
 	.vop_write =		ffs_write,
@@ -161,7 +161,7 @@ struct vop_vector ffs_vnodeops2 = {
 struct vop_vector ffs_fifoops2 = {
 	.vop_default =		&ufs_fifoops,
 	.vop_fsync =		ffs_fsync,
-	._vop_lock =		ffs_lock,
+	.vop_lock1 =		ffs_lock,
 	.vop_reallocblks =	ffs_reallocblks,
 	.vop_strategy =		ffsext_strategy,
 	.vop_closeextattr =	ffs_closeextattr,
@@ -338,7 +338,7 @@ ffs_syncvnode(struct vnode *vp, int waitfor)
 
 static int
 ffs_lock(ap)
-	struct _vop_lock_args /* {
+	struct vop_lock1_args /* {
 		struct vnode *a_vp;
 		int a_flags;
 		struct thread *a_td;
@@ -388,11 +388,11 @@ ffs_lock(ap)
 		}
 		break;
 	default:
-		result = _VOP_LOCK_APV(&ufs_vnodeops, ap);
+		result = VOP_LOCK1_APV(&ufs_vnodeops, ap);
 	}
 	return (result);
 #else
-	return (_VOP_LOCK_APV(&ufs_vnodeops, ap));
+	return (VOP_LOCK1_APV(&ufs_vnodeops, ap));
 #endif
 }