diff --git a/kernel/src/memory/MemoryManager.cpp b/kernel/src/memory/MemoryManager.cpp
index 5043597b..a5023375 100644
--- a/kernel/src/memory/MemoryManager.cpp
+++ b/kernel/src/memory/MemoryManager.cpp
@@ -451,7 +451,7 @@ namespace MemoryManager
 
         TRY(result.try_append(0)); // null terminator
 
-        return String::from_string_literal(result.data());
+        return String::from_cstring(result.data());
     }
 
     bool validate_user_write(void* user, usize size)
diff --git a/libluna/include/luna/String.h b/libluna/include/luna/String.h
index 64607a47..f9202d7c 100644
--- a/libluna/include/luna/String.h
+++ b/libluna/include/luna/String.h
@@ -18,7 +18,7 @@ class String
 
     Result<String> substring(usize begin, usize size) const;
 
-    static Result<String> from_string_literal(const char* str);
+    static Result<String> from_cstring(const char* str);
 
     const char* chars() const
     {
diff --git a/libluna/src/PathParser.cpp b/libluna/src/PathParser.cpp
index d159e86b..6ae26b7c 100644
--- a/libluna/src/PathParser.cpp
+++ b/libluna/src/PathParser.cpp
@@ -44,7 +44,7 @@ Result<String> PathParser::basename()
     char* result = ::basename(copy);
 
     // We must copy this as we cannot rely on the original string.
-    return String::from_string_literal(result);
+    return String::from_cstring(result);
 }
 
 Result<String> PathParser::dirname()
@@ -57,5 +57,5 @@ Result<String> PathParser::dirname()
     char* result = ::dirname(copy);
 
     // We must copy this as we cannot rely on the original string.
-    return String::from_string_literal(result);
+    return String::from_cstring(result);
 }
diff --git a/libluna/src/String.cpp b/libluna/src/String.cpp
index 51275219..ec99bde1 100644
--- a/libluna/src/String.cpp
+++ b/libluna/src/String.cpp
@@ -44,7 +44,7 @@ String::~String()
 
 Result<String> String::clone() const
 {
-    return from_string_literal(chars());
+    return from_cstring(chars());
 }
 
 Result<String> String::substring(usize begin, usize size) const
@@ -61,7 +61,7 @@ const char& String::operator[](usize index) const
     return chars()[index];
 }
 
-Result<String> String::from_string_literal(const char* str)
+Result<String> String::from_cstring(const char* str)
 {
     usize len = strlen(str);
     if (len < sizeof(m_inline_storage))