diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Definition.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Definition.java
index 0a729b15808..f4c2d9b4d69 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Definition.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Definition.java
@@ -21,8 +21,8 @@ public class Definition {
   private List<Related> relatedWords = new ArrayList<Related>();
   private String sequence = null;
   private String word = null;
-  private List<TextPron> textProns = new ArrayList<TextPron>();
   private List<Note> notes = new ArrayList<Note>();
+  private List<TextPron> textProns = new ArrayList<TextPron>();
   private String partOfSpeech = null;
   public String getExtendedText() {
     return extendedText;
@@ -115,13 +115,6 @@ public class Definition {
     this.word = word;
   }
 
-  public List<TextPron> getTextProns() {
-    return textProns;
-  }
-  public void setTextProns(List<TextPron> textProns) {
-    this.textProns = textProns;
-  }
-
   public List<Note> getNotes() {
     return notes;
   }
@@ -129,6 +122,13 @@ public class Definition {
     this.notes = notes;
   }
 
+  public List<TextPron> getTextProns() {
+    return textProns;
+  }
+  public void setTextProns(List<TextPron> textProns) {
+    this.textProns = textProns;
+  }
+
   public String getPartOfSpeech() {
     return partOfSpeech;
   }
@@ -153,8 +153,8 @@ public class Definition {
     sb.append("  relatedWords: ").append(relatedWords).append("\n");
     sb.append("  sequence: ").append(sequence).append("\n");
     sb.append("  word: ").append(word).append("\n");
-    sb.append("  textProns: ").append(textProns).append("\n");
     sb.append("  notes: ").append(notes).append("\n");
+    sb.append("  textProns: ").append(textProns).append("\n");
     sb.append("  partOfSpeech: ").append(partOfSpeech).append("\n");
     sb.append("}\n");
     return sb.toString();
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Example.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Example.java
index 03d6302ed5e..58f09de0172 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Example.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Example.java
@@ -5,17 +5,17 @@ import com.wordnik.client.model.ScoredWord;
 import com.wordnik.client.model.ContentProvider;
 public class Example {
   private Long id = null;
-  private String text = null;
-  private String title = null;
   private Long exampleId = null;
+  private String title = null;
+  private String text = null;
   private ScoredWord score = null;
   private Sentence sentence = null;
-  private Integer year = null;
-  private ContentProvider provider = null;
   private String word = null;
+  private ContentProvider provider = null;
+  private Integer year = null;
   private Float rating = null;
-  private String url = null;
   private Long documentId = null;
+  private String url = null;
   public Long getId() {
     return id;
   }
@@ -23,11 +23,11 @@ public class Example {
     this.id = id;
   }
 
-  public String getText() {
-    return text;
+  public Long getExampleId() {
+    return exampleId;
   }
-  public void setText(String text) {
-    this.text = text;
+  public void setExampleId(Long exampleId) {
+    this.exampleId = exampleId;
   }
 
   public String getTitle() {
@@ -37,11 +37,11 @@ public class Example {
     this.title = title;
   }
 
-  public Long getExampleId() {
-    return exampleId;
+  public String getText() {
+    return text;
   }
-  public void setExampleId(Long exampleId) {
-    this.exampleId = exampleId;
+  public void setText(String text) {
+    this.text = text;
   }
 
   public ScoredWord getScore() {
@@ -58,11 +58,11 @@ public class Example {
     this.sentence = sentence;
   }
 
-  public Integer getYear() {
-    return year;
+  public String getWord() {
+    return word;
   }
-  public void setYear(Integer year) {
-    this.year = year;
+  public void setWord(String word) {
+    this.word = word;
   }
 
   public ContentProvider getProvider() {
@@ -72,11 +72,11 @@ public class Example {
     this.provider = provider;
   }
 
-  public String getWord() {
-    return word;
+  public Integer getYear() {
+    return year;
   }
-  public void setWord(String word) {
-    this.word = word;
+  public void setYear(Integer year) {
+    this.year = year;
   }
 
   public Float getRating() {
@@ -86,13 +86,6 @@ public class Example {
     this.rating = rating;
   }
 
-  public String getUrl() {
-    return url;
-  }
-  public void setUrl(String url) {
-    this.url = url;
-  }
-
   public Long getDocumentId() {
     return documentId;
   }
@@ -100,22 +93,29 @@ public class Example {
     this.documentId = documentId;
   }
 
+  public String getUrl() {
+    return url;
+  }
+  public void setUrl(String url) {
+    this.url = url;
+  }
+
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Example {\n");
     sb.append("  id: ").append(id).append("\n");
-    sb.append("  text: ").append(text).append("\n");
-    sb.append("  title: ").append(title).append("\n");
     sb.append("  exampleId: ").append(exampleId).append("\n");
+    sb.append("  title: ").append(title).append("\n");
+    sb.append("  text: ").append(text).append("\n");
     sb.append("  score: ").append(score).append("\n");
     sb.append("  sentence: ").append(sentence).append("\n");
-    sb.append("  year: ").append(year).append("\n");
-    sb.append("  provider: ").append(provider).append("\n");
     sb.append("  word: ").append(word).append("\n");
+    sb.append("  provider: ").append(provider).append("\n");
+    sb.append("  year: ").append(year).append("\n");
     sb.append("  rating: ").append(rating).append("\n");
-    sb.append("  url: ").append(url).append("\n");
     sb.append("  documentId: ").append(documentId).append("\n");
+    sb.append("  url: ").append(url).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Related.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Related.java
index 8616bc8ef03..8881cef0d8a 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Related.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Related.java
@@ -3,12 +3,12 @@ package com.wordnik.client.model;
 import java.util.*;
 public class Related {
   private String label1 = null;
-  private String label2 = null;
   private String relationshipType = null;
+  private String label2 = null;
   private String label3 = null;
   private List<String> words = new ArrayList<String>();
-  private String label4 = null;
   private String gram = null;
+  private String label4 = null;
   public String getLabel1() {
     return label1;
   }
@@ -16,13 +16,6 @@ public class Related {
     this.label1 = label1;
   }
 
-  public String getLabel2() {
-    return label2;
-  }
-  public void setLabel2(String label2) {
-    this.label2 = label2;
-  }
-
   public String getRelationshipType() {
     return relationshipType;
   }
@@ -30,6 +23,13 @@ public class Related {
     this.relationshipType = relationshipType;
   }
 
+  public String getLabel2() {
+    return label2;
+  }
+  public void setLabel2(String label2) {
+    this.label2 = label2;
+  }
+
   public String getLabel3() {
     return label3;
   }
@@ -44,13 +44,6 @@ public class Related {
     this.words = words;
   }
 
-  public String getLabel4() {
-    return label4;
-  }
-  public void setLabel4(String label4) {
-    this.label4 = label4;
-  }
-
   public String getGram() {
     return gram;
   }
@@ -58,17 +51,24 @@ public class Related {
     this.gram = gram;
   }
 
+  public String getLabel4() {
+    return label4;
+  }
+  public void setLabel4(String label4) {
+    this.label4 = label4;
+  }
+
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Related {\n");
     sb.append("  label1: ").append(label1).append("\n");
-    sb.append("  label2: ").append(label2).append("\n");
     sb.append("  relationshipType: ").append(relationshipType).append("\n");
+    sb.append("  label2: ").append(label2).append("\n");
     sb.append("  label3: ").append(label3).append("\n");
     sb.append("  words: ").append(words).append("\n");
-    sb.append("  label4: ").append(label4).append("\n");
     sb.append("  gram: ").append(gram).append("\n");
+    sb.append("  label4: ").append(label4).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/ScoredWord.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/ScoredWord.java
index 5d6741ddc4f..f1ea071d6a6 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/ScoredWord.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/ScoredWord.java
@@ -1,24 +1,17 @@
 package com.wordnik.client.model;
 
 public class ScoredWord {
-  private Long id = null;
   private Integer position = null;
-  private String lemma = null;
+  private Long id = null;
   private Integer docTermCount = null;
+  private String lemma = null;
   private String wordType = null;
   private Float score = null;
-  private String word = null;
   private Long sentenceId = null;
+  private String word = null;
   private Boolean stopword = null;
   private Double baseWordScore = null;
   private String partOfSpeech = null;
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
   public Integer getPosition() {
     return position;
   }
@@ -26,11 +19,11 @@ public class ScoredWord {
     this.position = position;
   }
 
-  public String getLemma() {
-    return lemma;
+  public Long getId() {
+    return id;
   }
-  public void setLemma(String lemma) {
-    this.lemma = lemma;
+  public void setId(Long id) {
+    this.id = id;
   }
 
   public Integer getDocTermCount() {
@@ -40,6 +33,13 @@ public class ScoredWord {
     this.docTermCount = docTermCount;
   }
 
+  public String getLemma() {
+    return lemma;
+  }
+  public void setLemma(String lemma) {
+    this.lemma = lemma;
+  }
+
   public String getWordType() {
     return wordType;
   }
@@ -54,13 +54,6 @@ public class ScoredWord {
     this.score = score;
   }
 
-  public String getWord() {
-    return word;
-  }
-  public void setWord(String word) {
-    this.word = word;
-  }
-
   public Long getSentenceId() {
     return sentenceId;
   }
@@ -68,6 +61,13 @@ public class ScoredWord {
     this.sentenceId = sentenceId;
   }
 
+  public String getWord() {
+    return word;
+  }
+  public void setWord(String word) {
+    this.word = word;
+  }
+
   public Boolean getStopword() {
     return stopword;
   }
@@ -93,14 +93,14 @@ public class ScoredWord {
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class ScoredWord {\n");
-    sb.append("  id: ").append(id).append("\n");
     sb.append("  position: ").append(position).append("\n");
-    sb.append("  lemma: ").append(lemma).append("\n");
+    sb.append("  id: ").append(id).append("\n");
     sb.append("  docTermCount: ").append(docTermCount).append("\n");
+    sb.append("  lemma: ").append(lemma).append("\n");
     sb.append("  wordType: ").append(wordType).append("\n");
     sb.append("  score: ").append(score).append("\n");
-    sb.append("  word: ").append(word).append("\n");
     sb.append("  sentenceId: ").append(sentenceId).append("\n");
+    sb.append("  word: ").append(word).append("\n");
     sb.append("  stopword: ").append(stopword).append("\n");
     sb.append("  baseWordScore: ").append(baseWordScore).append("\n");
     sb.append("  partOfSpeech: ").append(partOfSpeech).append("\n");
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Sentence.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Sentence.java
index c921134e551..de5c1f1851e 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Sentence.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/Sentence.java
@@ -3,19 +3,12 @@ package com.wordnik.client.model;
 import java.util.*;
 import com.wordnik.client.model.ScoredWord;
 public class Sentence {
-  private Long id = null;
   private Boolean hasScoredWords = null;
+  private Long id = null;
   private List<ScoredWord> scoredWords = new ArrayList<ScoredWord>();
   private String display = null;
   private Integer rating = null;
   private Long documentMetadataId = null;
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
   public Boolean getHasScoredWords() {
     return hasScoredWords;
   }
@@ -23,6 +16,13 @@ public class Sentence {
     this.hasScoredWords = hasScoredWords;
   }
 
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
   public List<ScoredWord> getScoredWords() {
     return scoredWords;
   }
@@ -55,8 +55,8 @@ public class Sentence {
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class Sentence {\n");
-    sb.append("  id: ").append(id).append("\n");
     sb.append("  hasScoredWords: ").append(hasScoredWords).append("\n");
+    sb.append("  id: ").append(id).append("\n");
     sb.append("  scoredWords: ").append(scoredWords).append("\n");
     sb.append("  display: ").append(display).append("\n");
     sb.append("  rating: ").append(rating).append("\n");
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/SimpleExample.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/SimpleExample.java
index 5d3d592f1bb..89ee2fd2e66 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/SimpleExample.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/SimpleExample.java
@@ -2,8 +2,8 @@ package com.wordnik.client.model;
 
 public class SimpleExample {
   private Long id = null;
-  private String text = null;
   private String title = null;
+  private String text = null;
   private String url = null;
   public Long getId() {
     return id;
@@ -12,13 +12,6 @@ public class SimpleExample {
     this.id = id;
   }
 
-  public String getText() {
-    return text;
-  }
-  public void setText(String text) {
-    this.text = text;
-  }
-
   public String getTitle() {
     return title;
   }
@@ -26,6 +19,13 @@ public class SimpleExample {
     this.title = title;
   }
 
+  public String getText() {
+    return text;
+  }
+  public void setText(String text) {
+    this.text = text;
+  }
+
   public String getUrl() {
     return url;
   }
@@ -38,8 +38,8 @@ public class SimpleExample {
     StringBuilder sb = new StringBuilder();
     sb.append("class SimpleExample {\n");
     sb.append("  id: ").append(id).append("\n");
-    sb.append("  text: ").append(text).append("\n");
     sb.append("  title: ").append(title).append("\n");
+    sb.append("  text: ").append(text).append("\n");
     sb.append("  url: ").append(url).append("\n");
     sb.append("}\n");
     return sb.toString();
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/User.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/User.java
index 2b9e23ce544..258ade5e9bd 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/User.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/User.java
@@ -3,8 +3,8 @@ package com.wordnik.client.model;
 public class User {
   private Long id = null;
   private String username = null;
-  private Integer status = null;
   private String email = null;
+  private Integer status = null;
   private String faceBookId = null;
   private String userName = null;
   private String displayName = null;
@@ -23,13 +23,6 @@ public class User {
     this.username = username;
   }
 
-  public Integer getStatus() {
-    return status;
-  }
-  public void setStatus(Integer status) {
-    this.status = status;
-  }
-
   public String getEmail() {
     return email;
   }
@@ -37,6 +30,13 @@ public class User {
     this.email = email;
   }
 
+  public Integer getStatus() {
+    return status;
+  }
+  public void setStatus(Integer status) {
+    this.status = status;
+  }
+
   public String getFaceBookId() {
     return faceBookId;
   }
@@ -71,8 +71,8 @@ public class User {
     sb.append("class User {\n");
     sb.append("  id: ").append(id).append("\n");
     sb.append("  username: ").append(username).append("\n");
-    sb.append("  status: ").append(status).append("\n");
     sb.append("  email: ").append(email).append("\n");
+    sb.append("  status: ").append(status).append("\n");
     sb.append("  faceBookId: ").append(faceBookId).append("\n");
     sb.append("  userName: ").append(userName).append("\n");
     sb.append("  displayName: ").append(displayName).append("\n");
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordList.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordList.java
index e663dbfef9f..5a6999cd596 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordList.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordList.java
@@ -2,24 +2,17 @@ package com.wordnik.client.model;
 
 import java.util.Date;
 public class WordList {
-  private Long id = null;
   private Date updatedAt = null;
+  private Long id = null;
   private String username = null;
   private String permalink = null;
-  private String description = null;
-  private Date createdAt = null;
   private Date lastActivityAt = null;
-  private String name = null;
+  private Date createdAt = null;
+  private String description = null;
   private Long userId = null;
+  private String name = null;
   private Long numberWordsInList = null;
   private String type = null;
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
   public Date getUpdatedAt() {
     return updatedAt;
   }
@@ -27,6 +20,13 @@ public class WordList {
     this.updatedAt = updatedAt;
   }
 
+  public Long getId() {
+    return id;
+  }
+  public void setId(Long id) {
+    this.id = id;
+  }
+
   public String getUsername() {
     return username;
   }
@@ -41,11 +41,11 @@ public class WordList {
     this.permalink = permalink;
   }
 
-  public String getDescription() {
-    return description;
+  public Date getLastActivityAt() {
+    return lastActivityAt;
   }
-  public void setDescription(String description) {
-    this.description = description;
+  public void setLastActivityAt(Date lastActivityAt) {
+    this.lastActivityAt = lastActivityAt;
   }
 
   public Date getCreatedAt() {
@@ -55,18 +55,11 @@ public class WordList {
     this.createdAt = createdAt;
   }
 
-  public Date getLastActivityAt() {
-    return lastActivityAt;
+  public String getDescription() {
+    return description;
   }
-  public void setLastActivityAt(Date lastActivityAt) {
-    this.lastActivityAt = lastActivityAt;
-  }
-
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
+  public void setDescription(String description) {
+    this.description = description;
   }
 
   public Long getUserId() {
@@ -76,6 +69,13 @@ public class WordList {
     this.userId = userId;
   }
 
+  public String getName() {
+    return name;
+  }
+  public void setName(String name) {
+    this.name = name;
+  }
+
   public Long getNumberWordsInList() {
     return numberWordsInList;
   }
@@ -94,15 +94,15 @@ public class WordList {
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class WordList {\n");
-    sb.append("  id: ").append(id).append("\n");
     sb.append("  updatedAt: ").append(updatedAt).append("\n");
+    sb.append("  id: ").append(id).append("\n");
     sb.append("  username: ").append(username).append("\n");
     sb.append("  permalink: ").append(permalink).append("\n");
-    sb.append("  description: ").append(description).append("\n");
-    sb.append("  createdAt: ").append(createdAt).append("\n");
     sb.append("  lastActivityAt: ").append(lastActivityAt).append("\n");
-    sb.append("  name: ").append(name).append("\n");
+    sb.append("  createdAt: ").append(createdAt).append("\n");
+    sb.append("  description: ").append(description).append("\n");
     sb.append("  userId: ").append(userId).append("\n");
+    sb.append("  name: ").append(name).append("\n");
     sb.append("  numberWordsInList: ").append(numberWordsInList).append("\n");
     sb.append("  type: ").append(type).append("\n");
     sb.append("}\n");
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordListWord.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordListWord.java
index 25124126882..06afab98911 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordListWord.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordListWord.java
@@ -5,8 +5,8 @@ public class WordListWord {
   private Long id = null;
   private String username = null;
   private Date createdAt = null;
-  private Long userId = null;
   private Long numberCommentsOnWord = null;
+  private Long userId = null;
   private String word = null;
   private Long numberLists = null;
   public Long getId() {
@@ -30,13 +30,6 @@ public class WordListWord {
     this.createdAt = createdAt;
   }
 
-  public Long getUserId() {
-    return userId;
-  }
-  public void setUserId(Long userId) {
-    this.userId = userId;
-  }
-
   public Long getNumberCommentsOnWord() {
     return numberCommentsOnWord;
   }
@@ -44,6 +37,13 @@ public class WordListWord {
     this.numberCommentsOnWord = numberCommentsOnWord;
   }
 
+  public Long getUserId() {
+    return userId;
+  }
+  public void setUserId(Long userId) {
+    this.userId = userId;
+  }
+
   public String getWord() {
     return word;
   }
@@ -65,8 +65,8 @@ public class WordListWord {
     sb.append("  id: ").append(id).append("\n");
     sb.append("  username: ").append(username).append("\n");
     sb.append("  createdAt: ").append(createdAt).append("\n");
-    sb.append("  userId: ").append(userId).append("\n");
     sb.append("  numberCommentsOnWord: ").append(numberCommentsOnWord).append("\n");
+    sb.append("  userId: ").append(userId).append("\n");
     sb.append("  word: ").append(word).append("\n");
     sb.append("  numberLists: ").append(numberLists).append("\n");
     sb.append("}\n");
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordObject.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordObject.java
index b205cc40747..96a5837044e 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordObject.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordObject.java
@@ -3,8 +3,8 @@ package com.wordnik.client.model;
 import java.util.*;
 public class WordObject {
   private Long id = null;
-  private String originalWord = null;
   private String word = null;
+  private String originalWord = null;
   private List<String> suggestions = new ArrayList<String>();
   private String canonicalForm = null;
   private String vulgar = null;
@@ -15,13 +15,6 @@ public class WordObject {
     this.id = id;
   }
 
-  public String getOriginalWord() {
-    return originalWord;
-  }
-  public void setOriginalWord(String originalWord) {
-    this.originalWord = originalWord;
-  }
-
   public String getWord() {
     return word;
   }
@@ -29,6 +22,13 @@ public class WordObject {
     this.word = word;
   }
 
+  public String getOriginalWord() {
+    return originalWord;
+  }
+  public void setOriginalWord(String originalWord) {
+    this.originalWord = originalWord;
+  }
+
   public List<String> getSuggestions() {
     return suggestions;
   }
@@ -55,8 +55,8 @@ public class WordObject {
     StringBuilder sb = new StringBuilder();
     sb.append("class WordObject {\n");
     sb.append("  id: ").append(id).append("\n");
-    sb.append("  originalWord: ").append(originalWord).append("\n");
     sb.append("  word: ").append(word).append("\n");
+    sb.append("  originalWord: ").append(originalWord).append("\n");
     sb.append("  suggestions: ").append(suggestions).append("\n");
     sb.append("  canonicalForm: ").append(canonicalForm).append("\n");
     sb.append("  vulgar: ").append(vulgar).append("\n");
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordOfTheDay.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordOfTheDay.java
index 6ff46c59e32..70f67fd3f87 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordOfTheDay.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordOfTheDay.java
@@ -12,12 +12,12 @@ public class WordOfTheDay {
   private String createdBy = null;
   private Date createdAt = null;
   private ContentProvider contentProvider = null;
-  private String word = null;
   private String htmlExtra = null;
+  private String word = null;
   private List<SimpleDefinition> definitions = new ArrayList<SimpleDefinition>();
   private List<SimpleExample> examples = new ArrayList<SimpleExample>();
-  private Date publishDate = null;
   private String note = null;
+  private Date publishDate = null;
   public Long getId() {
     return id;
   }
@@ -60,13 +60,6 @@ public class WordOfTheDay {
     this.contentProvider = contentProvider;
   }
 
-  public String getWord() {
-    return word;
-  }
-  public void setWord(String word) {
-    this.word = word;
-  }
-
   public String getHtmlExtra() {
     return htmlExtra;
   }
@@ -74,6 +67,13 @@ public class WordOfTheDay {
     this.htmlExtra = htmlExtra;
   }
 
+  public String getWord() {
+    return word;
+  }
+  public void setWord(String word) {
+    this.word = word;
+  }
+
   public List<SimpleDefinition> getDefinitions() {
     return definitions;
   }
@@ -88,13 +88,6 @@ public class WordOfTheDay {
     this.examples = examples;
   }
 
-  public Date getPublishDate() {
-    return publishDate;
-  }
-  public void setPublishDate(Date publishDate) {
-    this.publishDate = publishDate;
-  }
-
   public String getNote() {
     return note;
   }
@@ -102,6 +95,13 @@ public class WordOfTheDay {
     this.note = note;
   }
 
+  public Date getPublishDate() {
+    return publishDate;
+  }
+  public void setPublishDate(Date publishDate) {
+    this.publishDate = publishDate;
+  }
+
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
@@ -112,12 +112,12 @@ public class WordOfTheDay {
     sb.append("  createdBy: ").append(createdBy).append("\n");
     sb.append("  createdAt: ").append(createdAt).append("\n");
     sb.append("  contentProvider: ").append(contentProvider).append("\n");
-    sb.append("  word: ").append(word).append("\n");
     sb.append("  htmlExtra: ").append(htmlExtra).append("\n");
+    sb.append("  word: ").append(word).append("\n");
     sb.append("  definitions: ").append(definitions).append("\n");
     sb.append("  examples: ").append(examples).append("\n");
-    sb.append("  publishDate: ").append(publishDate).append("\n");
     sb.append("  note: ").append(note).append("\n");
+    sb.append("  publishDate: ").append(publishDate).append("\n");
     sb.append("}\n");
     return sb.toString();
   }
diff --git a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordSearchResults.java b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordSearchResults.java
index 7479dca5acb..11c97b39576 100644
--- a/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordSearchResults.java
+++ b/samples/client/wordnik-api/java/src/main/java/com/wordnik/client/model/WordSearchResults.java
@@ -3,15 +3,8 @@ package com.wordnik.client.model;
 import java.util.*;
 import com.wordnik.client.model.WordSearchResult;
 public class WordSearchResults {
-  private Integer totalResults = null;
   private List<WordSearchResult> searchResults = new ArrayList<WordSearchResult>();
-  public Integer getTotalResults() {
-    return totalResults;
-  }
-  public void setTotalResults(Integer totalResults) {
-    this.totalResults = totalResults;
-  }
-
+  private Integer totalResults = null;
   public List<WordSearchResult> getSearchResults() {
     return searchResults;
   }
@@ -19,12 +12,19 @@ public class WordSearchResults {
     this.searchResults = searchResults;
   }
 
+  public Integer getTotalResults() {
+    return totalResults;
+  }
+  public void setTotalResults(Integer totalResults) {
+    this.totalResults = totalResults;
+  }
+
   @Override
   public String toString()  {
     StringBuilder sb = new StringBuilder();
     sb.append("class WordSearchResults {\n");
-    sb.append("  totalResults: ").append(totalResults).append("\n");
     sb.append("  searchResults: ").append(searchResults).append("\n");
+    sb.append("  totalResults: ").append(totalResults).append("\n");
     sb.append("}\n");
     return sb.toString();
   }