@@ -15,11 +15,11 @@
  * file.
  */
 
 #include "config.h"
 
-#import "OFData+ASN1DERValue.h"
+#import "OFData+ASN1DERParsing.h"
 #import "OFASN1BitString.h"
 #import "OFASN1Boolean.h"
 #import "OFASN1Enumerated.h"
 #import "OFASN1IA5String.h"
 #import "OFASN1Integer.h"
@@ -40,11 +40,11 @@
 
 enum {
 	ASN1_TAG_CONSTRUCTED_MASK = 0x20
 };
 
-int _OFData_ASN1DERValue_reference;
+int _OFData_ASN1DERParsing_reference;
 
 static size_t parseObject(OFData *self, id *object, size_t depthLimit);
 
 static OFArray *
 parseSequence(OFData *contents, size_t depthLimit)
@@ -223,17 +223,17 @@
 		   constructed: tag & ASN1_TAG_CONSTRUCTED_MASK
 	    DEREncodedContents: contents] autorelease];
 	return bytesConsumed;
 }
 
-@implementation OFData (ASN1DERValue)
-- (id)ASN1DERValue
+@implementation OFData (ASN1DERParsing)
+- (id)objectByParsingASN1DER
 {
-	return [self ASN1DERValueWithDepthLimit: 32];
+	return [self objectByParsingASN1DERWithDepthLimit: 32];
 }
 
-- (id)ASN1DERValueWithDepthLimit: (size_t)depthLimit
+- (id)objectByParsingASN1DERWithDepthLimit: (size_t)depthLimit
 {
 	void *pool = objc_autoreleasePoolPush();
 	id object;
 
 	if (self.itemSize != 1)