@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2011, 2012, 2013, Jonathan Schleifer <js@heap.zone>
+ * Copyright (c) 2011, 2012, 2013, 2019, Jonathan Schleifer <js@heap.zone>
  * Copyright (c) 2011, Florian Zeitz <florob@babelmonkeys.de>
  *
  * https://heap.zone/objxmpp/
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -127,19 +127,19 @@
 	@try {
 		if (![name isEqual: @"iq"] && ![name isEqual: @"message"] &&
 		    ![name isEqual: @"presence"])
 			@throw [OFInvalidArgumentException exception];
 
-		[self setDefaultNamespace: XMPP_NS_CLIENT];
+		self.defaultNamespace = XMPP_NS_CLIENT;
 		[self setPrefix: @"stream"
 		   forNamespace: XMPP_NS_STREAM];
 
 		if (type != nil)
-			[self setType: type];
+			self.type = type;
 
 		if (ID != nil)
-			[self setID: ID];
+			self.ID = ID;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -152,22 +152,22 @@
 
 	@try {
 		OFXMLAttribute *attribute;
 
 		if ((attribute = [element attributeForName: @"from"]))
-			[self setFrom:
-			    [XMPPJID JIDWithString: [attribute stringValue]]];
+			self.from =
+			    [XMPPJID JIDWithString: attribute.stringValue];
 
 		if ((attribute = [element attributeForName: @"to"]))
-			[self setTo:
-			    [XMPPJID JIDWithString: [attribute stringValue]]];
+			self.to =
+			    [XMPPJID JIDWithString: attribute.stringValue];
 
 		if ((attribute = [element attributeForName: @"type"]))
-			[self setType: [attribute stringValue]];
+			self.type = attribute.stringValue;
 
 		if ((attribute = [element attributeForName: @"id"]))
-			[self setID: [attribute stringValue]];
+			self.ID = attribute.stringValue;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
 
@@ -192,11 +192,11 @@
 
 	[self removeAttributeForName: @"from"];
 
 	if (from != nil)
 		[self addAttributeWithName: @"from"
-			       stringValue: [from fullJID]];
+			       stringValue: from.fullJID];
 }
 
 - (void)setTo: (XMPPJID *)to
 {
 	XMPPJID *old = _to;
@@ -205,11 +205,11 @@
 
 	[self removeAttributeForName: @"to"];
 
 	if (to != nil)
 		[self addAttributeWithName: @"to"
-			       stringValue: [to fullJID]];
+			       stringValue: to.fullJID];
 }
 
 - (void)setType: (OFString *)type
 {
 	OFString *old = _type;