diff --git a/.gitignore b/.gitignore
index ea12c3c2..61ee23f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,6 @@
 /*.iso
 /*.so
 /*.a
+libmaxsi
 builds
 sysroot
diff --git a/Makefile b/Makefile
index 495854cb..4e029d07 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@ include compiler.mak
 include version.mak
 
 ifneq ($(BUILD_LIBC),0)
-  MODULES:=$(MODULES) libmaxsi
+  MODULES:=$(MODULES) libc
 endif
-ALLMODULES:=$(ALLMODULES) libmaxsi
+ALLMODULES:=$(ALLMODULES) libc
 
 ifneq ($(BUILD_GAMES),0)
   MODULES:=$(MODULES) games
@@ -66,7 +66,7 @@ suball: sysroot-base-headers
 	(for D in $(MODULES); do ($(MAKE) all $(MFLAGS) --directory $$D && $(MAKE) install $(MFLAGS) --directory $$D) || exit $$?; done)
 
 sysroot-base-headers: sysroot-fsh
-	(for D in libmaxsi sortix; do ($(MAKE) install-headers $(MFLAGS) --directory $$D) || exit $$?; done)
+	(for D in libc sortix; do ($(MAKE) install-headers $(MFLAGS) --directory $$D) || exit $$?; done)
 
 sysroot-fsh:
 	mkdir -p "$(SYSROOT)"
diff --git a/README b/README
index 0b5e9a0e..bfa6016a 100644
--- a/README
+++ b/README
@@ -203,6 +203,6 @@ kernel, the filesystem servers, the initrd tools, the utilities, the games, and
 the benchmark programs are licensed under the GNU General Public License, either
 version 3 or (at your option) any later version.
 
-Unless the license header in the source code states otherwise, the libmaxsi
-standard library is licensed under the GNU Lesser General Public License, either
-version 3 or (at your option) any later version.
+Unless the license header in the source code states otherwise, the libc library
+s licensed under the GNU Lesser General Public License, either version 3 or (at
+your option) any later version.
diff --git a/libmaxsi/.gitignore b/libc/.gitignore
similarity index 100%
rename from libmaxsi/.gitignore
rename to libc/.gitignore
diff --git a/libmaxsi/Makefile b/libc/Makefile
similarity index 98%
rename from libmaxsi/Makefile
rename to libc/Makefile
index 75767360..42b74016 100644
--- a/libmaxsi/Makefile
+++ b/libc/Makefile
@@ -23,7 +23,7 @@ ifeq ($(HOST),x86_64-sortix)
 endif
 
 CPPINCLUDES=-I preproc
-CPPFLAGS=-DLIBMAXSI_LIBRARY -U_GNU_SOURCE $(CPUDEFINES) $(CPPINCLUDES)
+CPPFLAGS=-DLIBC_LIBRARY -U_GNU_SOURCE $(CPUDEFINES) $(CPPINCLUDES)
 FLAGS=$(CPUFLAGS) -Wall -Wextra -fno-stack-protector $(FLAGSDEBUG)
 CFLAGS=$(FLAGS) -std=c99
 CXXFLAGS=$(FLAGS) -std=gnu++0x -fno-exceptions -fno-rtti
diff --git a/libmaxsi/SIG_DFL.cpp b/libc/SIG_DFL.cpp
similarity index 100%
rename from libmaxsi/SIG_DFL.cpp
rename to libc/SIG_DFL.cpp
diff --git a/libmaxsi/SIG_ERR.cpp b/libc/SIG_ERR.cpp
similarity index 100%
rename from libmaxsi/SIG_ERR.cpp
rename to libc/SIG_ERR.cpp
diff --git a/libmaxsi/SIG_IGN.cpp b/libc/SIG_IGN.cpp
similarity index 100%
rename from libmaxsi/SIG_IGN.cpp
rename to libc/SIG_IGN.cpp
diff --git a/libmaxsi/_Exit.cpp b/libc/_Exit.cpp
similarity index 100%
rename from libmaxsi/_Exit.cpp
rename to libc/_Exit.cpp
diff --git a/libmaxsi/_assert.cpp b/libc/_assert.cpp
similarity index 100%
rename from libmaxsi/_assert.cpp
rename to libc/_assert.cpp
diff --git a/libmaxsi/_exit.cpp b/libc/_exit.cpp
similarity index 100%
rename from libmaxsi/_exit.cpp
rename to libc/_exit.cpp
diff --git a/libmaxsi/abort.cpp b/libc/abort.cpp
similarity index 100%
rename from libmaxsi/abort.cpp
rename to libc/abort.cpp
diff --git a/libmaxsi/abs.cpp b/libc/abs.cpp
similarity index 100%
rename from libmaxsi/abs.cpp
rename to libc/abs.cpp
diff --git a/libmaxsi/access.cpp b/libc/access.cpp
similarity index 100%
rename from libmaxsi/access.cpp
rename to libc/access.cpp
diff --git a/libmaxsi/atoi.cpp b/libc/atoi.cpp
similarity index 100%
rename from libmaxsi/atoi.cpp
rename to libc/atoi.cpp
diff --git a/libmaxsi/atol.cpp b/libc/atol.cpp
similarity index 100%
rename from libmaxsi/atol.cpp
rename to libc/atol.cpp
diff --git a/libmaxsi/atoll.cpp b/libc/atoll.cpp
similarity index 100%
rename from libmaxsi/atoll.cpp
rename to libc/atoll.cpp
diff --git a/libmaxsi/bsearch.cpp b/libc/bsearch.cpp
similarity index 100%
rename from libmaxsi/bsearch.cpp
rename to libc/bsearch.cpp
diff --git a/libmaxsi/c++.cpp b/libc/c++.cpp
similarity index 100%
rename from libmaxsi/c++.cpp
rename to libc/c++.cpp
diff --git a/libmaxsi/calloc.cpp b/libc/calloc.cpp
similarity index 100%
rename from libmaxsi/calloc.cpp
rename to libc/calloc.cpp
diff --git a/libmaxsi/chdir.cpp b/libc/chdir.cpp
similarity index 100%
rename from libmaxsi/chdir.cpp
rename to libc/chdir.cpp
diff --git a/libmaxsi/chmod.cpp b/libc/chmod.cpp
similarity index 100%
rename from libmaxsi/chmod.cpp
rename to libc/chmod.cpp
diff --git a/libmaxsi/clearerr.cpp b/libc/clearerr.cpp
similarity index 100%
rename from libmaxsi/clearerr.cpp
rename to libc/clearerr.cpp
diff --git a/libmaxsi/clock.cpp b/libc/clock.cpp
similarity index 100%
rename from libmaxsi/clock.cpp
rename to libc/clock.cpp
diff --git a/libmaxsi/close.cpp b/libc/close.cpp
similarity index 100%
rename from libmaxsi/close.cpp
rename to libc/close.cpp
diff --git a/libmaxsi/ctime.cpp b/libc/ctime.cpp
similarity index 100%
rename from libmaxsi/ctime.cpp
rename to libc/ctime.cpp
diff --git a/libmaxsi/ctype.c b/libc/ctype.c
similarity index 100%
rename from libmaxsi/ctype.c
rename to libc/ctype.c
diff --git a/libmaxsi/decl/DIR.h b/libc/decl/DIR.h
similarity index 100%
rename from libmaxsi/decl/DIR.h
rename to libc/decl/DIR.h
diff --git a/libmaxsi/decl/FILE.h b/libc/decl/FILE.h
similarity index 100%
rename from libmaxsi/decl/FILE.h
rename to libc/decl/FILE.h
diff --git a/libmaxsi/decl/NULL.h b/libc/decl/NULL.h
similarity index 100%
rename from libmaxsi/decl/NULL.h
rename to libc/decl/NULL.h
diff --git a/libmaxsi/decl/WCHAR_MAX.h b/libc/decl/WCHAR_MAX.h
similarity index 100%
rename from libmaxsi/decl/WCHAR_MAX.h
rename to libc/decl/WCHAR_MAX.h
diff --git a/libmaxsi/decl/WCHAR_MIN.h b/libc/decl/WCHAR_MIN.h
similarity index 100%
rename from libmaxsi/decl/WCHAR_MIN.h
rename to libc/decl/WCHAR_MIN.h
diff --git a/libmaxsi/decl/WEOF.h b/libc/decl/WEOF.h
similarity index 100%
rename from libmaxsi/decl/WEOF.h
rename to libc/decl/WEOF.h
diff --git a/libmaxsi/decl/blkcnt_t.h b/libc/decl/blkcnt_t.h
similarity index 100%
rename from libmaxsi/decl/blkcnt_t.h
rename to libc/decl/blkcnt_t.h
diff --git a/libmaxsi/decl/blksize_t.h b/libc/decl/blksize_t.h
similarity index 100%
rename from libmaxsi/decl/blksize_t.h
rename to libc/decl/blksize_t.h
diff --git a/libmaxsi/decl/clock_t.h b/libc/decl/clock_t.h
similarity index 100%
rename from libmaxsi/decl/clock_t.h
rename to libc/decl/clock_t.h
diff --git a/libmaxsi/decl/dev_t.h b/libc/decl/dev_t.h
similarity index 100%
rename from libmaxsi/decl/dev_t.h
rename to libc/decl/dev_t.h
diff --git a/libmaxsi/decl/errno_decl.h b/libc/decl/errno_decl.h
similarity index 100%
rename from libmaxsi/decl/errno_decl.h
rename to libc/decl/errno_decl.h
diff --git a/libmaxsi/decl/errno_values.h b/libc/decl/errno_values.h
similarity index 100%
rename from libmaxsi/decl/errno_values.h
rename to libc/decl/errno_values.h
diff --git a/libmaxsi/decl/gid_t.h b/libc/decl/gid_t.h
similarity index 100%
rename from libmaxsi/decl/gid_t.h
rename to libc/decl/gid_t.h
diff --git a/libmaxsi/decl/id_t.h b/libc/decl/id_t.h
similarity index 100%
rename from libmaxsi/decl/id_t.h
rename to libc/decl/id_t.h
diff --git a/libmaxsi/decl/ino_t.h b/libc/decl/ino_t.h
similarity index 100%
rename from libmaxsi/decl/ino_t.h
rename to libc/decl/ino_t.h
diff --git a/libmaxsi/decl/intn_t.h b/libc/decl/intn_t.h
similarity index 100%
rename from libmaxsi/decl/intn_t.h
rename to libc/decl/intn_t.h
diff --git a/libmaxsi/decl/intptr_t.h b/libc/decl/intptr_t.h
similarity index 100%
rename from libmaxsi/decl/intptr_t.h
rename to libc/decl/intptr_t.h
diff --git a/libmaxsi/decl/locale_t.h b/libc/decl/locale_t.h
similarity index 100%
rename from libmaxsi/decl/locale_t.h
rename to libc/decl/locale_t.h
diff --git a/libmaxsi/decl/mode_t.h b/libc/decl/mode_t.h
similarity index 100%
rename from libmaxsi/decl/mode_t.h
rename to libc/decl/mode_t.h
diff --git a/libmaxsi/decl/nlink_t.h b/libc/decl/nlink_t.h
similarity index 100%
rename from libmaxsi/decl/nlink_t.h
rename to libc/decl/nlink_t.h
diff --git a/libmaxsi/decl/off_t.h b/libc/decl/off_t.h
similarity index 100%
rename from libmaxsi/decl/off_t.h
rename to libc/decl/off_t.h
diff --git a/libmaxsi/decl/pid_t.h b/libc/decl/pid_t.h
similarity index 100%
rename from libmaxsi/decl/pid_t.h
rename to libc/decl/pid_t.h
diff --git a/libmaxsi/decl/ptrdiff_t.h b/libc/decl/ptrdiff_t.h
similarity index 100%
rename from libmaxsi/decl/ptrdiff_t.h
rename to libc/decl/ptrdiff_t.h
diff --git a/libmaxsi/decl/size_t.h b/libc/decl/size_t.h
similarity index 100%
rename from libmaxsi/decl/size_t.h
rename to libc/decl/size_t.h
diff --git a/libmaxsi/decl/ssize_t.h b/libc/decl/ssize_t.h
similarity index 100%
rename from libmaxsi/decl/ssize_t.h
rename to libc/decl/ssize_t.h
diff --git a/libmaxsi/decl/suseconds_t.h b/libc/decl/suseconds_t.h
similarity index 100%
rename from libmaxsi/decl/suseconds_t.h
rename to libc/decl/suseconds_t.h
diff --git a/libmaxsi/decl/time_t.h b/libc/decl/time_t.h
similarity index 100%
rename from libmaxsi/decl/time_t.h
rename to libc/decl/time_t.h
diff --git a/libmaxsi/decl/uid_t.h b/libc/decl/uid_t.h
similarity index 100%
rename from libmaxsi/decl/uid_t.h
rename to libc/decl/uid_t.h
diff --git a/libmaxsi/decl/useconds_t.h b/libc/decl/useconds_t.h
similarity index 100%
rename from libmaxsi/decl/useconds_t.h
rename to libc/decl/useconds_t.h
diff --git a/libmaxsi/decl/va_list.h b/libc/decl/va_list.h
similarity index 100%
rename from libmaxsi/decl/va_list.h
rename to libc/decl/va_list.h
diff --git a/libmaxsi/decl/wchar_t.h b/libc/decl/wchar_t.h
similarity index 100%
rename from libmaxsi/decl/wchar_t.h
rename to libc/decl/wchar_t.h
diff --git a/libmaxsi/decl/wctrans_t.h b/libc/decl/wctrans_t.h
similarity index 100%
rename from libmaxsi/decl/wctrans_t.h
rename to libc/decl/wctrans_t.h
diff --git a/libmaxsi/decl/wctype_t.h b/libc/decl/wctype_t.h
similarity index 100%
rename from libmaxsi/decl/wctype_t.h
rename to libc/decl/wctype_t.h
diff --git a/libmaxsi/decl/wint_t.h b/libc/decl/wint_t.h
similarity index 100%
rename from libmaxsi/decl/wint_t.h
rename to libc/decl/wint_t.h
diff --git a/libmaxsi/dir.c b/libc/dir.c
similarity index 100%
rename from libmaxsi/dir.c
rename to libc/dir.c
diff --git a/libmaxsi/dlfcn.cpp b/libc/dlfcn.cpp
similarity index 100%
rename from libmaxsi/dlfcn.cpp
rename to libc/dlfcn.cpp
diff --git a/libmaxsi/dup.cpp b/libc/dup.cpp
similarity index 100%
rename from libmaxsi/dup.cpp
rename to libc/dup.cpp
diff --git a/libmaxsi/env.cpp b/libc/env.cpp
similarity index 100%
rename from libmaxsi/env.cpp
rename to libc/env.cpp
diff --git a/libmaxsi/errno.cpp b/libc/errno.cpp
similarity index 100%
rename from libmaxsi/errno.cpp
rename to libc/errno.cpp
diff --git a/libmaxsi/errorprint.cpp b/libc/errorprint.cpp
similarity index 100%
rename from libmaxsi/errorprint.cpp
rename to libc/errorprint.cpp
diff --git a/libmaxsi/execl.cpp b/libc/execl.cpp
similarity index 100%
rename from libmaxsi/execl.cpp
rename to libc/execl.cpp
diff --git a/libmaxsi/execle.cpp b/libc/execle.cpp
similarity index 100%
rename from libmaxsi/execle.cpp
rename to libc/execle.cpp
diff --git a/libmaxsi/execlp.cpp b/libc/execlp.cpp
similarity index 100%
rename from libmaxsi/execlp.cpp
rename to libc/execlp.cpp
diff --git a/libmaxsi/execv.cpp b/libc/execv.cpp
similarity index 100%
rename from libmaxsi/execv.cpp
rename to libc/execv.cpp
diff --git a/libmaxsi/execve.cpp b/libc/execve.cpp
similarity index 100%
rename from libmaxsi/execve.cpp
rename to libc/execve.cpp
diff --git a/libmaxsi/execvp.cpp b/libc/execvp.cpp
similarity index 100%
rename from libmaxsi/execvp.cpp
rename to libc/execvp.cpp
diff --git a/libmaxsi/execvpe.cpp b/libc/execvpe.cpp
similarity index 100%
rename from libmaxsi/execvpe.cpp
rename to libc/execvpe.cpp
diff --git a/libmaxsi/exit.cpp b/libc/exit.cpp
similarity index 100%
rename from libmaxsi/exit.cpp
rename to libc/exit.cpp
diff --git a/libmaxsi/fabs.cpp b/libc/fabs.cpp
similarity index 100%
rename from libmaxsi/fabs.cpp
rename to libc/fabs.cpp
diff --git a/libmaxsi/fbufsize.cpp b/libc/fbufsize.cpp
similarity index 100%
rename from libmaxsi/fbufsize.cpp
rename to libc/fbufsize.cpp
diff --git a/libmaxsi/fchmod.cpp b/libc/fchmod.cpp
similarity index 100%
rename from libmaxsi/fchmod.cpp
rename to libc/fchmod.cpp
diff --git a/libmaxsi/fclose.cpp b/libc/fclose.cpp
similarity index 100%
rename from libmaxsi/fclose.cpp
rename to libc/fclose.cpp
diff --git a/libmaxsi/fcloseall.cpp b/libc/fcloseall.cpp
similarity index 100%
rename from libmaxsi/fcloseall.cpp
rename to libc/fcloseall.cpp
diff --git a/libmaxsi/fcntl.cpp b/libc/fcntl.cpp
similarity index 100%
rename from libmaxsi/fcntl.cpp
rename to libc/fcntl.cpp
diff --git a/libmaxsi/fddir-sortix.c b/libc/fddir-sortix.c
similarity index 100%
rename from libmaxsi/fddir-sortix.c
rename to libc/fddir-sortix.c
diff --git a/libmaxsi/fdio.c b/libc/fdio.c
similarity index 100%
rename from libmaxsi/fdio.c
rename to libc/fdio.c
diff --git a/libmaxsi/fdio.h b/libc/fdio.h
similarity index 100%
rename from libmaxsi/fdio.h
rename to libc/fdio.h
diff --git a/libmaxsi/feof.cpp b/libc/feof.cpp
similarity index 100%
rename from libmaxsi/feof.cpp
rename to libc/feof.cpp
diff --git a/libmaxsi/ferror.cpp b/libc/ferror.cpp
similarity index 100%
rename from libmaxsi/ferror.cpp
rename to libc/ferror.cpp
diff --git a/libmaxsi/fflush.cpp b/libc/fflush.cpp
similarity index 100%
rename from libmaxsi/fflush.cpp
rename to libc/fflush.cpp
diff --git a/libmaxsi/fgetc.cpp b/libc/fgetc.cpp
similarity index 100%
rename from libmaxsi/fgetc.cpp
rename to libc/fgetc.cpp
diff --git a/libmaxsi/fgets.cpp b/libc/fgets.cpp
similarity index 100%
rename from libmaxsi/fgets.cpp
rename to libc/fgets.cpp
diff --git a/libmaxsi/fileno.cpp b/libc/fileno.cpp
similarity index 100%
rename from libmaxsi/fileno.cpp
rename to libc/fileno.cpp
diff --git a/libmaxsi/flbf.cpp b/libc/flbf.cpp
similarity index 100%
rename from libmaxsi/flbf.cpp
rename to libc/flbf.cpp
diff --git a/libmaxsi/flushlfb.cpp b/libc/flushlfb.cpp
similarity index 100%
rename from libmaxsi/flushlfb.cpp
rename to libc/flushlfb.cpp
diff --git a/libmaxsi/fnewline.cpp b/libc/fnewline.cpp
similarity index 100%
rename from libmaxsi/fnewline.cpp
rename to libc/fnewline.cpp
diff --git a/libmaxsi/fork.cpp b/libc/fork.cpp
similarity index 100%
rename from libmaxsi/fork.cpp
rename to libc/fork.cpp
diff --git a/libmaxsi/format.cpp b/libc/format.cpp
similarity index 100%
rename from libmaxsi/format.cpp
rename to libc/format.cpp
diff --git a/libmaxsi/fpending.cpp b/libc/fpending.cpp
similarity index 100%
rename from libmaxsi/fpending.cpp
rename to libc/fpending.cpp
diff --git a/libmaxsi/fpipe.cpp b/libc/fpipe.cpp
similarity index 100%
rename from libmaxsi/fpipe.cpp
rename to libc/fpipe.cpp
diff --git a/libmaxsi/fpurge.cpp b/libc/fpurge.cpp
similarity index 100%
rename from libmaxsi/fpurge.cpp
rename to libc/fpurge.cpp
diff --git a/libmaxsi/fputc.cpp b/libc/fputc.cpp
similarity index 100%
rename from libmaxsi/fputc.cpp
rename to libc/fputc.cpp
diff --git a/libmaxsi/fputs.cpp b/libc/fputs.cpp
similarity index 100%
rename from libmaxsi/fputs.cpp
rename to libc/fputs.cpp
diff --git a/libmaxsi/fread.cpp b/libc/fread.cpp
similarity index 100%
rename from libmaxsi/fread.cpp
rename to libc/fread.cpp
diff --git a/libmaxsi/freadable.cpp b/libc/freadable.cpp
similarity index 100%
rename from libmaxsi/freadable.cpp
rename to libc/freadable.cpp
diff --git a/libmaxsi/freading.cpp b/libc/freading.cpp
similarity index 100%
rename from libmaxsi/freading.cpp
rename to libc/freading.cpp
diff --git a/libmaxsi/fregister.cpp b/libc/fregister.cpp
similarity index 100%
rename from libmaxsi/fregister.cpp
rename to libc/fregister.cpp
diff --git a/libmaxsi/fscanf.cpp b/libc/fscanf.cpp
similarity index 100%
rename from libmaxsi/fscanf.cpp
rename to libc/fscanf.cpp
diff --git a/libmaxsi/fseek.cpp b/libc/fseek.cpp
similarity index 100%
rename from libmaxsi/fseek.cpp
rename to libc/fseek.cpp
diff --git a/libmaxsi/fseeko.cpp b/libc/fseeko.cpp
similarity index 100%
rename from libmaxsi/fseeko.cpp
rename to libc/fseeko.cpp
diff --git a/libmaxsi/fseterr.cpp b/libc/fseterr.cpp
similarity index 100%
rename from libmaxsi/fseterr.cpp
rename to libc/fseterr.cpp
diff --git a/libmaxsi/fsetlocking.cpp b/libc/fsetlocking.cpp
similarity index 100%
rename from libmaxsi/fsetlocking.cpp
rename to libc/fsetlocking.cpp
diff --git a/libmaxsi/fstat.cpp b/libc/fstat.cpp
similarity index 100%
rename from libmaxsi/fstat.cpp
rename to libc/fstat.cpp
diff --git a/libmaxsi/ftell.cpp b/libc/ftell.cpp
similarity index 100%
rename from libmaxsi/ftell.cpp
rename to libc/ftell.cpp
diff --git a/libmaxsi/ftello.cpp b/libc/ftello.cpp
similarity index 100%
rename from libmaxsi/ftello.cpp
rename to libc/ftello.cpp
diff --git a/libmaxsi/ftruncate.cpp b/libc/ftruncate.cpp
similarity index 100%
rename from libmaxsi/ftruncate.cpp
rename to libc/ftruncate.cpp
diff --git a/libmaxsi/fwritable.cpp b/libc/fwritable.cpp
similarity index 100%
rename from libmaxsi/fwritable.cpp
rename to libc/fwritable.cpp
diff --git a/libmaxsi/fwrite.cpp b/libc/fwrite.cpp
similarity index 100%
rename from libmaxsi/fwrite.cpp
rename to libc/fwrite.cpp
diff --git a/libmaxsi/fwriting.cpp b/libc/fwriting.cpp
similarity index 100%
rename from libmaxsi/fwriting.cpp
rename to libc/fwriting.cpp
diff --git a/libmaxsi/getc.cpp b/libc/getc.cpp
similarity index 100%
rename from libmaxsi/getc.cpp
rename to libc/getc.cpp
diff --git a/libmaxsi/getcwd.cpp b/libc/getcwd.cpp
similarity index 100%
rename from libmaxsi/getcwd.cpp
rename to libc/getcwd.cpp
diff --git a/libmaxsi/getdelim.cpp b/libc/getdelim.cpp
similarity index 100%
rename from libmaxsi/getdelim.cpp
rename to libc/getdelim.cpp
diff --git a/libmaxsi/getdtablesize.cpp b/libc/getdtablesize.cpp
similarity index 100%
rename from libmaxsi/getdtablesize.cpp
rename to libc/getdtablesize.cpp
diff --git a/libmaxsi/getline.cpp b/libc/getline.cpp
similarity index 100%
rename from libmaxsi/getline.cpp
rename to libc/getline.cpp
diff --git a/libmaxsi/getpagesize.cpp b/libc/getpagesize.cpp
similarity index 100%
rename from libmaxsi/getpagesize.cpp
rename to libc/getpagesize.cpp
diff --git a/libmaxsi/getpid.cpp b/libc/getpid.cpp
similarity index 100%
rename from libmaxsi/getpid.cpp
rename to libc/getpid.cpp
diff --git a/libmaxsi/getppid.cpp b/libc/getppid.cpp
similarity index 100%
rename from libmaxsi/getppid.cpp
rename to libc/getppid.cpp
diff --git a/libmaxsi/gettermmode.cpp b/libc/gettermmode.cpp
similarity index 100%
rename from libmaxsi/gettermmode.cpp
rename to libc/gettermmode.cpp
diff --git a/libmaxsi/gettimeofday.cpp b/libc/gettimeofday.cpp
similarity index 100%
rename from libmaxsi/gettimeofday.cpp
rename to libc/gettimeofday.cpp
diff --git a/libmaxsi/gmtime.cpp b/libc/gmtime.cpp
similarity index 100%
rename from libmaxsi/gmtime.cpp
rename to libc/gmtime.cpp
diff --git a/libmaxsi/gmtime_r.cpp b/libc/gmtime_r.cpp
similarity index 100%
rename from libmaxsi/gmtime_r.cpp
rename to libc/gmtime_r.cpp
diff --git a/libmaxsi/heap.cpp b/libc/heap.cpp
similarity index 100%
rename from libmaxsi/heap.cpp
rename to libc/heap.cpp
diff --git a/libmaxsi/include/assert.h b/libc/include/assert.h
similarity index 100%
rename from libmaxsi/include/assert.h
rename to libc/include/assert.h
diff --git a/libmaxsi/include/ctype.h b/libc/include/ctype.h
similarity index 100%
rename from libmaxsi/include/ctype.h
rename to libc/include/ctype.h
diff --git a/libmaxsi/include/dirent.h b/libc/include/dirent.h
similarity index 100%
rename from libmaxsi/include/dirent.h
rename to libc/include/dirent.h
diff --git a/libmaxsi/include/dlfcn.h b/libc/include/dlfcn.h
similarity index 100%
rename from libmaxsi/include/dlfcn.h
rename to libc/include/dlfcn.h
diff --git a/libmaxsi/include/errno.h b/libc/include/errno.h
similarity index 100%
rename from libmaxsi/include/errno.h
rename to libc/include/errno.h
diff --git a/libmaxsi/include/error.h b/libc/include/error.h
similarity index 100%
rename from libmaxsi/include/error.h
rename to libc/include/error.h
diff --git a/libmaxsi/include/fcntl.h b/libc/include/fcntl.h
similarity index 100%
rename from libmaxsi/include/fcntl.h
rename to libc/include/fcntl.h
diff --git a/libmaxsi/include/features.h b/libc/include/features.h
similarity index 100%
rename from libmaxsi/include/features.h
rename to libc/include/features.h
diff --git a/libmaxsi/include/inttypes.h b/libc/include/inttypes.h
similarity index 100%
rename from libmaxsi/include/inttypes.h
rename to libc/include/inttypes.h
diff --git a/libmaxsi/include/locale.h b/libc/include/locale.h
similarity index 100%
rename from libmaxsi/include/locale.h
rename to libc/include/locale.h
diff --git a/libmaxsi/include/malloc.h b/libc/include/malloc.h
similarity index 97%
rename from libmaxsi/include/malloc.h
rename to libc/include/malloc.h
index 93a725cf..3f91fbc2 100644
--- a/libmaxsi/include/malloc.h
+++ b/libc/include/malloc.h
@@ -31,7 +31,7 @@
 
 __BEGIN_DECLS
 
-extern "C" void _init_heap();
+void _init_heap();
 
 __END_DECLS
 
diff --git a/libmaxsi/include/math.h b/libc/include/math.h
similarity index 100%
rename from libmaxsi/include/math.h
rename to libc/include/math.h
diff --git a/libmaxsi/include/readparamstring.h b/libc/include/readparamstring.h
similarity index 100%
rename from libmaxsi/include/readparamstring.h
rename to libc/include/readparamstring.h
diff --git a/libmaxsi/include/setjmp.h b/libc/include/setjmp.h
similarity index 100%
rename from libmaxsi/include/setjmp.h
rename to libc/include/setjmp.h
diff --git a/libmaxsi/include/signal.h b/libc/include/signal.h
similarity index 100%
rename from libmaxsi/include/signal.h
rename to libc/include/signal.h
diff --git a/libmaxsi/include/stdint.h b/libc/include/stdint.h
similarity index 100%
rename from libmaxsi/include/stdint.h
rename to libc/include/stdint.h
diff --git a/libmaxsi/include/stdio.h b/libc/include/stdio.h
similarity index 97%
rename from libmaxsi/include/stdio.h
rename to libc/include/stdio.h
index d7402f62..bfc9ff07 100644
--- a/libmaxsi/include/stdio.h
+++ b/libc/include/stdio.h
@@ -55,7 +55,7 @@ typedef struct _fpos_t fpos_t;
 
 #define EOF (-1)
 
-/* FILENAME_MAX, FOPEN_MAX, TMP_MAX are not defined because libmaxsi and Sortix
+/* FILENAME_MAX, FOPEN_MAX, TMP_MAX are not defined because libc and Sortix
    do not have these restrictions. */
 
 /* Default path prefix for `tempnam' and `tmpnam'. */
