diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
index 1bf26ede0e4..7bdbc5361eb 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.html
@@ -20,7 +20,7 @@
     >
       <bit-item slot="attachment-button">
         <button
-          [disabled]="isAttachmentsButtonDisabled"
+          [disabled]="attachmentsButtonDisabled"
           bit-item-content
           type="button"
           (click)="openAttachmentsDialog()"
diff --git a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
index 4430c4bdd75..871ee900e38 100644
--- a/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
+++ b/apps/web/src/app/vault/components/vault-item-dialog/vault-item-dialog.component.ts
@@ -273,7 +273,7 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
 
   protected canDelete = false;
 
-  protected isAttachmentsButtonDisabled = false;
+  protected attachmentsButtonDisabled = false;
 
   constructor(
     @Inject(DIALOG_DATA) protected params: VaultItemDialogParams,
@@ -344,7 +344,7 @@ export class VaultItemDialogComponent implements OnInit, OnDestroy {
   }
 
   formStatusChanged(status: "disabled" | "enabled") {
-    this.isAttachmentsButtonDisabled = status === "disabled";
+    this.attachmentsButtonDisabled = status === "disabled";
   }
 
   /**
diff --git a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
index 84d7278cbf3..ac02bd560b4 100644
--- a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
+++ b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.html
@@ -11,7 +11,7 @@
       [attr.aria-checked]="itemDetailsForm.value.favorite"
       [appA11yTitle]="'favorite' | i18n"
       (click)="toggleFavorite()"
-      [disabled]="isFavoriteButtonDisabled"
+      [disabled]="favoriteButtonDisabled"
     ></button>
   </bit-section-header>
   <bit-card>
diff --git a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
index 9f28878c4db..bc5e7c43d12 100644
--- a/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
+++ b/libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
@@ -82,7 +82,7 @@ export class ItemDetailsSectionComponent implements OnInit {
 
   protected userId: UserId;
 
-  protected isFavoriteButtonDisabled = false;
+  protected favoriteButtonDisabled = false;
 
   @Input({ required: true })
   config: CipherFormConfig;
@@ -251,10 +251,10 @@ export class ItemDetailsSectionComponent implements OnInit {
       if (this.itemDetailsForm.controls.organizationId.value === null) {
         this.cipherFormContainer.disableFormFields();
         this.itemDetailsForm.controls.organizationId.enable();
-        this.isFavoriteButtonDisabled = true;
+        this.favoriteButtonDisabled = true;
       } else {
         this.cipherFormContainer.enableFormFields();
-        this.isFavoriteButtonDisabled = false;
+        this.favoriteButtonDisabled = false;
         this.setCollectionControlState();
       }
     }