Index: sys/kern/init_main.c
===================================================================
--- sys/kern/init_main.c
+++ sys/kern/init_main.c
@@ -389,26 +389,26 @@
 #endif
 
 static int
-null_fetch_syscall_args(struct thread *td __unused)
+elf_kernel_fetch_syscall_args(struct thread *td __unused)
 {
 
-	panic("null_fetch_syscall_args");
+	panic("elf_kernel_fetch_syscall_args");
 }
 
 static void
-null_set_syscall_retval(struct thread *td __unused, int error __unused)
+elf_kernel_set_syscall_retval(struct thread *td __unused, int error __unused)
 {
 
-	panic("null_set_syscall_retval");
+	panic("elf_kernel_set_syscall_retval");
 }
 
 static void
-null_set_fork_retval(struct thread *td __unused)
+elf_kernel_set_fork_retval(struct thread *td __unused)
 {
 
 }
 
-struct sysentvec null_sysvec = {
+struct sysentvec elf_kernel_sysvec = {
 	.sv_size	= 0,
 	.sv_table	= NULL,
 	.sv_transtrap	= NULL,
@@ -430,13 +430,13 @@
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
 	.sv_flags	= 0,
-	.sv_set_syscall_retval = null_set_syscall_retval,
-	.sv_fetch_syscall_args = null_fetch_syscall_args,
+	.sv_set_syscall_retval = elf_kernel_set_syscall_retval,
+	.sv_fetch_syscall_args = elf_kernel_fetch_syscall_args,
 	.sv_syscallnames = NULL,
 	.sv_schedtail	= NULL,
 	.sv_thread_detach = NULL,
 	.sv_trap	= NULL,
-	.sv_set_fork_retval = null_set_fork_retval,
+	.sv_set_fork_retval = elf_kernel_set_fork_retval,
 };
 
 /*
@@ -497,7 +497,7 @@
 	refcount_init(&session0.s_count, 1);
 	session0.s_leader = p;
 
-	p->p_sysent = &null_sysvec;
+	p->p_sysent = &elf_kernel_sysvec;
 	p->p_flag = P_SYSTEM | P_INMEM | P_KPROC;
 	p->p_flag2 = 0;
 	p->p_state = PRS_NORMAL;