diff --git a/config/Migrations/20250103091420_CreateContactUsFormSubmissions.php b/config/Migrations/20250103091420_CreateContactUsFormSubmissions.php
index e9bec0f..1a90eb7 100644
--- a/config/Migrations/20250103091420_CreateContactUsFormSubmissions.php
+++ b/config/Migrations/20250103091420_CreateContactUsFormSubmissions.php
@@ -28,17 +28,22 @@ class CreateContactUsFormSubmissions extends AbstractMigration {
 			'limit' => 45,
 			'null' => true,
 		]);
-		$table->addColumn('name', 'string', [
+		$table->addColumn('first_name', 'string', [
 			'default' => null,
 			'limit' => 255,
-			'null' => false,
+			'null' => true,
+		]);
+		$table->addColumn('last_name', 'string', [
+			'default' => null,
+			'limit' => 255,
+			'null' => true,
 		]);
 		$table->addColumn('email', 'string', [
 			'default' => null,
 			'limit' => 255,
 			'null' => true,
 		]);
-		$table->addColumn('subject', 'string', [
+		$table->addColumn('contact_subject', 'string', [
 			'default' => null,
 			'limit' => 255,
 			'null' => true,
diff --git a/config/Migrations/20260123091420_AlterContactUsFormSubmissionsKeywords.php b/config/Migrations/20260123091420_AlterContactUsFormSubmissionsKeywords.php
deleted file mode 100644
index 37916bd..0000000
--- a/config/Migrations/20260123091420_AlterContactUsFormSubmissionsKeywords.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-declare(strict_types=1);
-
-use Migrations\AbstractMigration;
-
-class AlterContactUsFormSubmissionsKeywords extends AbstractMigration {
-
-	/**
-     * up Method.
-     *
-     * More information on this method is available here:
-     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
-     * @return void
-     */
-	public function up(): void {
-		$table = $this->table('contact_us_form_submissions');
-		if ($table->hasColumn('subject')) {
-			$table->renameColumn('subject', 'contact_subject');
-		}
-		if ($table->hasColumn('name')) {
-			$table->renameColumn('name', 'first_name');
-		}
-		$table->addColumn('last_name', 'string', [
-			'limit' => 255,
-			'default' => null,
-			'null' => true,
-		]);
-		$table->update();
-	}
-
-	/**
-     * down Method.
-     *
-     * More information on this method is available here:
-     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
-     * @return void
-     */
-	public function down(): void {
-		$table = $this->table('contact_us_form_submissions');
-		if ($table->hasColumn('contact_subject')) {
-			$table->renameColumn('contact_subject', 'subject');
-		}
-		if ($table->hasColumn('fist_name')) {
-			$table->renameColumn('fist_name', 'name');
-		}
-		$table->removeColumn('last_name');
-		$table->update();
-	}
-
-}
diff --git a/src/Controller/Component/ContactUsComponent.php b/src/Controller/Component/ContactUsComponent.php
index 2c9cea5..ba5b5dc 100644
--- a/src/Controller/Component/ContactUsComponent.php
+++ b/src/Controller/Component/ContactUsComponent.php
@@ -90,7 +90,6 @@ class ContactUsComponent extends Component {
 			'contactUsFormSubmission' => $contactUsFormSubmission,
 		], $this->getController());
 		$result = $event->getResult();
-
 		Log::debug(print_r('$result', true));
 		Log::debug(print_r($result, true));
 		if ($result instanceof EntityInterface) {
@@ -104,15 +103,13 @@ class ContactUsComponent extends Component {
 			if ($contactUsFormSubmissionSaved) {
 				return $this->_afterFormSaved($contactUsFormSubmissionSaved);
 			}
-
 			// @TODO contact us form submission failed - handle here
 		}
 
 		if ($event->isStopped()) {
 			return $this->getController()->redirect($event->getResult());
 		}
-
-		if (!$this->getController()->getRequest()->is('post')) {
+		if (!$postData) {
 			return;
 		}
 
diff --git a/src/Mailer/ContactUsFormSubmissionsMailer.php b/src/Mailer/ContactUsFormSubmissionsMailer.php
index f80d85e..4ff4f35 100644
--- a/src/Mailer/ContactUsFormSubmissionsMailer.php
+++ b/src/Mailer/ContactUsFormSubmissionsMailer.php
@@ -45,7 +45,7 @@ class ContactUsFormSubmissionsMailer extends Mailer {
      */
 	protected function backend(ContactUsFormSubmission $contactUsFormSubmission, array $options = []) {
 		$subject = __d('cake_contact_us', 'Contact Us Form Submitted');
-		$name = isset($contactUsFormSubmission->name) ? ' by ' . $contactUsFormSubmission->name : '';
+		$name = isset($contactUsFormSubmission->full_name) ? ' by ' . $contactUsFormSubmission->full_name : '';
 
 		$to = Configure::readOrFail('ContactUs.email.backend.to');
 		$cc = Configure::read('ContactUs.email.backend.cc', []);
@@ -62,7 +62,7 @@ class ContactUsFormSubmissionsMailer extends Mailer {
 
 		if ($cc) {
 			$cc = !is_array($cc) ? [$cc] : $cc;
-			$this->setCc($to);
+			$this->setCc($cc);
 		}
 		if ($bcc) {
 			$bcc = !is_array($bcc) ? [$bcc] : $bcc;
diff --git a/src/Model/Entity/ContactUsFormSubmission.php b/src/Model/Entity/ContactUsFormSubmission.php
index 1688aea..0260521 100644
--- a/src/Model/Entity/ContactUsFormSubmission.php
+++ b/src/Model/Entity/ContactUsFormSubmission.php
@@ -11,7 +11,8 @@ use Cake\ORM\Entity;
  * @property string $id
  * @property \Cake\I18n\DateTime $submitted_at
  * @property string $client_ip
- * @property string $name
+ * @property string|null $first_name
+ * @property string|null $last_name
  * @property string|null $email
  * @property string|null $contact_subject
  * @property string $message
@@ -32,7 +33,8 @@ class ContactUsFormSubmission extends Entity {
 	protected array $_accessible = [
 		'submitted_at' => true,
 		'client_ip' => true,
-		'name' => true,
+		'first_name' => true,
+		'last_name' => true,
 		'email' => true,
 		'contact_subject' => true,
 		'message' => true,
@@ -40,4 +42,11 @@ class ContactUsFormSubmission extends Entity {
 		'backend_email_sent' => true,
 	];
 
+	/**
+     * @return string
+     */
+	protected function _getFullName(): string {
+		return $this->get('first_name') . ' ' . $this->get('last_name');
+	}
+
 }
diff --git a/src/Model/Table/ContactUsFormSubmissionsTable.php b/src/Model/Table/ContactUsFormSubmissionsTable.php
index d738ce1..6b930c5 100644
--- a/src/Model/Table/ContactUsFormSubmissionsTable.php
+++ b/src/Model/Table/ContactUsFormSubmissionsTable.php
@@ -46,7 +46,7 @@ class ContactUsFormSubmissionsTable extends Table {
 		parent::initialize($config);
 
 		$this->setTable('contact_us_form_submissions');
-		$this->setDisplayField('name');
+		$this->setDisplayField('email');
 		$this->setPrimaryKey('id');
 	}
 
@@ -69,10 +69,15 @@ class ContactUsFormSubmissionsTable extends Table {
 			->allowEmptyString('client_ip');
 
 		$validator
-			->scalar('name')
-			->maxLength('name', 255)
-			->requirePresence('name', 'create')
-			->notEmptyString('name');
+			->scalar('first_name')
+			->maxLength('first_name', 255)
+			->requirePresence('first_name', 'create')
+			->notEmptyString('first_name');
+
+		$validator
+			->scalar('last_name')
+			->maxLength('last_name', 255)
+			->allowEmptyString('last_name');
 
 		// email
 		$validator->email('email');
diff --git a/templates/Admin/ContactUsFormSubmissions/edit.php b/templates/Admin/ContactUsFormSubmissions/edit.php
index f288a22..c289c1c 100644
--- a/templates/Admin/ContactUsFormSubmissions/edit.php
+++ b/templates/Admin/ContactUsFormSubmissions/edit.php
@@ -24,9 +24,10 @@
                 <?php
                     echo $this->Form->control('submitted_at');
                     echo $this->Form->control('client_ip');
-                    echo $this->Form->control('name');
+                    echo $this->Form->control('first_name');
+                    echo $this->Form->control('last_name');
                     echo $this->Form->control('email');
-                    echo $this->Form->control('subject');
+                    echo $this->Form->control('contact_subject');
                     echo $this->Form->control('message');
                     echo $this->Form->control('confirm_email_sent', ['empty' => true]);
                     echo $this->Form->control('backend_email_sent', ['empty' => true]);
diff --git a/templates/Admin/ContactUsFormSubmissions/index.php b/templates/Admin/ContactUsFormSubmissions/index.php
index 3606b9a..23a49ad 100644
--- a/templates/Admin/ContactUsFormSubmissions/index.php
+++ b/templates/Admin/ContactUsFormSubmissions/index.php
@@ -13,9 +13,9 @@
                     <th><?= $this->Paginator->sort('id') ?></th>
                     <th><?= $this->Paginator->sort('submitted_at') ?></th>
                     <th><?= $this->Paginator->sort('client_ip') ?></th>
-                    <th><?= $this->Paginator->sort('name') ?></th>
+                    <th><?= $this->Paginator->sort('first_name') . ' ' . $this->Paginator->sort('last_name'); ?></th>
                     <th><?= $this->Paginator->sort('email') ?></th>
-                    <th><?= $this->Paginator->sort('subject') ?></th>
+                    <th><?= $this->Paginator->sort('contact_subject') ?></th>
                     <th><?= $this->Paginator->sort('confirm_email_sent') ?></th>
                     <th><?= $this->Paginator->sort('backend_email_sent') ?></th>
                     <th class="actions"><?= __('Actions') ?></th>
@@ -27,9 +27,9 @@
                     <td><?= h($contactUsFormSubmission->id) ?></td>
                     <td><?= h($contactUsFormSubmission->submitted_at) ?></td>
                     <td><?= h($contactUsFormSubmission->client_ip) ?></td>
-                    <td><?= h($contactUsFormSubmission->name) ?></td>
+                    <td><?= h($contactUsFormSubmission->full_name) ?></td>
                     <td><?= h($contactUsFormSubmission->email) ?></td>
-                    <td><?= h($contactUsFormSubmission->subject) ?></td>
+                    <td><?= h($contactUsFormSubmission->contact_subject) ?></td>
                     <td><?= h($contactUsFormSubmission->confirm_email_sent) ?></td>
                     <td><?= h($contactUsFormSubmission->backend_email_sent) ?></td>
                     <td class="actions">
diff --git a/templates/Admin/ContactUsFormSubmissions/view.php b/templates/Admin/ContactUsFormSubmissions/view.php
index f6815c9..206d43c 100644
--- a/templates/Admin/ContactUsFormSubmissions/view.php
+++ b/templates/Admin/ContactUsFormSubmissions/view.php
@@ -15,7 +15,7 @@
     </aside>
     <div class="column column-80">
         <div class="contactUsFormSubmissions view content">
-            <h3><?= h($contactUsFormSubmission->name) ?></h3>
+            <h3><?= h($contactUsFormSubmission->email) ?></h3>
             <table>
                 <tr>
                     <th><?= __('Id') ?></th>
@@ -27,7 +27,7 @@
                 </tr>
                 <tr>
                     <th><?= __('Name') ?></th>
-                    <td><?= h($contactUsFormSubmission->name) ?></td>
+                    <td><?= h($contactUsFormSubmission->full_name) ?></td>
                 </tr>
                 <tr>
                     <th><?= __('Email') ?></th>
@@ -35,7 +35,7 @@
                 </tr>
                 <tr>
                     <th><?= __('Subject') ?></th>
-                    <td><?= h($contactUsFormSubmission->subject) ?></td>
+                    <td><?= h($contactUsFormSubmission->contact_subject) ?></td>
                 </tr>
                 <tr>
                     <th><?= __('Submitted At') ?></th>
diff --git a/templates/ContactUsFormSubmissions/add.php b/templates/ContactUsFormSubmissions/add.php
index d633cee..17e8219 100644
--- a/templates/ContactUsFormSubmissions/add.php
+++ b/templates/ContactUsFormSubmissions/add.php
@@ -5,10 +5,6 @@
  */
 ?>
 <div class="row">
-    <aside class="column">
-        <div class="side-nav">
-        </div>
-    </aside>
     <div class="column column-80">
         <div class="contactUsFormSubmissions form content">
             <?= $this->Form->create($contactUsFormSubmission) ?>
diff --git a/templates/element/ContactUsFormSubmissions/form.php b/templates/element/ContactUsFormSubmissions/form.php
index 8e9a642..22c779f 100644
--- a/templates/element/ContactUsFormSubmissions/form.php
+++ b/templates/element/ContactUsFormSubmissions/form.php
@@ -7,10 +7,10 @@
 $fields = \Cake\Core\Configure::readOrFail('ContactUs.fields');
 ?>
 <?php
-echo $this->Form->control('name');
+echo $this->Form->control('first_name');
+echo $this->Form->control('last_name');
 echo isset($fields['email']) && $fields['email'] ? $this->Form->control('email', ['required' => true]) : '';
 echo isset($fields['subject']) && $fields['subject'] ? $this->Form->control('subject', ['required' => true]) : '';
 echo $this->Form->control('message');
 echo isset($fields['captcha']) && $fields['captcha'] ? $this->Captcha->render(['placeholder' => __('Please solve the riddle')]) : '';
-
 ?>
diff --git a/templates/email/html/backend.php b/templates/email/html/backend.php
index 2dd8476..23fe650 100644
--- a/templates/email/html/backend.php
+++ b/templates/email/html/backend.php
@@ -11,7 +11,7 @@ use Cake\Core\Configure;
     <?= __d('cake_contact_us', "A contact us form submission was received at {0}", $contactUsFormSubmission->submitted_at) ?>,
 </p>
 <p>
-    <?= h($contactUsFormSubmission->name); ?>
+    <?= h($contactUsFormSubmission->full_name); ?>
 </p>
 <?php if (Configure::read('ContactUs.fields.email', false) && isset($contactUsFormSubmission->email)) : ?>
     <p>
@@ -20,13 +20,13 @@ use Cake\Core\Configure;
     </p>
 <?php endif; ?>
 
-<?php if (Configure::read('ContactUs.fields.subject', false) && isset($contactUsFormSubmission->subject)) : ?>
+<?php if (Configure::read('ContactUs.fields.subject', false) && isset($contactUsFormSubmission->contact_subject)) : ?>
     <p>
         <strong><?= __d('cake_contact_us', 'Subject: ') ?></strong>
-        <span><?= h($contactUsFormSubmission->subject); ?></span>
+        <span><?= h($contactUsFormSubmission->contact_subject); ?></span>
     </p>
 <?php endif; ?>
 <p>
     <strong><?= __d('cake_contact_us', 'Message: ') ?></strong>
     <?= h($contactUsFormSubmission->message); ?>
-</p>
\ No newline at end of file
+</p>
diff --git a/tests/Fixture/ContactUsFormSubmissionsFixture.php b/tests/Fixture/ContactUsFormSubmissionsFixture.php
index 1dad8fb..0d42546 100644
--- a/tests/Fixture/ContactUsFormSubmissionsFixture.php
+++ b/tests/Fixture/ContactUsFormSubmissionsFixture.php
@@ -3,7 +3,9 @@ declare(strict_types=1);
 
 namespace CakeContactUs\Test\Fixture;
 
+use Cake\I18n\FrozenTime;
 use Cake\TestSuite\Fixture\TestFixture;
+use Cake\Utility\Text;
 
 /**
  * ContactUsFormSubmissionsFixture
@@ -18,7 +20,21 @@ class ContactUsFormSubmissionsFixture extends TestFixture {
      * @return void
      */
 	public function init(): void {
-		$this->records = [];
+		$this->records = [
+			[
+				'id' => Text::uuid(),
+				'submitted_at' => new FrozenTime(),
+				'client_ip' => 'cli',
+				'first_name' => 'test',
+				'last_name' => 'test',
+				'email' => 'test@test.com',
+				'contact_subject' => 'subject',
+				'message' => 'what are your business hours?',
+				'confirm_email_sent' => true,
+				'backend_email_sent' => true,
+			],
+		];
+
 		parent::init();
 	}
 
diff --git a/tests/TestCase/Controller/Component/ContactUsComponentTest.php b/tests/TestCase/Controller/Component/ContactUsComponentTest.php
index a107101..2f8793b 100644
--- a/tests/TestCase/Controller/Component/ContactUsComponentTest.php
+++ b/tests/TestCase/Controller/Component/ContactUsComponentTest.php
@@ -72,13 +72,14 @@ class ContactUsComponentTest extends TestCase {
      * @return void
      */
 	public function testProcessContactUsFormSaved() {
-		$numSubmissionsBefore = $this->fetchTable('CakeContactUs/ContactUsFormSubmissions')->find()->count();
+		$numSubmissionsBefore = $this->fetchTable('CakeContactUs.ContactUsFormSubmissions')->find()->count();
 		$result = $this->component->processContactUsForm($this->component->newContactUsForm(), [
-			'name' => 'Jane Doe',
+			'first_name' => 'Jane Doe',
 			'email' => 'test@example.com',
+			'message' => 'contact us message',
 		]);
 		$this->assertNotInstanceOf(ContactUsFormSubmission::class, $result);
-		$numSubmissionsAfter = $this->fetchTable('CakeContactUs/ContactUsFormSubmissions')->find()->count();
+		$numSubmissionsAfter = $this->fetchTable('CakeContactUs.ContactUsFormSubmissions')->find()->count();
 		$this->assertEquals($numSubmissionsBefore + 1, $numSubmissionsAfter);
 	}
 
diff --git a/tests/TestCase/Controller/ContactUsFormSubmissionsControllerTest.php b/tests/TestCase/Controller/ContactUsFormSubmissionsControllerTest.php
index 4fb2b04..86e0dcb 100644
--- a/tests/TestCase/Controller/ContactUsFormSubmissionsControllerTest.php
+++ b/tests/TestCase/Controller/ContactUsFormSubmissionsControllerTest.php
@@ -105,7 +105,7 @@ class ContactUsFormSubmissionsControllerTest extends TestCase {
 			'action' => 'add',
 		];
 		$data = [
-			'name' => 'valid name',
+			'first_name' => 'valid name',
 			'email' => 'valid_email@test.com',
 			'message' => 'valid message goes here',
 		];
@@ -156,7 +156,7 @@ class ContactUsFormSubmissionsControllerTest extends TestCase {
 			'action' => 'add',
 		];
 		$data = [
-			'name' => 'valid name',
+			'first_name' => 'valid name',
 			'email' => 'valid_email@test.com',
 			'message' => 'valid message goes here',
 		];
@@ -203,7 +203,7 @@ class ContactUsFormSubmissionsControllerTest extends TestCase {
 			'action' => 'add',
 		];
 		$data = [
-			'name' => 'valid name',
+			'first_name' => 'valid name',
 			'email' => 'valid_email@test.com',
 			'message' => 'valid message goes here',
 		];
@@ -251,7 +251,7 @@ class ContactUsFormSubmissionsControllerTest extends TestCase {
 			'action' => 'add',
 		];
 		$data = [
-			'name' => 'valid name',
+			'first_name' => 'valid name',
 			'email' => 'valid_email@test.com',
 			'message' => 'valid message goes here',
 		];
@@ -290,7 +290,7 @@ class ContactUsFormSubmissionsControllerTest extends TestCase {
 			'action' => 'add',
 		];
 		$data = [
-			'name' => 'valid name',
+			'first_name' => 'valid name',
 			'email' => 'not_valid_email',
 			'message' => 'this is a valid message ',
 		];