diff --git a/bin/akka-scala-petstore.sh b/bin/akka-scala-petstore.sh
index ccacb38950d..d8c8346ff1d 100755
--- a/bin/akka-scala-petstore.sh
+++ b/bin/akka-scala-petstore.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate --artifact-id "scala-akka-petstore-client" -t modules/openapi-generator/src/main/resources/akka-scala -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l akka-scala -o samples/client/petstore/akka-scala $@"
+ags="generate --artifact-id "scala-akka-petstore-client" -t modules/openapi-generator/src/main/resources/akka-scala -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l scala-akka -o samples/client/petstore/akka-scala $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/scala-petstore.sh b/bin/scala-petstore.sh
index 1c1b5775aba..ddaecc91160 100755
--- a/bin/scala-petstore.sh
+++ b/bin/scala-petstore.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -t modules/openapi-generator/src/main/resources/scala -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l scala -o samples/client/petstore/scala"
+ags="$@ generate -t modules/openapi-generator/src/main/resources/scala -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -l scala-httpclient -o samples/client/petstore/scala"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/akka-scala-petstore.bat b/bin/windows/akka-scala-petstore.bat
index c15a0603a82..a9ce9e14e27 100755
--- a/bin/windows/akka-scala-petstore.bat
+++ b/bin/windows/akka-scala-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
-set ags=generate  --artifact-id "scala-akka-petstore-client" -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l akka-scala -o samples\client\petstore\akka-scala
+set ags=generate  --artifact-id "scala-akka-petstore-client" -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l scala-akka -o samples\client\petstore\akka-scala
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/bin/windows/scala-petstore.bat b/bin/windows/scala-petstore.bat
index 3db6edafa8c..ae7df15ce1c 100755
--- a/bin/windows/scala-petstore.bat
+++ b/bin/windows/scala-petstore.bat
@@ -5,6 +5,6 @@ If Not Exist %executable% (
 )
 
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
-set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l scala -o samples\client\petstore\scala
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -l scala-httpclient -o samples\client\petstore\scala
 
 java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfigLoader.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfigLoader.java
index a367294d0a9..8e3c8d2035e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfigLoader.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConfigLoader.java
@@ -30,7 +30,7 @@ public class CodegenConfigLoader {
         try {
             return (CodegenConfig) Class.forName(name).newInstance();
         } catch (Exception e) {
-            throw new RuntimeException("Can't load config class with name ".concat(name) + " Available:\n" + availableConfigs.toString(), e);
+            throw new RuntimeException("Can't load config class with name '".concat(name) + "'\nAvailable:\n" + availableConfigs.toString());
         }
     }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AkkaScalaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
similarity index 98%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AkkaScalaClientCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
index 3191751f78c..59a3f92cd4e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AkkaScalaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaClientCodegen.java
@@ -35,7 +35,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
+public class ScalaAkkaClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
     protected String mainPackage = "io.swagger.client";
     protected String groupId = "io.swagger";
     protected String artifactId = "swagger-client";
@@ -56,9 +56,9 @@ public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements Code
     protected boolean onlyOneSuccess = true;
 
     @SuppressWarnings("hiding")
-    protected Logger LOGGER = LoggerFactory.getLogger(AkkaScalaClientCodegen.class);
+    protected Logger LOGGER = LoggerFactory.getLogger(ScalaAkkaClientCodegen.class);
 
-    public AkkaScalaClientCodegen() {
+    public ScalaAkkaClientCodegen() {
         super();
         outputFolder = "generated-code/scala";
         modelTemplateFiles.put("model.mustache", ".scala");
@@ -140,7 +140,7 @@ public class AkkaScalaClientCodegen extends AbstractScalaCodegen implements Code
 
     @Override
     public String getName() {
-        return "akka-scala";
+        return "scala-akka";
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java
similarity index 96%
rename from modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaClientCodegen.java
rename to modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java
index 20dc744eaab..d6c1e88f255 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaHttpClientCodegen.java
@@ -8,7 +8,7 @@ import java.util.HashMap;
 
 import org.apache.commons.lang3.StringUtils;
 
-public class ScalaClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
+public class ScalaHttpClientCodegen extends AbstractScalaCodegen implements CodegenConfig {
     protected String authScheme = "";
     protected String gradleWrapperPackage = "gradle.wrapper";
     protected boolean authPreemptive;
@@ -18,7 +18,7 @@ public class ScalaClientCodegen extends AbstractScalaCodegen implements CodegenC
     protected String artifactVersion = "1.0.0";
     protected String clientName = "AsyncClient";
 
-    public ScalaClientCodegen() {
+    public ScalaHttpClientCodegen() {
         super();
         outputFolder = "generated-code/scala";
         modelTemplateFiles.put("model.mustache", ".scala");
@@ -184,12 +184,14 @@ public class ScalaClientCodegen extends AbstractScalaCodegen implements CodegenC
 
     @Override
     public String getName() {
-        return "scala";
+        return "scala-httpclient";
     }
 
     @Override
     public String getHelp() {
-        return "Generates a Scala client library (beta).";
+        return "Generates a Scala client library (beta). IMPORTANT: " +
+                "This generator is no longer actively maintained and will be deprecated. " +
+                "PLease use 'scala-akka' generator instead.";
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
index 67c3f390a37..9043be5e7e6 100644
--- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
+++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig
@@ -1,7 +1,6 @@
 org.openapitools.codegen.languages.AdaCodegen
 org.openapitools.codegen.languages.AdaServerCodegen
 org.openapitools.codegen.languages.AndroidClientCodegen
-org.openapitools.codegen.languages.AkkaScalaClientCodegen
 org.openapitools.codegen.languages.Apache2ConfigCodegen
 org.openapitools.codegen.languages.ApexClientCodegen
 org.openapitools.codegen.languages.AspNetCoreServerCodegen
@@ -70,7 +69,8 @@ org.openapitools.codegen.languages.RubySinatraServerCodegen
 org.openapitools.codegen.languages.RustClientCodegen
 org.openapitools.codegen.languages.RustServerCodegen
 org.openapitools.codegen.languages.ScalatraServerCodegen
-org.openapitools.codegen.languages.ScalaClientCodegen
+org.openapitools.codegen.languages.ScalaAkkaClientCodegen
+org.openapitools.codegen.languages.ScalaHttpClientCodegen
 org.openapitools.codegen.languages.ScalaGatlingCodegen
 org.openapitools.codegen.languages.ScalaLagomServerCodegen
 org.openapitools.codegen.languages.ScalazClientCodegen