diff --git a/Foundation/CPAttributedString.j b/Foundation/CPAttributedString.j
index 4b61af4a7..bcbd9a732 100644
--- a/Foundation/CPAttributedString.j
+++ b/Foundation/CPAttributedString.j
@@ -48,7 +48,7 @@
     CPArray     _rangeEntries;
 }
 
-//Creating an NSAttributedString Object
+// Creating a CPAttributedString Object
 /*!
     Creates a new attributed string from a character string.
     @param aString is the string to initialise from.
diff --git a/Foundation/CPFunctionOperation.j b/Foundation/CPFunctionOperation.j
index f9f98c911..7fb44ed74 100644
--- a/Foundation/CPFunctionOperation.j
+++ b/Foundation/CPFunctionOperation.j
@@ -74,7 +74,7 @@
 }
 
 /*!
-    Creates and returns an NSFunctionOperation object and adds the specified function to it.
+    Creates and returns an CPFunctionOperation object and adds the specified function to it.
 */
 + (id)functionOperationWithFunction:(JSObject)jsFunction
 {
diff --git a/Foundation/CPInvocationOperation.j b/Foundation/CPInvocationOperation.j
index 0c1bdfda6..b897ec161 100644
--- a/Foundation/CPInvocationOperation.j
+++ b/Foundation/CPInvocationOperation.j
@@ -66,7 +66,7 @@
 }
 
 /*!
-    Returns an NSInvocationOperation object initialized with the specified target and selector.
+    Returns a CPInvocationOperation object initialized with the specified target and selector.
     @param target the target
     @param sel the selector that should be called on the target
     @param arg the arguments
diff --git a/Foundation/CPKeyedArchiver.j b/Foundation/CPKeyedArchiver.j
index c7c72c2ce..7bcd2412c 100644
--- a/Foundation/CPKeyedArchiver.j
+++ b/Foundation/CPKeyedArchiver.j
@@ -156,7 +156,7 @@ var _CPKeyedArchiverStringClass                         = Nil,
     return data;
 }
 
-// Initializing an NSKeyedArchiver object
+// Initializing a CPKeyedArchiver object
 /*!
     Initializes the keyed archiver with the specified \c CPMutableData for writing.
     @param data the object to archive to
diff --git a/Foundation/CPTimer.j b/Foundation/CPTimer.j
index eb1a5a3a7..eb27fb139 100644
--- a/Foundation/CPTimer.j
+++ b/Foundation/CPTimer.j
@@ -45,7 +45,7 @@
 }
 
 /*!
-    Returns a new NSTimer object and adds it to the current NSRunLoop object in the default mode.
+    Returns a new CPTimer object and adds it to the current CPRunLoop object in the default mode.
 */
 + (CPTimer)scheduledTimerWithTimeInterval:(CPTimeInterval)seconds invocation:(CPInvocation)anInvocation repeats:(BOOL)shouldRepeat
 {
@@ -58,7 +58,7 @@
 }
 
 /*!
-    Returns a new NSTimer object and adds it to the current NSRunLoop object in the default mode.
+    Returns a new CPTimer object and adds it to the current CPRunLoop object in the default mode.
 */
 + (CPTimer)scheduledTimerWithTimeInterval:(CPTimeInterval)seconds target:(id)aTarget selector:(SEL)aSelector userInfo:(id)userInfo repeats:(BOOL)shouldRepeat
 {
@@ -71,7 +71,7 @@
 }
 
 /*!
-    Returns a new NSTimer object and adds it to the current NSRunLoop object in the default mode.
+    Returns a new CPTimer object and adds it to the current CPRunLoop object in the default mode.
 */
 + (CPTimer)scheduledTimerWithTimeInterval:(CPTimeInterval)seconds callback:(Function)aFunction repeats:(BOOL)shouldRepeat
 {
@@ -84,7 +84,7 @@
 }
 
 /*!
-    Returns a new NSTimer that, when added to a run loop, will fire after seconds.
+    Returns a new CPTimer that, when added to a run loop, will fire after seconds.
 */
 + (CPTimer)timerWithTimeInterval:(CPTimeInterval)seconds invocation:(CPInvocation)anInvocation repeats:(BOOL)shouldRepeat
 {
@@ -92,7 +92,7 @@
 }
 
 /*!
-    Returns a new NSTimer that, when added to a run loop, will fire after seconds.
+    Returns a new CPTimer that, when added to a run loop, will fire after seconds.
 */
 + (CPTimer)timerWithTimeInterval:(CPTimeInterval)seconds target:(id)aTarget selector:(SEL)aSelector userInfo:(id)userInfo repeats:(BOOL)shouldRepeat
 {
@@ -100,7 +100,7 @@
 }
 
 /*!
-    Returns a new NSTimer that, when added to a run loop, will fire after seconds.
+    Returns a new CPTimer that, when added to a run loop, will fire after seconds.
 */
 + (CPTimer)timerWithTimeInterval:(CPTimeInterval)seconds callback:(Function)aFunction repeats:(BOOL)shouldRepeat
 {
@@ -108,7 +108,7 @@
 }
 
 /*!
-    Initializes a new NSTimer that, when added to a run loop, will fire at date and then, if repeats is YES, every seconds after that.
+    Initializes a new CPTimer that, when added to a run loop, will fire at date and then, if repeats is YES, every seconds after that.
 */
 - (id)initWithFireDate:(CPDate)aDate interval:(CPTimeInterval)seconds invocation:(CPInvocation)anInvocation repeats:(BOOL)shouldRepeat
 {
@@ -127,7 +127,7 @@
 }
 
 /*!
-    Initializes a new NSTimer that, when added to a run loop, will fire at date and then, if repeats is YES, every seconds after that.
+    Initializes a new CPTimer that, when added to a run loop, will fire at date and then, if repeats is YES, every seconds after that.
 */
 - (id)initWithFireDate:(CPDate)aDate interval:(CPTimeInterval)seconds target:(id)aTarget selector:(SEL)aSelector userInfo:(id)userInfo repeats:(BOOL)shouldRepeat
 {
@@ -146,7 +146,7 @@
 }
 
 /*!
-    Initializes a new NSTimer that, when added to a run loop, will fire at date and then, if repeats is YES, every seconds after that.
+    Initializes a new CPTimer that, when added to a run loop, will fire at date and then, if repeats is YES, every seconds after that.
 */
 - (id)initWithFireDate:(CPDate)aDate interval:(CPTimeInterval)seconds callback:(Function)aFunction repeats:(BOOL)shouldRepeat
 {
@@ -220,7 +220,7 @@
 }
 
 /*!
-    Stops the receiver from ever firing again and requests its removal from its NSRunLoop object.
+    Stops the receiver from ever firing again and requests its removal from its CPRunLoop object.
 */
 - (void)invalidate
 {