diff --git a/gajim/gtk/search.py b/gajim/gtk/component_search.py
similarity index 99%
rename from gajim/gtk/search.py
rename to gajim/gtk/component_search.py
index c66b18ee75cee9219f42e64e9b5713f71acc528a..8ca8fd1aaf5c772aaa632ef1c69d0280a6a9206e 100644
--- a/gajim/gtk/search.py
+++ b/gajim/gtk/component_search.py
@@ -47,7 +47,7 @@
 log = logging.getLogger('gajim.gui.search')
 
 
-class DirectorySearch(Assistant, EventHelper):
+class ComponentSearch(Assistant, EventHelper):
     def __init__(self,
                  account: str,
                  jid: str,
diff --git a/gajim/gtk/discovery.py b/gajim/gtk/discovery.py
index 64077815fbdedcf697c7d32b89e5854fd1911be9..cdd7d5e84d6131a53f50ce4b38b4eea18102a8a0 100644
--- a/gajim/gtk/discovery.py
+++ b/gajim/gtk/discovery.py
@@ -59,7 +59,7 @@
 from gajim.common.const import StyleAttr
 
 from .dialogs import ErrorDialog
-from .search import DirectorySearch
+from .component_search import ComponentSearch
 from .util import icon_exists
 from .builder import get_builder
 from .util import open_window
@@ -1310,7 +1310,7 @@ def on_search_button_clicked(self, widget=None):
         if not iter_:
             return
         service = model[iter_][0]
-        DirectorySearch(self.account, service, self.window.window)
+        ComponentSearch(self.account, service, self.window.window)
 
     def cleanup(self):
         AgentBrowser.cleanup(self)