diff --git a/kernel/src/arch/x86_64/CPU.cpp b/kernel/src/arch/x86_64/CPU.cpp
index 8654fe38..11043411 100644
--- a/kernel/src/arch/x86_64/CPU.cpp
+++ b/kernel/src/arch/x86_64/CPU.cpp
@@ -6,9 +6,9 @@
 #include "memory/MemoryManager.h"
 #include "thread/Scheduler.h"
 #include <cpuid.h>
+#include <luna/CString.h>
 #include <luna/Check.h>
 #include <luna/Result.h>
-#include <luna/String.h>
 #include <luna/SystemError.h>
 #include <luna/Types.h>
 
diff --git a/kernel/src/arch/x86_64/MMU.cpp b/kernel/src/arch/x86_64/MMU.cpp
index 25edd6ff..3b927aa4 100644
--- a/kernel/src/arch/x86_64/MMU.cpp
+++ b/kernel/src/arch/x86_64/MMU.cpp
@@ -1,7 +1,7 @@
 #include "arch/MMU.h"
 #include "memory/MemoryManager.h"
+#include <luna/CString.h>
 #include <luna/Result.h>
-#include <luna/String.h>
 #include <luna/SystemError.h>
 
 #pragma GCC push_options
diff --git a/kernel/src/arch/x86_64/Thread.cpp b/kernel/src/arch/x86_64/Thread.cpp
index 4e1ffe86..b9b76d59 100644
--- a/kernel/src/arch/x86_64/Thread.cpp
+++ b/kernel/src/arch/x86_64/Thread.cpp
@@ -1,5 +1,5 @@
 #include "thread/Thread.h"
-#include <luna/String.h>
+#include <luna/CString.h>
 
 bool is_in_kernel(Registers* regs)
 {
diff --git a/kernel/src/boot/Init.cpp b/kernel/src/boot/Init.cpp
index 64605a5b..0aba173e 100644
--- a/kernel/src/boot/Init.cpp
+++ b/kernel/src/boot/Init.cpp
@@ -4,8 +4,8 @@
 #include "boot/bootboot.h"
 #include "memory/MemoryManager.h"
 #include "video/Framebuffer.h"
+#include <luna/CString.h>
 #include <luna/Result.h>
-#include <luna/String.h>
 
 extern const BOOTBOOT bootboot;
 
diff --git a/kernel/src/memory/Heap.cpp b/kernel/src/memory/Heap.cpp
index faea101d..90fd79f0 100644
--- a/kernel/src/memory/Heap.cpp
+++ b/kernel/src/memory/Heap.cpp
@@ -6,10 +6,10 @@
 #include "memory/MemoryManager.h"
 #include <luna/Alignment.h>
 #include <luna/Alloc.h>
+#include <luna/CString.h>
 #include <luna/LinkedList.h>
 #include <luna/SafeArithmetic.h>
 #include <luna/ScopeGuard.h>
-#include <luna/String.h>
 #include <luna/SystemError.h>
 
 namespace std
diff --git a/kernel/src/memory/MemoryManager.cpp b/kernel/src/memory/MemoryManager.cpp
index 75db28db..6d335717 100644
--- a/kernel/src/memory/MemoryManager.cpp
+++ b/kernel/src/memory/MemoryManager.cpp
@@ -6,8 +6,8 @@
 #include "memory/MemoryMap.h"
 #include <luna/Alignment.h>
 #include <luna/Bitmap.h>
+#include <luna/CString.h>
 #include <luna/ScopeGuard.h>
-#include <luna/String.h>
 #include <luna/SystemError.h>
 #include <luna/Types.h>
 
diff --git a/kernel/src/video/TextConsole.cpp b/kernel/src/video/TextConsole.cpp
index d3679350..8ef6ad59 100644
--- a/kernel/src/video/TextConsole.cpp
+++ b/kernel/src/video/TextConsole.cpp
@@ -1,9 +1,9 @@
 #include "video/TextConsole.h"
 #include "boot/bootboot.h"
 #include "video/Framebuffer.h"
+#include <luna/CString.h>
 #include <luna/Format.h>
 #include <luna/Result.h>
-#include <luna/String.h>
 #include <stdarg.h>
 
 extern const BOOTBOOT bootboot;
diff --git a/luna/CMakeLists.txt b/luna/CMakeLists.txt
index 655dc333..53a8a28b 100644
--- a/luna/CMakeLists.txt
+++ b/luna/CMakeLists.txt
@@ -3,7 +3,7 @@
 set(FREESTANDING_SOURCES
     src/Format.cpp
     src/NumberParsing.cpp
-    src/String.cpp
+    src/CString.cpp
     src/Units.cpp
     src/SystemError.cpp
     src/Bitmap.cpp
diff --git a/luna/include/luna/String.h b/luna/include/luna/CString.h
similarity index 100%
rename from luna/include/luna/String.h
rename to luna/include/luna/CString.h
diff --git a/luna/src/Bitmap.cpp b/luna/src/Bitmap.cpp
index 7fb5302b..35b2ea8d 100644
--- a/luna/src/Bitmap.cpp
+++ b/luna/src/Bitmap.cpp
@@ -1,6 +1,6 @@
 #include <luna/Bitmap.h>
+#include <luna/CString.h>
 #include <luna/Check.h>
-#include <luna/String.h>
 
 Bitmap::Bitmap()
 {
diff --git a/luna/src/String.cpp b/luna/src/CString.cpp
similarity index 98%
rename from luna/src/String.cpp
rename to luna/src/CString.cpp
index 70b71d4f..7942501a 100644
--- a/luna/src/String.cpp
+++ b/luna/src/CString.cpp
@@ -1,5 +1,5 @@
 #include <luna/Alloc.h>
-#include <luna/String.h>
+#include <luna/CString.h>
 
 extern "C"
 {
diff --git a/luna/src/OwnedStringView.cpp b/luna/src/OwnedStringView.cpp
index a904a7ca..8ac2df4b 100644
--- a/luna/src/OwnedStringView.cpp
+++ b/luna/src/OwnedStringView.cpp
@@ -1,6 +1,6 @@
 #include <luna/Alloc.h>
+#include <luna/CString.h>
 #include <luna/OwnedStringView.h>
-#include <luna/String.h>
 
 OwnedStringView::OwnedStringView()
 {