diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java
index 2574f47eb..e01863620 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/ChatMarkersManager.java
@@ -44,7 +44,7 @@ import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Stanza;
 import org.jivesoftware.smackx.chat_markers.element.ChatMarkersElements;
 import org.jivesoftware.smackx.chat_markers.filter.ChatMarkersFilter;
-import org.jivesoftware.smackx.chat_markers.filter.EligibleForChatMarker;
+import org.jivesoftware.smackx.chat_markers.filter.EligibleForChatMarkerFilter;
 import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
 
 import org.jxmpp.jid.EntityBareJid;
@@ -76,14 +76,14 @@ public final class ChatMarkersManager extends Manager {
             MessageTypeFilter.NORMAL_OR_CHAT,
             new StanzaExtensionFilter(ChatMarkersElements.NAMESPACE),
             PossibleFromTypeFilter.ENTITY_BARE_JID,
-            EligibleForChatMarker.INSTANCE
+            EligibleForChatMarkerFilter.INSTANCE
     );
 
     private static final StanzaFilter OUTGOING_MESSAGE_FILTER = new AndFilter(
             MessageTypeFilter.NORMAL_OR_CHAT,
             MessageWithBodiesFilter.INSTANCE,
             new NotFilter(ChatMarkersFilter.INSTANCE),
-            EligibleForChatMarker.INSTANCE
+            EligibleForChatMarkerFilter.INSTANCE
     );
     // @FORMATTER:ON
 
diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarker.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarkerFilter.java
similarity index 89%
rename from smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarker.java
rename to smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarkerFilter.java
index 9f8f93c3d..09492c210 100644
--- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarker.java
+++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/filter/EligibleForChatMarkerFilter.java
@@ -29,11 +29,11 @@ import org.jivesoftware.smackx.chatstates.ChatStateManager;
  * @see <a href="http://xmpp.org/extensions/xep-0333.html">XEP-0333: Chat
  * Markers</a>
  */
-public final class EligibleForChatMarker extends StanzaExtensionFilter {
+public final class EligibleForChatMarkerFilter extends StanzaExtensionFilter {
 
-    public static final EligibleForChatMarker INSTANCE = new EligibleForChatMarker(ChatStateManager.NAMESPACE);
+    public static final EligibleForChatMarkerFilter INSTANCE = new EligibleForChatMarkerFilter(ChatStateManager.NAMESPACE);
 
-    private EligibleForChatMarker(String namespace) {
+    private EligibleForChatMarkerFilter(String namespace) {
         super(namespace);
     }