diff --git a/samples/client/petstore/android-java/AndroidJavaPetstoreCodegen.scala b/samples/client/petstore/android-java/AndroidJavaPetstoreCodegen.scala
index 2be7f229b8..bc441275a6 100644
--- a/samples/client/petstore/android-java/AndroidJavaPetstoreCodegen.scala
+++ b/samples/client/petstore/android-java/AndroidJavaPetstoreCodegen.scala
@@ -14,13 +14,13 @@
  *  limitations under the License.
  */
 
-import com.wordnik.swagger.codegen.BasicJavaGenerator
+import com.wordnik.swagger.codegen.BasicAndroidJavaGenerator
 
-object AndroidJavaPetstoreCodegen extends BasicJavaGenerator {
+object AndroidJavaPetstoreCodegen extends BasicAndroidJavaGenerator {
   def main(args: Array[String]) = generateClient(args)
 
   // location of templates
-  override def templateDir = "android-java"
+  override def templateDir = "src/main/resources/android-java"
 
   // where to write generated code
   override def destinationDir = "samples/client/petstore/android-java/src/main/java"
diff --git a/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala b/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
index e34f3ae535..779aa22627 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/BasicAndroidJavaClient.scala
@@ -14,15 +14,17 @@
  *  limitations under the License.
  */
 
+package com.wordnik.swagger.codegen
+
 import com.wordnik.swagger.codegen.BasicJavaGenerator
 
 import com.wordnik.swagger.model._
 
-object BasicAndroidJavaClient extends BasicJavaGenerator {
+object BasicAndroidJavaClient extends BasicAndroidJavaGenerator {
   def main(args: Array[String]) = generateClient(args)
+}
 
-  override def templateDir = "src/main/resources/android-java"
-
+class BasicAndroidJavaGenerator extends BasicJavaGenerator {
   override def typeMapping = super.typeMapping ++ Map(
     "file" -> "File")
 
@@ -42,15 +44,11 @@ object BasicAndroidJavaClient extends BasicJavaGenerator {
     "AnyRef",
     "Any")
 
-  additionalParams ++= Map(
-    "artifactId" -> "swagger-android-client", 
-    "artifactVersion" -> "1.0.0",
-    "groupId" -> "com.wordnik"
-  )
-
   // package for api invoker, error files
   override def invokerPackage = Some("com.wordnik.client")
 
+  override def templateDir = "android-java"
+
   // where to write generated code
   override def destinationDir = "generated-code/android-java/src/main/java"
 
@@ -60,7 +58,6 @@ object BasicAndroidJavaClient extends BasicJavaGenerator {
   // package for api classes
   override def apiPackage = Some("com.wordnik.client.api")
 
-
   // supporting classes
   override def supportingFiles = List(
     ("apiInvoker.mustache", destinationDir + java.io.File.separator + invokerPackage.get.replace(".", java.io.File.separator) + java.io.File.separator, "ApiInvoker.java"),