@@ -1513,14 +1513,14 @@
 }
 @end
 
 @implementation OFUnboundNamespaceException
 + newWithClass: (Class)class_
-     namespace: (OFString*)namespace
+     namespace: (OFString*)ns
 {
 	return [[self alloc] initWithClass: class_
-				 namespace: namespace];
+				 namespace: ns];
 }
 
 + newWithClass: (Class)class_
 	prefix: (OFString*)prefix
 {
@@ -1533,15 +1533,15 @@
 	@throw [OFNotImplementedException newWithClass: isa
 					      selector: _cmd];
 }
 
 - initWithClass: (Class)class_
-      namespace: (OFString*)namespace_
+      namespace: (OFString*)ns_
 {
 	self = [super initWithClass: class_];
 
-	namespace = [namespace_ copy];
+	ns = [ns_ copy];
 
 	return self;
 }
 
 - initWithClass: (Class)class_
@@ -1554,11 +1554,11 @@
 	return self;
 }
 
 - (void)dealloc
 {
-	[namespace release];
+	[ns release];
 	[prefix release];
 
 	[super dealloc];
 }
 
@@ -1565,11 +1565,11 @@
 - (OFString*)string
 {
 	if (string != nil)
 		return string;
 
-	if (namespace != nil)
+	if (ns != nil)
 		string = [[OFString alloc] initWithFormat:
 		    @"The namespace %s is not bound in class %s",
 		    [inClass className]];
 	else if (prefix != nil)
 		string = [[OFString alloc] initWithFormat:
@@ -1579,13 +1579,13 @@
 	return string;
 }
 
 - (OFString*)namespace
 {
-	return namespace;
+	return ns;
 }
 
 - (OFString*)prefix
 {
 	return prefix;
 }
 @end