diff --git a/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt b/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
index fbfdbc638..c471a0655 100644
--- a/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
+++ b/crypto/src/main/java/com/kunzisoft/encrypt/NativeLib.kt
@@ -30,7 +30,7 @@ object NativeLib {
     fun init(): Boolean {
         if (!isLoaded) {
             try {
-                System.loadLibrary("final-key")
+                System.loadLibrary("aes")
                 System.loadLibrary("argon2")
             } catch (e: UnsatisfiedLinkError) {
                 return false
diff --git a/crypto/src/main/jni/aes/CMakeLists.txt b/crypto/src/main/jni/aes/CMakeLists.txt
index 431ca13fd..3ef36ebe0 100644
--- a/crypto/src/main/jni/aes/CMakeLists.txt
+++ b/crypto/src/main/jni/aes/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(aes/)
 include_directories(sha/)
 
 add_library(
-    final-key SHARED
+    aes SHARED
     aes_jni.c
     aes/aescrypt.c
     aes/aeskey.c
@@ -19,4 +19,4 @@ add_library(
 
 find_library(log-lib log)
 
-target_link_libraries(final-key ${log-lib})
+target_link_libraries(aes ${log-lib})
diff --git a/crypto/src/main/jni/argon2/src/CMakeLists.txt b/crypto/src/main/jni/argon2/src/CMakeLists.txt
index 431ca13fd..3ef36ebe0 100644
--- a/crypto/src/main/jni/argon2/src/CMakeLists.txt
+++ b/crypto/src/main/jni/argon2/src/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(aes/)
 include_directories(sha/)
 
 add_library(
-    final-key SHARED
+    aes SHARED
     aes_jni.c
     aes/aescrypt.c
     aes/aeskey.c
@@ -19,4 +19,4 @@ add_library(
 
 find_library(log-lib log)
 
-target_link_libraries(final-key ${log-lib})
+target_link_libraries(aes ${log-lib})
diff --git a/crypto/src/main/res/values/strings.xml b/crypto/src/main/res/values/strings.xml
deleted file mode 100644
index 0dd698c07..000000000
--- a/crypto/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright 2021 Jeremy Jamet / Kunzisoft.
-
-    This file is part of KeePassDX.
-
-    KeePassDX is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    KeePassDX is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-</resources>