diff --git a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java
index 6448900ac..2871b424f 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smack/chat2/ChatManager.java
@@ -218,12 +218,24 @@ public final class ChatManager extends Manager {
      *
      * @param listener the listener to remove.
      * @return <code>true</code> if the listener was active and got removed.
+     * @deprecated Use {@link #removeIncomingListener(IncomingChatMessageListener)} instead.
      */
+    @Deprecated
     @SuppressWarnings("FunctionalInterfaceClash")
     public boolean removeListener(IncomingChatMessageListener listener) {
         return incomingListeners.remove(listener);
     }
 
+    /**
+     * Remove an incoming chat message listener.
+     *
+     * @param listener the listener to remove.
+     * @return <code>true</code> if the listener was active and got removed.
+     */
+    public boolean removeIncomingListener(IncomingChatMessageListener listener) {
+        return incomingListeners.remove(listener);
+    }
+
     /**
      * Add a new listener for outgoing chat messages.
      *
@@ -252,9 +264,11 @@ public final class ChatManager extends Manager {
      *
      * @param listener the listener to remove.
      * @return <code>true</code> if the listener was active and got removed.
+     * @deprecated use {@link #removeOutgoingListener(OutgoingChatMessageListener)} instead.
      */
+    @Deprecated
     public boolean removeListener(OutgoingChatMessageListener listener) {
-        return outgoingListeners.remove(listener);
+        return removeOutgoingListener(listener);
     }
 
     /**
@@ -262,11 +276,9 @@ public final class ChatManager extends Manager {
      *
      * @param listener the listener to remove.
      * @return <code>true</code> if the listener was active and got removed.
-     * @deprecated use {@link #removeListener(OutgoingChatMessageListener)} instead.
      */
-    @Deprecated
-    public boolean removeOutoingLIstener(OutgoingChatMessageListener listener) {
-        return removeListener(listener);
+    public boolean removeOutgoingListener(OutgoingChatMessageListener listener) {
+        return outgoingListeners.remove(listener);
     }
 
     /**