diff --git a/src/add-ons/kernel/file_systems/udf/DirectoryIterator.cpp b/src/add-ons/kernel/file_systems/udf/DirectoryIterator.cpp
index 12d19ed24c..42f1bacc94 100644
--- a/src/add-ons/kernel/file_systems/udf/DirectoryIterator.cpp
+++ b/src/add-ons/kernel/file_systems/udf/DirectoryIterator.cpp
@@ -15,7 +15,7 @@
 
 #include "Icb.h"
 
-#include "CS0String.h"
+#include "UdfString.h"
 #include "Utils.h"
 
 using namespace Udf;
@@ -59,11 +59,11 @@ DirectoryIterator::GetNextEntry(char *name, uint32 *length, vnode_id *id)
 			sprintf(name, "..");
 			*length = 3;
 		} else {
-			CS0String string(entry->id(), entry->id_length());
-			PRINT(("id == `%s'\n", string.String()));
+			String string(entry->id(), entry->id_length());
+			PRINT(("id == `%s'\n", string.Utf8()));
 			DUMP(entry->icb());
-			sprintf(name, "%s", string.String());
-			*length = string.Length();
+			sprintf(name, "%s", string.Utf8());
+			*length = string.Utf8Length();
 		}		
 		*id = to_vnode_id(entry->icb());
 	}	
diff --git a/src/add-ons/kernel/file_systems/udf/Jamfile b/src/add-ons/kernel/file_systems/udf/Jamfile
index e0f0ec48f4..aaf3d58787 100644
--- a/src/add-ons/kernel/file_systems/udf/Jamfile
+++ b/src/add-ons/kernel/file_systems/udf/Jamfile
@@ -30,7 +30,6 @@ R5KernelAddon udf : [ FDirName kernel file_systems udf ] :
 	kernel_cpp.cpp
 	udf.cpp
 
-	CS0String.cpp
 	DirectoryIterator.cpp
 	Icb.cpp
 	MetadataPartition.cpp
@@ -38,6 +37,7 @@ R5KernelAddon udf : [ FDirName kernel file_systems udf ] :
 	Recognition.cpp
 	SparablePartition.cpp
 	UdfDebug.cpp
+	UdfString.cpp
 	UdfStructures.cpp
 	Utils.cpp
 	VirtualPartition.cpp
diff --git a/src/add-ons/kernel/file_systems/udf/Recognition.cpp b/src/add-ons/kernel/file_systems/udf/Recognition.cpp
index b3e54e1cb6..e5b7e895cf 100644
--- a/src/add-ons/kernel/file_systems/udf/Recognition.cpp
+++ b/src/add-ons/kernel/file_systems/udf/Recognition.cpp
@@ -1,6 +1,6 @@
 #include "Recognition.h"
 
-#include "CS0String.h"
+#include "UdfString.h"
 #include "MemoryChunk.h"
 #include "Utils.h"
 
@@ -80,8 +80,8 @@ Udf::udf_recognize(int device, off_t offset, off_t length, uint32 blockSize,
 	                               logicalVolumeDescriptor, partitionDescriptors,
 	                               partitionDescriptorCount);
 	if (!error && volumeName) {
-		CS0String name(logicalVolumeDescriptor.logical_volume_identifier());
-		strcpy(volumeName, name.String());
+		String name(logicalVolumeDescriptor.logical_volume_identifier());
+		strcpy(volumeName, name.Utf8());
 	}
 	RETURN(error);
 }
