diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java
index d77763a126d..1ead8de061f 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AkkaScalaClientCodegen.java
@@ -231,7 +231,7 @@ public String toOperationId(String operationId) {
     }
 
     private String formatIdentifier(String name, boolean capitalized) {
-        String identifier = camelize(name, true);
+        String identifier = camelize(sanitizeName(name), true);
         if (capitalized) {
             identifier = StringUtils.capitalize(identifier);
         }
@@ -290,6 +290,11 @@ public String toDefaultValue(Property p) {
         }
     }
 
+    @Override
+    public String toModelName(final String name) {
+        return formatIdentifier(name, true);
+    }
+
     private static abstract class CustomLambda implements Mustache.Lambda {
         @Override
         public void execute(Template.Fragment frag, Writer out) throws IOException {
@@ -301,7 +306,6 @@ public void execute(Template.Fragment frag, Writer out) throws IOException {
         public abstract String formatFragment(String fragment);
     }
 
-
     private static class JavadocLambda extends CustomLambda {
         @Override
         public String formatFragment(String fragment) {
diff --git a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala
index 4b8b8c3631e..d1f95bdc18d 100644
--- a/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala
+++ b/samples/client/petstore/akka-scala/src/main/scala/io/swagger/client/api/UserApi.scala
@@ -95,8 +95,8 @@ object UserApi {
       .withErrorResponse[Unit](400)
       
   object LoginUserHeaders { 
-    def `x-Rate-Limit`(r: ApiReturnWithHeaders) = r.getIntHeader("X-Rate-Limit")
-    def `x-Expires-After`(r: ApiReturnWithHeaders) = r.getDateTimeHeader("X-Expires-After")
+    def xRateLimit(r: ApiReturnWithHeaders) = r.getIntHeader("X-Rate-Limit")
+    def xExpiresAfter(r: ApiReturnWithHeaders) = r.getDateTimeHeader("X-Expires-After")
   }
   /**
    *