@@ -36,11 +36,11 @@
 	    @"foo",
 	    [OFNumber numberWithBool: false],
 	    nil],
 	    nil];
 
-	TEST(@"-[JSONValue] #1", [s.JSONValue isEqual: d])
+	TEST(@"-[objectByParsingJSON] #1", [s.objectByParsingJSON isEqual: d])
 
 	TEST(@"-[JSONRepresentation]", [[d JSONRepresentation] isEqual:
 	    @"{\"x\":[0.5,15,null,\"foo\",false],\"foo\":\"b\\na\\r\"}"])
 
 	TEST(@"OF_JSON_REPRESENTATION_PRETTY",
@@ -50,22 +50,22 @@
 
 	TEST(@"OF_JSON_REPRESENTATION_JSON5",
 	    [[d JSONRepresentationWithOptions: OF_JSON_REPRESENTATION_JSON5]
 	    isEqual: @"{x:[0.5,15,null,\"foo\",false],foo:\"b\\\na\\r\"}"])
 
-	EXPECT_EXCEPTION(@"-[JSONValue] #2", OFInvalidJSONException,
-	    [@"{" JSONValue])
-	EXPECT_EXCEPTION(@"-[JSONValue] #3", OFInvalidJSONException,
-	    [@"]" JSONValue])
-	EXPECT_EXCEPTION(@"-[JSONValue] #4", OFInvalidJSONException,
-	    [@"bar" JSONValue])
-	EXPECT_EXCEPTION(@"-[JSONValue] #5", OFInvalidJSONException,
-	    [@"[\"a\" \"b\"]" JSONValue])
-
-	TEST(@"-[JSONValue] #6",
-	    [@"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[{}]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
-	    .JSONValue isEqual: [OFArray arrayWithObject:
+	EXPECT_EXCEPTION(@"-[objectByParsingJSON] #2", OFInvalidJSONException,
+	    [@"{" objectByParsingJSON])
+	EXPECT_EXCEPTION(@"-[objectByParsingJSON] #3", OFInvalidJSONException,
+	    [@"]" objectByParsingJSON])
+	EXPECT_EXCEPTION(@"-[objectByParsingJSON] #4", OFInvalidJSONException,
+	    [@"bar" objectByParsingJSON])
+	EXPECT_EXCEPTION(@"-[objectByParsingJSON] #5", OFInvalidJSONException,
+	    [@"[\"a\" \"b\"]" objectByParsingJSON])
+
+	TEST(@"-[objectByParsingJSON] #6",
+	    [@"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[{}]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
+	    .objectByParsingJSON isEqual: [OFArray arrayWithObject:
 	    [OFArray arrayWithObject: [OFArray arrayWithObject:
 	    [OFArray arrayWithObject: [OFArray arrayWithObject:
 	    [OFArray arrayWithObject: [OFArray arrayWithObject:
 	    [OFArray arrayWithObject: [OFArray arrayWithObject:
 	    [OFArray arrayWithObject: [OFArray arrayWithObject:
@@ -79,12 +79,12 @@
 	    [OFArray arrayWithObject: [OFArray arrayWithObject:
 	    [OFArray arrayWithObject: [OFArray arrayWithObject:
 	    [OFArray arrayWithObject:
 	    [OFDictionary dictionary]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]])
 
-	EXPECT_EXCEPTION(@"-[JSONValue] #7", OFInvalidJSONException,
+	EXPECT_EXCEPTION(@"-[objectByParsingJSON] #7", OFInvalidJSONException,
 	    [@"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[{}]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
-	    JSONValue])
+	    objectByParsingJSON])
 
 	objc_autoreleasePoolPop(pool);
 }
 @end