diff --git a/src/app/components/autocomplete/autocomplete.interface.ts b/src/app/components/autocomplete/autocomplete.interface.ts
index 659e2c882d6..b38cf56552d 100644
--- a/src/app/components/autocomplete/autocomplete.interface.ts
+++ b/src/app/components/autocomplete/autocomplete.interface.ts
@@ -37,7 +37,7 @@ export interface AutoCompleteDropdownClickEvent {
  * @see {@link AutoComplete.onSelect}
  * @group Events
  */
-export interface AutoCompleteOnSelectEvent {
+export interface AutoCompleteSelectEvent {
     /**
      * Browser event.
      */
diff --git a/src/app/components/autocomplete/autocomplete.ts b/src/app/components/autocomplete/autocomplete.ts
index f7b00499d9e..7ce3ba92bee 100755
--- a/src/app/components/autocomplete/autocomplete.ts
+++ b/src/app/components/autocomplete/autocomplete.ts
@@ -40,7 +40,7 @@ import { SpinnerIcon } from 'primeng/icons/spinner';
 import { TimesIcon } from 'primeng/icons/times';
 import { ChevronDownIcon } from 'primeng/icons/chevrondown';
 import { Nullable, VoidListener } from 'primeng/ts-helpers';
-import { AutoCompleteCompleteEvent, AutoCompleteDropdownClickEvent, AutoCompleteLazyLoadEvent, AutoCompleteOnSelectEvent, AutoCompleteUnselectEvent } from './autocomplete.interface';
+import { AutoCompleteCompleteEvent, AutoCompleteDropdownClickEvent, AutoCompleteLazyLoadEvent, AutoCompleteSelectEvent, AutoCompleteUnselectEvent } from './autocomplete.interface';
 
 export const AUTOCOMPLETE_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR,
@@ -611,10 +611,10 @@ export class AutoComplete implements AfterViewChecked, AfterContentInit, OnDestr
     @Output() completeMethod: EventEmitter<AutoCompleteCompleteEvent> = new EventEmitter<AutoCompleteCompleteEvent>();
     /**
      * Callback to invoke when a suggestion is selected.
-     * @param {AutoCompleteOnSelectEvent} event - custom select event.
+     * @param {AutoCompleteSelectEvent} event - custom select event.
      * @group Emits
      */
-    @Output() onSelect: EventEmitter<AutoCompleteOnSelectEvent> = new EventEmitter<AutoCompleteOnSelectEvent>();
+    @Output() onSelect: EventEmitter<AutoCompleteSelectEvent> = new EventEmitter<AutoCompleteSelectEvent>();
     /**
      * Callback to invoke when a selected value is removed.
      * @param {AutoCompleteUnselectEvent} event - custom unselect event.
diff --git a/src/app/components/inputswitch/inputswitch.interface.ts b/src/app/components/inputswitch/inputswitch.interface.ts
index 9d7164b9a60..b9ab1377d62 100644
--- a/src/app/components/inputswitch/inputswitch.interface.ts
+++ b/src/app/components/inputswitch/inputswitch.interface.ts
@@ -4,7 +4,7 @@ import { InputSwitch } from './inputswitch';
  * @see {@link InputSwitch.onChange}
  * @group Events
  */
-export interface InputSwitchOnChangeEvent {
+export interface InputSwitchChangeEvent {
     /**
      * Browser event.
      */
diff --git a/src/app/components/inputswitch/inputswitch.ts b/src/app/components/inputswitch/inputswitch.ts
index 9390d594981..a86257d3d37 100755
--- a/src/app/components/inputswitch/inputswitch.ts
+++ b/src/app/components/inputswitch/inputswitch.ts
@@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, NgModule, Output, ViewChild, ViewEncapsulation, forwardRef } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
-import { InputSwitchOnChangeEvent } from './inputswitch.interface';
+import { InputSwitchChangeEvent } from './inputswitch.interface';
 
 export const INPUTSWITCH_VALUE_ACCESSOR: any = {
     provide: NG_VALUE_ACCESSOR,
@@ -110,10 +110,10 @@ export class InputSwitch {
     @Input() ariaLabelledBy: string | undefined;
     /**
      * Callback to invoke when the on value change.
-     * @param {InputSwitchOnChangeEvent} event - Custom change event.
+     * @param {InputSwitchChangeEvent} event - Custom change event.
      * @group Emits
      */
-    @Output() onChange: EventEmitter<InputSwitchOnChangeEvent> = new EventEmitter<InputSwitchOnChangeEvent>();
+    @Output() onChange: EventEmitter<InputSwitchChangeEvent> = new EventEmitter<InputSwitchChangeEvent>();
 
     @ViewChild('input') input!: ElementRef;
 
diff --git a/src/app/showcase/layout/config/app.config.component.ts b/src/app/showcase/layout/config/app.config.component.ts
index ac777ff6472..cc664fd77f5 100644
--- a/src/app/showcase/layout/config/app.config.component.ts
+++ b/src/app/showcase/layout/config/app.config.component.ts
@@ -2,7 +2,7 @@ import { CommonModule, DOCUMENT } from '@angular/common';
 import { Component, EventEmitter, Inject, Output, Renderer2 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { ButtonModule } from 'primeng/button';
-import { InputSwitchModule, InputSwitchOnChangeEvent } from 'primeng/inputswitch';
+import { InputSwitchModule, InputSwitchChangeEvent } from 'primeng/inputswitch';
 import { RadioButtonModule } from 'primeng/radiobutton';
 import { SelectButtonChangeEvent, SelectButtonModule } from 'primeng/selectbutton';
 import { SidebarModule } from 'primeng/sidebar';
@@ -113,7 +113,7 @@ export class AppConfigComponent {
         this.configService.setInputStyle(event.value);
     }
 
-    onRippleChange(event: InputSwitchOnChangeEvent) {
+    onRippleChange(event: InputSwitchChangeEvent) {
         this.configService.setRipple(event.checked);
     }