diff --git a/src/add-ons/kernel/file_systems/udf/Volume.cpp b/src/add-ons/kernel/file_systems/udf/Volume.cpp
index 03985fc526..17fb97e66a 100644
--- a/src/add-ons/kernel/file_systems/udf/Volume.cpp
+++ b/src/add-ons/kernel/file_systems/udf/Volume.cpp
@@ -263,7 +263,7 @@ Volume::Mount(const char *deviceName, off_t offset, off_t length,
 
 const char*
 Volume::Name() const {
-	return fName.String();
+	return fName.Utf8();
 }
 
 /*! \brief Maps the given logical block to a physical block.
@@ -298,7 +298,7 @@ Volume::_Unset()
 	fLength = 0;
 	fBlockSize = 0;
 	fBlockShift = 0;
-	fName.SetTo("");
+	fName.SetTo("", 0);
 	// delete our partitions
 	for (int i = 0; i < UDF_MAX_PARTITION_MAPS; i++)
 		_SetPartition(i, NULL);
diff --git a/src/add-ons/kernel/file_systems/udf/Volume.h b/src/add-ons/kernel/file_systems/udf/Volume.h
index a469cbd40f..5cf9c6ccd8 100644
--- a/src/add-ons/kernel/file_systems/udf/Volume.h
+++ b/src/add-ons/kernel/file_systems/udf/Volume.h
@@ -24,7 +24,7 @@ extern "C" {
 #include "kernel_cpp.h"
 #include "UdfDebug.h"
 
-#include "CS0String.h"
+#include "UdfString.h"
 #include "UdfStructures.h"
 #include "Partition.h"
 
@@ -78,7 +78,7 @@ private:
 	uint32 fBlockShift;
 	Partition *fPartitions[UDF_MAX_PARTITION_MAPS];
 	Icb *fRootIcb;	// Destroyed by vfs via callback to release_node()
-	CS0String fName;
+	String fName;
 };
 
 };	// namespace Udf
diff --git a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
index 6207a54be0..5b55a5bbf4 100644
--- a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
+++ b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
@@ -35,9 +35,9 @@ SubDirHdrs [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
 # iso9660/UDF hybrid discs.
 Addon i-udf-ds : [ FDirName drive_setup fs ] :
 	udf-ds.cpp
-	CS0String.cpp
 	Recognition.cpp
 	UdfDebug.cpp
+	UdfString.cpp
 	UdfStructures.cpp
 	Utils.cpp
 	
@@ -46,7 +46,7 @@ Addon i-udf-ds : [ FDirName drive_setup fs ] :
 ;
 
 SEARCH on [ FGristFiles
-		CS0String.cpp Recognition.cpp UdfDebug.cpp UdfStructures.cpp Utils.cpp
+		Recognition.cpp UdfDebug.cpp UdfString.cpp UdfStructures.cpp Utils.cpp
 	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
 
 rule InstallUDFDS
diff --git a/src/apps/bin/makeudfimage/Jamfile b/src/apps/bin/makeudfimage/Jamfile
index d58ab66353..767996afb3 100644
--- a/src/apps/bin/makeudfimage/Jamfile
+++ b/src/apps/bin/makeudfimage/Jamfile
@@ -19,8 +19,8 @@ BinCommand makeudfimage
 	  UdfBuilder.cpp
 
 	  # Common Udf source files
-	  CS0String.cpp
 	  UdfDebug.cpp
+	  UdfString.cpp
 	  UdfStructures.cpp
 	  Utils.cpp
 
@@ -29,6 +29,6 @@ BinCommand makeudfimage
 	
 ;
 
-SEARCH on [ FGristFiles CS0String.cpp UdfDebug.cpp UdfStructures.cpp Utils.cpp ]
+SEARCH on [ FGristFiles UdfDebug.cpp UdfString.cpp UdfStructures.cpp Utils.cpp ]
 	= [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
 
diff --git a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
index a5c0414966..a4843144f8 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
@@ -17,10 +17,10 @@ SimpleTest udf_shell
 	sysdep.c hexdump.c argv.c tracker.cpp
 
 	udf.cpp
-	CS0String.cpp DirectoryIterator.cpp Icb.cpp
+	DirectoryIterator.cpp Icb.cpp
 	MetadataPartition.cpp PhysicalPartition.cpp Recognition.cpp
-	UdfDebug.cpp UdfStructures.cpp Utils.cpp SparablePartition.cpp
-	VirtualPartition.cpp Volume.cpp 
+	UdfDebug.cpp UdfString.cpp UdfStructures.cpp Utils.cpp
+	SparablePartition.cpp VirtualPartition.cpp Volume.cpp 
 	:
 	;
 
@@ -29,8 +29,8 @@ SEARCH on [ FGristFiles
 		udf.cpp 
 		CS0String.cpp DirectoryIterator.cpp Icb.cpp
 		MetadataPartition.cpp PhysicalPartition.cpp Recognition.cpp
-		UdfDebug.cpp  UdfStructures.cpp Utils.cpp SparablePartition.cpp
-		VirtualPartition.cpp Volume.cpp 
+		UdfDebug.cpp  UdfString.cpp UdfStructures.cpp Utils.cpp
+		SparablePartition.cpp VirtualPartition.cpp Volume.cpp 
 	] = [ FDirName $(OBOS_TOP) src add-ons kernel file_systems udf ] ;
 
 SEARCH on [ FGristFiles