diff --git a/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java b/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java
index a48a92f3faa..cdfb1191b2f 100644
--- a/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java
+++ b/src/main/java/com/wordnik/swagger/codegen/ClientOptInput.java
@@ -22,11 +22,11 @@ import com.wordnik.swagger.models.Swagger;
 
 public class ClientOptInput {
   private ClientOpts opts;
-  private Swagger model;
+  private Swagger swagger;
   protected CodegenConfig config;
 
-  public ClientOptInput model(Swagger model) {
-    this.setModel(model);
+  public ClientOptInput swagger(Swagger swagger) {
+    this.setSwagger(swagger);
     return this;
   }
   public ClientOptInput opts(ClientOpts opts) {
@@ -49,11 +49,11 @@ public class ClientOptInput {
     return opts;
   }
 
-  public void setModel(Swagger model) {
-    this.model = model;
+  public void setSwagger(Swagger swagger) {
+    this.swagger = swagger;
   }
 
-  public Swagger getModel() {
-    return model;
+  public Swagger getSwagger() {
+    return swagger;
   }
 }
\ No newline at end of file
diff --git a/src/main/java/com/wordnik/swagger/codegen/Codegen.java b/src/main/java/com/wordnik/swagger/codegen/Codegen.java
index 5d2cfb4818b..fbbf55f80dd 100644
--- a/src/main/java/com/wordnik/swagger/codegen/Codegen.java
+++ b/src/main/java/com/wordnik/swagger/codegen/Codegen.java
@@ -39,7 +39,7 @@ public class Codegen extends DefaultGenerator {
     try{
       codegenInput
         .opts(clientArgs)
-        .model(swagger);
+        .swagger(swagger);
 
       new Codegen().opts(codegenInput).generate();
     }
diff --git a/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java b/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
index 877d8ffe0f8..278e91fd86f 100644
--- a/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
+++ b/src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
@@ -381,6 +381,8 @@ public class DefaultCodegen {
       if(languageSpecificPrimitives().contains(type))
         property.isPrimitiveType = true;
     }
+    if("id".equals(property.name))
+      Json.prettyPrint(property);
     return property;
   }
 
diff --git a/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java b/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
index 0cfe4c8b7cd..28fab4d90a8 100644
--- a/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
+++ b/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
@@ -20,7 +20,7 @@ public class DefaultGenerator implements Generator {
   public Generator opts(ClientOptInput opts) {
     this.opts = opts;
 
-    this.swagger = opts.getModel();
+    this.swagger = opts.getSwagger();
     ClientOpts clientOpts = opts.getOpts();
     this.config = opts.getConfig();