diff --git a/src/Core.Scripts/src/FluentUICustomEvents.ts b/src/Core.Scripts/src/FluentUICustomEvents.ts
index 8066cea478..990c762026 100644
--- a/src/Core.Scripts/src/FluentUICustomEvents.ts
+++ b/src/Core.Scripts/src/FluentUICustomEvents.ts
@@ -87,7 +87,7 @@ export namespace Microsoft.FluentUI.Blazor.FluentUICustomEvents {
       }
     });
 
-    blazor.registerCustomEventType('listboxchange', {
+    blazor.registerCustomEventType('listchange', {
       browserEventName: 'listboxchange',
       createEventArgs: (event: any)=> {
         return {
@@ -155,7 +155,7 @@ export namespace Microsoft.FluentUI.Blazor.FluentUICustomEvents {
   }
 
   export function TextInput(blazor: Blazor) {
-    blazor.registerCustomEventType('immediate', {
+    blazor.registerCustomEventType('textimmediate', {
       browserEventName: 'immediate',
       createEventArgs: (event: any)=> {
        return {
diff --git a/src/Core/Components/List/FluentListbox.razor b/src/Core/Components/List/FluentListbox.razor
index f93ba8f96c..f4e9646b2e 100644
--- a/src/Core/Components/List/FluentListbox.razor
+++ b/src/Core/Components/List/FluentListbox.razor
@@ -18,7 +18,7 @@
                  name="@Name"
                  readonly="@ReadOnly"
                  required="@Required"
-                 @onlistboxchange="@OnDropdownChangeHandlerAsync"
+                 @onlistchange="@OnDropdownChangeHandlerAsync"
                  @onfocusout="@FocusOutHandlerAsync"
                  @attributes="@AdditionalAttributes">
                 <fluent-listbox style="@ListStyle">
diff --git a/src/Core/Components/TextArea/FluentTextArea.razor b/src/Core/Components/TextArea/FluentTextArea.razor
index 5ed754f93d..68b7d39a67 100644
--- a/src/Core/Components/TextArea/FluentTextArea.razor
+++ b/src/Core/Components/TextArea/FluentTextArea.razor
@@ -26,7 +26,7 @@
                      value="@CurrentValueAsString"
                      @onfocusout="@FocusOutHandlerAsync"
                      @onchange="@ChangeHandlerAsync"
-                     @onimmediate="@InputHandlerAsync"
+                     @ontextimmediate="@InputHandlerAsync"
                      @attributes="AdditionalAttributes">
     </fluent-textarea>
 </FluentField>
diff --git a/src/Core/Components/TextInput/FluentTextInput.razor b/src/Core/Components/TextInput/FluentTextInput.razor
index 08b9cbd6f8..81c3b55fdf 100644
--- a/src/Core/Components/TextInput/FluentTextInput.razor
+++ b/src/Core/Components/TextInput/FluentTextInput.razor
@@ -27,7 +27,7 @@
                        value="@CurrentValueAsString"
                        @onfocusout="@FocusOutHandlerAsync"
                        @onchange="@ChangeHandlerAsync"
-                       @onimmediate="@InputHandlerAsync"
+                       @ontextimmediate="@InputHandlerAsync"
                        @attributes="AdditionalAttributes">
 
         @if (StartTemplate != null)
diff --git a/src/Core/Events/EventHandlers.cs b/src/Core/Events/EventHandlers.cs
index ad7b3a0743..09ca98038f 100644
--- a/src/Core/Events/EventHandlers.cs
+++ b/src/Core/Events/EventHandlers.cs
@@ -33,13 +33,13 @@ namespace Microsoft.FluentUI.AspNetCore.Components;
 [EventHandler("onmenuitemchange", typeof(MenuItemEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
 [EventHandler("ontabchange", typeof(TabChangeEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
 [EventHandler("ondropdownchange", typeof(DropdownEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
-[EventHandler("onlistboxchange", typeof(DropdownEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
+[EventHandler("onlistchange", typeof(DropdownEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
 [EventHandler("ontreechanged", typeof(TreeItemChangedEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
 [EventHandler("ontreetoggle", typeof(TreeItemToggleEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
 [EventHandler("onclosecolumnoptions", typeof(EventArgs), enableStopPropagation: true, enablePreventDefault: true)]
 [EventHandler("onclosecolumnresize", typeof(EventArgs), enableStopPropagation: true, enablePreventDefault: true)]
 [EventHandler("onradiochange", typeof(RadioEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
-[EventHandler("onimmediate", typeof(ChangeEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
+[EventHandler("ontextimmediate", typeof(ChangeEventArgs), enableStopPropagation: true, enablePreventDefault: true)]
 public static class EventHandlers
 {
 }
diff --git a/tests/Core/Components/TextArea/FluentTextAreaTests.razor b/tests/Core/Components/TextArea/FluentTextAreaTests.razor
index 93e3f82635..3127e69f01 100644
--- a/tests/Core/Components/TextArea/FluentTextAreaTests.razor
+++ b/tests/Core/Components/TextArea/FluentTextAreaTests.razor
@@ -146,7 +146,7 @@
         var cut = Render(@<FluentTextArea @bind-Value="@value" Immediate="@immediate" ImmediateDelay="@immediateDelay" />);
 
         // Act
-        cut.Find("fluent-textarea").TriggerEvent("onimmediate", new ChangeEventArgs() { Value = "new value"});
+        cut.Find("fluent-textarea").TriggerEvent("ontextimmediate", new ChangeEventArgs() { Value = "new value"});
 
         // Assert: Immediate
         Assert.Equal(expectedImmediateValue, value);
diff --git a/tests/Core/Components/TextInput/FluentTextInputTests.razor b/tests/Core/Components/TextInput/FluentTextInputTests.razor
index 8f334afa1f..50a0633d7e 100644
--- a/tests/Core/Components/TextInput/FluentTextInputTests.razor
+++ b/tests/Core/Components/TextInput/FluentTextInputTests.razor
@@ -161,7 +161,7 @@
         var cut = Render(@<FluentTextInput @bind-Value="@value" Immediate="@immediate" ImmediateDelay="@immediateDelay" />);
 
         // Act
-        cut.Find("fluent-text-input").TriggerEvent("onimmediate", new ChangeEventArgs() { Value = "new value"});
+        cut.Find("fluent-text-input").TriggerEvent("ontextimmediate", new ChangeEventArgs() { Value = "new value"});
 
         // Assert: Immediate
         Assert.Equal(expectedImmediateValue, value);