diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/ApiException.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiException.java
similarity index 94%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/ApiException.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiException.java
index 9a1f62b3061..31bc8a0978a 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/ApiException.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiException.java
@@ -1,4 +1,4 @@
-package com.wordnik.client;
+package io.swagger.client;
 
 public class ApiException extends Exception {
   int code = 0;
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/ApiInvoker.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
similarity index 99%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/ApiInvoker.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
index 2ca01b65678..6306e0734a9 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/ApiInvoker.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -1,4 +1,4 @@
-package com.wordnik.client;
+package io.swagger.client;
 
 
 import com.fasterxml.jackson.core.JsonGenerator.Feature;
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/HttpPatch.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/HttpPatch.java
similarity index 91%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/HttpPatch.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/HttpPatch.java
index 3243cc901a7..cb97056dbc9 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/HttpPatch.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/HttpPatch.java
@@ -1,4 +1,4 @@
-package com.wordnik.client;
+package io.swagger.client;
 
 import org.apache.http.client.methods.*;
 
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/JsonUtil.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java
similarity index 95%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/JsonUtil.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java
index b761cc4bf44..90b99b48ec8 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/JsonUtil.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/JsonUtil.java
@@ -1,4 +1,4 @@
-package com.wordnik.client;
+package io.swagger.client;
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.databind.*;
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/PetApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
similarity index 95%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/PetApi.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
index c665531ff47..134ca490ef6 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/PetApi.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
@@ -1,13 +1,13 @@
-package com.wordnik.client.api;
+package io.swagger.client.api;
 
-import com.wordnik.client.ApiException;
-import com.wordnik.client.ApiInvoker;
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiInvoker;
 
-import com.wordnik.client.model.*;
+import io.swagger.client.model.*;
 
 import java.util.*;
 
-import com.wordnik.client.model.Pet;
+import io.swagger.client.model.Pet;
 import java.io.File;
 
 import java.util.Map;
@@ -133,7 +133,7 @@ public class PetApi {
     try {
       String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
       if(response != null){
-        return (List<Pet>) ApiInvoker.deserialize(response, "Pet", Pet.class);
+        return (List<Pet>) ApiInvoker.deserialize(response, "array", Pet.class);
       }
       else {
         return null;
@@ -172,7 +172,7 @@ public class PetApi {
     try {
       String response = apiInvoker.invokeAPI(basePath, path, "GET", queryParams, postBody, headerParams, contentType);
       if(response != null){
-        return (List<Pet>) ApiInvoker.deserialize(response, "Pet", Pet.class);
+        return (List<Pet>) ApiInvoker.deserialize(response, "array", Pet.class);
       }
       else {
         return null;
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/StoreApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
similarity index 94%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/StoreApi.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
index c8f85660f76..7126834ad4b 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/StoreApi.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
@@ -1,13 +1,13 @@
-package com.wordnik.client.api;
+package io.swagger.client.api;
 
-import com.wordnik.client.ApiException;
-import com.wordnik.client.ApiInvoker;
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiInvoker;
 
-import com.wordnik.client.model.*;
+import io.swagger.client.model.*;
 
 import java.util.*;
 
-import com.wordnik.client.model.Order;
+import io.swagger.client.model.Order;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/UserApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
similarity index 97%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/UserApi.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
index 5c9db1f37ac..aa8eace627d 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/api/UserApi.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
@@ -1,13 +1,13 @@
-package com.wordnik.client.api;
+package io.swagger.client.api;
 
-import com.wordnik.client.ApiException;
-import com.wordnik.client.ApiInvoker;
+import io.swagger.client.ApiException;
+import io.swagger.client.ApiInvoker;
 
-import com.wordnik.client.model.*;
+import io.swagger.client.model.*;
 
 import java.util.*;
 
-import com.wordnik.client.model.User;
+import io.swagger.client.model.User;
 import java.util.*;
 
 import java.util.Map;
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Category.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java
similarity index 96%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Category.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java
index 5a0a18d40a5..ee6fd792a98 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Category.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Category.java
@@ -1,4 +1,4 @@
-package com.wordnik.client.model;
+package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Order.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java
similarity index 98%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Order.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java
index 65af51c2f6d..f1e77e2748d 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Order.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Order.java
@@ -1,4 +1,4 @@
-package com.wordnik.client.model;
+package io.swagger.client.model;
 
 import java.util.Date;
 
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Pet.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
similarity index 94%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Pet.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
index f84c1d0d925..312f18d5824 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Pet.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java
@@ -1,7 +1,7 @@
-package com.wordnik.client.model;
+package io.swagger.client.model;
 
-import com.wordnik.client.model.Category;
-import com.wordnik.client.model.Tag;
+import io.swagger.client.model.Category;
+import io.swagger.client.model.Tag;
 import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Tag.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java
similarity index 95%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Tag.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java
index 6fdc13bb049..ee916c9971a 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/Tag.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Tag.java
@@ -1,4 +1,4 @@
-package com.wordnik.client.model;
+package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
diff --git a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/User.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java
similarity index 98%
rename from samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/User.java
rename to samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java
index 3e1d8d032e6..1465879441c 100644
--- a/samples/client/petstore/android-java/src/main/java/com/wordnik/client/model/User.java
+++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/User.java
@@ -1,4 +1,4 @@
-package com.wordnik.client.model;
+package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;