@@ -21,11 +21,13 @@
 #include <string.h>
 #include <math.h>
 
 #import "TestsAppDelegate.h"
 
-#import "OFMutableString_UTF8.h"
+#import "OFString.h"
+#import "OFMutableUTF8String.h"
+#import "OFUTF8String.h"
 
 static OFString *module = nil;
 static OFString *whitespace[] = {
 	@" \r \t\n\t \tasd  \t \t\t\r\n",
 	@" \t\t  \t\t  \t \t"
@@ -1430,9 +1432,9 @@
 	module = @"OFString";
 	[self stringTestsWithClass: [SimpleString class]
 		      mutableClass: [SimpleMutableString class]];
 
 	module = @"OFString_UTF8";
-	[self stringTestsWithClass: [OFString_UTF8 class]
-		      mutableClass: [OFMutableString_UTF8 class]];
+	[self stringTestsWithClass: [OFUTF8String class]
+		      mutableClass: [OFMutableUTF8String class]];
 }
 @end