diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala
index 7d56107b1861..8fdfdf5dd374 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicObjcGenerator.scala
@@ -45,7 +45,7 @@ class BasicObjcGenerator extends BasicGenerator {
     "NSString")
   
   override def typeMapping = Map(
-    "Date" -> "RVBDate",
+    "Date" -> "NIKDate",
     "boolean" -> "NSNumber",
     "string" -> "NSString",
     "integer" -> "NSNumber",
@@ -59,7 +59,8 @@ class BasicObjcGenerator extends BasicGenerator {
     "object" -> "NSObject")
 
   override def importMapping = Map(
-    "Date" -> "RVBDate")
+    "RVBDate" -> "NIKDate",
+    "Date" -> "NIKDate")
 
   override def toModelFilename(name: String) = "RVB" + name