@@ -22,21 +22,21 @@
 #import "OFInvalidArgumentException.h"
 
 @implementation OFASN1UTF8String
 @synthesize UTF8StringValue = _UTF8StringValue;
 
-+ (instancetype)stringWithStringValue: (OFString *)stringValue
++ (instancetype)stringWithString: (OFString *)string
 {
-	return [[[self alloc] initWithStringValue: stringValue] autorelease];
+	return [[[self alloc] initWithString: string] autorelease];
 }
 
-- (instancetype)initWithStringValue: (OFString *)stringValue
+- (instancetype)initWithString: (OFString *)string
 {
 	self = [super init];
 
 	@try {
-		_UTF8StringValue = [stringValue copy];
+		_UTF8StringValue = [string copy];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -47,29 +47,29 @@
 		       tagNumber: (of_asn1_tag_number_t)tagNumber
 		     constructed: (bool)constructed
 	      DEREncodedContents: (OFData *)DEREncodedContents
 {
 	void *pool = objc_autoreleasePoolPush();
-	OFString *UTF8StringValue;
+	OFString *UTF8String;
 
 	@try {
 		if (tagClass != OF_ASN1_TAG_CLASS_UNIVERSAL ||
 		    tagNumber != OF_ASN1_TAG_NUMBER_UTF8_STRING || constructed)
 			@throw [OFInvalidArgumentException exception];
 
 		if (DEREncodedContents.itemSize != 1)
 			@throw [OFInvalidArgumentException exception];
 
-		UTF8StringValue = [OFString
+		UTF8String = [OFString
 		    stringWithUTF8String: DEREncodedContents.items
 				  length: DEREncodedContents.count];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
-	self = [self initWithStringValue: UTF8StringValue];
+	self = [self initWithString: UTF8String];
 
 	objc_autoreleasePoolPop(pool);
 
 	return self;
 }