diff --git a/sys/compat/cloudabi64/cloudabi64_proto.h b/sys/compat/cloudabi64/cloudabi64_proto.h
index 9d33b7c938c9..0eaab8023fc9 100644
--- a/sys/compat/cloudabi64/cloudabi64_proto.h
+++ b/sys/compat/cloudabi64/cloudabi64_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285307 2015-07-09 07:20:15Z ed 
+ * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285540 2015-07-14 15:11:50Z ed 
  */
 
 #ifndef _CLOUDABI64_SYSPROTO_H_
@@ -301,7 +301,7 @@ struct cloudabi64_sys_thread_create_args {
 struct cloudabi_sys_thread_exit_args {
 	char lock_l_[PADL_(cloudabi_lock_t *)]; cloudabi_lock_t * lock; char lock_r_[PADR_(cloudabi_lock_t *)];
 };
-struct cloudabi64_sys_thread_tcb_set_args {
+struct cloudabi_sys_thread_tcb_set_args {
 	char tcb_l_[PADL_(void *)]; void * tcb; char tcb_r_[PADR_(void *)];
 };
 struct cloudabi_sys_thread_yield_args {
@@ -362,7 +362,7 @@ int	cloudabi_sys_sock_shutdown(struct thread *, struct cloudabi_sys_sock_shutdow
 int	cloudabi_sys_sock_stat_get(struct thread *, struct cloudabi_sys_sock_stat_get_args *);
 int	cloudabi64_sys_thread_create(struct thread *, struct cloudabi64_sys_thread_create_args *);
 int	cloudabi_sys_thread_exit(struct thread *, struct cloudabi_sys_thread_exit_args *);
-int	cloudabi64_sys_thread_tcb_set(struct thread *, struct cloudabi64_sys_thread_tcb_set_args *);
+int	cloudabi_sys_thread_tcb_set(struct thread *, struct cloudabi_sys_thread_tcb_set_args *);
 int	cloudabi_sys_thread_yield(struct thread *, struct cloudabi_sys_thread_yield_args *);
 
 #ifdef COMPAT_43
@@ -443,7 +443,7 @@ int	cloudabi_sys_thread_yield(struct thread *, struct cloudabi_sys_thread_yield_
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_sock_stat_get	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi64_sys_thread_create	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_thread_exit	AUE_NULL
-#define	CLOUDABI64_SYS_AUE_cloudabi64_sys_thread_tcb_set	AUE_NULL
+#define	CLOUDABI64_SYS_AUE_cloudabi_sys_thread_tcb_set	AUE_NULL
 #define	CLOUDABI64_SYS_AUE_cloudabi_sys_thread_yield	AUE_NULL
 
 #undef PAD_
diff --git a/sys/compat/cloudabi64/cloudabi64_syscall.h b/sys/compat/cloudabi64/cloudabi64_syscall.h
index 2904a9f0c25c..5d75eea0dc30 100644
--- a/sys/compat/cloudabi64/cloudabi64_syscall.h
+++ b/sys/compat/cloudabi64/cloudabi64_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285307 2015-07-09 07:20:15Z ed 
+ * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285540 2015-07-14 15:11:50Z ed 
  */
 
 #define	CLOUDABI64_SYS_cloudabi_sys_clock_res_get	0
@@ -61,6 +61,6 @@
 #define	CLOUDABI64_SYS_cloudabi_sys_sock_stat_get	52
 #define	CLOUDABI64_SYS_cloudabi64_sys_thread_create	53
 #define	CLOUDABI64_SYS_cloudabi_sys_thread_exit	54
-#define	CLOUDABI64_SYS_cloudabi64_sys_thread_tcb_set	55
+#define	CLOUDABI64_SYS_cloudabi_sys_thread_tcb_set	55
 #define	CLOUDABI64_SYS_cloudabi_sys_thread_yield	56
 #define	CLOUDABI64_SYS_MAXSYSCALL	57
diff --git a/sys/compat/cloudabi64/cloudabi64_syscalls.c b/sys/compat/cloudabi64/cloudabi64_syscalls.c
index f8fe811fb48d..b0895408343d 100644
--- a/sys/compat/cloudabi64/cloudabi64_syscalls.c
+++ b/sys/compat/cloudabi64/cloudabi64_syscalls.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285307 2015-07-09 07:20:15Z ed 
+ * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285540 2015-07-14 15:11:50Z ed 
  */
 
 const char *cloudabi64_syscallnames[] = {
@@ -62,6 +62,6 @@ const char *cloudabi64_syscallnames[] = {
 	"cloudabi_sys_sock_stat_get",			/* 52 = cloudabi_sys_sock_stat_get */
 	"cloudabi64_sys_thread_create",			/* 53 = cloudabi64_sys_thread_create */
 	"cloudabi_sys_thread_exit",			/* 54 = cloudabi_sys_thread_exit */
-	"cloudabi64_sys_thread_tcb_set",			/* 55 = cloudabi64_sys_thread_tcb_set */
+	"cloudabi_sys_thread_tcb_set",			/* 55 = cloudabi_sys_thread_tcb_set */
 	"cloudabi_sys_thread_yield",			/* 56 = cloudabi_sys_thread_yield */
 };
diff --git a/sys/compat/cloudabi64/cloudabi64_sysent.c b/sys/compat/cloudabi64/cloudabi64_sysent.c
index ccfb95be30ae..aaad2c94c405 100644
--- a/sys/compat/cloudabi64/cloudabi64_sysent.c
+++ b/sys/compat/cloudabi64/cloudabi64_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285307 2015-07-09 07:20:15Z ed 
+ * created from FreeBSD: head/sys/compat/cloudabi64/syscalls.master 285540 2015-07-14 15:11:50Z ed 
  */
 
 #include <sys/sysent.h>
@@ -70,6 +70,6 @@ struct sysent cloudabi64_sysent[] = {
 	{ AS(cloudabi_sys_sock_stat_get_args), (sy_call_t *)cloudabi_sys_sock_stat_get, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 52 = cloudabi_sys_sock_stat_get */
 	{ AS(cloudabi64_sys_thread_create_args), (sy_call_t *)cloudabi64_sys_thread_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 53 = cloudabi64_sys_thread_create */
 	{ AS(cloudabi_sys_thread_exit_args), (sy_call_t *)cloudabi_sys_thread_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 54 = cloudabi_sys_thread_exit */
-	{ AS(cloudabi64_sys_thread_tcb_set_args), (sy_call_t *)cloudabi64_sys_thread_tcb_set, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 55 = cloudabi64_sys_thread_tcb_set */
+	{ AS(cloudabi_sys_thread_tcb_set_args), (sy_call_t *)cloudabi_sys_thread_tcb_set, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 55 = cloudabi_sys_thread_tcb_set */
 	{ 0, (sy_call_t *)cloudabi_sys_thread_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 56 = cloudabi_sys_thread_yield */
 };
diff --git a/sys/compat/cloudabi64/cloudabi64_systrace_args.c b/sys/compat/cloudabi64/cloudabi64_systrace_args.c
index 0084cad83d51..df019b2ef86f 100644
--- a/sys/compat/cloudabi64/cloudabi64_systrace_args.c
+++ b/sys/compat/cloudabi64/cloudabi64_systrace_args.c
@@ -496,9 +496,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 1;
 		break;
 	}
-	/* cloudabi64_sys_thread_tcb_set */
+	/* cloudabi_sys_thread_tcb_set */
 	case 55: {
-		struct cloudabi64_sys_thread_tcb_set_args *p = params;
+		struct cloudabi_sys_thread_tcb_set_args *p = params;
 		uarg[0] = (intptr_t) p->tcb; /* void * */
 		*n_args = 1;
 		break;
@@ -1367,7 +1367,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* cloudabi64_sys_thread_tcb_set */
+	/* cloudabi_sys_thread_tcb_set */
 	case 55:
 		switch(ndx) {
 		case 0:
@@ -1663,7 +1663,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "void";
 		break;
-	/* cloudabi64_sys_thread_tcb_set */
+	/* cloudabi_sys_thread_tcb_set */
 	case 55:
 		if (ndx == 0 || ndx == 1)
 			p = "void";