diff --git a/src/core/strings/str8/str8.h b/src/core/strings/str8/str8.h
index d0aa575..c1fbd8d 100644
--- a/src/core/strings/str8/str8.h
+++ b/src/core/strings/str8/str8.h
@@ -21,7 +21,7 @@ typedef const Str8 Str8RO;
 
 typedef struct str8_node Str8Node;
 struct str8_node {
-  Str8RO *string;
+  Str8 *string;
   Str8Node *prev;
   Str8Node *next;
 };
diff --git a/tests/str8/test_str8_list.c b/tests/str8/test_str8_list.c
index 57c9306..a5800b6 100644
--- a/tests/str8/test_str8_list.c
+++ b/tests/str8/test_str8_list.c
@@ -5,11 +5,11 @@
 TestFuncResult test_str8_list_get(void) {
   bool result;
 
-  Str8RO s1 = wapp_str8_lit_ro("1");
-  Str8RO s2 = wapp_str8_lit_ro("2");
-  Str8RO s3 = wapp_str8_lit_ro("3");
-  Str8RO s4 = wapp_str8_lit_ro("4");
-  Str8RO s5 = wapp_str8_lit_ro("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");
 
   Str8List list = {0};
   Str8Node n1   = { .string = &s1 };
@@ -45,9 +45,9 @@ TestFuncResult test_str8_list_get(void) {
 TestFuncResult test_str8_list_push_front(void) {
   bool result;
 
-  Str8RO s1 = wapp_str8_lit_ro("1");
-  Str8RO s2 = wapp_str8_lit_ro("2");
-  Str8RO s3 = wapp_str8_lit_ro("3");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
 
   Str8List list = {0};
   Str8Node n1   = { .string = &s1 };
@@ -69,9 +69,9 @@ TestFuncResult test_str8_list_push_front(void) {
 TestFuncResult test_str8_list_push_back(void) {
   bool result;
 
-  Str8RO s1 = wapp_str8_lit_ro("1");
-  Str8RO s2 = wapp_str8_lit_ro("2");
-  Str8RO s3 = wapp_str8_lit_ro("3");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
 
   Str8List list = {0};
   Str8Node n1   = { .string = &s1 };
@@ -93,13 +93,13 @@ TestFuncResult test_str8_list_push_back(void) {
 TestFuncResult test_str8_list_insert(void) {
   bool result;
 
-  Str8RO s1 = wapp_str8_lit_ro("1");
-  Str8RO s2 = wapp_str8_lit_ro("2");
-  Str8RO s3 = wapp_str8_lit_ro("3");
-  Str8RO s4 = wapp_str8_lit_ro("4");
-  Str8RO s5 = wapp_str8_lit_ro("5");
-  Str8RO s6 = wapp_str8_lit_ro("6");
-  Str8RO s7 = wapp_str8_lit_ro("7");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");
+  Str8 s6 = wapp_str8_lit("6");
+  Str8 s7 = wapp_str8_lit("7");
 
   Str8List list = {0};
   Str8Node n1   = { .string = &s1 };
@@ -130,11 +130,11 @@ TestFuncResult test_str8_list_insert(void) {
 TestFuncResult test_str8_list_pop_front(void) {
   bool result;
 
-  Str8RO s1 = wapp_str8_lit_ro("1");
-  Str8RO s2 = wapp_str8_lit_ro("2");
-  Str8RO s3 = wapp_str8_lit_ro("3");
-  Str8RO s4 = wapp_str8_lit_ro("4");
-  Str8RO s5 = wapp_str8_lit_ro("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");
 
   Str8List list = {0};
   Str8Node n1   = { .string = &s1 };
@@ -170,11 +170,11 @@ TestFuncResult test_str8_list_pop_front(void) {
 TestFuncResult test_str8_list_pop_back(void) {
   bool result;
 
-  Str8RO s1 = wapp_str8_lit_ro("1");
-  Str8RO s2 = wapp_str8_lit_ro("2");
-  Str8RO s3 = wapp_str8_lit_ro("3");
-  Str8RO s4 = wapp_str8_lit_ro("4");
-  Str8RO s5 = wapp_str8_lit_ro("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");
 
   Str8List list = {0};
   Str8Node n1   = { .string = &s1 };
@@ -210,11 +210,11 @@ TestFuncResult test_str8_list_pop_back(void) {
 TestFuncResult test_str8_list_remove(void) {
   bool result;
 
-  Str8RO s1 = wapp_str8_lit_ro("1");
-  Str8RO s2 = wapp_str8_lit_ro("2");
-  Str8RO s3 = wapp_str8_lit_ro("3");
-  Str8RO s4 = wapp_str8_lit_ro("4");
-  Str8RO s5 = wapp_str8_lit_ro("5");
+  Str8 s1 = wapp_str8_lit("1");
+  Str8 s2 = wapp_str8_lit("2");
+  Str8 s3 = wapp_str8_lit("3");
+  Str8 s4 = wapp_str8_lit("4");
+  Str8 s5 = wapp_str8_lit("5");
 
   Str8List list = {0};
   Str8Node n1   = { .string = &s1 };