diff --git a/lib/models/code.dart b/lib/models/code.dart
index baf11c9f8..2fd775958 100644
--- a/lib/models/code.dart
+++ b/lib/models/code.dart
@@ -4,7 +4,7 @@ class Code {
   static const defaultDigits = 6;
   static const defaultPeriod = 30;
 
-  int? id;
+  int? generatedID;
   final String account;
   final String issuer;
   final int digits;
@@ -24,10 +24,14 @@ class Code {
     this.algorithm,
     this.type,
     this.rawData, {
-    this.id,
+    this.generatedID,
   });
 
-  static Code fromAccountAndSecret(String account, String issuer, String secret) {
+  static Code fromAccountAndSecret(
+    String account,
+    String issuer,
+    String secret,
+  ) {
     return Code(
       account,
       issuer,
diff --git a/lib/onboarding/view/setup_enter_secret_key_page.dart b/lib/onboarding/view/setup_enter_secret_key_page.dart
index 4a7e7a572..a7fce88d1 100644
--- a/lib/onboarding/view/setup_enter_secret_key_page.dart
+++ b/lib/onboarding/view/setup_enter_secret_key_page.dart
@@ -118,7 +118,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                         // Verify the validity of the code
                         getTotp(code);
                         if (widget.code != null) {
-                          code.id = widget.code!.id;
+                          code.generatedID = widget.code!.generatedID;
                         }
                         Navigator.of(context).pop(code);
                       } catch (e) {
diff --git a/lib/store/code_store.dart b/lib/store/code_store.dart
index 562ff5cdd..7b2551ebf 100644
--- a/lib/store/code_store.dart
+++ b/lib/store/code_store.dart
@@ -26,7 +26,7 @@ class CodeStore {
     for (final entity in entities) {
       final decodeJson = jsonDecode(entity.rawData);
       final code = Code.fromRawData(decodeJson);
-      code.id = entity.generatedID;
+      code.generatedID = entity.generatedID;
       code.hasSynced = entity.hasSynced;
       codes.add(code);
     }
@@ -46,19 +46,19 @@ class CodeStore {
       if (existingCode == code) {
         _logger.info("Found duplicate code, skipping add");
         return;
-      } else if (existingCode.id == code.id) {
+      } else if (existingCode.generatedID == code.generatedID) {
         isExistingCode = true;
         break;
       }
     }
     if (isExistingCode) {
       await _authenticatorService.updateEntry(
-        code.id!,
+        code.generatedID!,
         jsonEncode(code.rawData),
         shouldSync,
       );
     } else {
-      code.id = await _authenticatorService.addEntry(
+      code.generatedID = await _authenticatorService.addEntry(
         jsonEncode(code.rawData),
         shouldSync,
       );
@@ -67,7 +67,7 @@ class CodeStore {
   }
 
   Future<void> removeCode(Code code) async {
-    await _authenticatorService.deleteEntry(code.id!);
+    await _authenticatorService.deleteEntry(code.generatedID!);
     Bus.instance.fire(CodesUpdatedEvent());
   }
 }