diff --git a/example/lib/get/core_module.dart b/example/lib/get/core_module.dart
index 42b6250..77dd18f 100644
--- a/example/lib/get/core_module.dart
+++ b/example/lib/get/core_module.dart
@@ -18,7 +18,7 @@ class CoreModule extends GetModule {
               ..init(
                 navigator: GetAppNavigator(),
                 feedbacksExecutor: GetFeedbacksExecutor(),
-                moduleRegistries: [
+                eventHandlersRegistries: [
                   ProfileModuleRegistries(
                     () => Get.find<IProfileRepository>(),
                   ),
diff --git a/example/lib/modular/core_module.dart b/example/lib/modular/core_module.dart
index 39b657b..4660cf6 100644
--- a/example/lib/modular/core_module.dart
+++ b/example/lib/modular/core_module.dart
@@ -16,7 +16,7 @@ class CoreModule extends Module {
           (i) => Buzz
             ..init(
               navigator: ModularAppNavigator(),
-              moduleRegistries: [
+              eventHandlersRegistries: [
                 ProfileModuleRegistries(
                   () => Modular.get<IProfileRepository>(),
                 ),
diff --git a/lib/buzz_impl.dart b/lib/buzz_impl.dart
index 4138f2a..39d25e0 100644
--- a/lib/buzz_impl.dart
+++ b/lib/buzz_impl.dart
@@ -25,7 +25,7 @@ abstract class IBuzzBase {
   void init({
     required Navigator navigator,
     FeedbacksExecutor? feedbacksExecutor,
-    List<BuzzEventHandlersRegistries>? moduleRegistries,
+    List<BuzzEventHandlersRegistries>? eventHandlersRegistries,
   });
 
   void fire(dynamic message);
@@ -50,17 +50,17 @@ class BuzzBase implements IBuzzBase {
 
   late Navigator _navigator;
   late FeedbacksExecutor _feedbacksExecutor;
-  List<BuzzEventHandlersRegistries>? _moduleRegistries;
+  List<BuzzEventHandlersRegistries>? _eventHandlersRegistries;
 
   @override
   void init({
     required Navigator navigator,
     FeedbacksExecutor? feedbacksExecutor,
-    List<BuzzEventHandlersRegistries>? moduleRegistries,
+    List<BuzzEventHandlersRegistries>? eventHandlersRegistries,
   }) {
     _navigator = navigator;
     _feedbacksExecutor = feedbacksExecutor ?? DefaultFeedbacksExecutor();
-    _moduleRegistries = moduleRegistries;
+    _eventHandlersRegistries = eventHandlersRegistries;
 
     _bindNavigationCommandHandler();
     _bindRegistries();
@@ -94,10 +94,10 @@ class BuzzBase implements IBuzzBase {
   }
 
   void _bindRegistries() {
-    _moduleRegistries?.forEach((moduleRegistry) {
-      uiEvents.bindRegistries(moduleRegistry.uiEvents);
-      commands.bindRegistries(moduleRegistry.commands);
-      appEvents.bindRegistries(moduleRegistry.appEvents);
+    _eventHandlersRegistries?.forEach((eventHandlerRegistry) {
+      uiEvents.bindRegistries(eventHandlerRegistry.uiEvents);
+      commands.bindRegistries(eventHandlerRegistry.commands);
+      appEvents.bindRegistries(eventHandlerRegistry.appEvents);
     });
   }
 }
diff --git a/lib/infra/registries.dart b/lib/infra/registries.dart
index a11c925..acb9861 100644
--- a/lib/infra/registries.dart
+++ b/lib/infra/registries.dart
@@ -1,23 +1,5 @@
 import 'package:buzz/buzz.dart';
 
-abstract class IBuzzDataRegistries {
-  List<DataRegistry> get registries;
-}
-
-abstract class BuzzDataRegistries extends IBuzzDataRegistries {}
-
-class DataRegistry<T> {
-  DataRegistry({
-    required this.binder,
-  });
-
-  final Function(T) binder;
-  dynamic get registryType => T;
-
-  @override
-  String toString() => '$runtimeType type: $T handler: $binder';
-}
-
 abstract class IBuzzEventHandlersRegistries {
   List<CommandRegistry> get commands;
   List<UiEventRegistry> get uiEvents;
diff --git a/test/registries_test.dart b/test/registries_test.dart
index 602772d..36f4bd6 100644
--- a/test/registries_test.dart
+++ b/test/registries_test.dart
@@ -14,13 +14,4 @@ void main() {
     );
     expect(registry.registryType, BaseAppEvent);
   });
-
-  test('DataRegistry.registryType works for fake repository', () {
-    final registry = DataRegistry<FakeDataRepository>(
-      binder: (repository) {
-        print('Add $repository to DI');
-      },
-    );
-    expect(registry.registryType, FakeDataRepository);
-  });
 }