diff --git a/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.html b/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.html
index 4cbd31254..2fcd3a615 100644
--- a/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.html
+++ b/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.html
@@ -1,4 +1,7 @@
-<form [formGroup]="feedbackForm" class="feedback-form">
+<form
+  [formGroup]="feedbackForm"
+  class="feedback-form"
+  (ngSubmit)="submitForm()">
   <legend class="feedback-form-title">Tell us what you think</legend>
   <input
     class="feedback-form-control"
@@ -10,8 +13,7 @@
     [formControl]="feedbackForm.controls.email"
     placeholder="Email"
     type="text" />
-  <app-feedback-control (ratingUpdated)="rating = $event">
-  </app-feedback-control>
+  <app-rating-control (ratingUpdated)="rating = $event"> </app-rating-control>
   <textarea
     class="feedback-form-control"
     [formControl]="feedbackForm.controls.comment"
@@ -20,9 +22,8 @@
     class="feedback-form-submit"
     type="submit"
     [disabled]="
-      feedbackForm.touched && (rating === null || feedbackForm.invalid)
-    "
-    (click)="submitForm()">
+      !feedbackForm.touched || rating === null || feedbackForm.invalid
+    ">
     Submit
   </button>
 </form>
diff --git a/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.ts b/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.ts
index 80d19463f..9fd759ae9 100644
--- a/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.ts
+++ b/apps/forms/control-value-accessor/src/app/feedback-form/feedback-form.component.ts
@@ -5,11 +5,11 @@ import { Validators } from '@angular/forms';
 import { FormControl } from '@angular/forms';
 import { FormGroup } from '@angular/forms';
 import { ReactiveFormsModule } from '@angular/forms';
-import { FeedbackControlComponent } from '../feedback-control/feedback-control.component';
+import { RatingControlComponent } from '../rating-control/rating-control.component';
 
 @Component({
   standalone: true,
-  imports: [FeedbackControlComponent, ReactiveFormsModule],
+  imports: [RatingControlComponent, ReactiveFormsModule],
   selector: 'app-feedback-form',
   templateUrl: 'feedback-form.component.html',
   styleUrls: ['feedback-form.component.scss'],
diff --git a/apps/forms/control-value-accessor/src/app/feedback-control/feedback-control.component.html b/apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.html
similarity index 100%
rename from apps/forms/control-value-accessor/src/app/feedback-control/feedback-control.component.html
rename to apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.html
diff --git a/apps/forms/control-value-accessor/src/app/feedback-control/feedback-control.component.scss b/apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.scss
similarity index 100%
rename from apps/forms/control-value-accessor/src/app/feedback-control/feedback-control.component.scss
rename to apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.scss
diff --git a/apps/forms/control-value-accessor/src/app/feedback-control/feedback-control.component.ts b/apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.ts
similarity index 74%
rename from apps/forms/control-value-accessor/src/app/feedback-control/feedback-control.component.ts
rename to apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.ts
index b54dfbbd5..551cdbdc0 100644
--- a/apps/forms/control-value-accessor/src/app/feedback-control/feedback-control.component.ts
+++ b/apps/forms/control-value-accessor/src/app/rating-control/rating-control.component.ts
@@ -4,11 +4,11 @@ import { Component } from '@angular/core';
 
 @Component({
   standalone: true,
-  selector: 'app-feedback-control',
-  templateUrl: 'feedback-control.component.html',
-  styleUrls: ['feedback-control.component.scss'],
+  selector: 'app-rating-control',
+  templateUrl: 'rating-control.component.html',
+  styleUrls: ['rating-control.component.scss'],
 })
-export class FeedbackControlComponent {
+export class RatingControlComponent {
   @Output()
   readonly ratingUpdated: EventEmitter<string> = new EventEmitter<string>();