diff --git a/src/backend/database/database.ts b/src/backend/database/database.ts
index eb768181..0810cabc 100644
--- a/src/backend/database/database.ts
+++ b/src/backend/database/database.ts
@@ -678,7 +678,7 @@ app.post("/database/export", authenticateJWT, async (req, res) => {
           decrypted.authType,
           decrypted.password || null,
           decrypted.key || null,
-          decrypted.keyPassword || null,
+          decrypted.key_password || null,
           decrypted.keyType || null,
           decrypted.autostartPassword || null,
           decrypted.autostartKey || null,
@@ -721,9 +721,9 @@ app.post("/database/export", authenticateJWT, async (req, res) => {
           decrypted.username,
           decrypted.password || null,
           decrypted.key || null,
-          decrypted.privateKey || null,
-          decrypted.publicKey || null,
-          decrypted.keyPassword || null,
+          decrypted.private_key || null,
+          decrypted.public_key || null,
+          decrypted.key_password || null,
           decrypted.keyType || null,
           decrypted.detectedKeyType || null,
           decrypted.usageCount || 0,
diff --git a/src/backend/utils/simple-db-ops.ts b/src/backend/utils/simple-db-ops.ts
index 4d67908b..c0f8180b 100644
--- a/src/backend/utils/simple-db-ops.ts
+++ b/src/backend/utils/simple-db-ops.ts
@@ -57,14 +57,14 @@ class SimpleDBOps {
 
     const results = await query;
 
-    const decryptedResults = DataCrypto.decryptRecords(
+    const decryptedResults = DataCrypto.decryptRecords<T>(
       tableName,
-      results as unknown[],
+      results as T[],
       userId,
       userDataKey,
     );
 
-    return decryptedResults as T[];
+    return decryptedResults;
   }
 
   static async selectOne<T extends Record<string, unknown>>(
@@ -80,9 +80,9 @@ class SimpleDBOps {
     const result = await query;
     if (!result) return undefined;
 
-    const decryptedResult = DataCrypto.decryptRecord(
+    const decryptedResult = DataCrypto.decryptRecord<T>(
       tableName,
-      result as Record<string, unknown>,
+      result as T,
       userId,
       userDataKey,
     );