@@ -86,25 +86,25 @@
 			namespace: nil
 		      stringValue: stringval];
 }
 
 - initWithName: (OFString*)name_
-     namespace: (OFString*)ns
+     namespace: (OFString*)ns_
 {
 	return [self initWithName: name_
-			namespace: ns
+			namespace: ns_
 		      stringValue: nil];
 }
 
 - initWithName: (OFString*)name_
-     namespace: (OFString*)ns
+     namespace: (OFString*)ns_
    stringValue: (OFString*)stringval
 {
 	self = [super init];
 
 	name = [name_ copy];
-	namespace = [ns copy];
+	ns = [ns_ copy];
 
 	if (stringval != nil) {
 		OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];;
 		[self addChild:
 		    [OFXMLElement elementWithCharacters: stringval]];
@@ -150,11 +150,11 @@
 	return [[name copy] autorelease];
 }
 
 - (OFString*)namespace
 {
-	return [[namespace copy] autorelease];
+	return [[ns copy] autorelease];
 }
 
 - (OFArray*)attributes
 {
 	return [[attributes copy] autorelease];
@@ -217,19 +217,16 @@
 	str_c = [self allocMemoryWithSize: len];
 
 	/* Start of tag */
 	str_c[i++] = '<';
 
-	if ((namespace == nil && def_ns != nil) ||
-	    (namespace != nil && def_ns == nil) ||
-	    (namespace != nil && ![namespace isEqual: def_ns])) {
+	if ((ns == nil && def_ns != nil) || (ns != nil && def_ns == nil) ||
+	    (ns != nil && ![ns isEqual: def_ns])) {
 		if ((prefix = [all_namespaces objectForKey:
-		    (namespace != nil ? namespace : (OFString*)@"")]) == nil)
-			@throw [OFUnboundNamespaceException
-			    newWithClass: isa
-			       namespace: namespace];
-
+		    (ns != nil ? ns : (OFString*)@"")]) == nil)
+			@throw [OFUnboundNamespaceException newWithClass: isa
+							       namespace: ns];
 		len += [prefix cStringLength] + 1;
 		@try {
 			str_c = [self resizeMemory: str_c
 					    toSize: len];
 		} @catch (OFException *e) {
@@ -394,11 +391,11 @@
 						  stringValue: value]];
 	[pool release];
 }
 
 - (void)addAttributeWithName: (OFString*)name_
-		   namespace: (OFString*)ns
+		   namespace: (OFString*)ns_
 		 stringValue: (OFString*)value
 {
 	OFAutoreleasePool *pool;
 
 	if (name == nil)
@@ -405,39 +402,39 @@
 		@throw [OFInvalidArgumentException newWithClass: isa
 						       selector: _cmd];
 
 	pool = [[OFAutoreleasePool alloc] init];
 	[self addAttribute: [OFXMLAttribute attributeWithName: name_
-						    namespace: ns
+						    namespace: ns_
 						  stringValue: value]];
 	[pool release];
 }
 
 /* TODO: Replace attribute */
 /* TODO: Remove attribute */
 
 - (void)setPrefix: (OFString*)prefix
-     forNamespace: (OFString*)ns
+     forNamespace: (OFString*)ns_
 {
 	if (name == nil || prefix == nil || [prefix isEqual: @""])
 		@throw [OFInvalidArgumentException newWithClass: isa
 						       selector: _cmd];
-	if (ns == nil)
-		ns = @"";
+	if (ns_ == nil)
+		ns_ = @"";
 
 	[namespaces setObject: prefix
-		       forKey: ns];
+		       forKey: ns_];
 }
 
 - (void)bindPrefix: (OFString*)prefix
-      forNamespace: (OFString*)ns
+      forNamespace: (OFString*)ns_
 {
 	[self setPrefix: prefix
-	   forNamespace: ns];
+	   forNamespace: ns_];
 	[self addAttributeWithName: prefix
 			 namespace: @"http://www.w3.org/2000/xmlns/"
-		       stringValue: ns];
+		       stringValue: ns_];
 }
 
 - (OFString*)defaultNamespace
 {
 	if (name == nil)
@@ -445,26 +442,26 @@
 						       selector: _cmd];
 
 	return [[defaultNamespace retain] autorelease];
 }
 
-- (void)setDefaultNamespace: (OFString*)ns
+- (void)setDefaultNamespace: (OFString*)ns_
 {
 	if (name == nil)
 		@throw [OFInvalidArgumentException newWithClass: isa
 						       selector: _cmd];
 
 	OFString *old = defaultNamespace;
-	defaultNamespace = [ns copy];
+	defaultNamespace = [ns_ copy];
 	[old release];
 }
 
-- (void)bindDefaultNamespace: (OFString*)ns
+- (void)bindDefaultNamespace: (OFString*)ns_
 {
-	[self setDefaultNamespace: ns];
+	[self setDefaultNamespace: ns_];
 	[self addAttributeWithName: @"xmlns"
-		       stringValue: ns];
+		       stringValue: ns_];
 }
 
 - (void)addChild: (OFXMLElement*)child
 {
 	if (name == nil)
@@ -478,11 +475,11 @@
 }
 
 - (void)dealloc
 {
 	[name release];
-	[namespace release];
+	[ns release];
 	[attributes release];
 	[namespaces release];
 	[children release];
 	[characters release];
 	[cdata release];