@@ -70,11 +70,11 @@
 	_exception = [exception retain];
 }
 @end
 
 @implementation OFTLSStream
-@synthesize wrappedStream = _wrappedStream;
+@synthesize underlyingStream = _underlyingStream;
 @dynamic delegate;
 @synthesize verifiesCertificates = _verifiesCertificates;
 
 + (instancetype)alloc
 {
@@ -104,11 +104,11 @@
 				     OFReadyForWritingObserving> *)stream
 {
 	self = [super init];
 
 	@try {
-		_wrappedStream = [stream retain];
+		_underlyingStream = [stream retain];
 		_verifiesCertificates = true;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
@@ -116,19 +116,19 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[_wrappedStream release];
+	[_underlyingStream release];
 
 	[super dealloc];
 }
 
 - (void)close
 {
-	[_wrappedStream release];
-	_wrappedStream = nil;
+	[_underlyingStream release];
+	_underlyingStream = nil;
 
 	[super close];
 }
 
 - (size_t)lowlevelReadIntoBuffer: (void *)buffer length: (size_t)length
@@ -142,26 +142,26 @@
 }
 
 - (bool)hasDataInReadBuffer
 {
 	return (super.hasDataInReadBuffer ||
-	    _wrappedStream.hasDataInReadBuffer);
+	    _underlyingStream.hasDataInReadBuffer);
 }
 
 - (bool)lowlevelIsAtEndOfStream
 {
-	return _wrappedStream.atEndOfStream;
+	return _underlyingStream.atEndOfStream;
 }
 
 - (int)fileDescriptorForReading
 {
-	return _wrappedStream.fileDescriptorForReading;
+	return _underlyingStream.fileDescriptorForReading;
 }
 
 - (int)fileDescriptorForWriting
 {
-	return _wrappedStream.fileDescriptorForWriting;
+	return _underlyingStream.fileDescriptorForWriting;
 }
 
 - (void)asyncPerformClientHandshakeWithHost: (OFString *)host
 {
 	[self asyncPerformClientHandshakeWithHost: host