diff --git a/legacy/elementary/src/lib/elm_map.c b/legacy/elementary/src/lib/elm_map.c
index d6f3a48a4f..4541279c54 100644
--- a/legacy/elementary/src/lib/elm_map.c
+++ b/legacy/elementary/src/lib/elm_map.c
@@ -4612,13 +4612,9 @@ _elm_map_name_add(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, const char *address, d
                           name_cb, data);
 }
 
-EAPI void
-elm_map_name_search(const Evas_Object *obj,
-                  const char *address,
-                  Elm_Map_Name_List_Cb name_cb,
-                  void *data)
+EOLIAN static void
+_elm_map_name_search(Eo *obj, Elm_Map_Data *_pd EINA_UNUSED, const char *address, Elm_Map_Name_List_Cb name_cb, void *data)
 {
-   ELM_MAP_CHECK(obj);
    if (address)
      _name_list_request(obj, ELM_MAP_NAME_METHOD_SEARCH, address, 0, 0,
                         name_cb, data);
diff --git a/legacy/elementary/src/lib/elm_map.eo b/legacy/elementary/src/lib/elm_map.eo
index 8cce2657cb..0c6757c47b 100644
--- a/legacy/elementary/src/lib/elm_map.eo
+++ b/legacy/elementary/src/lib/elm_map.eo
@@ -613,6 +613,23 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable)
             @in void *data; /*@ The user callback data. */
          }
       }
+      name_search {
+         /*@
+         @brief Requests a list of addresses corresponding to a given name.
+
+         @since 1.8
+
+         @remarks This is used if you want to search the address from a name.
+
+         @internal
+         @ingroup Map */
+         const;
+         params {
+            @in const(char)* address; /*@ The address. */
+            @in Elm_Map_Name_List_Cb name_cb; /*@ The callback function. */
+            @in void *data; /*@ The user callback data. */
+         }
+      }
       region_bring_in {
          /*@
          Animatedly bring in given coordinates to the center of the map.
diff --git a/legacy/elementary/src/lib/elm_map_legacy.h b/legacy/elementary/src/lib/elm_map_legacy.h
index 4c7aff27d7..617652234f 100644
--- a/legacy/elementary/src/lib/elm_map_legacy.h
+++ b/legacy/elementary/src/lib/elm_map_legacy.h
@@ -10,22 +10,4 @@
  */
 EAPI Evas_Object          *elm_map_add(Evas_Object *parent);
 
-/**
- * @internal
- *
- * @brief Requests a list of addresses corresponding to a given name.
- *
- * @since 1.8
- *
- * @remarks This is used if you want to search the address from a name.
- *
- * @param obj The map object
- * @param address The address
- * @param name_cb The callback function
- * @param data The user callback data
- *
- * @ingroup Map
- */
-EAPI void                  elm_map_name_search(const Evas_Object *obj, const char *address, Elm_Map_Name_List_Cb name_cb, void *data);
-
 #include "elm_map.eo.legacy.h"