diff --git a/analysis_options.yaml b/analysis_options.yaml
index dbe441e6..69388509 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -11,7 +11,7 @@ include: package:flutter_lints/flutter.yaml
 
 analyzer:
   exclude:
-    - lib/pigeon.dart
+    - lib/auto_generated_pigeon.dart
 
 linter:
   # The lint rules applied to this project can be customized in the
diff --git a/android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.kt b/android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.gen.kt
similarity index 100%
rename from android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.kt
rename to android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.gen.kt
diff --git a/example/lib/main.dart b/example/lib/main.dart
index fc2ff7e6..95718941 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:onegini/onegini.dart';
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 import 'package:onegini_example/components/display_toast.dart';
 import 'package:onegini_example/screens/login_screen.dart';
 
diff --git a/example/lib/screens/login_screen.dart b/example/lib/screens/login_screen.dart
index 2f9fd2ad..fac24bcd 100644
--- a/example/lib/screens/login_screen.dart
+++ b/example/lib/screens/login_screen.dart
@@ -7,7 +7,7 @@ import 'package:onegini/callbacks/onegini_registration_callback.dart';
 import 'package:onegini/events/onewelcome_events.dart';
 import 'package:onegini/model/request_details.dart';
 import 'package:onegini/onegini.dart';
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 import 'package:onegini_example/ow_broadcast_helper.dart';
 import 'package:onegini_example/screens/user_screen.dart';
 
diff --git a/example/lib/screens/user_screen.dart b/example/lib/screens/user_screen.dart
index c5ce6dfd..8c75c157 100644
--- a/example/lib/screens/user_screen.dart
+++ b/example/lib/screens/user_screen.dart
@@ -14,7 +14,7 @@ import 'package:onegini_example/ow_broadcast_helper.dart';
 import 'package:onegini_example/screens/qr_scan_screen.dart';
 import 'package:onegini_example/subscription_handlers/otp_subscriptions.dart';
 import 'package:url_launcher/url_launcher.dart';
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 // ignore: import_of_legacy_library_into_null_safe
 import '../main.dart';
 // ignore: import_of_legacy_library_into_null_safe
