@@ -24,11 +24,11 @@
 - (instancetype)init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)initWithRange: (of_range_t)range
+- (instancetype)initWithRange: (OFRange)range
 {
 	self = [super init];
 
 	@try {
 		if (SIZE_MAX - range.location < range.length)
@@ -41,11 +41,11 @@
 	}
 
 	return self;
 }
 
-- (bool)characterIsMember: (of_unichar_t)character
+- (bool)characterIsMember: (OFUnichar)character
 {
 	return (character >= _range.location &&
 	    character < _range.location + _range.length);
 }
 @end