diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
index 4ea1cc81f66..511c396bfcf 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
@@ -73,6 +73,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
         );
         instantiationTypes.put("array", "ArrayList");
         instantiationTypes.put("map", "HashMap");
+        typeMapping.put("date", "Date");
+        typeMapping.put("file", "File");
 
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
@@ -143,7 +145,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
         if (typeMapping.containsKey(swaggerType)) {
             type = typeMapping.get(swaggerType);
             if (languageSpecificPrimitives.contains(type) || type.indexOf(".") >= 0 ||
-                type.equals("Map") || type.equals("List")) {
+                type.equals("Map") || type.equals("List") ||
+                type.equals("File") || type.equals("Date")) {
                 return type;
             }
         } else {
@@ -184,7 +187,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
     public String toModelName(String name) {
         // camelize the model name
         // phone_number => PhoneNumber
-        name = camelize(sanitizeName(name));
+        name = camelize(sanitizeName(modelNamePrefix + name + modelNameSuffix));
 
         // model name cannot use reserved keyword, e.g. return
         if (isReservedWord(name)) {