diff --git a/fints4k/src/main/kotlin/net/dankito/fints/callback/FinTsClientCallback.kt b/fints4k/src/main/kotlin/net/dankito/fints/callback/FinTsClientCallback.kt
index 171be228..436c946e 100644
--- a/fints4k/src/main/kotlin/net/dankito/fints/callback/FinTsClientCallback.kt
+++ b/fints4k/src/main/kotlin/net/dankito/fints/callback/FinTsClientCallback.kt
@@ -11,7 +11,7 @@ interface FinTsClientCallback {
      *
      * As almost all FinTS messages need the selected TAN procedure, this method gets called quite early.
      *
-     * As a simplification fints4java already suggests which TAN procedure may is the best one for user.
+     * As a simplification fints4k already suggests which TAN procedure may is the best one for user.
      *
      * If you do not support an enter tan dialog or if your enter tan dialog supports selecting a TAN procedure, it's
      * best returning [suggestedTanProcedure] and to not show an extra select TAN procedure dialog.
diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingModule.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingModule.kt
index 1cb68fda..4bb50d95 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingModule.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/fints4java/android/di/BankingModule.kt
@@ -7,7 +7,7 @@ import dagger.Provides
 import net.dankito.banking.fints4java.android.RouterAndroid
 import net.dankito.banking.fints4java.android.ui.util.CurrentActivityTracker
 import net.dankito.banking.fints4java.android.util.Base64ServiceAndroid
-import net.dankito.banking.fints4javaBankingClientCreator
+import net.dankito.banking.fints4kBankingClientCreator
 import net.dankito.banking.persistence.IBankingPersistence
 import net.dankito.banking.persistence.LuceneBankingPersistence
 import net.dankito.banking.search.IRemitteeSearcher
@@ -98,7 +98,7 @@ class BankingModule(private val applicationContext: Context) {
     @Provides
     @Singleton
     fun provideBankingClientCreator(webClient: IWebClient, base64Service: net.dankito.banking.util.IBase64Service) : IBankingClientCreator {
-        return fints4javaBankingClientCreator(webClient, base64Service)
+        return fints4kBankingClientCreator(webClient, base64Service)
     }
 
     @Provides
diff --git a/ui/BankingJavaFxApp/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/mainwindow/MainWindow.kt b/ui/BankingJavaFxApp/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/mainwindow/MainWindow.kt
index 71843621..17208e1c 100755
--- a/ui/BankingJavaFxApp/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/mainwindow/MainWindow.kt
+++ b/ui/BankingJavaFxApp/src/main/kotlin/net/dankito/banking/ui/javafx/dialogs/mainwindow/MainWindow.kt
@@ -1,7 +1,7 @@
 package net.dankito.banking.ui.javafx.dialogs.mainwindow
 
 import javafx.scene.control.SplitPane
-import net.dankito.banking.fints4javaBankingClientCreator
+import net.dankito.banking.fints4kBankingClientCreator
 import net.dankito.banking.persistence.BankingPersistenceJson
 import net.dankito.banking.ui.javafx.RouterJavaFx
 import net.dankito.banking.ui.javafx.controls.AccountTransactionsView
@@ -25,7 +25,7 @@ class MainWindow : View(messages["application.title"]) {
 
     private val indexFolder = File(dataFolder, "index")
 
-    private val presenter = BankingPresenter(fints4javaBankingClientCreator(OkHttpWebClient(), Base64ServiceJava8()),
+    private val presenter = BankingPresenter(fints4kBankingClientCreator(OkHttpWebClient(), Base64ServiceJava8()),
         LuceneBankFinder(indexFolder), databaseFolder, dataFolder, BankingPersistenceJson(File(databaseFolder, "accounts.json")), BankIconFinder(), RouterJavaFx())
 //    private val presenter = BankingPresenter(hbci4jBankingClientCreator(), LuceneBankFinder(indexFolder), databaseFolder,
 //    dataFolder, BankingPersistenceJson(File(databaseFolder, "accounts.json")), BankIconFinder(), RouterJavaFx())
diff --git a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/IBankingClientCreator.kt b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/IBankingClientCreator.kt
index f707ee78..407f256a 100644
--- a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/IBankingClientCreator.kt
+++ b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/IBankingClientCreator.kt
@@ -8,7 +8,7 @@ import java.io.File
 interface IBankingClientCreator {
 
     fun createClient(
-        bankInfo: BankInfo, // TODO: create own value object to get rid off fints4java dependency
+        bankInfo: BankInfo, // TODO: create own value object to get rid off fints4k dependency
         customerId: String,
         pin: String,
         dataFolder: File,
diff --git a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/presenter/BankingPresenter.kt b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/presenter/BankingPresenter.kt
index c2f4b0ef..a6826cb1 100644
--- a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/presenter/BankingPresenter.kt
+++ b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/presenter/BankingPresenter.kt
@@ -139,7 +139,7 @@ open class BankingPresenter(
     }
 
 
-    // TODO: move BankInfo out of fints4javaLib
+    // TODO: move BankInfo out of fints4k
     open fun addAccountAsync(bankInfo: BankInfo, customerId: String, pin: String, callback: (AddAccountResponse) -> Unit) {
 
         val newClient = bankingClientCreator.createClient(bankInfo, customerId, pin, databaseFolder, threadPool, this.callback)
diff --git a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/util/FlickerCodeAnimator.kt b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/util/FlickerCodeAnimator.kt
index c488600e..316b865c 100644
--- a/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/util/FlickerCodeAnimator.kt
+++ b/ui/BankingUiCommon/src/main/java/net/dankito/banking/ui/util/FlickerCodeAnimator.kt
@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory
 import java.util.concurrent.TimeUnit
 
 
-open class FlickerCodeAnimator { // TODO: move to fints4javaLib
+open class FlickerCodeAnimator { // TODO: move to fints44
 
     companion object {
         const val MinFrequency = 2
diff --git a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4javaBankingClient.kt b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4kBankingClient.kt
similarity index 91%
rename from ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4javaBankingClient.kt
rename to ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4kBankingClient.kt
index f5f2d436..594d2c81 100644
--- a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4javaBankingClient.kt
+++ b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4kBankingClient.kt
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory
 import java.io.File
 
 
-open class fints4javaBankingClient(
+open class fints4kBankingClient(
     bankInfo: BankInfo,
     customerId: String,
     pin: String,
@@ -37,13 +37,13 @@ open class fints4javaBankingClient(
 ) : IBankingClient {
 
     companion object {
-        val fints4javaClientDataFilename = "fints4javaClientData.json"
+        val fints4kClientDataFilename = "fints4kClientData.json"
 
-        private val log = LoggerFactory.getLogger(fints4javaBankingClient::class.java)
+        private val log = LoggerFactory.getLogger(fints4kBankingClient::class.java)
     }
 
 
-    protected val mapper = net.dankito.banking.mapper.fints4javaModelMapper()
+    protected val mapper = net.dankito.banking.mapper.fints4kModelMapper()
 
     protected val bankDataMapper = BankDataMapper()
 
@@ -131,7 +131,7 @@ open class fints4javaBankingClient(
 
 
     override fun restoreData() {
-        val deserializedCustomer = serializer.deserializeObject(getFints4javaClientDataFile(), CustomerData::class.java)
+        val deserializedCustomer = serializer.deserializeObject(getFints4kClientDataFile(), CustomerData::class.java)
 
         deserializedCustomer?.let {
             mapper.updateCustomer(customer, deserializedCustomer)
@@ -142,14 +142,14 @@ open class fints4javaBankingClient(
 
     protected open fun saveData() {
         try {
-            serializer.serializeObject(customer, getFints4javaClientDataFile())
+            serializer.serializeObject(customer, getFints4kClientDataFile())
         } catch (e: Exception) {
             log.error("Could not save customer data for $customer", e)
         }
     }
 
-    protected open fun getFints4javaClientDataFile(): File {
-        return File(dataFolder, "${bank.bankCode}_${customer.customerId}_$fints4javaClientDataFilename")
+    protected open fun getFints4kClientDataFile(): File {
+        return File(dataFolder, "${bank.bankCode}_${customer.customerId}_$fints4kClientDataFilename")
     }
 
 }
\ No newline at end of file
diff --git a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4javaBankingClientCreator.kt b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4kBankingClientCreator.kt
similarity index 79%
rename from ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4javaBankingClientCreator.kt
rename to ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4kBankingClientCreator.kt
index 5702083b..96bc6a10 100644
--- a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4javaBankingClientCreator.kt
+++ b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/fints4kBankingClientCreator.kt
@@ -11,7 +11,7 @@ import net.dankito.utils.web.client.IWebClient
 import java.io.File
 
 
-open class fints4javaBankingClientCreator(
+open class fints4kBankingClientCreator(
     protected val webClient: IWebClient,
     protected val base64Service: IBase64Service
 ) : IBankingClientCreator {
@@ -25,7 +25,7 @@ open class fints4javaBankingClientCreator(
         callback: BankingClientCallback
     ): IBankingClient {
 
-        return fints4javaBankingClient(bankInfo, customerId, pin, dataFolder, webClient, UiCommonBase64ServiceWrapper(base64Service), threadPool, callback)
+        return fints4kBankingClient(bankInfo, customerId, pin, dataFolder, webClient, UiCommonBase64ServiceWrapper(base64Service), threadPool, callback)
     }
 
 }
\ No newline at end of file
diff --git a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt
similarity index 99%
rename from ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt
rename to ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt
index 3ecfeaa0..b21386b8 100644
--- a/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4javaModelMapper.kt
+++ b/ui/fints4kBankingClient/src/main/kotlin/net/dankito/banking/mapper/fints4kModelMapper.kt
@@ -16,7 +16,7 @@ import net.dankito.utils.exception.ExceptionHelper
 import java.math.BigDecimal
 
 
-open class fints4javaModelMapper {
+open class fints4kModelMapper {
 
 
     private val exceptionHelper = ExceptionHelper()
@@ -79,7 +79,7 @@ open class fints4javaModelMapper {
         return account
     }
 
-    // TODO: move to a fints4java internal mapper
+    // TODO: move to a fints4k internal mapper
     open fun updateCustomer(customer: CustomerData, updatedCustomer: CustomerData) {
         customer.pin = updatedCustomer.pin
         customer.name = updatedCustomer.name
@@ -124,7 +124,7 @@ open class fints4javaModelMapper {
         }
     }
 
-    // TODO: move to a fints4java internal mapper
+    // TODO: move to a fints4k internal mapper
     open fun updateBankAccounts(customer: CustomerData, updatedAccounts: List<AccountData>) {
         val accounts = customer.accounts