@@ -18,11 +18,11 @@
 #import "OFMethodSignature.h"
 #import "OFNonretainedObjectValue.h"
 #import "OFPointValue.h"
 #import "OFPointerValue.h"
 #import "OFRangeValue.h"
-#import "OFRectangleValue.h"
+#import "OFRectValue.h"
 #import "OFSizeValue.h"
 #import "OFString.h"
 
 #import "OFOutOfMemoryException.h"
 
@@ -66,14 +66,13 @@
 + (instancetype)valueWithSize: (OFSize)size
 {
 	return [[[OFSizeValue alloc] initWithSize: size] autorelease];
 }
 
-+ (instancetype)valueWithRectangle: (of_rectangle_t)rectangle
++ (instancetype)valueWithRect: (OFRect)rect
 {
-	return [[[OFRectangleValue alloc]
-	    initWithRectangle: rectangle] autorelease];
+	return [[[OFRectValue alloc] initWithRect: rect] autorelease];
 }
 
 - (instancetype)initWithBytes: (const void *)bytes
 		     objCType: (const char *)objCType
 {
@@ -191,13 +190,13 @@
 	OFSize ret;
 	[self getValue: &ret size: sizeof(ret)];
 	return ret;
 }
 
-- (of_rectangle_t)rectangleValue
+- (OFRect)rectValue
 {
-	of_rectangle_t ret;
+	OFRect ret;
 	[self getValue: &ret size: sizeof(ret)];
 	return ret;
 }
 
 - (OFString *)description