@@ -196,18 +196,18 @@
 
 	return [timer autorelease];
 }
 #endif
 
-- _initWithFireDate: (OFDate*)fireDate_
-	   interval: (double)interval_
-	     target: (id)target_
-	   selector: (SEL)selector_
-	     object: (id)object1_
-	     object: (id)object2_
-	  arguments: (uint8_t)arguments_
-	    repeats: (BOOL)repeats_
+- OF_initWithFireDate: (OFDate*)fireDate_
+	     interval: (double)interval_
+	       target: (id)target_
+	     selector: (SEL)selector_
+	       object: (id)object1_
+	       object: (id)object2_
+	    arguments: (uint8_t)arguments_
+	      repeats: (BOOL)repeats_
 {
 	self = [super init];
 
 	@try {
 		fireDate = [fireDate_ retain];
@@ -230,35 +230,35 @@
 	  interval: (double)interval_
 	    target: (id)target_
 	  selector: (SEL)selector_
 	   repeats: (BOOL)repeats_
 {
-	return [self _initWithFireDate: fireDate_
-			      interval: interval_
-				target: target_
-			      selector: selector_
-				object: nil
-				object: nil
-			     arguments: 0
-			       repeats: repeats_];
+	return [self OF_initWithFireDate: fireDate_
+				interval: interval_
+				  target: target_
+				selector: selector_
+				  object: nil
+				  object: nil
+			       arguments: 0
+				 repeats: repeats_];
 }
 
 - initWithFireDate: (OFDate*)fireDate_
 	  interval: (double)interval_
 	    target: (id)target_
 	  selector: (SEL)selector_
 	    object: (id)object
 	   repeats: (BOOL)repeats_
 {
-	return [self _initWithFireDate: fireDate_
-			      interval: interval_
-				target: target_
-			      selector: selector_
-				object: object
-				object: nil
-			     arguments: 1
-			       repeats: repeats_];
+	return [self OF_initWithFireDate: fireDate_
+				interval: interval_
+				  target: target_
+				selector: selector_
+				  object: object
+				  object: nil
+			       arguments: 1
+				 repeats: repeats_];
 }
 
 - initWithFireDate: (OFDate*)fireDate_
 	  interval: (double)interval_
 	    target: (id)target_
@@ -265,18 +265,18 @@
 	  selector: (SEL)selector_
 	    object: (id)object1_
 	    object: (id)object2_
 	   repeats: (BOOL)repeats_
 {
-	return [self _initWithFireDate: fireDate_
-			      interval: interval_
-				target: target_
-			      selector: selector_
-				object: object1_
-				object: object2_
-			     arguments: 2
-			       repeats: repeats_];
+	return [self OF_initWithFireDate: fireDate_
+				interval: interval_
+				  target: target_
+				selector: selector_
+				  object: object1_
+				  object: object2_
+			       arguments: 2
+				 repeats: repeats_];
 }
 
 #ifdef OF_HAVE_BLOCKS
 - initWithFireDate: (OFDate*)fireDate_
 	   interval: (double)interval_