diff --git a/src/haapi-react-sdk/haapi-stepper/README.md b/src/haapi-react-sdk/haapi-stepper/README.md
index 54faf3ed..7d29be71 100644
--- a/src/haapi-react-sdk/haapi-stepper/README.md
+++ b/src/haapi-react-sdk/haapi-stepper/README.md
@@ -299,28 +299,28 @@ const { app, input } = error || {};
 
 ##### HAAPI Error Utils
 
-###### HaapiErrorNotifier
+###### HaapiStepperErrorNotifier
 **Purpose**: Toast-based notification system for HAAPI `AppError`s, and optionally, `InputErrors`s:
 
 **Example Usage**:
 ```tsx
-<HaapiErrorNotifier>
+<HaapiStepperErrorNotifier>
   <YourApplication />
-</HaapiErrorNotifier>
+</HaapiStepperErrorNotifier>
 ```
 
 **Features:**
 - Automatically shows notifications for `AppError` and, optionally, `InputError`.
 - Auto-dismisses and manually dismisses with a close button.
 
-###### HaapiValidationErrorInputWrapper (Input-Level Errors)
+###### HaapiStepperFormValidationErrorInputWrapper (Input-Level Errors)
 **Purpose**: A field-specific error display for HAAPI validation `InputError`s:
 
 **Example Usage**:
 ```tsx
-<HaapiValidationErrorInputWrapper fieldName="username">
+<HaapiStepperFormValidationErrorInputWrapper fieldName="username">
   <input name="username" type="text" />
-</HaapiValidationErrorInputWrapper>
+</HaapiStepperFormValidationErrorInputWrapper>
 ```
 
 **Features:**
diff --git a/src/haapi-react-sdk/haapi-stepper/feature/stepper/HaapiStepperErrorNotifier.tsx b/src/haapi-react-sdk/haapi-stepper/feature/stepper/HaapiStepperErrorNotifier.tsx
index 23ed821e..8bd4f697 100644
--- a/src/haapi-react-sdk/haapi-stepper/feature/stepper/HaapiStepperErrorNotifier.tsx
+++ b/src/haapi-react-sdk/haapi-stepper/feature/stepper/HaapiStepperErrorNotifier.tsx
@@ -15,7 +15,7 @@ import { createPortal } from 'react-dom';
 import { useHaapiStepper } from './HaapiStepperHook';
 import { HaapiStepperAppError, HaapiStepperInputError } from './haapi-stepper.types';
 
-interface HaapiErrorNotifierProps {
+interface HaapiStepperErrorNotifierProps {
   children: ReactNode;
   showInputErrorNotifications?: boolean;
   notificationDuration?: number;
@@ -27,7 +27,7 @@ export function HaapiStepperErrorNotifier({
   showInputErrorNotifications = true,
   notificationDuration = 10000,
   errorFormatter = defaultErrorFormatter,
-}: HaapiErrorNotifierProps) {
+}: HaapiStepperErrorNotifierProps) {
   const { error } = useHaapiStepper();
   const currentError = error?.app ?? (showInputErrorNotifications ? error?.input : null);
   const [dismissedError, setDismissedError] = useState<HaapiStepperAppError | HaapiStepperInputError | null>(null);