diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c0c1f2f..04dd5fef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ set(CMAKE_FIND_ROOT_PATH ${LUNA_ROOT}/toolchain/${LUNA_ARCH}-luna)
 
 message(STATUS "Configuring Luna for ${LUNA_ARCH}")
 
-add_subdirectory(luna)
+add_subdirectory(libluna)
 add_subdirectory(libc)
 add_subdirectory(kernel)
 add_subdirectory(apps)
diff --git a/luna/CMakeLists.txt b/libluna/CMakeLists.txt
similarity index 100%
rename from luna/CMakeLists.txt
rename to libluna/CMakeLists.txt
diff --git a/luna/include/luna/Alignment.h b/libluna/include/luna/Alignment.h
similarity index 100%
rename from luna/include/luna/Alignment.h
rename to libluna/include/luna/Alignment.h
diff --git a/luna/include/luna/Alloc.h b/libluna/include/luna/Alloc.h
similarity index 100%
rename from luna/include/luna/Alloc.h
rename to libluna/include/luna/Alloc.h
diff --git a/luna/include/luna/Atomic.h b/libluna/include/luna/Atomic.h
similarity index 100%
rename from luna/include/luna/Atomic.h
rename to libluna/include/luna/Atomic.h
diff --git a/luna/include/luna/Attributes.h b/libluna/include/luna/Attributes.h
similarity index 100%
rename from luna/include/luna/Attributes.h
rename to libluna/include/luna/Attributes.h
diff --git a/luna/include/luna/Badge.h b/libluna/include/luna/Badge.h
similarity index 100%
rename from luna/include/luna/Badge.h
rename to libluna/include/luna/Badge.h
diff --git a/luna/include/luna/Bitmap.h b/libluna/include/luna/Bitmap.h
similarity index 100%
rename from luna/include/luna/Bitmap.h
rename to libluna/include/luna/Bitmap.h
diff --git a/luna/include/luna/CString.h b/libluna/include/luna/CString.h
similarity index 100%
rename from luna/include/luna/CString.h
rename to libluna/include/luna/CString.h
diff --git a/luna/include/luna/CType.h b/libluna/include/luna/CType.h
similarity index 100%
rename from luna/include/luna/CType.h
rename to libluna/include/luna/CType.h
diff --git a/luna/include/luna/Check.h b/libluna/include/luna/Check.h
similarity index 100%
rename from luna/include/luna/Check.h
rename to libluna/include/luna/Check.h
diff --git a/luna/include/luna/CircularQueue.h b/libluna/include/luna/CircularQueue.h
similarity index 100%
rename from luna/include/luna/CircularQueue.h
rename to libluna/include/luna/CircularQueue.h
diff --git a/luna/include/luna/DebugLog.h b/libluna/include/luna/DebugLog.h
similarity index 100%
rename from luna/include/luna/DebugLog.h
rename to libluna/include/luna/DebugLog.h
diff --git a/luna/include/luna/Format.h b/libluna/include/luna/Format.h
similarity index 100%
rename from luna/include/luna/Format.h
rename to libluna/include/luna/Format.h
diff --git a/luna/include/luna/Heap.h b/libluna/include/luna/Heap.h
similarity index 100%
rename from luna/include/luna/Heap.h
rename to libluna/include/luna/Heap.h
diff --git a/luna/include/luna/Ignore.h b/libluna/include/luna/Ignore.h
similarity index 100%
rename from luna/include/luna/Ignore.h
rename to libluna/include/luna/Ignore.h
diff --git a/luna/include/luna/LinkedList.h b/libluna/include/luna/LinkedList.h
similarity index 100%
rename from luna/include/luna/LinkedList.h
rename to libluna/include/luna/LinkedList.h
diff --git a/luna/include/luna/Move.h b/libluna/include/luna/Move.h
similarity index 100%
rename from luna/include/luna/Move.h
rename to libluna/include/luna/Move.h
diff --git a/luna/include/luna/NumberParsing.h b/libluna/include/luna/NumberParsing.h
similarity index 100%
rename from luna/include/luna/NumberParsing.h
rename to libluna/include/luna/NumberParsing.h
diff --git a/luna/include/luna/Option.h b/libluna/include/luna/Option.h
similarity index 100%
rename from luna/include/luna/Option.h
rename to libluna/include/luna/Option.h
diff --git a/luna/include/luna/OwnedPtr.h b/libluna/include/luna/OwnedPtr.h
similarity index 100%
rename from luna/include/luna/OwnedPtr.h
rename to libluna/include/luna/OwnedPtr.h
diff --git a/luna/include/luna/OwnedStringView.h b/libluna/include/luna/OwnedStringView.h
similarity index 100%
rename from luna/include/luna/OwnedStringView.h
rename to libluna/include/luna/OwnedStringView.h
diff --git a/luna/include/luna/PlacementNew.h b/libluna/include/luna/PlacementNew.h
similarity index 100%
rename from luna/include/luna/PlacementNew.h
rename to libluna/include/luna/PlacementNew.h
diff --git a/luna/include/luna/Result.h b/libluna/include/luna/Result.h
similarity index 100%
rename from luna/include/luna/Result.h
rename to libluna/include/luna/Result.h
diff --git a/luna/include/luna/SafeArithmetic.h b/libluna/include/luna/SafeArithmetic.h
similarity index 100%
rename from luna/include/luna/SafeArithmetic.h
rename to libluna/include/luna/SafeArithmetic.h
diff --git a/luna/include/luna/ScopeGuard.h b/libluna/include/luna/ScopeGuard.h
similarity index 100%
rename from luna/include/luna/ScopeGuard.h
rename to libluna/include/luna/ScopeGuard.h
diff --git a/luna/include/luna/SharedPtr.h b/libluna/include/luna/SharedPtr.h
similarity index 100%
rename from luna/include/luna/SharedPtr.h
rename to libluna/include/luna/SharedPtr.h
diff --git a/luna/include/luna/SourceLocation.h b/libluna/include/luna/SourceLocation.h
similarity index 100%
rename from luna/include/luna/SourceLocation.h
rename to libluna/include/luna/SourceLocation.h
diff --git a/luna/include/luna/Spinlock.h b/libluna/include/luna/Spinlock.h
similarity index 100%
rename from luna/include/luna/Spinlock.h
rename to libluna/include/luna/Spinlock.h
diff --git a/luna/include/luna/Stack.h b/libluna/include/luna/Stack.h
similarity index 100%
rename from luna/include/luna/Stack.h
rename to libluna/include/luna/Stack.h
diff --git a/luna/include/luna/StaticString.h b/libluna/include/luna/StaticString.h
similarity index 100%
rename from luna/include/luna/StaticString.h
rename to libluna/include/luna/StaticString.h
diff --git a/luna/include/luna/Syscall.h b/libluna/include/luna/Syscall.h
similarity index 100%
rename from luna/include/luna/Syscall.h
rename to libluna/include/luna/Syscall.h
diff --git a/luna/include/luna/SystemError.h b/libluna/include/luna/SystemError.h
similarity index 100%
rename from luna/include/luna/SystemError.h
rename to libluna/include/luna/SystemError.h
diff --git a/luna/include/luna/TarStream.h b/libluna/include/luna/TarStream.h
similarity index 100%
rename from luna/include/luna/TarStream.h
rename to libluna/include/luna/TarStream.h
diff --git a/luna/include/luna/TypeTraits.h b/libluna/include/luna/TypeTraits.h
similarity index 100%
rename from luna/include/luna/TypeTraits.h
rename to libluna/include/luna/TypeTraits.h
diff --git a/luna/include/luna/Types.h b/libluna/include/luna/Types.h
similarity index 100%
rename from luna/include/luna/Types.h
rename to libluna/include/luna/Types.h
diff --git a/luna/include/luna/UBSAN.h b/libluna/include/luna/UBSAN.h
similarity index 100%
rename from luna/include/luna/UBSAN.h
rename to libluna/include/luna/UBSAN.h
diff --git a/luna/include/luna/Units.h b/libluna/include/luna/Units.h
similarity index 100%
rename from luna/include/luna/Units.h
rename to libluna/include/luna/Units.h
diff --git a/luna/include/luna/Utf8.h b/libluna/include/luna/Utf8.h
similarity index 100%
rename from luna/include/luna/Utf8.h
rename to libluna/include/luna/Utf8.h
diff --git a/luna/include/luna/Vector.h b/libluna/include/luna/Vector.h
similarity index 100%
rename from luna/include/luna/Vector.h
rename to libluna/include/luna/Vector.h
diff --git a/luna/src/Bitmap.cpp b/libluna/src/Bitmap.cpp
similarity index 100%
rename from luna/src/Bitmap.cpp
rename to libluna/src/Bitmap.cpp
diff --git a/luna/src/CString.cpp b/libluna/src/CString.cpp
similarity index 100%
rename from luna/src/CString.cpp
rename to libluna/src/CString.cpp
diff --git a/luna/src/Check.cpp b/libluna/src/Check.cpp
similarity index 100%
rename from luna/src/Check.cpp
rename to libluna/src/Check.cpp
diff --git a/luna/src/DebugLog.cpp b/libluna/src/DebugLog.cpp
similarity index 100%
rename from luna/src/DebugLog.cpp
rename to libluna/src/DebugLog.cpp
diff --git a/luna/src/Format.cpp b/libluna/src/Format.cpp
similarity index 100%
rename from luna/src/Format.cpp
rename to libluna/src/Format.cpp
diff --git a/luna/src/Heap.cpp b/libluna/src/Heap.cpp
similarity index 100%
rename from luna/src/Heap.cpp
rename to libluna/src/Heap.cpp
diff --git a/luna/src/NumberParsing.cpp b/libluna/src/NumberParsing.cpp
similarity index 100%
rename from luna/src/NumberParsing.cpp
rename to libluna/src/NumberParsing.cpp
diff --git a/luna/src/OwnedStringView.cpp b/libluna/src/OwnedStringView.cpp
similarity index 100%
rename from luna/src/OwnedStringView.cpp
rename to libluna/src/OwnedStringView.cpp
diff --git a/luna/src/Spinlock.cpp b/libluna/src/Spinlock.cpp
similarity index 100%
rename from luna/src/Spinlock.cpp
rename to libluna/src/Spinlock.cpp
diff --git a/luna/src/Stack.cpp b/libluna/src/Stack.cpp
similarity index 100%
rename from luna/src/Stack.cpp
rename to libluna/src/Stack.cpp
diff --git a/luna/src/SystemError.cpp b/libluna/src/SystemError.cpp
similarity index 100%
rename from luna/src/SystemError.cpp
rename to libluna/src/SystemError.cpp
diff --git a/luna/src/TarStream.cpp b/libluna/src/TarStream.cpp
similarity index 100%
rename from luna/src/TarStream.cpp
rename to libluna/src/TarStream.cpp
diff --git a/luna/src/UBSAN.cpp b/libluna/src/UBSAN.cpp
similarity index 100%
rename from luna/src/UBSAN.cpp
rename to libluna/src/UBSAN.cpp
diff --git a/luna/src/Units.cpp b/libluna/src/Units.cpp
similarity index 100%
rename from luna/src/Units.cpp
rename to libluna/src/Units.cpp
diff --git a/luna/src/Utf8.cpp b/libluna/src/Utf8.cpp
similarity index 100%
rename from luna/src/Utf8.cpp
rename to libluna/src/Utf8.cpp
diff --git a/tools/install-headers.sh b/tools/install-headers.sh
index 324ce7ab..71b3b07f 100755
--- a/tools/install-headers.sh
+++ b/tools/install-headers.sh
@@ -10,4 +10,4 @@ mkdir -p $LUNA_BASE/usr/include
 mkdir -p $LUNA_BASE/usr/include/luna
 
 cp --preserve=timestamps -RT libc/include/ $LUNA_BASE/usr/include
-cp --preserve=timestamps -RT luna/include/luna/ $LUNA_BASE/usr/include/luna
+cp --preserve=timestamps -RT libluna/include/luna/ $LUNA_BASE/usr/include/luna