diff --git a/Livewire/Branch/BranchModal.php b/Livewire/Branch/BranchModal.php
index 7679f69..ff965e7 100644
--- a/Livewire/Branch/BranchModal.php
+++ b/Livewire/Branch/BranchModal.php
@@ -5,8 +5,8 @@
     use Illuminate\Support\Facades\DB;
     use Livewire\Component;
     use Modules\Writeoff\Entities\Branch;
-    use Modules\Writeoff\Http\Requests\Branch\StoreCurrencyRequest;
-    use Modules\Writeoff\Http\Requests\Branch\UpdateCurrencyRequest;
+    use Modules\Writeoff\Http\Requests\Branch\StoreBranchRequest;
+    use Modules\Writeoff\Http\Requests\Branch\UpdateBranchRequest;
 
     class BranchModal extends Component
     {
@@ -26,17 +26,6 @@
             return view('writeoff::livewire.branch.branch-modal');
         }
 
-        protected function rules()
-        {
-            if ($this->edit_mode) {
-                $request = new UpdateCurrencyRequest();
-            } else {
-                $request = new StoreCurrencyRequest();
-            }
-
-            return $request->rules();
-        }
-
         public function submit()
         {
             $this->validate();
@@ -66,14 +55,6 @@
             $this->reset();
         }
 
-        public function delete($id)
-        {
-            Branch::destroy($id);
-
-            // Emit a success event with a message
-            $this->dispatch('success', 'Branch successfully deleted');
-        }
-
         public function update($id)
         {
             $this->edit_mode = true;
@@ -85,10 +66,29 @@
             $this->name = $branch->name;
         }
 
+        public function delete($id)
+        {
+            Branch::destroy($id);
+
+            // Emit a success event with a message
+            $this->dispatch('success', 'Branch successfully deleted');
+        }
+
         public function hydrate()
         {
             $this->resetErrorBag();
             $this->resetValidation();
         }
+
+        protected function rules()
+        {
+            if ($this->edit_mode) {
+                $request = new UpdateBranchRequest();
+            } else {
+                $request = new StoreBranchRequest();
+            }
+
+            return $request->rules();
+        }
     }
 
diff --git a/Livewire/Currency/CurrencyModal.php b/Livewire/Currency/CurrencyModal.php
index 5c730ee..32566a8 100644
--- a/Livewire/Currency/CurrencyModal.php
+++ b/Livewire/Currency/CurrencyModal.php
@@ -5,8 +5,8 @@
     use Illuminate\Support\Facades\DB;
     use Livewire\Component;
     use Modules\Writeoff\Entities\Currency;
-    use Modules\Writeoff\Http\Requests\Currency\StoreGuaranteeTypeRequest;
-    use Modules\Writeoff\Http\Requests\Currency\UpdateGuaranteeTypeRequest;
+    use Modules\Writeoff\Http\Requests\Currency\StoreCurrencyRequest;
+    use Modules\Writeoff\Http\Requests\Currency\UpdateCurrencyRequest;
 
     class CurrencyModal extends Component
     {
@@ -26,17 +26,6 @@
             return view('writeoff::livewire.currency.currency-modal');
         }
 
-        protected function rules()
-        {
-            if ($this->edit_mode) {
-                $request = new UpdateGuaranteeTypeRequest();
-            } else {
-                $request = new StoreGuaranteeTypeRequest();
-            }
-
-            return $request->rules();
-        }
-
         public function submit()
         {
             $this->validate();
@@ -66,14 +55,6 @@
             $this->reset();
         }
 
-        public function delete($id)
-        {
-            Currency::destroy($id);
-
-            // Emit a success event with a message
-            $this->dispatch('success', 'Currency successfully deleted');
-        }
-
         public function update($id)
         {
             $this->edit_mode = true;
@@ -85,10 +66,29 @@
             $this->name = $currency->name;
         }
 
+        public function delete($id)
+        {
+            Currency::destroy($id);
+
+            // Emit a success event with a message
+            $this->dispatch('success', 'Currency successfully deleted');
+        }
+
         public function hydrate()
         {
             $this->resetErrorBag();
             $this->resetValidation();
         }
+
+        protected function rules()
+        {
+            if ($this->edit_mode) {
+                $request = new UpdateCurrencyRequest();
+            } else {
+                $request = new StoreCurrencyRequest();
+            }
+
+            return $request->rules();
+        }
     }
 
diff --git a/Livewire/GuaranteeType/GuaranteeTypeModal.php b/Livewire/GuaranteeType/GuaranteeTypeModal.php
index e04423c..885be39 100644
--- a/Livewire/GuaranteeType/GuaranteeTypeModal.php
+++ b/Livewire/GuaranteeType/GuaranteeTypeModal.php
@@ -26,17 +26,6 @@
             return view('writeoff::livewire.guarantee-type.guarantee-type-modal');
         }
 
-        protected function rules()
-        {
-            if ($this->edit_mode) {
-                $request = new UpdateGuaranteeTypeRequest();
-            } else {
-                $request = new StoreGuaranteeTypeRequest();
-            }
-
-            return $request->rules();
-        }
-
         public function submit()
         {
             $this->validate();
@@ -66,14 +55,6 @@
             $this->reset();
         }
 
-        public function delete($id)
-        {
-            GuaranteeType::destroy($id);
-
-            // Emit a success event with a message
-            $this->dispatch('success', 'Guarante Type successfully deleted');
-        }
-
         public function update($id)
         {
             $this->edit_mode = true;
@@ -85,10 +66,29 @@
             $this->name = $guarantee_type->name;
         }
 
+        public function delete($id)
+        {
+            GuaranteeType::destroy($id);
+
+            // Emit a success event with a message
+            $this->dispatch('success', 'Guarante Type successfully deleted');
+        }
+
         public function hydrate()
         {
             $this->resetErrorBag();
             $this->resetValidation();
         }
+
+        protected function rules()
+        {
+            if ($this->edit_mode) {
+                $request = new UpdateGuaranteeTypeRequest();
+            } else {
+                $request = new StoreGuaranteeTypeRequest();
+            }
+
+            return $request->rules();
+        }
     }