diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxBlocGeneratorBase.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxBlocGeneratorBase.kt
index 96e9c1d62..05c105ee7 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxBlocGeneratorBase.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxBlocGeneratorBase.kt
@@ -3,7 +3,7 @@
 package com.primeholding.rxbloc_generator_plugin.generator
 
 import com.google.common.io.CharStreams
-import org.apache.commons.lang.text.StrSubstitutor
+import org.apache.commons.text.StringSubstitutor
 import java.io.InputStreamReader
 import java.lang.RuntimeException
 
@@ -55,7 +55,7 @@ abstract class RxBlocGeneratorBase(
     }
 
     override fun generate(): String {
-        val substitute = StrSubstitutor(templateValues)
+        val substitute = StringSubstitutor(templateValues)
         return substitute.replace(templateString)
     }
 
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxDependenciesGeneratorBase.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxDependenciesGeneratorBase.kt
index 45ac9c76b..dd262c3cc 100755
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxDependenciesGeneratorBase.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxDependenciesGeneratorBase.kt
@@ -4,7 +4,7 @@ package com.primeholding.rxbloc_generator_plugin.generator
 
 import com.google.common.io.CharStreams
 import com.primeholding.rxbloc_generator_plugin.action.GenerateRxBlocDialog.RoutingIntegration
-import org.apache.commons.lang.text.StrSubstitutor
+import org.apache.commons.text.StringSubstitutor
 import java.io.InputStreamReader
 import java.lang.RuntimeException
 
@@ -49,7 +49,7 @@ abstract class RxDependenciesGeneratorBase(
     }
 
     override fun generate(): String {
-        val substitute = StrSubstitutor(templateValues)
+        val substitute = StringSubstitutor(templateValues)
         var result = substitute.replace(templateString)
         if (includeLocalServiceFlag) {
             result = result.replace("// ", "")
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxListBlocGeneratorBase.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxListBlocGeneratorBase.kt
index 379cb7719..eb17c1670 100755
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxListBlocGeneratorBase.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxListBlocGeneratorBase.kt
@@ -3,7 +3,7 @@
 package com.primeholding.rxbloc_generator_plugin.generator
 
 import com.google.common.io.CharStreams
-import org.apache.commons.lang.text.StrSubstitutor
+import org.apache.commons.text.StringSubstitutor
 import java.io.InputStreamReader
 import java.lang.RuntimeException
 
@@ -34,7 +34,7 @@ abstract class RxListBlocGeneratorBase(
     }
 
     override fun generate(): String {
-        val substitutor = StrSubstitutor(templateValues)
+        val substitutor = StringSubstitutor(templateValues)
         return substitutor.replace(templateString)
     }
 
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxPageGeneratorBase.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxPageGeneratorBase.kt
index 3f3677b3c..7c1380139 100755
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxPageGeneratorBase.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxPageGeneratorBase.kt
@@ -4,7 +4,7 @@ package com.primeholding.rxbloc_generator_plugin.generator
 
 import com.google.common.io.CharStreams
 import com.primeholding.rxbloc_generator_plugin.action.GenerateRxBlocDialog
-import org.apache.commons.lang.text.StrSubstitutor
+import org.apache.commons.text.StringSubstitutor
 import java.io.InputStreamReader
 import java.lang.RuntimeException
 
@@ -45,7 +45,7 @@ abstract class RxPageGeneratorBase(
     }
 
     override fun generate(): String {
-        val substitutor = StrSubstitutor(templateValues)
+        val substitutor = StringSubstitutor(templateValues)
         return substitutor.replace(templateString)
     }
 }
\ No newline at end of file
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxTestGeneratorBase.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxTestGeneratorBase.kt
index a97c26987..a5e38711f 100755
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxTestGeneratorBase.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/RxTestGeneratorBase.kt
@@ -9,7 +9,7 @@ import com.google.common.io.CharStreams
 import com.intellij.openapi.vfs.VirtualFile
 import com.primeholding.rxbloc_generator_plugin.generator.parser.TestableClass
 import com.primeholding.rxbloc_generator_plugin.generator.parser.Utils
-import org.apache.commons.lang.text.StrSubstitutor
+import org.apache.commons.text.StringSubstitutor
 import java.io.File
 import java.io.InputStreamReader
 import java.lang.RuntimeException
@@ -420,7 +420,7 @@ abstract class RxTestGeneratorBase(
     }
 
     override fun generate(): String {
-        val substitutor = StrSubstitutor(templateValues)
+        val substitutor = StringSubstitutor(templateValues)
         return substitutor.replace(templateString)
     }
 
diff --git a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/components/RxBlocWithServiceGenerator.kt b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/components/RxBlocWithServiceGenerator.kt
index b4a7e7841..4df73f083 100644
--- a/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/components/RxBlocWithServiceGenerator.kt
+++ b/extensions/intellij/intellij_generator_plugin/src/main/java/com/primeholding/rxbloc_generator_plugin/generator/components/RxBlocWithServiceGenerator.kt
@@ -5,7 +5,7 @@ package com.primeholding.rxbloc_generator_plugin.generator.components
 import com.google.common.io.CharStreams
 import com.primeholding.rxbloc_generator_plugin.generator.RxBlocGeneratorBase
 import com.primeholding.rxbloc_generator_plugin.generator.RxGeneratorBase
-import org.apache.commons.lang.text.StrSubstitutor
+import org.apache.commons.text.StringSubstitutor
 import java.io.InputStreamReader
 import java.lang.RuntimeException
 
@@ -39,7 +39,7 @@ class RxBlocWithServiceGenerator(
     override fun contextDirectoryName(): String = "services"
 
     override fun generate(): String {
-        val substitute = StrSubstitutor(templateValues)
+        val substitute = StringSubstitutor(templateValues)
         return substitute.replace(templateString)
     }
 }
\ No newline at end of file