diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java
index 81d55226fb4e..c97f1f5a434a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ScalaClientCodegen.java
@@ -81,7 +81,7 @@ public class ScalaClientCodegen extends AbstractScalaCodegen implements CodegenC
         importMapping.remove("Map");
 
         importMapping.put("Date", "java.util.Date");
-        importMapping.put("ListBuffer", "scala.collections.mutable.ListBuffer");
+        importMapping.put("ListBuffer", "scala.collection.mutable.ListBuffer");
 
         typeMapping = new HashMap<String, String>();
         typeMapping.put("enum", "NSString");
diff --git a/samples/client/petstore/scala/.swagger-codegen/VERSION b/samples/client/petstore/scala/.swagger-codegen/VERSION
index 7fea99011a6f..f9f7450d1359 100644
--- a/samples/client/petstore/scala/.swagger-codegen/VERSION
+++ b/samples/client/petstore/scala/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.2.3-SNAPSHOT
\ No newline at end of file
+2.3.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
index 2941fd914f49..278704243ac4 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/PetApi.scala
@@ -77,7 +77,6 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -104,7 +103,6 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -131,7 +129,6 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -157,7 +154,6 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -183,7 +179,6 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -209,7 +204,6 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -237,7 +231,6 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -267,7 +260,6 @@ class PetApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
index cb2ebf47255c..cd09c136746a 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/StoreApi.scala
@@ -75,7 +75,6 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -100,7 +99,6 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -125,7 +123,6 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -151,7 +148,6 @@ class StoreApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
diff --git a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
index 7893cc266772..cd3004f19882 100644
--- a/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
+++ b/samples/client/petstore/scala/src/main/scala/io/swagger/client/api/UserApi.scala
@@ -75,7 +75,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -101,7 +100,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -127,7 +125,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -153,7 +150,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -179,7 +175,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -206,7 +201,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -232,7 +226,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**
@@ -258,7 +251,6 @@ class UserApi(val defBasePath: String = "http://petstore.swagger.io/v2",
       case Success(i) => Some(await.get)
       case Failure(t) => None
     }
-
   }
 
   /**