@@ -31,11 +31,11 @@
 
 #import "OFInvalidArgumentException.h"
 
 @implementation OFTimer
 @synthesize timeInterval = _interval, repeating = _repeats, valid = _valid;
-@synthesize OF_inRunLoop = _inRunLoop;
+@synthesize of_inRunLoop = _inRunLoop;
 
 + (instancetype)scheduledTimerWithTimeInterval: (of_time_interval_t)timeInterval
 					target: (id)target
 				      selector: (SEL)selector
 				       repeats: (bool)repeats
@@ -210,18 +210,18 @@
 - init
 {
 	OF_INVALID_INIT_METHOD
 }
 
-- (instancetype)OF_initWithFireDate: (OFDate *)fireDate
+- (instancetype)of_initWithFireDate: (OFDate *)fireDate
 			   interval: (of_time_interval_t)interval
 			     target: (id)target
 			   selector: (SEL)selector
 			     object: (id)object1
 			     object: (id)object2
 			  arguments: (uint8_t)arguments
-			    repeats: (bool)repeats
+			    repeats: (bool)repeats OF_METHOD_FAMILY(init)
 {
 	self = [super init];
 
 	@try {
 		_fireDate = [fireDate retain];
@@ -248,11 +248,11 @@
 	  interval: (of_time_interval_t)interval
 	    target: (id)target
 	  selector: (SEL)selector
 	   repeats: (bool)repeats
 {
-	return [self OF_initWithFireDate: fireDate
+	return [self of_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
 				  object: nil
 				  object: nil
@@ -265,11 +265,11 @@
 	    target: (id)target
 	  selector: (SEL)selector
 	    object: (id)object
 	   repeats: (bool)repeats
 {
-	return [self OF_initWithFireDate: fireDate
+	return [self of_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
 				  object: object
 				  object: nil
@@ -283,11 +283,11 @@
 	  selector: (SEL)selector
 	    object: (id)object1
 	    object: (id)object2
 	   repeats: (bool)repeats
 {
-	return [self OF_initWithFireDate: fireDate
+	return [self of_initWithFireDate: fireDate
 				interval: interval
 				  target: target
 				selector: selector
 				  object: object1
 				  object: object2
@@ -420,11 +420,11 @@
 	[self retain];
 	@try {
 		@synchronized (self) {
 			OFDate *old;
 
-			[_inRunLoop OF_removeTimer: self];
+			[_inRunLoop of_removeTimer: self];
 
 			old = _fireDate;
 			_fireDate = [fireDate copy];
 			[old release];