diff --git a/lib/db/files_db.dart b/lib/db/files_db.dart
index c92a16596..0c88cda44 100644
--- a/lib/db/files_db.dart
+++ b/lib/db/files_db.dart
@@ -32,7 +32,7 @@ class FilesDB {
   static final columnModificationTime = 'modification_time';
   static final columnUpdationTime = 'updation_time';
   static final columnEncryptedKey = 'encrypted_key';
-  static final columnIV = 'iv';
+  static final columnEncryptedKeyIV = 'encrypted_key_iv';
 
   // make this a singleton class
   FilesDB._privateConstructor();
@@ -73,9 +73,9 @@ class FilesDB {
             $columnIsDeleted INTEGER DEFAULT 0,
             $columnCreationTime TEXT NOT NULL,
             $columnModificationTime TEXT NOT NULL,
-            $columnUpdationTime TEXT
-            $columnEncryptedKey TEXT
-            $columnIV TEXT
+            $columnUpdationTime TEXT,
+            $columnEncryptedKey TEXT,
+            $columnEncryptedKeyIV TEXT
           )
           ''');
   }
@@ -188,7 +188,7 @@ class FilesDB {
       table,
       where: '''$columnLocalID=? AND ($columnTitle=? OR $columnTitle=?) AND 
           $columnDeviceFolder=? AND $columnCreationTime=? AND 
-          $columnModificationTime=? AND $columnEncryptedKey AND $columnIV''',
+          $columnModificationTime=? AND $columnEncryptedKey AND $columnEncryptedKeyIV''',
       whereArgs: [
         localID,
         title,
@@ -233,7 +233,7 @@ class FilesDB {
     values[columnUploadedFileID] = uploadedID;
     values[columnUpdationTime] = updationTime;
     values[columnEncryptedKey] = encryptedKey;
-    values[columnIV] = iv;
+    values[columnEncryptedKeyIV] = iv;
     return await db.update(
       table,
       values,
@@ -386,7 +386,7 @@ class FilesDB {
     row[columnModificationTime] = file.modificationTime;
     row[columnUpdationTime] = file.updationTime;
     row[columnEncryptedKey] = file.encryptedKey;
-    row[columnIV] = file.iv;
+    row[columnEncryptedKeyIV] = file.encryptedKeyIV;
     return row;
   }
 
@@ -410,7 +410,7 @@ class FilesDB {
         ? -1
         : int.parse(row[columnUpdationTime]);
     file.encryptedKey = row[columnEncryptedKey];
-    file.iv = row[columnIV];
+    file.encryptedKeyIV = row[columnEncryptedKeyIV];
     return file;
   }
 }
diff --git a/lib/face_search_manager.dart b/lib/face_search_manager.dart
index 461a44741..c61fd105a 100644
--- a/lib/face_search_manager.dart
+++ b/lib/face_search_manager.dart
@@ -61,7 +61,7 @@ class FaceSearchManager {
             file.creationTime,
             file.modificationTime,
             file.encryptedKey,
-            file.iv,
+            file.encryptedKeyIV,
             alternateTitle: getHEICFileNameForJPG(file)));
       } catch (e) {
         // Not available locally
diff --git a/lib/folder_service.dart b/lib/folder_service.dart
index d57cb7f49..c551127b2 100644
--- a/lib/folder_service.dart
+++ b/lib/folder_service.dart
@@ -71,7 +71,7 @@ class FolderSharingService {
         var existingPhoto =
             await FilesDB.instance.getMatchingRemoteFile(file.uploadedFileID);
         await FilesDB.instance.update(existingPhoto.generatedID,
-            file.uploadedFileID, file.updationTime, file.encryptedKey, file.iv);
+            file.uploadedFileID, file.updationTime, file.encryptedKey, file.encryptedKeyIV);
       } catch (e) {
         await FilesDB.instance.insert(file);
       }
diff --git a/lib/models/file.dart b/lib/models/file.dart
index e0c335515..f76d1a2f7 100644
--- a/lib/models/file.dart
+++ b/lib/models/file.dart
@@ -20,7 +20,7 @@ class File {
   Location location;
   FileType fileType;
   String encryptedKey;
-  String iv;
+  String encryptedKeyIV;
 
   File();
 
@@ -35,7 +35,7 @@ class File {
     modificationTime = json["modificationTime"];
     updationTime = json["updationTime"];
     encryptedKey = json["encryptedKey"];
-    iv = json["iv"];
+    encryptedKeyIV = json["encryptedKeyIV"];
   }
 
   static Future<File> fromAsset(
@@ -140,7 +140,7 @@ class File {
       return null;
     }
     return CryptoUtil.decryptFromBase64(
-        encryptedKey, Configuration.instance.getKey(), iv);
+        encryptedKey, Configuration.instance.getKey(), encryptedKeyIV);
   }
 
   @override