Index: sbin/bectl/bectl.8
===================================================================
--- sbin/bectl/bectl.8
+++ sbin/bectl/bectl.8
@@ -52,7 +52,6 @@
 .Cm jail
 .Brq Fl b | Fl U
 .Oo Bro Fl o Ar key Ns = Ns Ar value | Fl u Ar key Brc Oc Ns ...
-.Brq Ar jailID | jailName
 .Ar bootenv
 .Op Ar utility Op Ar argument ...
 .Nm
@@ -153,7 +152,6 @@
 .Cm jail
 .Brq Fl b | Fl U
 .Oo Bro Fl o Ar key Ns = Ns Ar value | Fl u Ar key Brc Oc Ns ...
-.Brq Ar jailID | jailName
 .Ao Ar bootenv Ac
 .Op Ar utility Op Ar argument ...
 .Xc
@@ -193,10 +191,7 @@
 .Va host.hostname ,
 and
 .Va path
-may not actually be unset.
-Attempts to unset any of these will revert them to the default values specified
-below, if they have been overwritten by
-.Fl o .
+must be set, the default values are specified below.
 .Pp
 All
 .Ar key Ns = Ns Ar value
@@ -207,7 +202,7 @@
 .It Va allow.mount Ta Cm true
 .It Va allow.mount.devfs Ta Cm true
 .It Va enforce_statfs Ta Cm 1
-.It Va name Ta Va bootenv
+.It Va name Ta jail id
 .It Va host.hostname Ta Va bootenv
 .It Va path Ta Set to a path in /tmp generated by
 .Xr libbe 3 .
Index: sbin/bectl/bectl_jail.c
===================================================================
--- sbin/bectl/bectl_jail.c
+++ sbin/bectl/bectl_jail.c
@@ -181,10 +181,10 @@
 {
 	char *bootenv, *mountpoint;
 	int jid, opt, ret;
-	bool default_hostname, default_name, interactive, unjail;
+	bool default_hostname, interactive, unjail;
 	pid_t pid;
 
-	default_hostname = default_name = interactive = unjail = true;
+	default_hostname = interactive = unjail = true;
 	jpcnt = INIT_PARAMCOUNT;
 	jp = malloc(jpcnt * sizeof(*jp));
 	if (jp == NULL)
@@ -206,8 +206,6 @@
 				 * optarg has been modified to null terminate
 				 * at the assignment operator.
 				 */
-				if (strcmp(optarg, "name") == 0)
-					default_name = false;
 				if (strcmp(optarg, "host.hostname") == 0)
 					default_hostname = false;
 			}
@@ -217,8 +215,6 @@
 			break;
 		case 'u':
 			if ((ret = jailparam_delarg(optarg)) == 0) {
-				if (strcmp(optarg, "name") == 0)
-					default_name = true;
 				if (strcmp(optarg, "host.hostname") == 0)
 					default_hostname = true;
 			} else if (ret != ENOENT) {
@@ -259,8 +255,6 @@
 		return (1);
 	}
 
-	if (default_name)
-		jailparam_add("name", bootenv);
 	if (default_hostname)
 		jailparam_add("host.hostname", bootenv);
 
@@ -316,15 +310,22 @@
 static int
 bectl_search_jail_paths(const char *mnt)
 {
+	int jid = 0;
+	char lastjid[16];
 	char jailpath[MAXPATHLEN];
-	int jid;
 
-	jid = 0;
-	(void)mnt;
-	while ((jid = jail_getv(0, "lastjid", &jid, "path", &jailpath,
+	/* jail_getv expects name/value strings */
+	snprintf(lastjid, sizeof(lastjid), "%d", 0);
+
+	while ((jid = jail_getv(0, "lastjid", lastjid, "path", &jailpath,
 	    NULL)) != -1) {
+
+		/* the jail we've been looking for */
 		if (strcmp(jailpath, mnt) == 0)
 			return (jid);
+
+		/* update lastjid and keep on looking */
+		snprintf(lastjid, sizeof(lastjid), "%d", jid);
 	}
 
 	return (-1);
@@ -354,8 +355,11 @@
 		return (-1);
 
 	if (nvlist_lookup_nvlist(belist, ident, &props) == 0) {
-		/* We'll attempt to resolve the jid by way of mountpoint */
-		if (nvlist_lookup_string(props, "mountpoint", &mnt) == 0) {
+
+		/* path where a boot environment is mounted */
+		if (nvlist_lookup_string(props, "mounted", &mnt) == 0) {
+
+			/* looking for a jail that matches our bootenv path */
 			jid = bectl_search_jail_paths(mnt);
 			be_prop_list_free(belist);
 			return (jid);