@@ -121,7 +121,7 @@ extern int vsnprintf(char* restrict, size_t, const char* restrict, __gnuc_va_lis
 extern int vsprintf(char* restrict s, const char* restrict format, __gnuc_va_list ap);
 extern int vsscanf(const char* restrict s, const char* restrict format, __gnuc_va_list arg);
 
-/* TODO: These are not implemented in libmaxsi/sortix yet. */
+/* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
 extern char* ctermid(char* s);
 extern FILE *fmemopen(void* restrict buf, size_t size, const char* restrict mode);
@@ -168,7 +168,7 @@ FILE* fnewfile(void);
 int fcloseall(void);
 int fpipe(FILE* pipes[2]);
 /* Internally used by standard library. */
-#if defined(LIBMAXSI_LIBRARY)
+#if defined(LIBC_LIBRARY)
 extern FILE* _firstfile;
 #endif
 #endif
diff --git a/libmaxsi/include/stdio_ext.h b/libc/include/stdio_ext.h
similarity index 100%
rename from libmaxsi/include/stdio_ext.h
rename to libc/include/stdio_ext.h
diff --git a/libmaxsi/include/stdlib.h b/libc/include/stdlib.h
similarity index 98%
rename from libmaxsi/include/stdlib.h
rename to libc/include/stdlib.h
index 5e87970b..d9d8ba4d 100644
--- a/libmaxsi/include/stdlib.h
+++ b/libc/include/stdlib.h
@@ -93,7 +93,7 @@ char* getenv(const char*);
 int clearenv(void);
 #endif
 
-/* TODO: These are not implemented in libmaxsi/sortix yet. */
+/* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
 long a64l(const char* s);
 double atof(const char* value);
diff --git a/libmaxsi/include/string.h b/libc/include/string.h
similarity index 97%
rename from libmaxsi/include/string.h
rename to libc/include/string.h
index 452d3bba..4e064cf7 100644
--- a/libmaxsi/include/string.h
+++ b/libc/include/string.h
@@ -59,7 +59,7 @@ char* strstr(const char*, const char*);
 char* strtok(char* restrict, const char* restrict);
 char* strtok_r(char* restrict, const char* restrict, char** restrict);
 
-/* TODO: These are not implemented in libmaxsi/sortix yet. */
+/* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
 void* memccpy(void* restrict, const void* restrict, int, size_t);
 char* stpncpy(char* restrict, const char* restrict, size_t);
diff --git a/libmaxsi/include/strings.h b/libc/include/strings.h
similarity index 100%
rename from libmaxsi/include/strings.h
rename to libc/include/strings.h
diff --git a/libmaxsi/include/sys/kernelinfo.h b/libc/include/sys/kernelinfo.h
similarity index 100%
rename from libmaxsi/include/sys/kernelinfo.h
rename to libc/include/sys/kernelinfo.h
diff --git a/libmaxsi/include/sys/keycodes.h b/libc/include/sys/keycodes.h
similarity index 100%
rename from libmaxsi/include/sys/keycodes.h
rename to libc/include/sys/keycodes.h
diff --git a/libmaxsi/include/sys/mman.h b/libc/include/sys/mman.h
similarity index 100%
rename from libmaxsi/include/sys/mman.h
rename to libc/include/sys/mman.h
diff --git a/libmaxsi/include/sys/readdirents.h b/libc/include/sys/readdirents.h
similarity index 100%
rename from libmaxsi/include/sys/readdirents.h
rename to libc/include/sys/readdirents.h
diff --git a/libmaxsi/include/sys/stat.h b/libc/include/sys/stat.h
similarity index 100%
rename from libmaxsi/include/sys/stat.h
rename to libc/include/sys/stat.h
diff --git a/libmaxsi/include/sys/syscall.h b/libc/include/sys/syscall.h
similarity index 100%
rename from libmaxsi/include/sys/syscall.h
rename to libc/include/sys/syscall.h
diff --git a/libmaxsi/include/sys/termmode.h b/libc/include/sys/termmode.h
similarity index 100%
rename from libmaxsi/include/sys/termmode.h
rename to libc/include/sys/termmode.h
diff --git a/libmaxsi/include/sys/time.h b/libc/include/sys/time.h
similarity index 100%
rename from libmaxsi/include/sys/time.h
rename to libc/include/sys/time.h
diff --git a/libmaxsi/include/sys/types.h b/libc/include/sys/types.h
similarity index 100%
rename from libmaxsi/include/sys/types.h
rename to libc/include/sys/types.h
diff --git a/libmaxsi/include/sys/wait.h b/libc/include/sys/wait.h
similarity index 95%
rename from libmaxsi/include/sys/wait.h
rename to libc/include/sys/wait.h
index d60202ec..ed2e165e 100644
--- a/libmaxsi/include/sys/wait.h
+++ b/libc/include/sys/wait.h
@@ -34,7 +34,7 @@ __BEGIN_DECLS
 
 @include(pid_t.h)
 
-/* TODO: These are not implemented in libmaxsi/sortix yet. */
+/* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
 int waitid(idtype_t, id_t, siginfo_t*, int);
 #endif
diff --git a/libmaxsi/include/termios.h b/libc/include/termios.h
similarity index 100%
rename from libmaxsi/include/termios.h
rename to libc/include/termios.h
diff --git a/libmaxsi/include/time.h b/libc/include/time.h
similarity index 100%
rename from libmaxsi/include/time.h
rename to libc/include/time.h
diff --git a/libmaxsi/include/unistd.h b/libc/include/unistd.h
similarity index 98%
rename from libmaxsi/include/unistd.h
rename to libc/include/unistd.h
index 4e738891..2adbeaa4 100644
--- a/libmaxsi/include/unistd.h
+++ b/libc/include/unistd.h
@@ -85,7 +85,7 @@ __BEGIN_DECLS
 extern char** environ;
 #endif
 
-/* TODO: These are not implemented in libmaxsi/sortix yet. */
+/* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
 unsigned alarm(unsigned);
 int chown(const char*, uid_t, gid_t);
diff --git a/libmaxsi/include/wchar.h b/libc/include/wchar.h
similarity index 98%
rename from libmaxsi/include/wchar.h
rename to libc/include/wchar.h
index ba91d22f..f36a9c24 100644
--- a/libmaxsi/include/wchar.h
+++ b/libc/include/wchar.h
@@ -61,7 +61,7 @@ __BEGIN_DECLS
 
 struct tm;
 
-/* TODO: These are not implemented in libmaxsi/sortix yet. */
+/* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
 double wcstod(const wchar_t* restrict, wchar_t** restrict);
 FILE* open_wmemstream(wchar_t** bufp, size_t* sizep);
diff --git a/libmaxsi/include/wctype.h b/libc/include/wctype.h
similarity index 97%
rename from libmaxsi/include/wctype.h
rename to libc/include/wctype.h
index 46d85004..1421ca42 100644
--- a/libmaxsi/include/wctype.h
+++ b/libc/include/wctype.h
@@ -34,7 +34,7 @@ __BEGIN_DECLS
 @include(locale_t.h)
 @include(WEOF.h)
 
-/* TODO: These are not implemented in libmaxsi/sortix yet. */
+/* TODO: These are not implemented in sortix libc yet. */
 #if defined(__SORTIX_SHOW_UNIMPLEMENTED)
 int iswalnum(wint_t);
 int iswalnum_l(wint_t, locale_t);
diff --git a/libmaxsi/init.cpp b/libc/init.cpp
similarity index 100%
rename from libmaxsi/init.cpp
rename to libc/init.cpp
diff --git a/libmaxsi/integer.cpp b/libc/integer.cpp
similarity index 100%
rename from libmaxsi/integer.cpp
rename to libc/integer.cpp
diff --git a/libmaxsi/ioleast.cpp b/libc/ioleast.cpp
similarity index 100%
rename from libmaxsi/ioleast.cpp
rename to libc/ioleast.cpp
diff --git a/libmaxsi/isatty.cpp b/libc/isatty.cpp
similarity index 100%
rename from libmaxsi/isatty.cpp
rename to libc/isatty.cpp
diff --git a/libmaxsi/kernelinfo.cpp b/libc/kernelinfo.cpp
similarity index 100%
rename from libmaxsi/kernelinfo.cpp
rename to libc/kernelinfo.cpp
diff --git a/libmaxsi/kill.cpp b/libc/kill.cpp
similarity index 100%
rename from libmaxsi/kill.cpp
rename to libc/kill.cpp
diff --git a/libmaxsi/localeconv.cpp b/libc/localeconv.cpp
similarity index 100%
rename from libmaxsi/localeconv.cpp
rename to libc/localeconv.cpp
diff --git a/libmaxsi/localtime.cpp b/libc/localtime.cpp
similarity index 100%
rename from libmaxsi/localtime.cpp
rename to libc/localtime.cpp
diff --git a/libmaxsi/localtime_r.cpp b/libc/localtime_r.cpp
similarity index 100%
rename from libmaxsi/localtime_r.cpp
rename to libc/localtime_r.cpp
diff --git a/libmaxsi/lseek.cpp b/libc/lseek.cpp
similarity index 100%
rename from libmaxsi/lseek.cpp
rename to libc/lseek.cpp
diff --git a/libmaxsi/mbtowc.cpp b/libc/mbtowc.cpp
similarity index 100%
rename from libmaxsi/mbtowc.cpp
rename to libc/mbtowc.cpp
diff --git a/libmaxsi/memchr.cpp b/libc/memchr.cpp
similarity index 100%
rename from libmaxsi/memchr.cpp
rename to libc/memchr.cpp
diff --git a/libmaxsi/memcmp.cpp b/libc/memcmp.cpp
similarity index 100%
rename from libmaxsi/memcmp.cpp
rename to libc/memcmp.cpp
diff --git a/libmaxsi/memcpy.cpp b/libc/memcpy.cpp
similarity index 100%
rename from libmaxsi/memcpy.cpp
rename to libc/memcpy.cpp
diff --git a/libmaxsi/memmove.cpp b/libc/memmove.cpp
similarity index 100%
rename from libmaxsi/memmove.cpp
rename to libc/memmove.cpp
diff --git a/libmaxsi/memset.cpp b/libc/memset.cpp
similarity index 100%
rename from libmaxsi/memset.cpp
rename to libc/memset.cpp
diff --git a/libmaxsi/memstat.cpp b/libc/memstat.cpp
similarity index 100%
rename from libmaxsi/memstat.cpp
rename to libc/memstat.cpp
diff --git a/libmaxsi/mkdir.cpp b/libc/mkdir.cpp
similarity index 100%
rename from libmaxsi/mkdir.cpp
rename to libc/mkdir.cpp
diff --git a/libmaxsi/mktemp.cpp b/libc/mktemp.cpp
similarity index 100%
rename from libmaxsi/mktemp.cpp
rename to libc/mktemp.cpp
diff --git a/libmaxsi/on_exit.cpp b/libc/on_exit.cpp
similarity index 100%
rename from libmaxsi/on_exit.cpp
rename to libc/on_exit.cpp
diff --git a/libmaxsi/op-new.cpp b/libc/op-new.cpp
similarity index 100%
rename from libmaxsi/op-new.cpp
rename to libc/op-new.cpp
diff --git a/libmaxsi/open.cpp b/libc/open.cpp
similarity index 100%
rename from libmaxsi/open.cpp
rename to libc/open.cpp
diff --git a/libmaxsi/pipe.cpp b/libc/pipe.cpp
similarity index 100%
rename from libmaxsi/pipe.cpp
rename to libc/pipe.cpp
diff --git a/libmaxsi/print.cpp b/libc/print.cpp
similarity index 100%
rename from libmaxsi/print.cpp
rename to libc/print.cpp
diff --git a/libmaxsi/putc.cpp b/libc/putc.cpp
similarity index 100%
rename from libmaxsi/putc.cpp
rename to libc/putc.cpp
diff --git a/libmaxsi/raise.cpp b/libc/raise.cpp
similarity index 100%
rename from libmaxsi/raise.cpp
rename to libc/raise.cpp
diff --git a/libmaxsi/rand.cpp b/libc/rand.cpp
similarity index 100%
rename from libmaxsi/rand.cpp
rename to libc/rand.cpp
diff --git a/libmaxsi/read.cpp b/libc/read.cpp
similarity index 100%
rename from libmaxsi/read.cpp
rename to libc/read.cpp
diff --git a/libmaxsi/readdirents.cpp b/libc/readdirents.cpp
similarity index 100%
rename from libmaxsi/readdirents.cpp
rename to libc/readdirents.cpp
diff --git a/libmaxsi/readparamstring.cpp b/libc/readparamstring.cpp
similarity index 100%
rename from libmaxsi/readparamstring.cpp
rename to libc/readparamstring.cpp
diff --git a/libmaxsi/rewind.cpp b/libc/rewind.cpp
similarity index 100%
rename from libmaxsi/rewind.cpp
rename to libc/rewind.cpp
diff --git a/libmaxsi/rmdir.cpp b/libc/rmdir.cpp
similarity index 100%
rename from libmaxsi/rmdir.cpp
rename to libc/rmdir.cpp
diff --git a/libmaxsi/sbrk.cpp b/libc/sbrk.cpp
similarity index 100%
rename from libmaxsi/sbrk.cpp
rename to libc/sbrk.cpp
diff --git a/libmaxsi/scanf.cpp b/libc/scanf.cpp
similarity index 100%
rename from libmaxsi/scanf.cpp
rename to libc/scanf.cpp
diff --git a/libmaxsi/setjmp.c b/libc/setjmp.c
similarity index 100%
rename from libmaxsi/setjmp.c
rename to libc/setjmp.c
diff --git a/libmaxsi/setlocale.cpp b/libc/setlocale.cpp
similarity index 100%
rename from libmaxsi/setlocale.cpp
rename to libc/setlocale.cpp
diff --git a/libmaxsi/settermmode.cpp b/libc/settermmode.cpp
similarity index 100%
rename from libmaxsi/settermmode.cpp
rename to libc/settermmode.cpp
diff --git a/libmaxsi/sfork.cpp b/libc/sfork.cpp
similarity index 100%
rename from libmaxsi/sfork.cpp
rename to libc/sfork.cpp
diff --git a/libmaxsi/signal.cpp b/libc/signal.cpp
similarity index 100%
rename from libmaxsi/signal.cpp
rename to libc/signal.cpp
diff --git a/libmaxsi/sleep.cpp b/libc/sleep.cpp
similarity index 100%
rename from libmaxsi/sleep.cpp
rename to libc/sleep.cpp
diff --git a/libmaxsi/sort.cpp b/libc/sort.cpp
similarity index 100%
rename from libmaxsi/sort.cpp
rename to libc/sort.cpp
diff --git a/libmaxsi/sprint.cpp b/libc/sprint.cpp
similarity index 100%
rename from libmaxsi/sprint.cpp
rename to libc/sprint.cpp
diff --git a/libmaxsi/sscanf.cpp b/libc/sscanf.cpp
similarity index 100%
rename from libmaxsi/sscanf.cpp
rename to libc/sscanf.cpp
diff --git a/libmaxsi/stat.cpp b/libc/stat.cpp
similarity index 100%
rename from libmaxsi/stat.cpp
rename to libc/stat.cpp
diff --git a/libmaxsi/stdio.c b/libc/stdio.c
similarity index 100%
rename from libmaxsi/stdio.c
rename to libc/stdio.c
diff --git a/libmaxsi/stpcpy.cpp b/libc/stpcpy.cpp
similarity index 100%
rename from libmaxsi/stpcpy.cpp
rename to libc/stpcpy.cpp
diff --git a/libmaxsi/strcasecmp.cpp b/libc/strcasecmp.cpp
similarity index 100%
rename from libmaxsi/strcasecmp.cpp
rename to libc/strcasecmp.cpp
diff --git a/libmaxsi/strcat.cpp b/libc/strcat.cpp
similarity index 100%
rename from libmaxsi/strcat.cpp
rename to libc/strcat.cpp
diff --git a/libmaxsi/strchr.cpp b/libc/strchr.cpp
similarity index 100%
rename from libmaxsi/strchr.cpp
rename to libc/strchr.cpp
diff --git a/libmaxsi/strchrnul.cpp b/libc/strchrnul.cpp
similarity index 100%
rename from libmaxsi/strchrnul.cpp
rename to libc/strchrnul.cpp
diff --git a/libmaxsi/strcmp.cpp b/libc/strcmp.cpp
similarity index 100%
rename from libmaxsi/strcmp.cpp
rename to libc/strcmp.cpp
diff --git a/libmaxsi/strcoll.cpp b/libc/strcoll.cpp
similarity index 100%
rename from libmaxsi/strcoll.cpp
rename to libc/strcoll.cpp
diff --git a/libmaxsi/strcpy.cpp b/libc/strcpy.cpp
similarity index 100%
rename from libmaxsi/strcpy.cpp
rename to libc/strcpy.cpp
diff --git a/libmaxsi/strcspn.cpp b/libc/strcspn.cpp
similarity index 100%
rename from libmaxsi/strcspn.cpp
rename to libc/strcspn.cpp
diff --git a/libmaxsi/strdup.cpp b/libc/strdup.cpp
similarity index 100%
rename from libmaxsi/strdup.cpp
rename to libc/strdup.cpp
diff --git a/libmaxsi/strerror.cpp b/libc/strerror.cpp
similarity index 100%
rename from libmaxsi/strerror.cpp
rename to libc/strerror.cpp
diff --git a/libmaxsi/strlen.cpp b/libc/strlen.cpp
similarity index 100%
rename from libmaxsi/strlen.cpp
rename to libc/strlen.cpp
diff --git a/libmaxsi/strncasecmp.cpp b/libc/strncasecmp.cpp
similarity index 100%
rename from libmaxsi/strncasecmp.cpp
rename to libc/strncasecmp.cpp
diff --git a/libmaxsi/strncat.cpp b/libc/strncat.cpp
similarity index 100%
rename from libmaxsi/strncat.cpp
rename to libc/strncat.cpp
diff --git a/libmaxsi/strncmp.cpp b/libc/strncmp.cpp
similarity index 100%
rename from libmaxsi/strncmp.cpp
rename to libc/strncmp.cpp
diff --git a/libmaxsi/strncpy.cpp b/libc/strncpy.cpp
similarity index 100%
rename from libmaxsi/strncpy.cpp
rename to libc/strncpy.cpp
diff --git a/libmaxsi/strnlen.cpp b/libc/strnlen.cpp
similarity index 100%
rename from libmaxsi/strnlen.cpp
rename to libc/strnlen.cpp
diff --git a/libmaxsi/strpbrk.cpp b/libc/strpbrk.cpp
similarity index 100%
rename from libmaxsi/strpbrk.cpp
rename to libc/strpbrk.cpp
diff --git a/libmaxsi/strrchr.cpp b/libc/strrchr.cpp
similarity index 100%
rename from libmaxsi/strrchr.cpp
rename to libc/strrchr.cpp
diff --git a/libmaxsi/strspn.cpp b/libc/strspn.cpp
similarity index 100%
rename from libmaxsi/strspn.cpp
rename to libc/strspn.cpp
diff --git a/libmaxsi/strstr.cpp b/libc/strstr.cpp
similarity index 100%
rename from libmaxsi/strstr.cpp
rename to libc/strstr.cpp
diff --git a/libmaxsi/strtok.cpp b/libc/strtok.cpp
similarity index 100%
rename from libmaxsi/strtok.cpp
rename to libc/strtok.cpp
diff --git a/libmaxsi/strtok_r.cpp b/libc/strtok_r.cpp
similarity index 100%
rename from libmaxsi/strtok_r.cpp
rename to libc/strtok_r.cpp
diff --git a/libmaxsi/tfork.cpp b/libc/tfork.cpp
similarity index 100%
rename from libmaxsi/tfork.cpp
rename to libc/tfork.cpp
diff --git a/libmaxsi/time.cpp b/libc/time.cpp
similarity index 100%
rename from libmaxsi/time.cpp
rename to libc/time.cpp
diff --git a/libmaxsi/truncate.cpp b/libc/truncate.cpp
similarity index 100%
rename from libmaxsi/truncate.cpp
rename to libc/truncate.cpp
diff --git a/libmaxsi/umask.cpp b/libc/umask.cpp
similarity index 100%
rename from libmaxsi/umask.cpp
rename to libc/umask.cpp
diff --git a/libmaxsi/ungetc.cpp b/libc/ungetc.cpp
similarity index 100%
rename from libmaxsi/ungetc.cpp
rename to libc/ungetc.cpp
diff --git a/libmaxsi/unlink.cpp b/libc/unlink.cpp
similarity index 100%
rename from libmaxsi/unlink.cpp
rename to libc/unlink.cpp
diff --git a/libmaxsi/uptime.cpp b/libc/uptime.cpp
similarity index 100%
rename from libmaxsi/uptime.cpp
rename to libc/uptime.cpp
diff --git a/libmaxsi/usleep.cpp b/libc/usleep.cpp
similarity index 100%
rename from libmaxsi/usleep.cpp
rename to libc/usleep.cpp
diff --git a/libmaxsi/utime.cpp b/libc/utime.cpp
similarity index 100%
rename from libmaxsi/utime.cpp
rename to libc/utime.cpp
diff --git a/libmaxsi/vexecl.cpp b/libc/vexecl.cpp
similarity index 100%
rename from libmaxsi/vexecl.cpp
rename to libc/vexecl.cpp
diff --git a/libmaxsi/vexecle.cpp b/libc/vexecle.cpp
similarity index 100%
rename from libmaxsi/vexecle.cpp
rename to libc/vexecle.cpp
diff --git a/libmaxsi/vexeclp.cpp b/libc/vexeclp.cpp
similarity index 100%
rename from libmaxsi/vexeclp.cpp
rename to libc/vexeclp.cpp
diff --git a/libmaxsi/vfscanf.cpp b/libc/vfscanf.cpp
similarity index 100%
rename from libmaxsi/vfscanf.cpp
rename to libc/vfscanf.cpp
diff --git a/libmaxsi/vscanf.cpp b/libc/vscanf.cpp
similarity index 100%
rename from libmaxsi/vscanf.cpp
rename to libc/vscanf.cpp
diff --git a/libmaxsi/vsscanf.cpp b/libc/vsscanf.cpp
similarity index 100%
rename from libmaxsi/vsscanf.cpp
rename to libc/vsscanf.cpp
diff --git a/libmaxsi/wait.cpp b/libc/wait.cpp
similarity index 100%
rename from libmaxsi/wait.cpp
rename to libc/wait.cpp
diff --git a/libmaxsi/waitpid.cpp b/libc/waitpid.cpp
similarity index 100%
rename from libmaxsi/waitpid.cpp
rename to libc/waitpid.cpp
diff --git a/libmaxsi/winsize.cpp b/libc/winsize.cpp
similarity index 100%
rename from libmaxsi/winsize.cpp
rename to libc/winsize.cpp
diff --git a/libmaxsi/write.cpp b/libc/write.cpp
similarity index 100%
rename from libmaxsi/write.cpp
rename to libc/write.cpp
diff --git a/libmaxsi/x64/crt1.s b/libc/x64/crt1.s
similarity index 100%
rename from libmaxsi/x64/crt1.s
rename to libc/x64/crt1.s
diff --git a/libmaxsi/x64/crti.s b/libc/x64/crti.s
similarity index 100%
rename from libmaxsi/x64/crti.s
rename to libc/x64/crti.s
diff --git a/libmaxsi/x64/crtn.s b/libc/x64/crtn.s
similarity index 100%
rename from libmaxsi/x64/crtn.s
rename to libc/x64/crtn.s
diff --git a/libmaxsi/x64/fork.s b/libc/x64/fork.s
similarity index 100%
rename from libmaxsi/x64/fork.s
rename to libc/x64/fork.s
diff --git a/libmaxsi/x64/signal.s b/libc/x64/signal.s
similarity index 100%
rename from libmaxsi/x64/signal.s
rename to libc/x64/signal.s
diff --git a/libmaxsi/x64/start.s b/libc/x64/start.s
similarity index 100%
rename from libmaxsi/x64/start.s
rename to libc/x64/start.s
diff --git a/libmaxsi/x86/crt1.s b/libc/x86/crt1.s
similarity index 100%
rename from libmaxsi/x86/crt1.s
rename to libc/x86/crt1.s
diff --git a/libmaxsi/x86/crti.s b/libc/x86/crti.s
similarity index 100%
rename from libmaxsi/x86/crti.s
rename to libc/x86/crti.s
diff --git a/libmaxsi/x86/crtn.s b/libc/x86/crtn.s
similarity index 100%
rename from libmaxsi/x86/crtn.s
rename to libc/x86/crtn.s
diff --git a/libmaxsi/x86/fork.s b/libc/x86/fork.s
similarity index 100%
rename from libmaxsi/x86/fork.s
rename to libc/x86/fork.s
diff --git a/libmaxsi/x86/signal.s b/libc/x86/signal.s
similarity index 100%
rename from libmaxsi/x86/signal.s
rename to libc/x86/signal.s
diff --git a/libmaxsi/x86/start.s b/libc/x86/start.s
similarity index 100%
rename from libmaxsi/x86/start.s
rename to libc/x86/start.s
diff --git a/mkinitrd/Makefile b/mkinitrd/Makefile
index fc7e53ac..19cdef50 100644
--- a/mkinitrd/Makefile
+++ b/mkinitrd/Makefile
@@ -1,5 +1,5 @@
 SORTIXKERNEL=../sortix
-LIBMAXSI=../libmaxsi
+LIBC=../libc
 
 CPPFLAGS=-I../sortix/include
 CXXFLAGS=-Wall
@@ -8,8 +8,8 @@ BINARIES=mkinitrd initrdfs
 
 all: $(BINARIES)
 
-%: %.cpp crc32.cpp $(LIBMAXSI)/ioleast.cpp
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< crc32.cpp $(LIBMAXSI)/ioleast.cpp -o $@
+%: %.cpp crc32.cpp $(LIBC)/ioleast.cpp
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< crc32.cpp $(LIBC)/ioleast.cpp -o $@
 
 clean:
 	rm -f $(BINARIES)
diff --git a/mxmpp/README b/mxmpp/README
index 9a1cc356..4b3b51a0 100644
--- a/mxmpp/README
+++ b/mxmpp/README
@@ -1 +1 @@
-This is a small stupid macro processor used for building Sortix's libmaxsi.
+This is a small stupid macro processor used for building Sortix's libc.