diff --git a/src/android/ShutoEventManager.java b/src/android/ShutoEventManager.java
index 7490ccd..238332e 100644
--- a/src/android/ShutoEventManager.java
+++ b/src/android/ShutoEventManager.java
@@ -28,8 +28,8 @@ public class ShutoEventManager {
         return instance;
     }
     
-    public void addListener(ShutoEventListener listener, String eventName) {
-        if (listener == null || eventName == null) {
+    public void addListener(String eventName, ShutoEventListener listener) {
+        if (eventName == null || listener == null) {
             return;
         }
         
@@ -37,8 +37,8 @@ public class ShutoEventManager {
         LOG.d(TAG, "Added listener for event: " + eventName + ", total listeners: " + eventListeners.get(eventName).size());
     }
     
-    public void removeListener(ShutoEventListener listener, String eventName) {
-        if (listener == null || eventName == null) {
+    public void removeListener(String eventName, ShutoEventListener listener) {
+        if (eventName == null || listener == null) {
             return;
         }
         
diff --git a/src/ios/ShutoEventManager.h b/src/ios/ShutoEventManager.h
index 4691749..d819d17 100644
--- a/src/ios/ShutoEventManager.h
+++ b/src/ios/ShutoEventManager.h
@@ -17,8 +17,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (instancetype)sharedInstance;
 
-- (void)addListener:(id<ShutoEventListener>)listener forEvent:(NSString *)eventName;
-- (void)removeListener:(id<ShutoEventListener>)listener forEvent:(NSString *)eventName;
+- (void)addListenerForEvent:(NSString *)eventName listener:(id<ShutoEventListener>)listener;
+- (void)removeListenerForEvent:(NSString *)eventName listener:(id<ShutoEventListener>)listener;
 - (void)removeListener:(id<ShutoEventListener>)listener;
 - (void)fireEvent:(NSString *)eventName data:(NSDictionary *)data;
 
diff --git a/src/ios/ShutoEventManager.m b/src/ios/ShutoEventManager.m
index 4a74b25..dcd2dcc 100644
--- a/src/ios/ShutoEventManager.m
+++ b/src/ios/ShutoEventManager.m
@@ -31,8 +31,8 @@
     return self;
 }
 
-- (void)addListener:(id<ShutoEventListener>)listener forEvent:(NSString *)eventName {
-    if (!listener || !eventName) {
+- (void)addListenerForEvent:(NSString *)eventName listener:(id<ShutoEventListener>)listener {
+    if (!eventName || !listener) {
         return;
     }
     
@@ -45,8 +45,8 @@
     }
 }
 
-- (void)removeListener:(id<ShutoEventListener>)listener forEvent:(NSString *)eventName {
-    if (!listener || !eventName) {
+- (void)removeListenerForEvent:(NSString *)eventName listener:(id<ShutoEventListener>)listener {
+    if (!eventName || !listener) {
         return;
     }