diff --git a/samples/client/petstore/flash/FlashPetstoreCodegen.scala b/samples/client/petstore/flash/FlashPetstoreCodegen.scala
index 49342537d18d..0198674a2eb1 100644
--- a/samples/client/petstore/flash/FlashPetstoreCodegen.scala
+++ b/samples/client/petstore/flash/FlashPetstoreCodegen.scala
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2012 Wordnik, Inc.
+ *  Copyright 2014 Wordnik, Inc.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/samples/client/petstore/flash/build.xml b/samples/client/petstore/flash/build.xml
index 58c487d23644..6861dd464ece 100644
--- a/samples/client/petstore/flash/build.xml
+++ b/samples/client/petstore/flash/build.xml
@@ -63,7 +63,7 @@
             <arg line="-source-path ${sourcepath}"/>
             <arg line="-footer 'Copyright Wordnik'"/>
             <arg line="-package com.wordnik.swagger.api 'Contains the apis which are used by clients to make calls to the services deployed'"/>
-            <arg line="-package com.wordnik.swagger.model 'Contains common classes which encapsulate data elements required'"/>
+            <arg line="-package com.wordnik.swagger.codegen.model 'Contains common classes which encapsulate data elements required'"/>
             <arg line="-package com.wordnik.swagger.common 'Contains classes which are used by the api classes to invoke the deployed api like SwaggerApi - a base class, ApiUserCredentials, etc.'"/>
             <arg line="-package com.wordnik.swagger.event 'Results of calls made to Wordnik are returned via dispatched events. This package contains such event classes. Right now thats just ApiClientEvent and Response.'"/>
             <arg line="-package com.wordnik.swagger.exception 'Contains classes that encapsulate the errors generated'"/>
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as
index 945997f2fb44..1b17bd5b3321 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as
+++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Category.as
@@ -2,11 +2,9 @@ package com.wordnik.client.model {
 
 [XmlRootNode(name="Category")]
     public class Category {
-    /* Category unique identifier */
     [XmlElement(name="id")]
         public var id: Number = 0.0;
 
-    /* Name of the category */
     [XmlElement(name="name")]
         public var name: String = null;
 
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as
index d1842252d2fe..d4a423ba11c3 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as
+++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Order.as
@@ -2,23 +2,19 @@ package com.wordnik.client.model {
 
 [XmlRootNode(name="Order")]
     public class Order {
-    /* Unique identifier for the order */
     [XmlElement(name="id")]
         public var id: Number = 0.0;
 
-    /* ID of pet being ordered */
     [XmlElement(name="petId")]
         public var petId: Number = 0.0;
 
-    /* Number of pets ordered */
     [XmlElement(name="quantity")]
         public var quantity: Number = 0.0;
 
-    /* Status of the order */
+    /* Order Status */
     [XmlElement(name="status")]
         public var status: String = null;
 
-    /* Date shipped, only if it has been */
     [XmlElement(name="shipDate")]
         public var shipDate: Date = null;
 
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as
index cfab2c7f90f4..63f79d33ea2f 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as
+++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Pet.as
@@ -4,26 +4,22 @@ import com.wordnik.client.model.Category;
 import com.wordnik.client.model.Tag;
 [XmlRootNode(name="Pet")]
     public class Pet {
-    /* Unique identifier for the Pet */
+    /* unique identifier for the pet */
     [XmlElement(name="id")]
         public var id: Number = 0.0;
 
-    /* Category the pet is in */
     [XmlElement(name="category")]
         public var category: Category = null;
 
-    /* Friendly name of the pet */
     [XmlElement(name="name")]
         public var name: String = null;
 
-    /* Image URLs */
     // This declaration below of _photoUrls_obj_class is to force flash compiler to include this class
         private var _photoUrls_obj_class: com.wordnik.client.model.String = null;
         [XmlElementWrapper(name="photoUrls")]
         [XmlElements(name="photoUrl", type="com.wordnik.client.model.String")]
         public var photoUrls: Array = new Array();
 
-    /* Tags assigned to this pet */
     // This declaration below of _tags_obj_class is to force flash compiler to include this class
         private var _tags_obj_class: com.wordnik.client.model.Tag = null;
         [XmlElementWrapper(name="tags")]
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as
index 93f77b50b2e7..e229eb0ba64b 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as
+++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/Tag.as
@@ -2,11 +2,9 @@ package com.wordnik.client.model {
 
 [XmlRootNode(name="Tag")]
     public class Tag {
-    /* Unique identifier for the tag */
     [XmlElement(name="id")]
         public var id: Number = 0.0;
 
-    /* Friendly name for the tag */
     [XmlElement(name="name")]
         public var name: String = null;
 
diff --git a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as
index b5110b3cc5f2..717b5a6c2ef6 100644
--- a/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as
+++ b/samples/client/petstore/flash/src/main/flex/com/wordnik/client/model/User.as
@@ -2,31 +2,24 @@ package com.wordnik.client.model {
 
 [XmlRootNode(name="User")]
     public class User {
-    /* Unique identifier for the user */
     [XmlElement(name="id")]
         public var id: Number = 0.0;
 
-    /* Unique username */
-    [XmlElement(name="username")]
-        public var username: String = null;
-
-    /* First name of the user */
     [XmlElement(name="firstName")]
         public var firstName: String = null;
 
-    /* Last name of the user */
+    [XmlElement(name="username")]
+        public var username: String = null;
+
     [XmlElement(name="lastName")]
         public var lastName: String = null;
 
-    /* Email address of the user */
     [XmlElement(name="email")]
         public var email: String = null;
 
-    /* Password name of the user */
     [XmlElement(name="password")]
         public var password: String = null;
 
-    /* Phone number of the user */
     [XmlElement(name="phone")]
         public var phone: String = null;
 
@@ -37,8 +30,8 @@ package com.wordnik.client.model {
     public function toString(): String {
             var str: String = "User: ";
             str += " (id: " + id + ")";
-            str += " (username: " + username + ")";
             str += " (firstName: " + firstName + ")";
+            str += " (username: " + username + ")";
             str += " (lastName: " + lastName + ")";
             str += " (email: " + email + ")";
             str += " (password: " + password + ")";