diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index c8715d9c4481..8f47a4980b4f 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -184,14 +184,14 @@
 82	AUE_SETPGRP	MSTD	{ int setpgid(int pid, int pgid); }
 83	AUE_SETITIMER	MSTD	{ int setitimer(u_int which, struct \
 				    itimerval *itv, struct itimerval *oitv); }
-84	AUE_O_WAIT	MCOMPAT	{ int wait(void); }
+84	AUE_WAIT4	MCOMPAT	{ int wait(void); }
 85	AUE_SWAPON	MSTD	{ int swapon(char *name); }
 86	AUE_GETITIMER	MSTD	{ int getitimer(u_int which, \
 				    struct itimerval *itv); }
-87	AUE_O_GETHOSTNAME	MCOMPAT	{ int gethostname(char *hostname, \
+87	AUE_SYSCTL	MCOMPAT	{ int gethostname(char *hostname, \
 				    u_int len); } gethostname \
 				    gethostname_args int
-88	AUE_O_SETHOSTNAME	MCOMPAT	{ int sethostname(char *hostname, \
+88	AUE_SYSCTL	MCOMPAT	{ int sethostname(char *hostname, \
 				    u_int len); } sethostname \
 				    sethostname_args int
 89	AUE_GETDTABLESIZE	MSTD	{ int getdtablesize(void); }
@@ -213,9 +213,9 @@
 99	AUE_ACCEPT	MCPT_NOA { int accept(int s, caddr_t name, \
 				    int *anamelen); } accept accept_args int
 100	AUE_GETPRIORITY	MSTD	{ int getpriority(int which, int who); }
-101	AUE_O_SEND	MCOMPAT	{ int send(int s, caddr_t buf, int len, \
+101	AUE_SEND	MCOMPAT	{ int send(int s, caddr_t buf, int len, \
 				    int flags); }
-102	AUE_O_RECV	MCOMPAT	{ int recv(int s, caddr_t buf, int len, \
+102	AUE_RECV	MCOMPAT	{ int recv(int s, caddr_t buf, int len, \
 				    int flags); }
 103	AUE_SIGRETURN	MCOMPAT	{ int sigreturn( \
 				    struct osigcontext *sigcntxp); }
@@ -225,25 +225,25 @@
 				    caddr_t val, int valsize); }
 106	AUE_LISTEN	MSTD	{ int listen(int s, int backlog); }
 107	AUE_NULL	OBSOL	vtimes
-108	AUE_O_SIGVEC	MCOMPAT	{ int sigvec(int signum, struct sigvec *nsv, \
+108	AUE_NULL	MCOMPAT	{ int sigvec(int signum, struct sigvec *nsv, \
 				    struct sigvec *osv); }
-109	AUE_O_SIGBLOCK	MCOMPAT	{ int sigblock(int mask); }
-110	AUE_O_SIGSETMASK	MCOMPAT	{ int sigsetmask(int mask); }
-111	AUE_SIGSUSPEND	MCOMPAT	{ int sigsuspend(osigset_t mask); }
+109	AUE_NULL	MCOMPAT	{ int sigblock(int mask); }
+110	AUE_NULL	MCOMPAT	{ int sigsetmask(int mask); }
+111	AUE_NULL	MCOMPAT	{ int sigsuspend(osigset_t mask); }
 ; XXX note nonstandard (bogus) calling convention - the libc stub passes
 ; us the mask, not a pointer to it.
-112	AUE_O_SIGSTACK	MCOMPAT	{ int sigstack(struct sigstack *nss, \
+112	AUE_NULL	MCOMPAT	{ int sigstack(struct sigstack *nss, \
 				    struct sigstack *oss); }
-113	AUE_O_RECVMSG	MCOMPAT	{ int recvmsg(int s, struct omsghdr *msg, \
+113	AUE_RECVMSG	MCOMPAT	{ int recvmsg(int s, struct omsghdr *msg, \
 				    int flags); }
-114	AUE_O_SENDMSG	MCOMPAT	{ int sendmsg(int s, caddr_t msg, \
+114	AUE_SENDMSG	MCOMPAT	{ int sendmsg(int s, caddr_t msg, \
 				    int flags); }
 115	AUE_NULL	OBSOL	vtrace
 116	AUE_GETTIMEOFDAY	MSTD	{ int gettimeofday(struct timeval *tp, \
 				    struct timezone *tzp); }
 117	AUE_GETRUSAGE	MSTD	{ int getrusage(int who, \
 				    struct rusage *rusage); }
-118	AUE_GTSOCKOPT	MSTD	{ int getsockopt(int s, int level, int name, \
+118	AUE_GETSOCKOPT	MSTD	{ int getsockopt(int s, int level, int name, \
 				    caddr_t val, int *avalsize); }
 119	AUE_NULL	UNIMPL	resuba (BSD/OS 2.x)
 120	AUE_READV	MSTD	{ int readv(int fd, struct iovec *iovp, \
@@ -261,8 +261,8 @@
 126	AUE_SETREUID	MSTD	{ int setreuid(int ruid, int euid); }
 127	AUE_SETREGID	MSTD	{ int setregid(int rgid, int egid); }
 128	AUE_RENAME	MSTD	{ int rename(char *from, char *to); }
-129	AUE_O_TRUNCATE	MCOMPAT	{ int truncate(char *path, long length); }
-130	AUE_O_FTRUNCATE	MCOMPAT	{ int ftruncate(int fd, long length); }
+129	AUE_TRUNCATE	MCOMPAT	{ int truncate(char *path, long length); }
+130	AUE_FTRUNCATE	MCOMPAT	{ int ftruncate(int fd, long length); }
 131	AUE_FLOCK	MSTD	{ int flock(int fd, int how); }
 132	AUE_MKFIFO	MSTD	{ int mkfifo(char *path, int mode); }
 133	AUE_SENDTO	MSTD	{ int sendto(int s, caddr_t buf, size_t len, \
@@ -277,15 +277,15 @@
 139	AUE_NULL	OBSOL	4.2 sigreturn
 140	AUE_ADJTIME	MSTD	{ int adjtime(struct timeval *delta, \
 				    struct timeval *olddelta); }
-141	AUE_O_GETPEERNAME	MCOMPAT	{ int getpeername(int fdes, caddr_t asa, \
+141	AUE_GETPEERNAME	MCOMPAT	{ int getpeername(int fdes, caddr_t asa, \
 				    int *alen); }
-142	AUE_O_GETHOSTID	MCOMPAT	{ long gethostid(void); }
-143	AUE_O_SETHOSTID	MCOMPAT	{ int sethostid(long hostid); }
-144	AUE_O_GETRLIMIT	MCOMPAT	{ int getrlimit(u_int which, struct \
+142	AUE_SYSCTL	MCOMPAT	{ long gethostid(void); }
+143	AUE_SYSCTL	MCOMPAT	{ int sethostid(long hostid); }
+144	AUE_GETRLIMIT	MCOMPAT	{ int getrlimit(u_int which, struct \
 				    orlimit *rlp); }
-145	AUE_O_SETRLIMIT	MCOMPAT	{ int setrlimit(u_int which, \
+145	AUE_SETRLIMIT	MCOMPAT	{ int setrlimit(u_int which, \
 				    struct orlimit *rlp); }
-146	AUE_O_KILLPG	MCOMPAT	{ int killpg(int pgid, int signum); }
+146	AUE_KILLPG	MCOMPAT	{ int killpg(int pgid, int signum); }
 147	AUE_SETSID	MSTD	{ int setsid(void); }
 148	AUE_QUOTACTL	MSTD	{ int quotactl(char *path, int cmd, int uid, \
 				    caddr_t arg); }
@@ -662,7 +662,7 @@
 375	AUE_NULL	NOIMPL	{ int nfsclnt(int flag, caddr_t argp); }
 376	AUE_EACCESS	MSTD	{ int eaccess(char *path, int flags); }
 377	AUE_NULL	UNIMPL	afs_syscall
-378	AUE_NULL	STD	{ int nmount(struct iovec *iovp, \
+378	AUE_NMOUNT	STD	{ int nmount(struct iovec *iovp, \
 				    unsigned int iovcnt, int flags); }
 379	AUE_NULL	MSTD	{ int kse_exit(void); }
 380	AUE_NULL	MSTD	{ int kse_wakeup(struct kse_mailbox *mbx); }