@@ -64,51 +64,52 @@
 	TEST(@"-[categoryForName:]",
 	    tests != nil && foobar != nil && types != nil)
 
 	module = @"OFINICategory";
 
-	TEST(@"-[stringForKey:]",
-	    [[tests stringForKey: @"foo"] isEqual: @"bar"] &&
-	    [[foobar stringForKey: @"quxquxqux"] isEqual: @"hello\"wörld"])
-
-	TEST(@"-[setString:forKey:]",
-	    R([tests setString: @"baz" forKey: @"foo"]) &&
-	    R([tests setString: @"new" forKey: @"new"]) &&
-	    R([foobar setString: @"a\fb" forKey: @"qux3"]))
-
-	TEST(@"-[longLongForKey:defaultValue:]",
-	    [types longLongForKey: @"integer" defaultValue: 2] == 0x20)
-
-	TEST(@"-[setLongLong:forKey:]",
-	    R([types setLongLong: 0x10 forKey: @"integer"]))
-
-	TEST(@"-[boolForKey:defaultValue:]",
-	    [types boolForKey: @"bool" defaultValue: false] == true)
-
-	TEST(@"-[setBool:forKey:]", R([types setBool: false forKey: @"bool"]))
-
-	TEST(@"-[floatForKey:defaultValue:]",
-	    [types floatForKey: @"float" defaultValue: 1] == 0.5f)
-
-	TEST(@"-[setFloat:forKey:]",
-	    R([types setFloat: 0.25f forKey: @"float"]))
-
-	TEST(@"-[doubleForKey:defaultValue:]",
-	    [types doubleForKey: @"double" defaultValue: 3] == 0.25)
-
-	TEST(@"-[setDouble:forKey:]",
-	    R([types setDouble: 0.75 forKey: @"double"]))
+	TEST(@"-[stringValueForKey:]",
+	    [[tests stringValueForKey: @"foo"] isEqual: @"bar"] &&
+	    [[foobar stringValueForKey: @"quxquxqux"] isEqual: @"hello\"wörld"])
+
+	TEST(@"-[setStringValue:forKey:]",
+	    R([tests setStringValue: @"baz" forKey: @"foo"]) &&
+	    R([tests setStringValue: @"new" forKey: @"new"]) &&
+	    R([foobar setStringValue: @"a\fb" forKey: @"qux3"]))
+
+	TEST(@"-[longLongValueForKey:defaultValue:]",
+	    [types longLongValueForKey: @"integer" defaultValue: 2] == 0x20)
+
+	TEST(@"-[setLongLongValue:forKey:]",
+	    R([types setLongLongValue: 0x10 forKey: @"integer"]))
+
+	TEST(@"-[boolValueForKey:defaultValue:]",
+	    [types boolValueForKey: @"bool" defaultValue: false] == true)
+
+	TEST(@"-[setBoolValue:forKey:]",
+	    R([types setBoolValue: false forKey: @"bool"]))
+
+	TEST(@"-[floatValueForKey:defaultValue:]",
+	    [types floatValueForKey: @"float" defaultValue: 1] == 0.5f)
+
+	TEST(@"-[setFloatValue:forKey:]",
+	    R([types setFloatValue: 0.25f forKey: @"float"]))
+
+	TEST(@"-[doubleValueForKey:defaultValue:]",
+	    [types doubleValueForKey: @"double" defaultValue: 3] == 0.25)
+
+	TEST(@"-[setDoubleValue:forKey:]",
+	    R([types setDoubleValue: 0.75 forKey: @"double"]))
 
 	array = [OFArray arrayWithObjects: @"1", @"2", nil];
-	TEST(@"-[stringArrayForKey:]",
-	    [[types stringArrayForKey: @"array1"] isEqual: array] &&
-	    [[types stringArrayForKey: @"array2"] isEqual: array] &&
-	    [[types stringArrayForKey: @"array3"] isEqual: [OFArray array]])
+	TEST(@"-[arrayValueForKey:]",
+	    [[types arrayValueForKey: @"array1"] isEqual: array] &&
+	    [[types arrayValueForKey: @"array2"] isEqual: array] &&
+	    [[types arrayValueForKey: @"array3"] isEqual: [OFArray array]])
 
 	array = [OFArray arrayWithObjects: @"foo", @"bar", nil];
-	TEST(@"-[setStringArray:forKey:]",
-	    R([types setStringArray: array forKey: @"array1"]))
+	TEST(@"-[setArrayValue:forKey:]",
+	    R([types setArrayValue: array forKey: @"array1"]))
 
 	TEST(@"-[removeValueForKey:]",
 	    R([foobar removeValueForKey: @"quxqux "]) &&
 	    R([types removeValueForKey: @"array2"]))