diff --git a/ios/Classes/Pigeon.swift b/ios/Classes/Pigeon.gen.swift
similarity index 100%
rename from ios/Classes/Pigeon.swift
rename to ios/Classes/Pigeon.gen.swift
diff --git a/lib/callbacks/onegini_custom_registration_callback.dart b/lib/callbacks/onegini_custom_registration_callback.dart
index ae8e5aec..463baf2c 100644
--- a/lib/callbacks/onegini_custom_registration_callback.dart
+++ b/lib/callbacks/onegini_custom_registration_callback.dart
@@ -1,4 +1,4 @@
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 class OneginiCustomRegistrationCallback {
   final api = UserClientApi();
diff --git a/lib/callbacks/onegini_fingerprint_callback.dart b/lib/callbacks/onegini_fingerprint_callback.dart
index 6d9e3555..7e153f32 100644
--- a/lib/callbacks/onegini_fingerprint_callback.dart
+++ b/lib/callbacks/onegini_fingerprint_callback.dart
@@ -1,5 +1,5 @@
 import 'dart:async';
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 /// A callback of fingerprint authentication.
 ///
diff --git a/lib/callbacks/onegini_otp_accept_deny_callback.dart b/lib/callbacks/onegini_otp_accept_deny_callback.dart
index 938a1ba2..441244c2 100644
--- a/lib/callbacks/onegini_otp_accept_deny_callback.dart
+++ b/lib/callbacks/onegini_otp_accept_deny_callback.dart
@@ -1,4 +1,4 @@
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 /// A callback for mobile authentication with OTP
 class OneginiOtpAcceptDenyCallback {
diff --git a/lib/callbacks/onegini_pin_authentication_callback.dart b/lib/callbacks/onegini_pin_authentication_callback.dart
index fbaae4c5..dea375c4 100644
--- a/lib/callbacks/onegini_pin_authentication_callback.dart
+++ b/lib/callbacks/onegini_pin_authentication_callback.dart
@@ -1,4 +1,4 @@
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 /// A callback for pin AUTHENTICATION.
 class OneginiPinAuthenticationCallback {
diff --git a/lib/callbacks/onegini_pin_registration_callback.dart b/lib/callbacks/onegini_pin_registration_callback.dart
index e9a79dd4..94fae29c 100644
--- a/lib/callbacks/onegini_pin_registration_callback.dart
+++ b/lib/callbacks/onegini_pin_registration_callback.dart
@@ -1,4 +1,4 @@
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 /// A callback for pin REGISTRATION.
 class OneginiPinRegistrationCallback {
diff --git a/lib/callbacks/onegini_registration_callback.dart b/lib/callbacks/onegini_registration_callback.dart
index 75697b75..3eb02db2 100644
--- a/lib/callbacks/onegini_registration_callback.dart
+++ b/lib/callbacks/onegini_registration_callback.dart
@@ -1,4 +1,4 @@
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 /// A callback for registration.
 class OneginiRegistrationCallback {
diff --git a/lib/events/custom_registration_event.dart b/lib/events/custom_registration_event.dart
index ebdeb4a0..89792013 100644
--- a/lib/events/custom_registration_event.dart
+++ b/lib/events/custom_registration_event.dart
@@ -1,6 +1,6 @@
 // Wrapper for Custom Registration Events
 import 'package:onegini/events/onewelcome_events.dart';
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 class InitCustomRegistrationEvent extends OWEvent {
   OWCustomInfo? customInfo;
diff --git a/lib/events/pin_event.dart b/lib/events/pin_event.dart
index 4481d5d9..aa6e1fe1 100644
--- a/lib/events/pin_event.dart
+++ b/lib/events/pin_event.dart
@@ -1,6 +1,6 @@
 // Wrapper for Pin Events
 import 'package:onegini/events/onewelcome_events.dart';
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 // For Pin Creation
 class OpenPinCreationEvent extends OWEvent {
diff --git a/lib/model/request_details.dart b/lib/model/request_details.dart
index c5de8dc7..700509f8 100644
--- a/lib/model/request_details.dart
+++ b/lib/model/request_details.dart
@@ -1,4 +1,4 @@
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 // Wrapper class for pigeon class to enforce non null map values.
 class RequestDetails {
diff --git a/lib/onegini.dart b/lib/onegini.dart
index a51352df..27dfc597 100644
--- a/lib/onegini.dart
+++ b/lib/onegini.dart
@@ -5,7 +5,7 @@ import 'package:onegini/events/onewelcome_events.dart';
 import 'package:onegini/onegini_event_listener.dart';
 import 'package:onegini/resources_methods.dart';
 import 'package:onegini/user_client.dart';
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 /// The main class used to call methods.
 class Onegini {
diff --git a/lib/pigeon.dart b/lib/onegini.gen.dart
similarity index 100%
rename from lib/pigeon.dart
rename to lib/onegini.gen.dart
diff --git a/lib/onegini_event_listener.dart b/lib/onegini_event_listener.dart
index 7a6e9193..a7341c93 100644
--- a/lib/onegini_event_listener.dart
+++ b/lib/onegini_event_listener.dart
@@ -6,7 +6,7 @@ import 'package:onegini/events/fingerprint_event.dart';
 import 'package:onegini/events/onewelcome_events.dart';
 import 'package:onegini/events/otp_event.dart';
 import 'package:onegini/events/pin_event.dart';
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 class OneginiEventListener implements NativeCallFlutterApi {
   final StreamController<OWEvent> broadCastController;
diff --git a/lib/resources_methods.dart b/lib/resources_methods.dart
index ed008a44..31dd960b 100644
--- a/lib/resources_methods.dart
+++ b/lib/resources_methods.dart
@@ -1,7 +1,7 @@
 import 'model/request_details.dart';
 import 'model/request_response.dart';
 
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 /// The class with resources methods
 class ResourcesMethods {
diff --git a/lib/user_client.dart b/lib/user_client.dart
index 58f40a36..5a913976 100644
--- a/lib/user_client.dart
+++ b/lib/user_client.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:onegini/pigeon.dart';
+import 'package:onegini/onegini.gen.dart';
 
 ///Сlass with basic methods available to the developer.
 class UserClient {
diff --git a/pigeons/README.md b/pigeons/README.md
index cacb7909..8ddb188f 100644
--- a/pigeons/README.md
+++ b/pigeons/README.md
@@ -4,11 +4,11 @@ Pidgeon is used within this project to enable type-save communication between th
 Command for code generation which is performed from top level:
 flutter pub run pigeon \
   --input pigeons/onewelcome_pigeon_interface.dart \
-  --dart_out lib/pigeon.dart \
-  --experimental_kotlin_out ./android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.kt  \
+  --dart_out lib/onegini.gen.dart \
+  --experimental_kotlin_out ./android/src/main/kotlin/com/onegini/mobile/sdk/flutter/pigeonPlugin/Pigeon.gen.kt  \
   --experimental_kotlin_package "com.onegini.mobile.sdk.flutter.pigeonPlugin" \
-  --experimental_swift_out ios/Classes/Pigeon.swift
-dart format lib/pigeon.dart
+  --experimental_swift_out ios/Classes/Pigeon.gen.swift
+dart format lib/onegini.gen.dart
 
 ## Missing documentation
 Pigeon is poorly documented; so to keep knowledge on why and how certain things are done we will refer to pull requests where we obtained information.
diff --git a/pigeons/onewelcome_pigeon_interface.dart b/pigeons/onewelcome_pigeon_interface.dart
index 87fe7ab5..f3fd3c91 100644
--- a/pigeons/onewelcome_pigeon_interface.dart
+++ b/pigeons/onewelcome_pigeon_interface.dart
@@ -21,12 +21,6 @@ class OWUserProfile {
   OWUserProfile({required this.profileId});
 }
 
-class OWRemovedUserProfile {
-  String profileId;
-
-  OWRemovedUserProfile(this.profileId);
-}
-
 class OWCustomInfo {
   int status;
   String? data;