@@ -17,12 +17,13 @@
 
 #include "config.h"
 
 #import "TestsAppDelegate.h"
 
-#import "OFCharacterSet_bitset.h"
-#import "OFCharacterSet_range.h"
+#import "OFCharacterSet.h"
+#import "OFBitSetCharacterSet.h"
+#import "OFRangeCharacterSet.h"
 
 static OFString *module = nil;
 
 @interface SimpleCharacterSet: OFCharacterSet
 @end
@@ -53,16 +54,16 @@
 		} else if ([cs characterIsMember: c])
 			ok = false;
 	}
 	TEST(@"-[characterIsMember:]", ok);
 
-	module = @"OFCharacterSet_bitset";
+	module = @"OFBitSetCharacterSet";
 
 	TEST(@"+[characterSetWithCharactersInString:]",
 	    (cs = [OFCharacterSet characterSetWithCharactersInString:
 	    @"0123456789"]) &&
-	    [cs isKindOfClass: [OFCharacterSet_bitset class]])
+	    [cs isKindOfClass: [OFBitSetCharacterSet class]])
 
 	ok = true;
 	for (of_unichar_t c = 0; c < 65536; c++) {
 		if (c >= '0' && c <= '9') {
 			if (![cs characterIsMember: c])
@@ -70,15 +71,15 @@
 		} else if ([cs characterIsMember: c])
 			ok = false;
 	}
 	TEST(@"-[characterIsMember:]", ok);
 
-	module = @"OFCharacterSet_range";
+	module = @"OFRangeCharacterSet";
 
 	TEST(@"+[characterSetWithRange:]",
 	    (cs = [OFCharacterSet characterSetWithRange: of_range('0', 10)]) &&
-	    [cs isKindOfClass: [OFCharacterSet_range class]])
+	    [cs isKindOfClass: [OFRangeCharacterSet class]])
 
 	ok = true;
 	for (of_unichar_t c = 0; c < 65536; c++) {
 		if (c >= '0' && c <= '9') {
 			if (![cs characterIsMember: c])