diff --git a/app/Http/Livewire/Form/CreateCharacterForm.php b/app/Http/Livewire/Form/CharacterForm.php
similarity index 98%
rename from app/Http/Livewire/Form/CreateCharacterForm.php
rename to app/Http/Livewire/Form/CharacterForm.php
index 846c989..b08b505 100644
--- a/app/Http/Livewire/Form/CreateCharacterForm.php
+++ b/app/Http/Livewire/Form/CharacterForm.php
@@ -10,7 +10,7 @@ use Livewire\Component;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Validation\Rule;
 
-class CreateCharacterForm extends Component
+class CharacterForm extends Component
 {
     use AuthorizesRequests;
 
diff --git a/resources/views/character/create.blade.php b/resources/views/character/create.blade.php
index f91bc1a..524db46 100644
--- a/resources/views/character/create.blade.php
+++ b/resources/views/character/create.blade.php
@@ -3,7 +3,7 @@
 <x-slot name="title">{{ __('Add character') }}</x-slot>
 
 <div class="p-6 mx-auto max-w-xl">
-    <livewire:form.create-character-form />
+    <livewire:form.character-form />
 </div>
 
 </x-layout>
diff --git a/resources/views/character/edit.blade.php b/resources/views/character/edit.blade.php
index 74ff4f9..2c65f4c 100644
--- a/resources/views/character/edit.blade.php
+++ b/resources/views/character/edit.blade.php
@@ -10,7 +10,7 @@
 </x-slot>
 
 <div class="p-6 mx-auto max-w-xl">
-    <livewire:form.create-character-form :character="$character" />
+    <livewire:form.character-form :character="$character" />
 </div>
 
 </x-layout>
diff --git a/tests/Feature/CharacterCreateTest.php b/tests/Feature/CharacterCreateTest.php
index acc713b..5dca7a1 100644
--- a/tests/Feature/CharacterCreateTest.php
+++ b/tests/Feature/CharacterCreateTest.php
@@ -9,7 +9,7 @@ use Tests\TestCase;
 use App\Models\User;
 use App\Models\Character;
 
-use App\Http\Livewire\Form\CreateCharacterForm;
+use App\Http\Livewire\Form\CharacterForm;
 
 class CharacterCreateTest extends TestCase
 {
@@ -36,7 +36,7 @@ class CharacterCreateTest extends TestCase
     {
         $this->actingAs(User::factory()->create());
 
-        \Livewire::test(CreateCharacterForm::class)
+        \Livewire::test(CharacterForm::class)
             ->set('character.name', 'Elise')
             ->set('character.level', '70')
             ->set('character.class', 'warrior')
@@ -66,7 +66,7 @@ class CharacterCreateTest extends TestCase
         $this->actingAs($user);
 
         // Try create one more via livewire form.
-        \Livewire::test(CreateCharacterForm::class)
+        \Livewire::test(CharacterForm::class)
             ->set('character.name', 'Notonemore')
             ->set('character.level', '10')
             ->set('character.class', 'mage')
@@ -78,7 +78,7 @@ class CharacterCreateTest extends TestCase
 
     public function test_guest_can_not_create_characters()
     {
-        \Livewire::test(CreateCharacterForm::class)
+        \Livewire::test(CharacterForm::class)
             ->set('character.name', 'Guestchar')
             ->set('character.level', '61')
             ->set('character.class', 'priest')
diff --git a/tests/Feature/CharacterUpdateTest.php b/tests/Feature/CharacterUpdateTest.php
index aeb378a..78e2276 100644
--- a/tests/Feature/CharacterUpdateTest.php
+++ b/tests/Feature/CharacterUpdateTest.php
@@ -9,7 +9,7 @@ use Tests\TestCase;
 use App\Models\User;
 use App\Models\Character;
 
-use App\Http\Livewire\Form\CreateCharacterForm;
+use App\Http\Livewire\Form\CharacterForm;
 
 class CharacterUpdateTest extends TestCase
 {
@@ -50,7 +50,7 @@ class CharacterUpdateTest extends TestCase
 
         $this->actingAs($user);
 
-        \Livewire::test(CreateCharacterForm::class, ['character' => $character])
+        \Livewire::test(CharacterForm::class, ['character' => $character])
             ->set('character.name', 'Updated')
             ->set('character.level', '70')
             ->set('character.class', 'priest')
@@ -80,7 +80,7 @@ class CharacterUpdateTest extends TestCase
         $this->actingAs($user);
 
         // Try update via livewire form.
-        \Livewire::test(CreateCharacterForm::class, ['character' => $character])
+        \Livewire::test(CharacterForm::class, ['character' => $character])
             ->set('character.name', 'Mynewname')
             ->call('save')
             ->assertForbidden();
@@ -102,7 +102,7 @@ class CharacterUpdateTest extends TestCase
             'class' => 'mage'
         ]);
 
-        \Livewire::test(CreateCharacterForm::class, ['character' => $character])
+        \Livewire::test(CharacterForm::class, ['character' => $character])
             ->set('character.name', 'Guestchar')
             ->set('character.level', '61')
             ->set('character.class', 'priest')