stefan pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=a6592b1ec6efe862008d1038327cb4a0b8fd636a

commit a6592b1ec6efe862008d1038327cb4a0b8fd636a
Author: Stefan Schmidt <ste...@osg.samsung.com>
Date:   Wed Mar 16 16:05:31 2016 +0100

    docs: bring back docs from eo files by switching to the new group name
    
    During the migration of docs to the eo file the group name changed to have a
    Elm_ prefix which resulted in our docs not including this group and not 
showing
    any of the docs in there. Switching to the new name fixes this.
    
    Having this prefix makes sense especially as we are now merging elm into 
efl.
    
    @fix
    
    Fixes T3109
---
 doc/index.doxy                           | 104 ++++++++++++++--------------
 src/lib/elc_combobox.h                   |   2 +-
 src/lib/elc_combobox_legacy.h            |   2 +-
 src/lib/elc_ctxpopup.h                   |   2 +-
 src/lib/elc_ctxpopup_legacy.h            |   2 +-
 src/lib/elc_fileselector.h               |   4 +-
 src/lib/elc_fileselector_button.h        |   2 +-
 src/lib/elc_fileselector_button_legacy.h |   2 +-
 src/lib/elc_fileselector_entry.h         |   2 +-
 src/lib/elc_fileselector_entry_legacy.h  |   2 +-
 src/lib/elc_fileselector_eo.h            |   2 +-
 src/lib/elc_fileselector_legacy.h        |  50 +++++++-------
 src/lib/elc_hoversel.h                   |   2 +-
 src/lib/elc_hoversel_legacy.h            |   2 +-
 src/lib/elc_popup.h                      |   2 +-
 src/lib/elc_popup_eo.h                   |   2 +-
 src/lib/elc_popup_legacy.h               |   2 +-
 src/lib/elm_actionslider.h               |   2 +-
 src/lib/elm_actionslider_legacy.h        |   4 +-
 src/lib/elm_bg.h                         |   2 +-
 src/lib/elm_bg_legacy.h                  |  10 +--
 src/lib/elm_bubble.h                     |   2 +-
 src/lib/elm_bubble_legacy.h              |   2 +-
 src/lib/elm_button.h                     |   4 +-
 src/lib/elm_button_legacy.h              |   4 +-
 src/lib/elm_calendar.h                   |   4 +-
 src/lib/elm_calendar_common.h            |   2 +-
 src/lib/elm_calendar_legacy.h            |   2 +-
 src/lib/elm_check.h                      |   2 +-
 src/lib/elm_check_legacy.h               |   2 +-
 src/lib/elm_clock.h                      |   4 +-
 src/lib/elm_clock_legacy.h               |   2 +-
 src/lib/elm_colorselector.h              |   2 +-
 src/lib/elm_colorselector_common.h       |   2 +-
 src/lib/elm_colorselector_legacy.h       |   2 +-
 src/lib/elm_config.h                     |   8 +--
 src/lib/elm_datetime.h                   |   4 +-
 src/lib/elm_datetime_common.h            |   2 +-
 src/lib/elm_datetime_legacy.h            |   2 +-
 src/lib/elm_dayselector.h                |   4 +-
 src/lib/elm_dayselector_legacy.h         |   2 +-
 src/lib/elm_deprecated.h                 | 112 +++++++++++++++----------------
 src/lib/elm_diskselector.h               |   4 +-
 src/lib/elm_diskselector_legacy.h        |   2 +-
 src/lib/elm_entry.h                      |   2 +-
 src/lib/elm_entry_common.h               |   2 +-
 src/lib/elm_entry_legacy.h               |  10 +--
 src/lib/elm_flip.h                       |   2 +-
 src/lib/elm_flip_legacy.h                |   4 +-
 src/lib/elm_flipselector.h               |   4 +-
 src/lib/elm_flipselector_legacy.h        |   2 +-
 src/lib/elm_frame.h                      |   2 +-
 src/lib/elm_frame_legacy.h               |   2 +-
 src/lib/elm_glview.h                     |   4 +-
 src/lib/elm_glview_common.h              |   2 +-
 src/lib/elm_glview_legacy.h              |   2 +-
 src/lib/elm_hover.h                      |   2 +-
 src/lib/elm_hover_legacy.h               |   6 +-
 src/lib/elm_icon.h                       |   2 +-
 src/lib/elm_icon_legacy.h                |   2 +-
 src/lib/elm_image.h                      |   4 +-
 src/lib/elm_image_eo.h                   |   2 +-
 src/lib/elm_image_legacy.h               |  22 +++---
 src/lib/elm_index.h                      |   4 +-
 src/lib/elm_index_eo.h                   |   2 +-
 src/lib/elm_index_legacy.h               |   2 +-
 src/lib/elm_inwin.h                      |   4 +-
 src/lib/elm_inwin_legacy.h               |   8 +--
 src/lib/elm_label.h                      |   2 +-
 src/lib/elm_label_eo.h                   |   2 +-
 src/lib/elm_label_legacy.h               |   2 +-
 src/lib/elm_list.h                       |   4 +-
 src/lib/elm_list_eo.h                    |   2 +-
 src/lib/elm_list_legacy.h                |   2 +-
 src/lib/elm_map.h                        |   2 +-
 src/lib/elm_map_common.h                 |   2 +-
 src/lib/elm_map_legacy.h                 |   2 +-
 src/lib/elm_mapbuf.h                     |   4 +-
 src/lib/elm_mapbuf_eo.h                  |   2 +-
 src/lib/elm_mapbuf_legacy.h              |   2 +-
 src/lib/elm_menu.h                       |   2 +-
 src/lib/elm_menu_legacy.h                |   6 +-
 src/lib/elm_need.h                       |   4 +-
 src/lib/elm_notify.h                     |   2 +-
 src/lib/elm_notify_eo.h                  |   2 +-
 src/lib/elm_notify_legacy.h              |   6 +-
 src/lib/elm_panel.h                      |   2 +-
 src/lib/elm_panel_common.h               |   2 +-
 src/lib/elm_panel_legacy.h               |   2 +-
 src/lib/elm_photo.h                      |   2 +-
 src/lib/elm_photo_eo.h                   |   2 +-
 src/lib/elm_photo_legacy.h               |   4 +-
 src/lib/elm_photocam.h                   |   2 +-
 src/lib/elm_photocam_legacy.h            |   8 +--
 src/lib/elm_prefs.h                      |   2 +-
 src/lib/elm_prefs_common.h               |   2 +-
 src/lib/elm_prefs_eo.h                   |   2 +-
 src/lib/elm_prefs_legacy.h               |   2 +-
 src/lib/elm_progressbar.h                |   2 +-
 src/lib/elm_progressbar_common.h         |   2 +-
 src/lib/elm_progressbar_legacy.h         |   2 +-
 src/lib/elm_radio.h                      |   2 +-
 src/lib/elm_radio_legacy.h               |   2 +-
 src/lib/elm_removed.h                    |  90 ++++++++++++-------------
 src/lib/elm_route.c                      |   2 +-
 src/lib/elm_route.h                      |   2 +-
 src/lib/elm_route_legacy.h               |   2 +-
 src/lib/elm_segment_control.h            |   4 +-
 src/lib/elm_segment_control_legacy.h     |   2 +-
 src/lib/elm_separator.h                  |   2 +-
 src/lib/elm_separator_legacy.h           |   2 +-
 src/lib/elm_slider.h                     |   4 +-
 src/lib/elm_slider_common.h              |   2 +-
 src/lib/elm_slider_legacy.h              |   2 +-
 src/lib/elm_slideshow.h                  |   4 +-
 src/lib/elm_slideshow_common.h           |   2 +-
 src/lib/elm_slideshow_legacy.h           |   2 +-
 src/lib/elm_spinner.h                    |   4 +-
 src/lib/elm_spinner_legacy.h             |   6 +-
 src/lib/elm_thumb.h                      |   4 +-
 src/lib/elm_thumb_common.h               |   2 +-
 src/lib/elm_thumb_legacy.h               |   6 +-
 src/lib/elm_toolbar.h                    |   4 +-
 src/lib/elm_toolbar_common.h             |   2 +-
 src/lib/elm_toolbar_eo.h                 |   2 +-
 src/lib/elm_toolbar_legacy.h             |  10 +--
 src/lib/elm_tooltip.h                    |  32 ++++-----
 src/lib/elm_video.h                      |   4 +-
 src/lib/elm_video_legacy.h               |   8 +--
 src/lib/elm_web.h                        |   4 +-
 src/lib/elm_web_common.h                 |   2 +-
 src/lib/elm_web_legacy.h                 |   6 +-
 src/lib/elm_win.h                        |   2 +-
 src/lib/elm_win_common.h                 |   2 +-
 src/lib/elm_win_eo.h                     |   2 +-
 src/lib/elm_win_legacy.h                 |  28 ++++----
 src/lib/els_tooltip.c                    |   2 +-
 137 files changed, 412 insertions(+), 412 deletions(-)

diff --git a/doc/index.doxy b/doc/index.doxy
index f20bb0a..41fa963 100644
--- a/doc/index.doxy
+++ b/doc/index.doxy
@@ -40,205 +40,205 @@
  *
  * Here is a list of the widgets and some images to give you an idea of what
  * they are:
- * @li @ref Actionslider
+ * @li @ref Elm_Actionslider
  *
  * @image html img/widget/actionslider/preview-00.png
  * @image latex img/widget/actionslider/preview-00.eps
- * @li @ref Bg
+ * @li @ref Elm_Bg
  *
  * @image html img/widget/bg/preview-00.png
  * @image latex img/widget/bg/preview-00.eps
- * @li @ref Bubble
+ * @li @ref Elm_Bubble
  *
  * @image html img/widget/bubble/preview-00.png
  * @image latex img/widget/bubble/preview-00.eps
- * @li @ref Button
+ * @li @ref Elm_Button
  *
  * @image html img/widget/button/preview-00.png
  * @image latex img/widget/button/preview-00.eps
- * @li @ref Calendar
+ * @li @ref Elm_Calendar
  *
  * @image html img/widget/calendar/preview-00.png
  * @image latex img/widget/calendar/preview-00.eps
- * @li @ref Check
+ * @li @ref Elm_Check
  *
  * @image html img/widget/check/preview-00.png
  * @image latex img/widget/check/preview-00.eps
- * @li @ref Clock
+ * @li @ref Elm_Clock
  *
  * @image html img/widget/clock/preview-00.png
  * @image latex img/widget/clock/preview-00.eps
  *
- * @li @ref Colorselector
+ * @li @ref Elm_Colorselector
  *
  * @image html img/widget/colorselector/preview-00.png
  * @image latex img/widget/colorselector/preview-00.eps
- * @li @ref Ctxpopup
+ * @li @ref Elm_Ctxpopup
  *
  * @image html img/widget/ctxpopup/preview-00.png
  * @image latex img/widget/ctxpopup/preview-00.eps
- * @li @ref Combobox
+ * @li @ref Elm_Combobox
  *
  * @image html img/widget/combobox/preview-00.png
  * @image latex img/widget/combobox/preview-00.eps
- * @li @ref Datetime
+ * @li @ref Elm_Datetime
  *
  * @image html img/widget/datetime/preview-00.png
  * @image latex img/widget/datetime/preview-00.eps
- * @li @ref Dayselector
+ * @li @ref Elm_Dayselector
  *
  * @image html img/widget/dayselector/preview-00.png
  * @image latex img/widget/dayselector/preview-00.eps
- * @li @ref Diskselector
+ * @li @ref Elm_Diskselector
  *
  * @image html img/widget/diskselector/preview-00.png
  * @image latex img/widget/diskselector/preview-00.eps
- * @li @ref Entry
+ * @li @ref Elm_Entry
  *
  * @image html img/widget/entry/preview-02.png
  * @image latex img/widget/entry/preview-02.eps
- * @li @ref File_Selector_Button
+ * @li @ref Elm_File_Selector_Button
  *
  * @image html img/widget/fileselector_button/preview-00.png
  * @image latex img/widget/fileselector_button/preview-00.eps
- * @li @ref File_Selector_Entry
+ * @li @ref Elm_File_Selector_Entry
  *
  * @image html img/widget/fileselector_entry/preview-00.png
  * @image latex img/widget/fileselector_entry/preview-00.eps
- * @li @ref Fileselector
+ * @li @ref Elm_Fileselector
  *
  * @image html img/widget/fileselector/preview-00.png
  * @image latex img/widget/fileselector/preview-00.eps
- * @li @ref Flip
+ * @li @ref Elm_Flip
  *
  * @image html img/widget/flip/preview-00.png
  * @image latex img/widget/flip/preview-00.eps
- * @li @ref Flipselector
+ * @li @ref Elm_Flipselector
  *
  * @image html img/widget/flipselector/preview-00.png
  * @image latex img/widget/flipselector/preview-00.eps
- * @li @ref Frame
+ * @li @ref Elm_Frame
  *
  * @image html img/widget/frame/preview-00.png
  * @image latex img/widget/frame/preview-00.eps
  *
- * @li @ref GLView
- * @li @ref Hover
+ * @li @ref Elm_GLView
+ * @li @ref Elm_Hover
  *
  * @image html img/widget/hover/preview-00.png
  * @image latex img/widget/hover/preview-00.eps
- * @li @ref Hoversel
+ * @li @ref Elm_Hoversel
  *
  * @image html img/widget/hoversel/preview-00.png
  * @image latex img/widget/hoversel/preview-00.eps
- * @li @ref Icon
+ * @li @ref Elm_Icon
  *
  * @image html img/widget/icon/preview-00.png
  * @image latex img/widget/icon/preview-00.eps
- * @li @ref Image
+ * @li @ref Elm_Image
  *
  * @image html img/widget/image/preview-00.png
  * @image latex img/widget/image/preview-00.eps
- * @li @ref Index
+ * @li @ref Elm_Index
  *
  * @image html img/widget/index/preview-00.png
  * @image latex img/widget/index/preview-00.eps
- * @li @ref Inwin
+ * @li @ref Elm_Inwin
  *
  * @image html img/widget/inwin/preview-00.png
  * @image latex img/widget/inwin/preview-00.eps
- * @li @ref List
+ * @li @ref Elm_List
  *
  * @image html img/widget/list/preview-00.png
  * @image latex img/widget/list/preview-00.eps
  * @image html img/list.png
  * @image latex img/list.eps
- * @li @ref Label
+ * @li @ref Elm_Label
  *
  * @image html img/widget/label/preview-00.png
  * @image latex img/widget/label/preview-00.eps
- * @li @ref Map
+ * @li @ref Elm_Map
  *
  * @image html img/widget/map/preview-00.png
  * @image latex img/widget/map/preview-00.eps
- * @li @ref Mapbuf
+ * @li @ref Elm_Mapbuf
  *
  * @image html img/widget/mapbuf/preview-00.png
  * @image latex img/widget/mapbuf/preview-00.eps
- * @li @ref Menu
+ * @li @ref Elm_Menu
  *
  * @image html img/widget/menu/preview-00.png
  * @image latex img/widget/menu/preview-00.eps
- * @li @ref Notify
+ * @li @ref Elm_Notify
  *
  * @image html img/widget/notify/preview-00.png
  * @image latex img/widget/notify/preview-00.eps
- * @li @ref Panel
+ * @li @ref Elm_Panel
  *
  * @image html img/widget/panel/preview-00.png
  * @image latex img/widget/panel/preview-00.eps
- * @li @ref Photo
- * @li @ref Photocam
+ * @li @ref Elm_Photo
+ * @li @ref Elm_Photocam
  *
  * @image html img/widget/photocam/preview-00.png
  * @image latex img/widget/photocam/preview-00.eps
- * @li @ref Popup
+ * @li @ref Elm_Popup
  *
- * @li @ref Prefs
+ * @li @ref Elm_Prefs
  *
  * @image html img/widget/prefs/preview-00.png
  * @image latex img/widget/prefs/preview-00.eps
  * @image html img/prefs.png
  * @image latex img/prefs.eps
  *
- * @li @ref Progressbar
+ * @li @ref Elm_Progressbar
  *
  * @image html img/widget/progressbar/preview-00.png
  * @image latex img/widget/progressbar/preview-00.eps
- * @li @ref Radio
+ * @li @ref Elm_Radio
  *
  * @image html img/widget/radio/preview-00.png
  * @image latex img/widget/radio/preview-00.eps
- * @li @ref Route
- * @li @ref SegmentControl
+ * @li @ref Elm_Route
+ * @li @ref Elm_SegmentControl
  *
  * @image html img/widget/segment_control/preview-00.png
  * @image latex img/widget/segment_control/preview-00.eps
  * @image html img/segment_control.png
  * @image latex img/segment_control.eps
- * @li @ref Separator
+ * @li @ref Elm_Separator
  *
  * @image html img/widget/separator/preview-00.png
  * @image latex img/widget/separator/preview-00.eps
- * @li @ref Slider
+ * @li @ref Elm_Slider
  *
  * @image html img/widget/slider/preview-00.png
  * @image latex img/widget/slider/preview-00.eps
- * @li @ref Slideshow
+ * @li @ref Elm_Slideshow
  *
  * @image html img/widget/slideshow/preview-00.png
  * @image latex img/widget/slideshow/preview-00.eps
- * @li @ref Spinner
+ * @li @ref Elm_Spinner
  *
  * @image html img/widget/spinner/preview-00.png
  * @image latex img/widget/spinner/preview-00.eps
- * @li @ref Thumb
+ * @li @ref Elm_Thumb
 
  * @image html img/widget/thumb/preview-00.png
  * @image latex img/widget/thumb/preview-00.eps
- * @li @ref Toolbar
+ * @li @ref Elm_Toolbar
  *
  * @image html img/widget/toolbar/preview-00.png
  * @image latex img/widget/toolbar/preview-00.eps
  * @image html img/toolbar.png
  * @image latex img/toolbar.eps
- * @li @ref Tooltips
- * @li @ref Video
- * @li @ref Web
+ * @li @ref Elm_Tooltips
+ * @li @ref Elm_Video
+ * @li @ref Elm_Web
  *
  * @image html img/widget/web/preview-00.png
  * @image latex img/widget/web/preview-00.eps
- * @li @ref Win
+ * @li @ref Elm_Win
  *
  * @image html img/widget/win/preview-00.png
  * @image latex img/widget/win/preview-00.eps
diff --git a/src/lib/elc_combobox.h b/src/lib/elc_combobox.h
index 8237b87..006280b 100644
--- a/src/lib/elc_combobox.h
+++ b/src/lib/elc_combobox.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Combobox Combobox
+ * @defgroup Elm_Combobox Combobox
  * @ingroup Elementary
  *
  * @image html combobox_inheritance_tree.png
diff --git a/src/lib/elc_combobox_legacy.h b/src/lib/elc_combobox_legacy.h
index 0719c78..21e888f 100644
--- a/src/lib/elc_combobox_legacy.h
+++ b/src/lib/elc_combobox_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Combobox
+ * @ingroup Elm_Combobox
  */
 EAPI Evas_Object                 *elm_combobox_add(Evas_Object *parent);
 
diff --git a/src/lib/elc_ctxpopup.h b/src/lib/elc_ctxpopup.h
index 0cde2b6..7d05a68 100644
--- a/src/lib/elc_ctxpopup.h
+++ b/src/lib/elc_ctxpopup.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Ctxpopup Ctxpopup
+ * @defgroup Elm_Ctxpopup Ctxpopup
  * @ingroup Elementary
  *
  * @image html ctxpopup_inheritance_tree.png
diff --git a/src/lib/elc_ctxpopup_legacy.h b/src/lib/elc_ctxpopup_legacy.h
index 346589c..cf3ad28 100644
--- a/src/lib/elc_ctxpopup_legacy.h
+++ b/src/lib/elc_ctxpopup_legacy.h
@@ -4,7 +4,7 @@
  * @param parent Parent object
  * @return New object or @c NULL, if it cannot be created
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EAPI Evas_Object                 *elm_ctxpopup_add(Evas_Object *parent);
 
diff --git a/src/lib/elc_fileselector.h b/src/lib/elc_fileselector.h
index 9ecd561..a2c3e19 100644
--- a/src/lib/elc_fileselector.h
+++ b/src/lib/elc_fileselector.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Fileselector File Selector
+ * @defgroup Elm_Fileselector File Selector
  * @ingroup Elementary
  *
  * @image html fileselector_inheritance_tree.png
@@ -64,7 +64,7 @@
  */
 
 /**
- * @addtogroup Fileselector
+ * @addtogroup Elm_Fileselector
  * @{
  */
 
diff --git a/src/lib/elc_fileselector_button.h 
b/src/lib/elc_fileselector_button.h
index c7b268a..a60f981 100644
--- a/src/lib/elc_fileselector_button.h
+++ b/src/lib/elc_fileselector_button.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup File_Selector_Button File Selector Button
+ * @defgroup Elm_File_Selector_Button File Selector Button
  * @ingroup Elementary
  *
  * @image html fileselector_button_inheritance_tree.png
diff --git a/src/lib/elc_fileselector_button_legacy.h 
b/src/lib/elc_fileselector_button_legacy.h
index 0bc2860..54c2bac 100644
--- a/src/lib/elc_fileselector_button_legacy.h
+++ b/src/lib/elc_fileselector_button_legacy.h
@@ -6,7 +6,7 @@
  * @return a new file selector button widget handle or @c NULL, on
  * errors
  *
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
  */
 EAPI Evas_Object                *elm_fileselector_button_add(Evas_Object 
*parent);
 
diff --git a/src/lib/elc_fileselector_entry.h b/src/lib/elc_fileselector_entry.h
index 49e0f18..5e8f643 100644
--- a/src/lib/elc_fileselector_entry.h
+++ b/src/lib/elc_fileselector_entry.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup File_Selector_Entry File Selector Entry
+ * @defgroup Elm_File_Selector_Entry File Selector Entry
  * @ingroup Elementary
  *
  * @image html fileselector_entry_inheritance_tree.png
diff --git a/src/lib/elc_fileselector_entry_legacy.h 
b/src/lib/elc_fileselector_entry_legacy.h
index 72f96b9..f4f9b98 100644
--- a/src/lib/elc_fileselector_entry_legacy.h
+++ b/src/lib/elc_fileselector_entry_legacy.h
@@ -7,7 +7,7 @@
  * @return a new file selector entry widget handle or @c NULL, on
  * errors
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EAPI Evas_Object                *elm_fileselector_entry_add(Evas_Object 
*parent);
 
diff --git a/src/lib/elc_fileselector_eo.h b/src/lib/elc_fileselector_eo.h
index dfc85c2..68277bc 100644
--- a/src/lib/elc_fileselector_eo.h
+++ b/src/lib/elc_fileselector_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  *
  * @{
  */
diff --git a/src/lib/elc_fileselector_legacy.h 
b/src/lib/elc_fileselector_legacy.h
index 88c1ef3..426a707 100644
--- a/src/lib/elc_fileselector_legacy.h
+++ b/src/lib/elc_fileselector_legacy.h
@@ -8,7 +8,7 @@
  *
  * This function inserts a new file selector widget on the canvas.
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Evas_Object          *elm_fileselector_add(Evas_Object *parent);
 
@@ -27,7 +27,7 @@ EAPI Evas_Object          *elm_fileselector_add(Evas_Object 
*parent);
  *
  * @see elm_fileselector_is_save_get()
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_is_save_set(Evas_Object *obj, 
Eina_Bool is_save);
 
@@ -40,7 +40,7 @@ EAPI void                  
elm_fileselector_is_save_set(Evas_Object *obj, Eina_B
  *
  * @see elm_fileselector_is_save_set() for more details
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Eina_Bool             elm_fileselector_is_save_get(const Evas_Object 
*obj);
 
@@ -57,7 +57,7 @@ EAPI Eina_Bool             elm_fileselector_is_save_get(const 
Evas_Object *obj);
  *
  * @see elm_fileselector_folder_only_get()
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_folder_only_set(Evas_Object *obj, 
Eina_Bool only);
 
@@ -72,7 +72,7 @@ EAPI void                  
elm_fileselector_folder_only_set(Evas_Object *obj, Ei
  *
  * @see elm_fileselector_folder_only_get()
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Eina_Bool             elm_fileselector_folder_only_get(const Evas_Object 
*obj);
 
@@ -92,7 +92,7 @@ EAPI Eina_Bool             
elm_fileselector_folder_only_get(const Evas_Object *o
  *
  * @see elm_fileselector_expandable_get()
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_expandable_set(Evas_Object *obj, 
Eina_Bool expand);
 
@@ -106,7 +106,7 @@ EAPI void                  
elm_fileselector_expandable_set(Evas_Object *obj, Ein
  *
  * @see elm_fileselector_expandable_set() for more details
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Eina_Bool             elm_fileselector_expandable_get(const Evas_Object 
*obj);
 
@@ -123,7 +123,7 @@ EAPI Eina_Bool             
elm_fileselector_expandable_get(const Evas_Object *ob
  *
  * @see elm_fileselector_path_get()
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_path_set(Evas_Object *obj, const 
char *path);
 
@@ -137,7 +137,7 @@ EAPI void                  
elm_fileselector_path_set(Evas_Object *obj, const cha
  *
  * @see elm_fileselector_path_set()
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI const char           *elm_fileselector_path_get(const Evas_Object *obj);
 
@@ -163,7 +163,7 @@ EAPI const char           *elm_fileselector_path_get(const 
Evas_Object *obj);
  * @see elm_fileselector_expandable_set().
  * @see elm_fileselector_mode_get().
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_mode_set(Evas_Object *obj, 
Elm_Fileselector_Mode mode);
 
@@ -176,7 +176,7 @@ EAPI void                  
elm_fileselector_mode_set(Evas_Object *obj, Elm_Files
  *
  * @see elm_fileselector_mode_set() for more details
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Elm_Fileselector_Mode elm_fileselector_mode_get(const Evas_Object *obj);
 
@@ -195,7 +195,7 @@ EAPI Elm_Fileselector_Mode elm_fileselector_mode_get(const 
Evas_Object *obj);
  * @see elm_fileselector_multi_select_get()
  *
  * @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_multi_select_set(Evas_Object *obj, 
Eina_Bool multi);
 
@@ -209,7 +209,7 @@ EAPI void                  
elm_fileselector_multi_select_set(Evas_Object *obj, E
  * @see elm_fileselector_multi_select_set()
  *
  * @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Eina_Bool             elm_fileselector_multi_select_get(const Evas_Object 
*obj);
 
@@ -225,7 +225,7 @@ EAPI Eina_Bool             
elm_fileselector_multi_select_get(const Evas_Object *
  *
  * @see elm_fileselector_selected_get()
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Eina_Bool             elm_fileselector_selected_set(Evas_Object *obj, 
const char *path);
 
@@ -242,7 +242,7 @@ EAPI Eina_Bool             
elm_fileselector_selected_set(Evas_Object *obj, const
  *
  * @see elm_fileselector_selected_set() for more details
  *
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI const char           *elm_fileselector_selected_get(const Evas_Object 
*obj);
 
@@ -268,7 +268,7 @@ EAPI const char           
*elm_fileselector_current_name_get(const Evas_Object *
  * @see elm_fileselector_selected_get()
  *
  * @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI const Eina_List      *elm_fileselector_selected_paths_get(const 
Evas_Object *obj);
 
@@ -288,7 +288,7 @@ EAPI const Eina_List      
*elm_fileselector_selected_paths_get(const Evas_Object
  * @see elm_fileselector_filters_clear()
  *
  * @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Eina_Bool             
elm_fileselector_mime_types_filter_append(Evas_Object *obj, const char 
*mime_types, const char *filter_name);
 
@@ -304,7 +304,7 @@ EAPI Eina_Bool             
elm_fileselector_mime_types_filter_append(Evas_Object
  * @note first added filter will be the default filter at the moment.
  *
  * @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Eina_Bool             elm_fileselector_custom_filter_append(Evas_Object 
*obj, Elm_Fileselector_Filter_Func func, void *data, const char *filter_name);
 
@@ -319,7 +319,7 @@ EAPI Eina_Bool             
elm_fileselector_custom_filter_append(Evas_Object *ob
  * @see elm_fileselector_mime_type_filter_append()
  *
  * @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_filters_clear(Evas_Object *obj);
 
@@ -334,7 +334,7 @@ EAPI void                  
elm_fileselector_filters_clear(Evas_Object *obj);
  * files/directories in the list/grid of the file selector widget.
  *
  * @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_hidden_visible_set(Evas_Object 
*obj, Eina_Bool visible);
 
@@ -348,7 +348,7 @@ EAPI void                  
elm_fileselector_hidden_visible_set(Evas_Object *obj,
  * @see elm_fileselector_hidden_visible_set()
  *
  * @since 1.8
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Eina_Bool             elm_fileselector_hidden_visible_get(const 
Evas_Object *obj);
 
@@ -364,7 +364,7 @@ EAPI Eina_Bool             
elm_fileselector_hidden_visible_get(const Evas_Object
  * @see elm_fileselector_thumbnail_size_get()
  *
  * @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_thumbnail_size_set(Evas_Object 
*obj, Evas_Coord w, Evas_Coord h);
 
@@ -381,7 +381,7 @@ EAPI void                  
elm_fileselector_thumbnail_size_set(Evas_Object *obj,
  * @see elm_fileselector_thumbnail_size_set()
  *
  * @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_thumbnail_size_get(const 
Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
 
@@ -394,7 +394,7 @@ EAPI void                  
elm_fileselector_thumbnail_size_get(const Evas_Object
  * @see elm_fileselector_sort_method_set()
  *
  * @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI Elm_Fileselector_Sort elm_fileselector_sort_method_get(const Evas_Object 
*obj);
 
@@ -407,7 +407,7 @@ EAPI Elm_Fileselector_Sort 
elm_fileselector_sort_method_get(const Evas_Object *o
  * @see elm_fileselector_sort_method_get()
  *
  * @since 1.9
- * @ingroup Fileselector
+ * @ingroup Elm_Fileselector
  */
 EAPI void                  elm_fileselector_sort_method_set(Evas_Object *obj, 
Elm_Fileselector_Sort sort);
 
diff --git a/src/lib/elc_hoversel.h b/src/lib/elc_hoversel.h
index 8296c16..50a7899 100644
--- a/src/lib/elc_hoversel.h
+++ b/src/lib/elc_hoversel.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Hoversel Hoversel
+ * @defgroup Elm_Hoversel Hoversel
  * @ingroup Elementary
  *
  * @image html hoversel_inheritance_tree.png
diff --git a/src/lib/elc_hoversel_legacy.h b/src/lib/elc_hoversel_legacy.h
index 6701171..89e6f9b 100644
--- a/src/lib/elc_hoversel_legacy.h
+++ b/src/lib/elc_hoversel_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Hoversel
+ * @ingroup Elm_Hoversel
  */
 EAPI Evas_Object                 *elm_hoversel_add(Evas_Object *parent);
 
diff --git a/src/lib/elc_popup.h b/src/lib/elc_popup.h
index d672db2..311869f 100644
--- a/src/lib/elc_popup.h
+++ b/src/lib/elc_popup.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Popup Popup
+ * @defgroup Elm_Popup Popup
  * @ingroup Elementary
  *
  * @image html popup_inheritance_tree.png
diff --git a/src/lib/elc_popup_eo.h b/src/lib/elc_popup_eo.h
index 880be9c..254a876 100644
--- a/src/lib/elc_popup_eo.h
+++ b/src/lib/elc_popup_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Popup
+ * @ingroup Elm_Popup
  *
  * @{
  */
diff --git a/src/lib/elc_popup_legacy.h b/src/lib/elc_popup_legacy.h
index 8ba86cf..027edbd 100644
--- a/src/lib/elc_popup_legacy.h
+++ b/src/lib/elc_popup_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Popup
+ * @ingroup Elm_Popup
  */
 EAPI Evas_Object *elm_popup_add(Evas_Object *parent) EINA_ARG_NONNULL(1);
 
diff --git a/src/lib/elm_actionslider.h b/src/lib/elm_actionslider.h
index 91868f8..74f3967 100644
--- a/src/lib/elm_actionslider.h
+++ b/src/lib/elm_actionslider.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Actionslider Actionslider
+ * @addtogroup Elm_Actionslider Actionslider
  * @ingroup Elementary
  *
  * @image html actionslider_inheritance_tree.png
diff --git a/src/lib/elm_actionslider_legacy.h 
b/src/lib/elm_actionslider_legacy.h
index 2ae13f2..60512fd 100644
--- a/src/lib/elm_actionslider_legacy.h
+++ b/src/lib/elm_actionslider_legacy.h
@@ -4,8 +4,8 @@
  * @param parent The parent object
  * @return The new actionslider object or NULL if it cannot be created
  *
- * @ingroup Actionslider
+ * @ingroup Elm_Actionslider
  */
 EAPI Evas_Object                *elm_actionslider_add(Evas_Object *parent);
 
-#include "elm_actionslider.eo.legacy.h"
\ No newline at end of file
+#include "elm_actionslider.eo.legacy.h"
diff --git a/src/lib/elm_bg.h b/src/lib/elm_bg.h
index b41a96d..0a93268 100644
--- a/src/lib/elm_bg.h
+++ b/src/lib/elm_bg.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Bg Background
+ * @defgroup Elm_Bg Background
  * @ingroup Elementary
  *
  * @image html bg_inheritance_tree.png
diff --git a/src/lib/elm_bg_legacy.h b/src/lib/elm_bg_legacy.h
index f6f3f3e..a46cc7b 100644
--- a/src/lib/elm_bg_legacy.h
+++ b/src/lib/elm_bg_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or @c NULL if it cannot be created
  *
- * @ingroup Bg
+ * @ingroup Elm_Bg
  */
 EAPI Evas_Object                 *elm_bg_add(Evas_Object *parent);
 
@@ -27,7 +27,7 @@ EAPI Evas_Object                 *elm_bg_add(Evas_Object 
*parent);
  *
  * @see elm_bg_color_get()
  *
- * @ingroup Bg
+ * @ingroup Elm_Bg
  */
 EAPI void                         elm_bg_color_set(Evas_Object *obj, int r, 
int g, int b);
 
@@ -44,7 +44,7 @@ EAPI void                         
elm_bg_color_set(Evas_Object *obj, int r, int
  *
  * @see elm_bg_color_get() for more details
  *
- * @ingroup Bg
+ * @ingroup Elm_Bg
  */
 EAPI void                         elm_bg_color_get(const Evas_Object *obj, int 
*r, int *g, int *b);
 
@@ -70,7 +70,7 @@ EAPI void                         elm_bg_color_get(const 
Evas_Object *obj, int *
  * achieve the @c Layout's file setting behavior, you'll have to call
  * that method on this object.
  *
- * @ingroup Bg
+ * @ingroup Elm_Bg
  *
  * @param[in] file The file path
  * @param[in] group Optional key (group in Edje) within the file
@@ -84,7 +84,7 @@ EAPI Eina_Bool elm_bg_file_set(Eo *obj, const char *file, 
const char *group);
  * @note Use @c NULL pointers on the file components you're not
  * interested in: they'll be ignored by the function.
  *
- * @ingroup Bg
+ * @ingroup Elm_Bg
  *
  * @param[out] file The file path
  * @param[out] group Optional key (group in Edje) within the file
diff --git a/src/lib/elm_bubble.h b/src/lib/elm_bubble.h
index f0ca62c..f96308b 100644
--- a/src/lib/elm_bubble.h
+++ b/src/lib/elm_bubble.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Bubble Bubble
+ * @defgroup Elm_Bubble Bubble
  * @ingroup Elementary
  *
  * @image html bubble_inheritance_tree.png
diff --git a/src/lib/elm_bubble_legacy.h b/src/lib/elm_bubble_legacy.h
index a0b3e36..fe19303 100644
--- a/src/lib/elm_bubble_legacy.h
+++ b/src/lib/elm_bubble_legacy.h
@@ -6,7 +6,7 @@
  *
  * This function adds a text bubble to the given parent evas object.
  *
- * @ingroup Bubble
+ * @ingroup Elm_Bubble
  */
 EAPI Evas_Object                 *elm_bubble_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_button.h b/src/lib/elm_button.h
index 72b6c74..0df901f 100644
--- a/src/lib/elm_button.h
+++ b/src/lib/elm_button.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Button Button
+ * @defgroup Elm_Button Button
  * @ingroup Elementary
  *
  * @image html button_inheritance_tree.png
@@ -63,7 +63,7 @@
  */
 
 /**
- * @addtogroup Button
+ * @addtogroup Elm_Button
  * @{
  */
 
diff --git a/src/lib/elm_button_legacy.h b/src/lib/elm_button_legacy.h
index b78a868..7901823 100644
--- a/src/lib/elm_button_legacy.h
+++ b/src/lib/elm_button_legacy.h
@@ -4,8 +4,8 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Button
+ * @ingroup Elm_Button
  */
 EAPI Evas_Object                 *elm_button_add(Evas_Object *parent);
 
-#include "elm_button.eo.legacy.h"
\ No newline at end of file
+#include "elm_button.eo.legacy.h"
diff --git a/src/lib/elm_calendar.h b/src/lib/elm_calendar.h
index b1a334f..f0fc828 100644
--- a/src/lib/elm_calendar.h
+++ b/src/lib/elm_calendar.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Calendar Calendar
+ * @defgroup Elm_Calendar Calendar
  * @ingroup Elementary
  *
  * @image html calendar_inheritance_tree.png
@@ -44,7 +44,7 @@
  */
 
 /**
- * @addtogroup Calendar
+ * @addtogroup Elm_Calendar
  * @{
  */
 
diff --git a/src/lib/elm_calendar_common.h b/src/lib/elm_calendar_common.h
index 52381dc..e044452 100644
--- a/src/lib/elm_calendar_common.h
+++ b/src/lib/elm_calendar_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Calendar
+ * @addtogroup Elm_Calendar
  *
  * @{
  */
diff --git a/src/lib/elm_calendar_legacy.h b/src/lib/elm_calendar_legacy.h
index be54a5d..ddc8ac0 100644
--- a/src/lib/elm_calendar_legacy.h
+++ b/src/lib/elm_calendar_legacy.h
@@ -11,7 +11,7 @@
  *
  * @ref calendar_example_01
  *
- * @ingroup Calendar
+ * @ingroup Elm_Calendar
  */
 EAPI Evas_Object         *elm_calendar_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_check.h b/src/lib/elm_check.h
index 51a57f2..dfac2f7 100644
--- a/src/lib/elm_check.h
+++ b/src/lib/elm_check.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Check Check
+ * @defgroup Elm_Check Check
  * @ingroup Elementary
  *
  * @image html check_inheritance_tree.png
diff --git a/src/lib/elm_check_legacy.h b/src/lib/elm_check_legacy.h
index 742881d..a6653c3 100644
--- a/src/lib/elm_check_legacy.h
+++ b/src/lib/elm_check_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Check
+ * @ingroup Elm_Check
  */
 EAPI Evas_Object *                elm_check_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_clock.h b/src/lib/elm_clock.h
index 7ba9285..138d39c 100644
--- a/src/lib/elm_clock.h
+++ b/src/lib/elm_clock.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Clock Clock
+ * @defgroup Elm_Clock Clock
  * @ingroup Elementary
  *
  * @image html clock_inheritance_tree.png
@@ -53,7 +53,7 @@
  */
 
 /**
- * @addtogroup Clock
+ * @addtogroup Elm_Clock
  * @{
  */
 
diff --git a/src/lib/elm_clock_legacy.h b/src/lib/elm_clock_legacy.h
index 914ecbd..22381ac 100644
--- a/src/lib/elm_clock_legacy.h
+++ b/src/lib/elm_clock_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new clock widget on the canvas.
  *
- * @ingroup Clock
+ * @ingroup Elm_Clock
  */
 EAPI Evas_Object      *elm_clock_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_colorselector.h b/src/lib/elm_colorselector.h
index b98f414..ffce041 100644
--- a/src/lib/elm_colorselector.h
+++ b/src/lib/elm_colorselector.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Colorselector Colorselector
+ * @defgroup Elm_Colorselector Colorselector
  * @ingroup Elementary
  *
  * @image html colorselector_inheritance_tree.png
diff --git a/src/lib/elm_colorselector_common.h 
b/src/lib/elm_colorselector_common.h
index ecce64d..3902173 100644
--- a/src/lib/elm_colorselector_common.h
+++ b/src/lib/elm_colorselector_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Colorselector
+ * @addtogroup Elm_Colorselector
  *
  * @{
  */
diff --git a/src/lib/elm_colorselector_legacy.h 
b/src/lib/elm_colorselector_legacy.h
index 90ae6f2..27008db 100644
--- a/src/lib/elm_colorselector_legacy.h
+++ b/src/lib/elm_colorselector_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Colorselector
+ * @ingroup Elm_Colorselector
  */
 EAPI Evas_Object *elm_colorselector_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h
index 0283dfc..1d0f3bb 100644
--- a/src/lib/elm_config.h
+++ b/src/lib/elm_config.h
@@ -301,7 +301,7 @@ EAPI void         
elm_config_scroll_page_scroll_friction_set(double friction);
  * Get enable status of context menu disabled.
  *
  * @see elm_config_context_menu_disabled_set()
- * @ingroup Entry
+ * @ingroup Elm_Entry
  * @since 1.17
  */
 EAPI Eina_Bool elm_config_context_menu_disabled_get(void);
@@ -312,7 +312,7 @@ EAPI Eina_Bool elm_config_context_menu_disabled_get(void);
  * @param disabled disable context menu if @c EINA_TRUE, enable otherwise
  *
  * @see elm_config_context_menu_disabled_get()
- * @ingroup Entry
+ * @ingroup Elm_Entry
  * @since 1.17
  */
 EAPI void elm_config_context_menu_disabled_set(Eina_Bool disabled);
@@ -843,7 +843,7 @@ EAPI void         
elm_config_focus_autoscroll_mode_set(Elm_Focus_Autoscroll_Mode
  * @param mode Elm_Slider_Indicator_Visible_Mode.
  * viewport.
  *
- * @ingroup Slider
+ * @ingroup Elm_Slider
  * @since 1.13
  */
 EAPI void 
elm_config_slider_indicator_visible_mode_set(Elm_Slider_Indicator_Visible_Mode 
mode);
@@ -856,7 +856,7 @@ EAPI void 
elm_config_slider_indicator_visible_mode_set(Elm_Slider_Indicator_Visi
  * @c ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS, 
ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS,
  *    ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE if any of the above is set by 
user.
  *
- * @ingroup Slider
+ * @ingroup Elm_Slider
  * @since 1.13
  */
 EAPI Elm_Slider_Indicator_Visible_Mode 
elm_config_slider_indicator_visible_mode_get(void);
diff --git a/src/lib/elm_datetime.h b/src/lib/elm_datetime.h
index cf4bc3e..48c7ac4 100644
--- a/src/lib/elm_datetime.h
+++ b/src/lib/elm_datetime.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Datetime Datetime
+ * @defgroup Elm_Datetime Datetime
  * @ingroup Elementary
  *
  * @image html datetime_inheritance_tree.png
@@ -192,7 +192,7 @@
  */
 
 /**
- * @addtogroup Datetime
+ * @addtogroup Elm_Datetime
  * @{
  */
 
diff --git a/src/lib/elm_datetime_common.h b/src/lib/elm_datetime_common.h
index a2bd98d..af246c8 100644
--- a/src/lib/elm_datetime_common.h
+++ b/src/lib/elm_datetime_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Datetime
+ * @addtogroup Elm_Datetime
  *
  * @{
  */
diff --git a/src/lib/elm_datetime_legacy.h b/src/lib/elm_datetime_legacy.h
index 9fb9eb9..7cf1397 100644
--- a/src/lib/elm_datetime_legacy.h
+++ b/src/lib/elm_datetime_legacy.h
@@ -8,7 +8,7 @@
  *
  * This function inserts a new datetime widget on the canvas.
  *
- * @ingroup Datetime
+ * @ingroup Elm_Datetime
  */
 EAPI Evas_Object *elm_datetime_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_dayselector.h b/src/lib/elm_dayselector.h
index feb5cf5..75371fb 100644
--- a/src/lib/elm_dayselector.h
+++ b/src/lib/elm_dayselector.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Dayselector Dayselector
+ * @defgroup Elm_Dayselector Dayselector
  * @ingroup Elementary
  *
  * @image html dayselector_inheritance_tree.png
@@ -71,7 +71,7 @@
  */
 
 /**
- * @addtogroup Dayselector
+ * @addtogroup Elm_Dayselector
  * @{
  */
 
diff --git a/src/lib/elm_dayselector_legacy.h b/src/lib/elm_dayselector_legacy.h
index 68bc78b..b30e574 100644
--- a/src/lib/elm_dayselector_legacy.h
+++ b/src/lib/elm_dayselector_legacy.h
@@ -4,7 +4,7 @@
  * @param parent Parent object
  * @return New dayselector object or @c NULL, if it cannot be created
  *
- * @ingroup Dayselector
+ * @ingroup Elm_Dayselector
  */
 EAPI Evas_Object *elm_dayselector_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index 2ad95a9..bbd0342 100644
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -470,7 +470,7 @@ EINA_DEPRECATED EAPI Elm_Notify_Orient            
elm_notify_orient_get(const Ev
  *
  * @deprecated see elm_label_slide_mode_set() instead.
  *
- * @ingroup Label
+ * @ingroup Elm_Label
  */
 EINA_DEPRECATED EAPI void                        
elm_label_slide_set(Evas_Object *obj, Eina_Bool slide);
 
@@ -484,7 +484,7 @@ EINA_DEPRECATED EAPI void                        
elm_label_slide_set(Evas_Object
  *
  * @deprecated see elm_label_slide_mode_get() instead.
  *
- * @ingroup Label
+ * @ingroup Elm_Label
  */
 EINA_DEPRECATED EAPI Eina_Bool                   elm_label_slide_get(const 
Evas_Object *obj);
 
@@ -656,7 +656,7 @@ EINA_DEPRECATED EAPI void          
elm_genlist_scroller_policy_get(const Evas_Ob
  *
  * @deprecated Use elm_scroller_policy_set() instead.
  *
- * @ingroup Entry
+ * @ingroup Elm_Entry
  */
 EINA_DEPRECATED EAPI void elm_entry_scrollbar_policy_set(Evas_Object *obj, 
Elm_Scroller_Policy h, Elm_Scroller_Policy v);
 
@@ -672,7 +672,7 @@ EINA_DEPRECATED EAPI void 
elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_S
  *
  * @deprecated Use elm_scroller_bounce_set() instead.
  *
- * @ingroup Entry
+ * @ingroup Elm_Entry
  */
 EINA_DEPRECATED EAPI void elm_entry_bounce_set(Evas_Object *obj, Eina_Bool 
h_bounce, Eina_Bool v_bounce);
 
@@ -685,7 +685,7 @@ EINA_DEPRECATED EAPI void elm_entry_bounce_set(Evas_Object 
*obj, Eina_Bool h_bou
  *
  * @deprecated Use elm_scroller_bounce_get() instead.
  *
- * @ingroup Entry
+ * @ingroup Elm_Entry
  */
 EINA_DEPRECATED EAPI void elm_entry_bounce_get(const Evas_Object *obj, 
Eina_Bool *h_bounce, Eina_Bool *v_bounce);
 
@@ -698,7 +698,7 @@ EINA_DEPRECATED EAPI void elm_entry_bounce_get(const 
Evas_Object *obj, Eina_Bool
  *
  * @deprecated Use elm_scroller_bounce_set() instead.
  *
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
  */
 EINA_DEPRECATED EAPI void   elm_photocam_bounce_set(Evas_Object *obj, 
Eina_Bool h_bounce, Eina_Bool v_bounce);
 
@@ -713,7 +713,7 @@ EINA_DEPRECATED EAPI void   
elm_photocam_bounce_set(Evas_Object *obj, Eina_Bool
  *
  * @deprecated Use elm_scroller_bounce_get() instead.
  *
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
  */
 EINA_DEPRECATED EAPI void   elm_photocam_bounce_get(const Evas_Object *obj, 
Eina_Bool *h_bounce, Eina_Bool *v_bounce);
 
@@ -731,7 +731,7 @@ EINA_DEPRECATED EAPI void   elm_photocam_bounce_get(const 
Evas_Object *obj, Eina
  *
  * @see elm_scroller_bounce_set()
  *
- * @ingroup List
+ * @ingroup Elm_List
  */
 EINA_DEPRECATED EAPI void         elm_list_bounce_set(Evas_Object *obj, 
Eina_Bool h_bounce, Eina_Bool v_bounce);
 
@@ -752,7 +752,7 @@ EINA_DEPRECATED EAPI void         
elm_list_bounce_set(Evas_Object *obj, Eina_Boo
  * @see elm_scroller_bounce_get()
  * @see elm_list_bounce_set()
  *
- * @ingroup List
+ * @ingroup Elm_List
  */
 EINA_DEPRECATED EAPI void         elm_list_bounce_get(const Evas_Object *obj, 
Eina_Bool *h_bounce, Eina_Bool *v_bounce);
 
@@ -775,7 +775,7 @@ EINA_DEPRECATED EAPI void         elm_list_bounce_get(const 
Evas_Object *obj, Ei
  *
  * @deprecated Use elm_scroller_policy_set() instead.
  *
- * @ingroup List
+ * @ingroup Elm_List
  */
 EINA_DEPRECATED EAPI void         elm_list_scroller_policy_set(Evas_Object 
*obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
 
@@ -790,7 +790,7 @@ EINA_DEPRECATED EAPI void         
elm_list_scroller_policy_set(Evas_Object *obj,
  *
  * @deprecated Use elm_scroller_policy_get() instead.
  *
- * @ingroup List
+ * @ingroup Elm_List
  */
 EINA_DEPRECATED EAPI void         elm_list_scroller_policy_get(const 
Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
 
@@ -821,7 +821,7 @@ EINA_DEPRECATED EAPI void         
elm_scroller_custom_widget_base_theme_set(Evas
  *
  * @see elm_scroller_bounce_set()
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void elm_diskselector_bounce_set(Evas_Object *obj, 
Eina_Bool h_bounce, Eina_Bool v_bounce);
 
@@ -842,7 +842,7 @@ EINA_DEPRECATED EAPI void 
elm_diskselector_bounce_set(Evas_Object *obj, Eina_Boo
  * @see elm_scroller_bounce_get()
  * @see elm_diskselector_bounce_set()
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void elm_diskselector_bounce_get(const Evas_Object *obj, 
Eina_Bool *h_bounce, Eina_Bool *v_bounce);
 
@@ -859,7 +859,7 @@ EINA_DEPRECATED EAPI void elm_diskselector_bounce_get(const 
Evas_Object *obj, Ei
  *
  * @see elm_scroller_policy_get()
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void elm_diskselector_scroller_policy_get(const 
Evas_Object *obj, Elm_Scroller_Policy *policy_h, Elm_Scroller_Policy *policy_v);
 
@@ -882,7 +882,7 @@ EINA_DEPRECATED EAPI void 
elm_diskselector_scroller_policy_get(const Evas_Object
  *
  * @see elm_scroller_policy_set()
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void elm_diskselector_scroller_policy_set(Evas_Object 
*obj, Elm_Scroller_Policy policy_h, Elm_Scroller_Policy policy_v);
 
@@ -902,7 +902,7 @@ EINA_DEPRECATED EAPI void 
elm_diskselector_scroller_policy_set(Evas_Object *obj,
  *
  * @deprecated Use elm_image_file_set() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI Eina_Bool             elm_icon_file_set(Evas_Object *obj, 
const char *file, const char *group);
 
@@ -927,7 +927,7 @@ EINA_DEPRECATED EAPI Eina_Bool             
elm_icon_file_set(Evas_Object *obj, c
  *
  * @deprecated Use elm_image_memfile_set() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI Eina_Bool             elm_icon_memfile_set(Evas_Object 
*obj, const void *img, size_t size, const char *format, const char *key);
 
@@ -942,7 +942,7 @@ EINA_DEPRECATED EAPI Eina_Bool             
elm_icon_memfile_set(Evas_Object *obj
  *
  * @deprecated Use elm_image_file_get() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI void                  elm_icon_file_get(const Evas_Object 
*obj, const char **file, const char **group);
 
@@ -965,7 +965,7 @@ EINA_DEPRECATED EAPI void                  
elm_icon_file_get(const Evas_Object *
  *
  * @deprecated Use elm_image_smooth_set() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI void                  elm_icon_smooth_set(Evas_Object 
*obj, Eina_Bool smooth);
 
@@ -979,7 +979,7 @@ EINA_DEPRECATED EAPI void                  
elm_icon_smooth_set(Evas_Object *obj,
  *
  * @deprecated Use elm_image_smooth_get() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI Eina_Bool             elm_icon_smooth_get(const 
Evas_Object *obj);
 
@@ -1001,7 +1001,7 @@ EINA_DEPRECATED EAPI Eina_Bool             
elm_icon_smooth_get(const Evas_Object
  *
  * @deprecated Use elm_image_no_scale_set() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI void                  elm_icon_no_scale_set(Evas_Object 
*obj, Eina_Bool no_scale);
 
@@ -1015,7 +1015,7 @@ EINA_DEPRECATED EAPI void                  
elm_icon_no_scale_set(Evas_Object *ob
  *
  * @deprecated Use elm_image_no_scale_get() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI Eina_Bool             elm_icon_no_scale_get(const 
Evas_Object *obj);
 
@@ -1036,7 +1036,7 @@ EINA_DEPRECATED EAPI Eina_Bool             
elm_icon_no_scale_get(const Evas_Obje
  *
  * @deprecated Use elm_image_resizable_set() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI void                  elm_icon_resizable_set(Evas_Object 
*obj, Eina_Bool size_up, Eina_Bool size_down);
 
@@ -1051,7 +1051,7 @@ EINA_DEPRECATED EAPI void                  
elm_icon_resizable_set(Evas_Object *o
  *
  * @deprecated Use elm_image_resizable_get() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI void                  elm_icon_resizable_get(const 
Evas_Object *obj, Eina_Bool *size_up, Eina_Bool *size_down);
 
@@ -1064,7 +1064,7 @@ EINA_DEPRECATED EAPI void                  
elm_icon_resizable_get(const Evas_Obj
  *
  * @deprecated Use elm_image_object_size_get() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI void                  elm_icon_size_get(const Evas_Object 
*obj, int *w, int *h);
 
@@ -1091,7 +1091,7 @@ EINA_DEPRECATED EAPI void                  
elm_icon_size_get(const Evas_Object *
  *
  * @deprecated Use elm_image_fill_outside_set() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI void                  
elm_icon_fill_outside_set(Evas_Object *obj, Eina_Bool fill_outside);
 
@@ -1106,7 +1106,7 @@ EINA_DEPRECATED EAPI void                  
elm_icon_fill_outside_set(Evas_Object
  *
  * @deprecated Use elm_image_fill_outside_get() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI Eina_Bool             elm_icon_fill_outside_get(const 
Evas_Object *obj);
 
@@ -1132,7 +1132,7 @@ EINA_DEPRECATED EAPI Eina_Bool             
elm_icon_fill_outside_get(const Evas_
  *
  * @deprecated Use elm_image_prescale_set() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI void                  elm_icon_prescale_set(Evas_Object 
*obj, int size);
 
@@ -1146,7 +1146,7 @@ EINA_DEPRECATED EAPI void                  
elm_icon_prescale_set(Evas_Object *ob
  *
  * @deprecated Use elm_image_prescale_get() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI int                   elm_icon_prescale_get(const 
Evas_Object *obj);
 
@@ -1158,7 +1158,7 @@ EINA_DEPRECATED EAPI int                   
elm_icon_prescale_get(const Evas_Obje
  *
  * @deprecated Use elm_image_object_get() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI Evas_Object          *elm_icon_object_get(Evas_Object 
*obj);
 
@@ -1167,7 +1167,7 @@ EINA_DEPRECATED EAPI Evas_Object          
*elm_icon_object_get(Evas_Object *obj)
  *
  * @param obj The icon object
  * @param disabled If EINA_TRUE, preloading will be disabled
- * @ingroup Icon
+ * @ingroup Elm_Icon
  *
  * @deprecated Use elm_image_preload_disabled_set() instead.
  *
@@ -1184,7 +1184,7 @@ EINA_DEPRECATED EAPI void  
elm_icon_preload_disabled_set(Evas_Object *obj, Eina_
  * Return if this elm icon's image can be animated. Currently Evas only
  * supports gif animation. If the return value is EINA_FALSE, other
  * elm_icon_animated_xxx APIs won't work.
- * @ingroup Icon
+ * @ingroup Elm_Icon
  *
  * @deprecated Use elm_image_animated_available_get() instead.
  *
@@ -1203,7 +1203,7 @@ EINA_DEPRECATED EAPI Eina_Bool 
elm_icon_animated_available_get(const Evas_Object
  * can animate, and this is supported if you enable animated support
  * on the icon.
  * Set it to EINA_TRUE when the icon needs to be animated.
- * @ingroup Icon
+ * @ingroup Elm_Icon
  *
  * @deprecated Use elm_image_animated_set() instead.
  *
@@ -1216,7 +1216,7 @@ EINA_DEPRECATED EAPI void  
elm_icon_animated_set(Evas_Object *obj, Eina_Bool ani
  * @param obj The icon object
  * @return The animation mode of the icon object
  * @see elm_icon_animated_set
- * @ingroup Icon
+ * @ingroup Elm_Icon
  *
  * @deprecated Use elm_image_animated_get() instead.
  *
@@ -1241,7 +1241,7 @@ EINA_DEPRECATED EAPI Eina_Bool 
elm_icon_animated_get(const Evas_Object *obj);
  * 2. Check play flag using elm_icon_animated_play_get
  * 3. If elm icon was playing, set play to EINA_FALSE.
  *    Then animation will be stopped and vice versa
- * @ingroup Icon
+ * @ingroup Elm_Icon
  *
  * @deprecated Use elm_image_animated_play_set() instead.
  *
@@ -1255,7 +1255,7 @@ EINA_DEPRECATED EAPI void  
elm_icon_animated_play_set(Evas_Object *obj, Eina_Boo
  * @return The play mode of the icon object
  *
  * @see elm_icon_animated_play_get
- * @ingroup Icon
+ * @ingroup Elm_Icon
  *
  * @deprecated Use elm_image_animated_play_get() instead.
  *
@@ -1277,7 +1277,7 @@ EINA_DEPRECATED EAPI Eina_Bool 
elm_icon_animated_play_get(const Evas_Object *obj
  * @see elm_icon_aspect_fixed_get()
  * @see elm_icon_fill_outside_set()
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  *
  * @deprecated Use elm_image_aspect_fixed_set() instead.
  *
@@ -1293,7 +1293,7 @@ EINA_DEPRECATED EAPI void  
elm_icon_aspect_fixed_set(Evas_Object *obj, Eina_Bool
  *
  * @deprecated Use elm_image_aspect_fixed_get() instead.
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EINA_DEPRECATED EAPI Eina_Bool elm_icon_aspect_fixed_get(const Evas_Object 
*obj);
 
@@ -1313,7 +1313,7 @@ EINA_DEPRECATED EAPI Eina_Bool 
elm_icon_aspect_fixed_get(const Evas_Object *obj)
  *
  * @deprecated Use elm_fileselector_path_set() instead.
  *
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
  */
 EINA_DEPRECATED EAPI void        elm_fileselector_button_path_set(Evas_Object 
*obj, const char *path);
 
@@ -1328,7 +1328,7 @@ EINA_DEPRECATED EAPI void        
elm_fileselector_button_path_set(Evas_Object *o
  *
  * @deprecated Use elm_fileselector_path_get() instead.
  *
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
  */
 EINA_DEPRECATED EAPI const char *elm_fileselector_button_path_get(const 
Evas_Object *obj);
 
@@ -1352,7 +1352,7 @@ EINA_DEPRECATED EAPI const char 
*elm_fileselector_button_path_get(const Evas_Obj
  *
  * @deprecated Use elm_fileselector_expandable_set() instead.
  *
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
  */
 EINA_DEPRECATED EAPI void        
elm_fileselector_button_expandable_set(Evas_Object *obj, Eina_Bool value);
 
@@ -1368,7 +1368,7 @@ EINA_DEPRECATED EAPI void        
elm_fileselector_button_expandable_set(Evas_Obj
  *
  * @deprecated Use elm_fileselector_expandable_get() instead.
  *
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
  */
 EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_expandable_get(const 
Evas_Object *obj);
 
@@ -1390,7 +1390,7 @@ EINA_DEPRECATED EAPI Eina_Bool   
elm_fileselector_button_expandable_get(const Ev
  *
  * @deprecated Use elm_fileselector_folder_only_set() instead.
  *
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
  */
 EINA_DEPRECATED EAPI void        
elm_fileselector_button_folder_only_set(Evas_Object *obj, Eina_Bool value);
 
@@ -1408,7 +1408,7 @@ EINA_DEPRECATED EAPI void        
elm_fileselector_button_folder_only_set(Evas_Ob
  *
  * @deprecated Use elm_fileselector_folder_only_get() instead.
  *
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
  */
 EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_folder_only_get(const 
Evas_Object *obj);
 
@@ -1429,7 +1429,7 @@ EINA_DEPRECATED EAPI Eina_Bool   
elm_fileselector_button_folder_only_get(const E
  *
  * @deprecated Use elm_fileselector_is_save_set() instead.
  *
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
  */
 EINA_DEPRECATED EAPI void        
elm_fileselector_button_is_save_set(Evas_Object *obj, Eina_Bool value);
 
@@ -1446,7 +1446,7 @@ EINA_DEPRECATED EAPI void        
elm_fileselector_button_is_save_set(Evas_Object
  *
  * @deprecated Use elm_fileselector_is_save_get() instead.
  *
- * @ingroup File_Selector_Button
+ * @ingroup Elm_File_Selector_Button
  */
 EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_is_save_get(const 
Evas_Object *obj);
 
@@ -1466,7 +1466,7 @@ EINA_DEPRECATED EAPI Eina_Bool   
elm_fileselector_button_is_save_get(const Evas_
  *
  * @deprecated Use elm_fileselector_path_set() instead.
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI void        elm_fileselector_entry_path_set(Evas_Object 
*obj, const char *path);
 
@@ -1480,7 +1480,7 @@ EINA_DEPRECATED EAPI void        
elm_fileselector_entry_path_set(Evas_Object *ob
  * @see elm_fileselector_path_set() for more details
  *
  * @deprecated Use elm_fileselector_path_get() instead.
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI const char *elm_fileselector_entry_path_get(const 
Evas_Object *obj);
 
@@ -1503,7 +1503,7 @@ EINA_DEPRECATED EAPI const char 
*elm_fileselector_entry_path_get(const Evas_Obje
  *
  * @deprecated Use elm_fileselector_expandable_set() instead.
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI void        
elm_fileselector_entry_expandable_set(Evas_Object *obj, Eina_Bool value);
 
@@ -1519,7 +1519,7 @@ EINA_DEPRECATED EAPI void        
elm_fileselector_entry_expandable_set(Evas_Obje
  *
  * @deprecated Use elm_fileselector_expandable_get() instead.
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_entry_expandable_get(const 
Evas_Object *obj);
 
@@ -1541,7 +1541,7 @@ EINA_DEPRECATED EAPI Eina_Bool   
elm_fileselector_entry_expandable_get(const Eva
  *
  * @deprecated Use elm_fileselector_folder_only_set() instead.
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI void        
elm_fileselector_entry_folder_only_set(Evas_Object *obj, Eina_Bool value);
 
@@ -1559,7 +1559,7 @@ EINA_DEPRECATED EAPI void        
elm_fileselector_entry_folder_only_set(Evas_Obj
  *
  * @deprecated Use elm_fileselector_folder_only_get() instead.
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_entry_folder_only_get(const 
Evas_Object *obj);
 
@@ -1580,7 +1580,7 @@ EINA_DEPRECATED EAPI Eina_Bool   
elm_fileselector_entry_folder_only_get(const Ev
  *
  * @deprecated Use elm_fileselector_is_save_set() instead.
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI void        
elm_fileselector_entry_is_save_set(Evas_Object *obj, Eina_Bool value);
 
@@ -1597,7 +1597,7 @@ EINA_DEPRECATED EAPI void        
elm_fileselector_entry_is_save_set(Evas_Object
  *
  * @deprecated Use elm_fileselector_is_save_get() instead.
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_entry_is_save_get(const 
Evas_Object *obj);
 
@@ -1617,7 +1617,7 @@ EINA_DEPRECATED EAPI Eina_Bool   
elm_fileselector_entry_is_save_get(const Evas_O
  *
  * @deprecated Use elm_fileselector_selected_set() instead.
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI void        
elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path);
 
@@ -1633,7 +1633,7 @@ EINA_DEPRECATED EAPI void        
elm_fileselector_entry_selected_set(Evas_Object
  *
  * @deprecated Use elm_fileselector_selected_get() instead.
  *
- * @ingroup File_Selector_Entry
+ * @ingroup Elm_File_Selector_Entry
  */
 EINA_DEPRECATED EAPI const char *elm_fileselector_entry_selected_get(const 
Evas_Object *obj);
 
diff --git a/src/lib/elm_diskselector.h b/src/lib/elm_diskselector.h
index 3f0a431..8ed6904 100644
--- a/src/lib/elm_diskselector.h
+++ b/src/lib/elm_diskselector.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Diskselector Diskselector
+ * @defgroup Elm_Diskselector Diskselector
  * @ingroup Elementary
  *
  * @image html diskselector_inheritance_tree.png
@@ -62,7 +62,7 @@
  */
 
 /**
- * @addtogroup Diskselector
+ * @addtogroup Elm_Diskselector
  * @{
  */
 
diff --git a/src/lib/elm_diskselector_legacy.h 
b/src/lib/elm_diskselector_legacy.h
index 5213ad5..7ee5080 100644
--- a/src/lib/elm_diskselector_legacy.h
+++ b/src/lib/elm_diskselector_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new diskselector widget on the canvas.
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EAPI Evas_Object           *elm_diskselector_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_entry.h b/src/lib/elm_entry.h
index c4dd8bd..a24a1cb 100644
--- a/src/lib/elm_entry.h
+++ b/src/lib/elm_entry.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Entry Entry
+ * @defgroup Elm_Entry Entry
  * @ingroup Elementary
  *
  * @image html entry_inheritance_tree.png
diff --git a/src/lib/elm_entry_common.h b/src/lib/elm_entry_common.h
index cee2383..01ececb 100644
--- a/src/lib/elm_entry_common.h
+++ b/src/lib/elm_entry_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Entry
+ * @addtogroup Elm_Entry
  *
  * @{
  */
diff --git a/src/lib/elm_entry_legacy.h b/src/lib/elm_entry_legacy.h
index 1482710..2a30544 100644
--- a/src/lib/elm_entry_legacy.h
+++ b/src/lib/elm_entry_legacy.h
@@ -12,7 +12,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Entry
+ * @ingroup Elm_Entry
  */
 EAPI Evas_Object       *elm_entry_add(Evas_Object *parent);
 
@@ -24,7 +24,7 @@ EAPI Evas_Object       *elm_entry_add(Evas_Object *parent);
  *
  * @note Using this function bypasses text filters
  *
- * @ingroup Entry
+ * @ingroup Elm_Entry
  */
 EAPI void               elm_entry_entry_set(Evas_Object *obj, const char 
*entry);
 
@@ -35,7 +35,7 @@ EAPI void               elm_entry_entry_set(Evas_Object *obj, 
const char *entry)
  * @param obj The entry object
  * @return The currently displayed text or NULL on failure
  *
- * @ingroup Entry
+ * @ingroup Elm_Entry
  */
 EAPI const char        *elm_entry_entry_get(const Evas_Object *obj);
 
@@ -51,7 +51,7 @@ EAPI const char        *elm_entry_entry_get(const Evas_Object 
*obj);
  *
  * @return @c EINA_TRUE on success, @c EINA_FALSE otherwise
  *
- * @ingroup Entry
+ * @ingroup Elm_Entry
  *
  * @param[in] file The path to the file to load and save
  * @param[in] format The file format
@@ -65,7 +65,7 @@ EAPI Eina_Bool          elm_entry_file_set(Evas_Object *obj, 
const char *file, E
  * This function can be used to retrieve any file set on the entry for
  * edition, along with the format used to load and save it.
  *
- * @ingroup Entry
+ * @ingroup Elm_Entry
  *
  * @param[out] file The path to the file to load and save
  * @param[out] format The file format
diff --git a/src/lib/elm_flip.h b/src/lib/elm_flip.h
index 8effc46..3bdbdd8 100644
--- a/src/lib/elm_flip.h
+++ b/src/lib/elm_flip.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Flip Flip
+ * @defgroup Elm_Flip Flip
  * @ingroup Elementary
  *
  * @image html flip_inheritance_tree.png
diff --git a/src/lib/elm_flip_legacy.h b/src/lib/elm_flip_legacy.h
index 85e09b9..23f3b78 100644
--- a/src/lib/elm_flip_legacy.h
+++ b/src/lib/elm_flip_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Flip
+ * @ingroup Elm_Flip
  */
 EAPI Evas_Object *elm_flip_add(Evas_Object *parent);
 
@@ -18,7 +18,7 @@ EAPI Evas_Object *elm_flip_add(Evas_Object *parent);
  *
  * @warning This function currently does nothing.
  *
- * @ingroup Flip
+ * @ingroup Elm_Flip
  */
 EAPI void                 elm_flip_perspective_set(Evas_Object *obj, 
Evas_Coord foc, Evas_Coord x, Evas_Coord y);
 
diff --git a/src/lib/elm_flipselector.h b/src/lib/elm_flipselector.h
index 615a5c3..ee9d765 100644
--- a/src/lib/elm_flipselector.h
+++ b/src/lib/elm_flipselector.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Flipselector Flip Selector
+ * @defgroup Elm_Flipselector Flip Selector
  * @ingroup Elementary
  *
  * @image html flipselector_inheritance_tree.png
@@ -55,7 +55,7 @@
  */
 
 /**
- * @addtogroup Flipselector
+ * @addtogroup Elm_Flipselector
  * @{
  */
 
diff --git a/src/lib/elm_flipselector_legacy.h 
b/src/lib/elm_flipselector_legacy.h
index 556272c..a2fbd58 100644
--- a/src/lib/elm_flipselector_legacy.h
+++ b/src/lib/elm_flipselector_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new flip selector widget on the canvas.
  *
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
  */
 EAPI Evas_Object                *elm_flipselector_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_frame.h b/src/lib/elm_frame.h
index a7dad2b..5ff0e17 100644
--- a/src/lib/elm_frame.h
+++ b/src/lib/elm_frame.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Frame Frame
+ * @defgroup Elm_Frame Frame
  * @ingroup Elementary
  *
  * @image html frame_inheritance_tree.png
diff --git a/src/lib/elm_frame_legacy.h b/src/lib/elm_frame_legacy.h
index 3462a1f..a0f51f8 100644
--- a/src/lib/elm_frame_legacy.h
+++ b/src/lib/elm_frame_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Frame
+ * @ingroup Elm_Frame
  */
 EAPI Evas_Object                 *elm_frame_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_glview.h b/src/lib/elm_glview.h
index 7a99d55..d1c6672 100644
--- a/src/lib/elm_glview.h
+++ b/src/lib/elm_glview.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup GLView GLView
+ * @defgroup Elm_GLView GLView
  * @ingroup Elementary
  *
  * @image html glview_inheritance_tree.png
@@ -23,7 +23,7 @@
  */
 
 /**
- * @ingroup GLView
+ * @ingroup Elm_GLView
  */
 
 #include "elm_glview_common.h"
diff --git a/src/lib/elm_glview_common.h b/src/lib/elm_glview_common.h
index 12c69ec..c84d49b 100644
--- a/src/lib/elm_glview_common.h
+++ b/src/lib/elm_glview_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup GLView
+ * @addtogroup Elm_GLView
  *
  * @{
  */
diff --git a/src/lib/elm_glview_legacy.h b/src/lib/elm_glview_legacy.h
index fdfbb6a..41944da 100644
--- a/src/lib/elm_glview_legacy.h
+++ b/src/lib/elm_glview_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup GLView
+ * @ingroup Elm_GLView
  */
 EAPI Evas_Object *elm_glview_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_hover.h b/src/lib/elm_hover.h
index 1563265..7e4f3f3 100644
--- a/src/lib/elm_hover.h
+++ b/src/lib/elm_hover.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Hover Hover
+ * @defgroup Elm_Hover Hover
  * @ingroup Elementary
  *
  * @image html hover_inheritance_tree.png
diff --git a/src/lib/elm_hover_legacy.h b/src/lib/elm_hover_legacy.h
index fdb5e62..407d97e 100644
--- a/src/lib/elm_hover_legacy.h
+++ b/src/lib/elm_hover_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The hover object or NULL if one could not be created
  *
- * @ingroup Hover
+ * @ingroup Elm_Hover
  */
 EAPI Evas_Object *elm_hover_add(Evas_Object *parent);
 
@@ -17,7 +17,7 @@ EAPI Evas_Object *elm_hover_add(Evas_Object *parent);
  * This function will cause the hover to take up the entire space that the
  * parent object fills.
  *
- * @ingroup Hover
+ * @ingroup Elm_Hover
  */
 EAPI void         elm_hover_parent_set(Evas_Object *obj, Evas_Object *parent);
 
@@ -29,7 +29,7 @@ EAPI void         elm_hover_parent_set(Evas_Object *obj, 
Evas_Object *parent);
  *
  * @see elm_hover_parent_set()
  *
- * @ingroup Hover
+ * @ingroup Elm_Hover
  */
 EAPI Evas_Object *elm_hover_parent_get(const Evas_Object *obj);
 
diff --git a/src/lib/elm_icon.h b/src/lib/elm_icon.h
index 3420fbd..a53a95b 100644
--- a/src/lib/elm_icon.h
+++ b/src/lib/elm_icon.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Icon Icon
+ * @defgroup Elm_Icon Icon
  * @ingroup Elementary
  *
  * @image html icon_inheritance_tree.png
diff --git a/src/lib/elm_icon_legacy.h b/src/lib/elm_icon_legacy.h
index edf51db..a034a68 100644
--- a/src/lib/elm_icon_legacy.h
+++ b/src/lib/elm_icon_legacy.h
@@ -6,7 +6,7 @@
  *
  * @see elm_image_file_set()
  *
- * @ingroup Icon
+ * @ingroup Elm_Icon
  */
 EAPI Evas_Object          *elm_icon_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_image.h b/src/lib/elm_image.h
index c14dc23..693086d 100644
--- a/src/lib/elm_image.h
+++ b/src/lib/elm_image.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Image Image
+ * @defgroup Elm_Image Image
  * @ingroup Elementary
  *
  * @image html image_inheritance_tree.png
@@ -37,7 +37,7 @@
 
 
 /**
- * @addtogroup Image
+ * @addtogroup Elm_Image
  * @{
  */
 
diff --git a/src/lib/elm_image_eo.h b/src/lib/elm_image_eo.h
index c423e65..22896e7 100644
--- a/src/lib/elm_image_eo.h
+++ b/src/lib/elm_image_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Image
+ * @ingroup Elm_Image
  *
  * @{
  */
diff --git a/src/lib/elm_image_legacy.h b/src/lib/elm_image_legacy.h
index 15d1e65..244ab22 100644
--- a/src/lib/elm_image_legacy.h
+++ b/src/lib/elm_image_legacy.h
@@ -6,7 +6,7 @@
  *
  * @see elm_image_file_set()
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  */
 EAPI Evas_Object     *elm_image_add(Evas_Object *parent);
 
@@ -32,7 +32,7 @@ EAPI Evas_Object     *elm_image_add(Evas_Object *parent);
  * Or image objects will share one evas image cache entry and you will get
  * unwanted frames.
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  */
 EAPI Eina_Bool        elm_image_file_set(Evas_Object *obj, const char *file, 
const char *group);
 
@@ -41,7 +41,7 @@ EAPI Eina_Bool        elm_image_file_set(Evas_Object *obj, 
const char *file, con
  *
  * @see elm_image_file_set()
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  *
  * @param[out] file The path to file that will be used as image source
  * @param[out] group The group that the image belongs to, in case it's an
@@ -70,7 +70,7 @@ EAPI void elm_image_file_get(const Eo *obj, const char 
**file, const char **grou
  * @see elm_image_prescale_get()
  * @see elm_bg_load_size_set()
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  */
 EAPI void             elm_image_prescale_set(Evas_Object *obj, int size);
 
@@ -82,7 +82,7 @@ EAPI void             elm_image_prescale_set(Evas_Object 
*obj, int size);
  *
  * @see elm_image_prescale_set()
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  */
 EAPI int              elm_image_prescale_get(const Evas_Object *obj);
 
@@ -108,7 +108,7 @@ EAPI int              elm_image_prescale_get(const 
Evas_Object *obj);
  * Or image objects will share one evas image cache entry and you will get
  * unwanted frames.
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  */
 EAPI Eina_Bool        elm_image_mmap_set(Evas_Object *obj, const Eina_File 
*file, const char *group);
 
@@ -171,7 +171,7 @@ EAPI Eina_Bool elm_image_smooth_get(const Evas_Object *obj);
  * @see elm_image_animated_set()
  * @see elm_image_animated_play_get()
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  * @since 1.7
  *
  * @param[in] play @c EINA_TRUE to start the animation, @c EINA_FALSE
@@ -187,7 +187,7 @@ EAPI void             
elm_image_animated_play_set(Evas_Object *obj, Eina_Bool pl
  *
  * @see elm_image_animated_play_get()
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  * @since 1.7
  */
 EAPI Eina_Bool        elm_image_animated_play_get(const Evas_Object *obj);
@@ -206,7 +206,7 @@ EAPI Eina_Bool        elm_image_animated_play_get(const 
Evas_Object *obj);
  * @see elm_image_animated_available_get()
  * @see elm_image_animated_play_set()
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  * @since 1.7
  *
  * @param[in] anim @c EINA_TRUE if the object is to animate itself,
@@ -223,7 +223,7 @@ EAPI void             elm_image_animated_set(Evas_Object 
*obj, Eina_Bool anim);
  *
  * @see elm_image_animated_set()
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  * @since 1.7
  *
  */
@@ -243,7 +243,7 @@ EAPI Eina_Bool        elm_image_animated_get(const 
Evas_Object *obj);
  *
  * @see elm_image_animated_set()
  *
- * @ingroup Image
+ * @ingroup Elm_Image
  * @since 1.7
  *
  */
diff --git a/src/lib/elm_index.h b/src/lib/elm_index.h
index 32e91fb..538e96b 100644
--- a/src/lib/elm_index.h
+++ b/src/lib/elm_index.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Index Index
+ * @defgroup Elm_Index Index
  * @ingroup Elementary
  *
  * @image html index_inheritance_tree.png
@@ -58,7 +58,7 @@
  */
 
 /**
- * @addtogroup Index
+ * @addtogroup Elm_Index
  * @{
  */
 
diff --git a/src/lib/elm_index_eo.h b/src/lib/elm_index_eo.h
index c46708d..9ca6418 100644
--- a/src/lib/elm_index_eo.h
+++ b/src/lib/elm_index_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Index
+ * @ingroup Elm_Index
  *
  * @{
  */
diff --git a/src/lib/elm_index_legacy.h b/src/lib/elm_index_legacy.h
index 7846f64..262aaf9 100644
--- a/src/lib/elm_index_legacy.h
+++ b/src/lib/elm_index_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new index widget on the canvas.
  *
- * @ingroup Index
+ * @ingroup Elm_Index
  */
 EAPI Evas_Object          *elm_index_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_inwin.h b/src/lib/elm_inwin.h
index 85335ab..a4448a1 100644
--- a/src/lib/elm_inwin.h
+++ b/src/lib/elm_inwin.h
@@ -1,6 +1,6 @@
 /**
- * @defgroup Inwin Inwin
- * @ingroup Win
+ * @defgroup Elm_Inwin Inwin
+ * @ingroup Elm_Win
  *
  * @image html inwin_inheritance_tree.png
  * @image latex inwin_inheritance_tree.eps
diff --git a/src/lib/elm_inwin_legacy.h b/src/lib/elm_inwin_legacy.h
index 20698c0..a085db0 100644
--- a/src/lib/elm_inwin_legacy.h
+++ b/src/lib/elm_inwin_legacy.h
@@ -14,7 +14,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Inwin
+ * @ingroup Elm_Inwin
  */
 EAPI Evas_Object *elm_win_inwin_add(Evas_Object *parent);
 
@@ -28,7 +28,7 @@ EAPI Evas_Object *elm_win_inwin_add(Evas_Object *parent);
  * @param obj The inwin object
  * @param content The object to set as content
  *
- * @ingroup Inwin
+ * @ingroup Elm_Inwin
  */
 EAPI void         elm_win_inwin_content_set(Evas_Object *obj, Evas_Object 
*content);
 
@@ -47,7 +47,7 @@ EAPI void         elm_win_inwin_content_set(Evas_Object *obj, 
Evas_Object *conte
  * @param obj The inwin object
  * @return The content that is being used
  *
- * @ingroup Inwin
+ * @ingroup Elm_Inwin
  */
 EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object *obj);
 
@@ -59,7 +59,7 @@ EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object 
*obj);
  * @param obj The inwin object
  * @return The content that was being used
  *
- * @ingroup Inwin
+ * @ingroup Elm_Inwin
  */
 EAPI Evas_Object *elm_win_inwin_content_unset(Evas_Object *obj);
 
diff --git a/src/lib/elm_label.h b/src/lib/elm_label.h
index d6187ef..83e497f 100644
--- a/src/lib/elm_label.h
+++ b/src/lib/elm_label.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Label Label
+ * @defgroup Elm_Label Label
  * @ingroup Elementary
  *
  * @image html label_inheritance_tree.png
diff --git a/src/lib/elm_label_eo.h b/src/lib/elm_label_eo.h
index 1355127..2666758 100644
--- a/src/lib/elm_label_eo.h
+++ b/src/lib/elm_label_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Label
+ * @ingroup Elm_Label
  *
  * @{
  */
diff --git a/src/lib/elm_label_legacy.h b/src/lib/elm_label_legacy.h
index dd48b82..f072006 100644
--- a/src/lib/elm_label_legacy.h
+++ b/src/lib/elm_label_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Label
+ * @ingroup Elm_Label
  */
 EAPI Evas_Object                *elm_label_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_list.h b/src/lib/elm_list.h
index a324ad2..b9e9000 100644
--- a/src/lib/elm_list.h
+++ b/src/lib/elm_list.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup List List
+ * @defgroup Elm_List List
  * @ingroup Elementary
  *
  * @image html list_inheritance_tree.png
@@ -92,7 +92,7 @@
  */
 
 /**
- * @addtogroup List
+ * @addtogroup Elm_List
  * @{
  */
 
diff --git a/src/lib/elm_list_eo.h b/src/lib/elm_list_eo.h
index f3bf3bc..d243e2b 100644
--- a/src/lib/elm_list_eo.h
+++ b/src/lib/elm_list_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup List
+ * @ingroup Elm_List
  *
  * @{
  */
diff --git a/src/lib/elm_list_legacy.h b/src/lib/elm_list_legacy.h
index 190a4c6..a99532d 100644
--- a/src/lib/elm_list_legacy.h
+++ b/src/lib/elm_list_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new list widget on the canvas.
  *
- * @ingroup List
+ * @ingroup Elm_List
  */
 EAPI Evas_Object                 *elm_list_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_map.h b/src/lib/elm_map.h
index 8f2bfdc..5026763 100644
--- a/src/lib/elm_map.h
+++ b/src/lib/elm_map.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Map Map
+ * @defgroup Elm_Map Map
  * @ingroup Elementary
  *
  * @image html map_inheritance_tree.png
diff --git a/src/lib/elm_map_common.h b/src/lib/elm_map_common.h
index 55fa955..625094a 100644
--- a/src/lib/elm_map_common.h
+++ b/src/lib/elm_map_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Map
+ * @addtogroup Elm_Map
  *
  * @{
  */
diff --git a/src/lib/elm_map_legacy.h b/src/lib/elm_map_legacy.h
index 6176522..ff0facd 100644
--- a/src/lib/elm_map_legacy.h
+++ b/src/lib/elm_map_legacy.h
@@ -6,7 +6,7 @@
  *
  * This function inserts a new map widget on the canvas.
  *
- * @ingroup Map
+ * @ingroup Elm_Map
  */
 EAPI Evas_Object          *elm_map_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_mapbuf.h b/src/lib/elm_mapbuf.h
index b2ef299..7714cfd 100644
--- a/src/lib/elm_mapbuf.h
+++ b/src/lib/elm_mapbuf.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Mapbuf Mapbuf
+ * @defgroup Elm_Mapbuf Mapbuf
  * @ingroup Elementary
  *
  * @image html mapbuf_inheritance_tree.png
@@ -32,7 +32,7 @@
  */
 
 /**
- * @addtogroup Mapbuf
+ * @addtogroup Elm_Mapbuf
  * @{
  */
 
diff --git a/src/lib/elm_mapbuf_eo.h b/src/lib/elm_mapbuf_eo.h
index 05862c4..dd0c5b8 100644
--- a/src/lib/elm_mapbuf_eo.h
+++ b/src/lib/elm_mapbuf_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Mapbuf
+ * @ingroup Elm_Mapbuf
  *
  * @{
  */
diff --git a/src/lib/elm_mapbuf_legacy.h b/src/lib/elm_mapbuf_legacy.h
index 6308956..bc56b1d 100644
--- a/src/lib/elm_mapbuf_legacy.h
+++ b/src/lib/elm_mapbuf_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new mapbuf widget on the canvas.
  *
- * @ingroup Mapbuf
+ * @ingroup Elm_Mapbuf
  */
 EAPI Evas_Object                 *elm_mapbuf_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_menu.h b/src/lib/elm_menu.h
index cf2eb05..1afb076 100644
--- a/src/lib/elm_menu.h
+++ b/src/lib/elm_menu.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Menu Menu
+ * @defgroup Elm_Menu Menu
  * @ingroup Elementary
  *
  * @image html menu_inheritance_tree.png
diff --git a/src/lib/elm_menu_legacy.h b/src/lib/elm_menu_legacy.h
index a575de8..9c86efc 100644
--- a/src/lib/elm_menu_legacy.h
+++ b/src/lib/elm_menu_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object.
  * @return The new object or NULL if it cannot be created.
  *
- * @ingroup Menu
+ * @ingroup Elm_Menu
  */
 EAPI Evas_Object                 *elm_menu_add(Evas_Object *parent);
 
@@ -14,7 +14,7 @@ EAPI Evas_Object                 *elm_menu_add(Evas_Object 
*parent);
  * @param obj The menu object.
  * @param parent The new parent.
  *
- * @ingroup Menu
+ * @ingroup Elm_Menu
  */
 EAPI void                         elm_menu_parent_set(Evas_Object *obj, 
Evas_Object *parent);
 
@@ -26,7 +26,7 @@ EAPI void                         
elm_menu_parent_set(Evas_Object *obj, Evas_Obj
  *
  * @see elm_menu_parent_set()
  *
- * @ingroup Menu
+ * @ingroup Elm_Menu
  */
 EAPI Evas_Object                 *elm_menu_parent_get(const Evas_Object *obj);
 
diff --git a/src/lib/elm_need.h b/src/lib/elm_need.h
index 6f2e89b..84bba74 100644
--- a/src/lib/elm_need.h
+++ b/src/lib/elm_need.h
@@ -93,7 +93,7 @@ EAPI Eina_Bool elm_need_elocation(void);
  * This must be called before any other function that deals with
  * elm_thumb objects or ethumb_client instances.
  *
- * @ingroup Thumb
+ * @ingroup Elm_Thumb
  */
 EAPI Eina_Bool elm_need_ethumb(void);
 
@@ -105,6 +105,6 @@ EAPI Eina_Bool elm_need_ethumb(void);
  * This must be called before any other function that deals with
  * elm_web objects or ewk_view instances.
  *
- * @ingroup Web
+ * @ingroup Elm_Web
  */
 EAPI Eina_Bool elm_need_web(void);
diff --git a/src/lib/elm_notify.h b/src/lib/elm_notify.h
index 170198f..0d4e5da 100644
--- a/src/lib/elm_notify.h
+++ b/src/lib/elm_notify.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Notify Notify
+ * @defgroup Elm_Notify Notify
  * @ingroup Elementary
  *
  * @image html notify_inheritance_tree.png
diff --git a/src/lib/elm_notify_eo.h b/src/lib/elm_notify_eo.h
index cc35dff..e1382c3 100644
--- a/src/lib/elm_notify_eo.h
+++ b/src/lib/elm_notify_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Notify
+ * @ingroup Elm_Notify
  *
  * @{
  */
diff --git a/src/lib/elm_notify_legacy.h b/src/lib/elm_notify_legacy.h
index fed3b98..e3547d7 100644
--- a/src/lib/elm_notify_legacy.h
+++ b/src/lib/elm_notify_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Notify
+ * @ingroup Elm_Notify
  */
 EAPI Evas_Object                 *elm_notify_add(Evas_Object *parent);
 
@@ -17,7 +17,7 @@ EAPI Evas_Object                 *elm_notify_add(Evas_Object 
*parent);
  * Once the parent object is set, a previously set one will be disconnected
  * and replaced.
  *
- * @ingroup Notify
+ * @ingroup Elm_Notify
  */
 EAPI void                         elm_notify_parent_set(Evas_Object *obj, 
Evas_Object *parent);
 
@@ -29,7 +29,7 @@ EAPI void                         
elm_notify_parent_set(Evas_Object *obj, Evas_O
  *
  * @see elm_notify_parent_set()
  *
- * @ingroup Notify
+ * @ingroup Elm_Notify
  */
 EAPI Evas_Object                 *elm_notify_parent_get(const Evas_Object 
*obj);
 
diff --git a/src/lib/elm_panel.h b/src/lib/elm_panel.h
index 175fcc1..1a9c5d0 100644
--- a/src/lib/elm_panel.h
+++ b/src/lib/elm_panel.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Panel Panel
+ * @defgroup Elm_Panel Panel
  * @ingroup Elementary
  *
  * @image html panel_inheritance_tree.png
diff --git a/src/lib/elm_panel_common.h b/src/lib/elm_panel_common.h
index 53b77e4..236c83d 100644
--- a/src/lib/elm_panel_common.h
+++ b/src/lib/elm_panel_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Panel
+ * @addtogroup Elm_Panel
  *
  * @{
  */
diff --git a/src/lib/elm_panel_legacy.h b/src/lib/elm_panel_legacy.h
index dd5d416..33513fc 100644
--- a/src/lib/elm_panel_legacy.h
+++ b/src/lib/elm_panel_legacy.h
@@ -5,7 +5,7 @@
  *
  * @return The panel object, or NULL on failure
  *
- * @ingroup Panel
+ * @ingroup Elm_Panel
  */
 EAPI Evas_Object                 *elm_panel_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_photo.h b/src/lib/elm_photo.h
index db928f0..60a8806 100644
--- a/src/lib/elm_photo.h
+++ b/src/lib/elm_photo.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Photo Photo
+ * @defgroup Elm_Photo Photo
  * @ingroup Elementary
  *
  * @image html photo_inheritance_tree.png
diff --git a/src/lib/elm_photo_eo.h b/src/lib/elm_photo_eo.h
index 5607977..f89beb7 100644
--- a/src/lib/elm_photo_eo.h
+++ b/src/lib/elm_photo_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Photo
+ * @ingroup Elm_Photo
  *
  * @{
  */
diff --git a/src/lib/elm_photo_legacy.h b/src/lib/elm_photo_legacy.h
index 8534268..0dca425 100644
--- a/src/lib/elm_photo_legacy.h
+++ b/src/lib/elm_photo_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Photo
+ * @ingroup Elm_Photo
  */
 EAPI Evas_Object *elm_photo_add(Evas_Object *parent);
 
@@ -17,7 +17,7 @@ EAPI Evas_Object *elm_photo_add(Evas_Object *parent);
  * @note Use @c NULL on @a file to set the photo widget back to it's
  * initial state, which indicates "no photo".
  *
- * @ingroup Photo
+ * @ingroup Elm_Photo
  *
  * @param[in] file The path to file that will be used as @a obj's image.
  */
diff --git a/src/lib/elm_photocam.h b/src/lib/elm_photocam.h
index c3b5b82..74cd16d 100644
--- a/src/lib/elm_photocam.h
+++ b/src/lib/elm_photocam.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Photocam Photocam
+ * @defgroup Elm_Photocam Photocam
  * @ingroup Elementary
  *
  * @image html photocam_inheritance_tree.png
diff --git a/src/lib/elm_photocam_legacy.h b/src/lib/elm_photocam_legacy.h
index c4c206e..c7e720c 100644
--- a/src/lib/elm_photocam_legacy.h
+++ b/src/lib/elm_photocam_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
  */
 EAPI Evas_Object           *elm_photocam_add(Evas_Object *parent);
 
@@ -19,7 +19,7 @@ EAPI Evas_Object           *elm_photocam_add(Evas_Object 
*parent);
  *
  * This shows the region of the image using animation.
  *
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
  */
 EAPI void                   elm_photocam_image_region_bring_in(Evas_Object 
*obj, int x, int y, int w, int h);
 
@@ -36,7 +36,7 @@ EAPI void                   
elm_photocam_image_region_bring_in(Evas_Object *obj,
  * photo that at some time in the future will be displayed at the full
  * quality needed.
  *
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
  *
  * @param[in] file The photo file
  */
@@ -50,7 +50,7 @@ EAPI Evas_Load_Error elm_photocam_file_set(Evas_Object *obj, 
const char *file);
  *
  * @see elm_photocam_file_set()
  *
- * @ingroup Photocam
+ * @ingroup Elm_Photocam
  *
  */
 EAPI const char *elm_photocam_file_get(const Evas_Object *obj);
diff --git a/src/lib/elm_prefs.h b/src/lib/elm_prefs.h
index fa9a827..66a049a 100644
--- a/src/lib/elm_prefs.h
+++ b/src/lib/elm_prefs.h
@@ -2,7 +2,7 @@
 #define ELM_PREFS_H
 
 /**
- * @addtogroup Prefs
+ * @addtogroup Elm_Prefs
  * @{
  *
  * @section elm-prefs-widget Prefs
diff --git a/src/lib/elm_prefs_common.h b/src/lib/elm_prefs_common.h
index 17cd0fb..cf73452 100644
--- a/src/lib/elm_prefs_common.h
+++ b/src/lib/elm_prefs_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Prefs
+ * @addtogroup Elm_Prefs
  *
  * @{
  */
diff --git a/src/lib/elm_prefs_eo.h b/src/lib/elm_prefs_eo.h
index c3e1612..657fbd3 100644
--- a/src/lib/elm_prefs_eo.h
+++ b/src/lib/elm_prefs_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Prefs
+ * @ingroup Elm_Prefs
  *
  * @{
  */
diff --git a/src/lib/elm_prefs_legacy.h b/src/lib/elm_prefs_legacy.h
index 5c9dd91..9670523 100644
--- a/src/lib/elm_prefs_legacy.h
+++ b/src/lib/elm_prefs_legacy.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Prefs
+ * @ingroup Elm_Prefs
  *
  * @{
  */
diff --git a/src/lib/elm_progressbar.h b/src/lib/elm_progressbar.h
index cbb1516..12cd9b3 100644
--- a/src/lib/elm_progressbar.h
+++ b/src/lib/elm_progressbar.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Progressbar Progress bar
+ * @defgroup Elm_Progressbar Progress bar
  * @ingroup Elementary
  *
  * @image html progressbar_inheritance_tree.png
diff --git a/src/lib/elm_progressbar_common.h b/src/lib/elm_progressbar_common.h
index a4704de..76f48a8 100644
--- a/src/lib/elm_progressbar_common.h
+++ b/src/lib/elm_progressbar_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Progressbar
+ * @addtogroup Elm_Progressbar
  *
  * @{
  */
diff --git a/src/lib/elm_progressbar_legacy.h b/src/lib/elm_progressbar_legacy.h
index ea405de..5979734 100644
--- a/src/lib/elm_progressbar_legacy.h
+++ b/src/lib/elm_progressbar_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new progress bar widget on the canvas.
  *
- * @ingroup Progressbar
+ * @ingroup Elm_Progressbar
  */
 EAPI Evas_Object                 *elm_progressbar_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_radio.h b/src/lib/elm_radio.h
index eeeb14b..be1fad2 100644
--- a/src/lib/elm_radio.h
+++ b/src/lib/elm_radio.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Radio Radio
+ * @defgroup Elm_Radio Radio
  * @ingroup Elementary
  *
  * @image html radio_inheritance_tree.png
diff --git a/src/lib/elm_radio_legacy.h b/src/lib/elm_radio_legacy.h
index 43b3de6..f4ad3b8 100644
--- a/src/lib/elm_radio_legacy.h
+++ b/src/lib/elm_radio_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Radio
+ * @ingroup Elm_Radio
  */
 EAPI Evas_Object                 *elm_radio_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_removed.h b/src/lib/elm_removed.h
index 8bff73d..4b5b6fa 100644
--- a/src/lib/elm_removed.h
+++ b/src/lib/elm_removed.h
@@ -558,7 +558,7 @@ EINA_DEPRECATED EAPI const char 
*elm_anchorview_text_get(const Evas_Object *obj)
  * @see elm_ctxpopup_item_disabled_set()
  * @deprecated use elm_object_item_disabled_get() instead
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EINA_DEPRECATED EAPI Eina_Bool                    
elm_ctxpopup_item_disabled_get(const Elm_Object_Item *it);
 
@@ -571,7 +571,7 @@ EINA_DEPRECATED EAPI Eina_Bool                    
elm_ctxpopup_item_disabled_get
  * When disabled the item is greyed out to indicate it's state.
  * @deprecated use elm_object_item_disabled_set() instead
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EINA_DEPRECATED EAPI void         
elm_ctxpopup_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
 
@@ -587,7 +587,7 @@ EINA_DEPRECATED EAPI void         
elm_ctxpopup_item_disabled_set(Elm_Object_Item
  *
  * @deprecated use elm_object_item_part_content_get() instead
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_item_icon_get(const 
Elm_Object_Item *it);
 
@@ -605,7 +605,7 @@ EINA_DEPRECATED EAPI Evas_Object 
*elm_ctxpopup_item_icon_get(const Elm_Object_It
  *
  * @deprecated use elm_object_item_part_content_set() instead
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EINA_DEPRECATED EAPI void         elm_ctxpopup_item_icon_set(Elm_Object_Item 
*it, Evas_Object *icon);
 
@@ -621,7 +621,7 @@ EINA_DEPRECATED EAPI void         
elm_ctxpopup_item_icon_set(Elm_Object_Item *it
  *
  * @deprecated use elm_object_item_text_get() instead
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EINA_DEPRECATED EAPI const char  *elm_ctxpopup_item_label_get(const 
Elm_Object_Item *it);
 
@@ -633,7 +633,7 @@ EINA_DEPRECATED EAPI const char  
*elm_ctxpopup_item_label_get(const Elm_Object_I
  *
  * @deprecated use elm_object_item_text_set() instead
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EINA_DEPRECATED EAPI void         elm_ctxpopup_item_label_set(Elm_Object_Item 
*it, const char *label);
 
@@ -652,7 +652,7 @@ EINA_DEPRECATED EAPI void         
elm_ctxpopup_item_label_set(Elm_Object_Item *i
  *
  * @deprecated use elm_object_content_set() instead
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EINA_DEPRECATED EAPI void         elm_ctxpopup_content_set(Evas_Object *obj, 
Evas_Object *content);
 
@@ -670,7 +670,7 @@ EINA_DEPRECATED EAPI void         
elm_ctxpopup_content_set(Evas_Object *obj, Eva
  *
  * @deprecated use elm_object_content_unset() instead
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_content_unset(Evas_Object *obj);
 
@@ -682,7 +682,7 @@ EINA_DEPRECATED EAPI Evas_Object 
*elm_ctxpopup_content_unset(Evas_Object *obj);
  * @deprecated Use elm_object_item_del() instead
  * @see elm_ctxpopup_item_append()
  *
- * @ingroup Ctxpopup
+ * @ingroup Elm_Ctxpopup
  */
 EINA_DEPRECATED EAPI void                         
elm_ctxpopup_item_del(Elm_Object_Item *it);
 
@@ -1048,7 +1048,7 @@ EINA_DEPRECATED EAPI const char 
*elm_actionslider_indicator_label_get(Evas_Objec
  *
  * @deprecated use elm_object_part_content_set() instead
  *
- * @ingroup Bg
+ * @ingroup Elm_Bg
  */
 
 EINA_DEPRECATED EAPI void         elm_bg_overlay_set(Evas_Object *obj, 
Evas_Object *overlay);
@@ -1063,7 +1063,7 @@ EINA_DEPRECATED EAPI void         
elm_bg_overlay_set(Evas_Object *obj, Evas_Obje
  *
  * @deprecated use elm_object_part_content_get() instead
  *
- * @ingroup Bg
+ * @ingroup Elm_Bg
  */
 EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_get(const Evas_Object *obj);
 
@@ -1077,7 +1077,7 @@ EINA_DEPRECATED EAPI Evas_Object 
*elm_bg_overlay_get(const Evas_Object *obj);
  *
  * @deprecated use elm_object_part_content_unset() instead
  *
- * @ingroup Bg
+ * @ingroup Elm_Bg
  */
 EINA_DEPRECATED EAPI Evas_Object *elm_bg_overlay_unset(Evas_Object *obj);
 
@@ -1298,7 +1298,7 @@ EINA_DEPRECATED EAPI Evas_Object 
*elm_button_icon_unset(Evas_Object *obj);
  *
  * @see elm_calendar_mark_add()
  *
- * @ingroup Calendar
+ * @ingroup Elm_Calendar
  */
 EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object 
*obj, int pos);
 
@@ -1318,7 +1318,7 @@ EINA_DEPRECATED EAPI void 
elm_calendar_text_saturday_color_set(Evas_Object *obj,
  *
  * @see elm_calendar_mark_add()
  *
- * @ingroup Calendar
+ * @ingroup Elm_Calendar
  */
 EINA_DEPRECATED EAPI void elm_calendar_text_sunday_color_set(Evas_Object *obj, 
int pos);
 
@@ -1347,7 +1347,7 @@ EINA_DEPRECATED EAPI void 
elm_calendar_text_sunday_color_set(Evas_Object *obj, i
  *
  * @see elm_calendar_mark_add()
  *
- * @ingroup Calendar
+ * @ingroup Elm_Calendar
  */
 EINA_DEPRECATED EAPI void elm_calendar_text_weekday_color_set(Evas_Object 
*obj, int pos);
 
@@ -1542,7 +1542,7 @@ EINA_DEPRECATED EAPI Evas_Object 
*elm_conformant_content_unset(Evas_Object *obj)
  * @return The max length defined for side labels, or 0 if not a valid
  * diskselector.
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI int    elm_diskselector_side_label_lenght_get(const 
Evas_Object *obj);
 
@@ -1554,7 +1554,7 @@ EINA_DEPRECATED EAPI int    
elm_diskselector_side_label_lenght_get(const Evas_Ob
  * @param obj The diskselector object.
  * @param len The max length defined for side labels.
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void   elm_diskselector_side_label_lenght_set(Evas_Object 
*obj, int len);
 
@@ -1571,7 +1571,7 @@ EINA_DEPRECATED EAPI void   
elm_diskselector_side_label_lenght_set(Evas_Object *
  * @see elm_diskselector_item_append()
  * @deprecated Use elm_object_item_data_get()
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                  
*elm_diskselector_item_data_get(const Elm_Object_Item *it);
 
@@ -1597,7 +1597,7 @@ EINA_DEPRECATED EAPI void                  
*elm_diskselector_item_data_get(const
  * @see elm_diskselector_item_icon_get()
  *
  * @deprecated Use elm_object_item_part_content_set() instead
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_icon_set(Elm_Object_Item *it, Evas_Object *icon);
 
@@ -1616,7 +1616,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_icon_set(Elm_O
  * @see elm_diskselector_item_icon_set()
  *
  * @deprecated Use elm_object_item_part_content_set() instead
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EAPI Evas_Object           *elm_diskselector_item_icon_get(const 
Elm_Object_Item *it);
 
@@ -1652,7 +1652,7 @@ EAPI Evas_Object           
*elm_diskselector_item_icon_get(const Elm_Object_Item
  * @see elm_diskselector_item_append()
  *
  * @deprecated Use elm_object_item_text_set() instead
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_label_set(Elm_Object_Item *it, const char *label);
 
@@ -1671,7 +1671,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_label_set(Elm_
  * @see elm_diskselector_item_append()
  * @deprecated Use elm_object_item_text_get() instead
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI const char            
*elm_diskselector_item_label_get(const Elm_Object_Item *it);
 
@@ -1691,7 +1691,7 @@ EINA_DEPRECATED EAPI const char            
*elm_diskselector_item_label_get(cons
  * freed.
  * @deprecated Use elm_object_item_del_cb_set() instead
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb func);
 
@@ -1707,7 +1707,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_del_cb_set(Elm
  * @see elm_diskselector_clear()
  * @see elm_diskselector_item_append()
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_del(Elm_Object_Item *it);
 
@@ -1723,7 +1723,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_del(Elm_Object
  * @deprecated Use elm_object_item_tooltip_text_set() instead
  * @see elm_object_tooltip_text_set() for more details.
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_tooltip_text_set(Elm_Object_Item *it, const char *text);
 
@@ -1748,7 +1748,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_tooltip_text_s
  * @deprecated Use elm_object_item_tooltip_content_cb_set() instead
  * @see elm_object_tooltip_content_cb_set() for more details.
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_tooltip_content_cb_set(Elm_Object_Item *it, 
Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
 
@@ -1765,7 +1765,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_tooltip_conten
  * @see elm_object_tooltip_unset() for more details.
  * @see elm_diskselector_item_tooltip_content_cb_set()
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_tooltip_unset(Elm_Object_Item *it);
 
@@ -1782,7 +1782,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_tooltip_unset(
  * @deprecated Use elm_object_item_tooltip_style_set() instead
  * @see elm_object_tooltip_style_set() for more details.
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_tooltip_style_set(Elm_Object_Item *it, const char *style);
 
@@ -1797,7 +1797,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_tooltip_style_
  * @see elm_object_tooltip_style_get() for more details.
  * @see elm_diskselector_item_tooltip_style_set()
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI const char            
*elm_diskselector_item_tooltip_style_get(const Elm_Object_Item *it);
 
@@ -1810,7 +1810,7 @@ EINA_DEPRECATED EAPI const char            
*elm_diskselector_item_tooltip_style_
  * @see elm_object_cursor_set() for more details.
  * @deprecated Use elm_object_item_cursor_set() instead
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_cursor_set(Elm_Object_Item *it, const char *cursor);
 
@@ -1824,7 +1824,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_cursor_set(Elm
  * @see elm_diskselector_item_cursor_set()
  * @deprecated Use elm_object_item_cursor_get() instead
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI const char            
*elm_diskselector_item_cursor_get(const Elm_Object_Item *it);
 
@@ -1837,7 +1837,7 @@ EINA_DEPRECATED EAPI const char            
*elm_diskselector_item_cursor_get(con
  * @see elm_diskselector_item_cursor_set()
  * @deprecated use elm_object_item_cursor_unset() instead
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_cursor_unset(Elm_Object_Item *it);
 
@@ -1853,7 +1853,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_cursor_unset(E
  * @see elm_object_cursor_style_set() for more details.
  * @deprecated Use elm_object_item_cursor_style_set() instead
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_cursor_style_set(Elm_Object_Item *it, const char *style);
 
@@ -1868,7 +1868,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_cursor_style_s
  * @see elm_diskselector_item_cursor_style_set()
  * @deprecated Use elm_object_item_cursor_style_get() instead
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI const char            
*elm_diskselector_item_cursor_style_get(const Elm_Object_Item *it);
 
@@ -1888,7 +1888,7 @@ EINA_DEPRECATED EAPI const char            
*elm_diskselector_item_cursor_style_g
  *
  * @deprecated Use elm_object_item_cursor_engine_only_set() instead
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI void                   
elm_diskselector_item_cursor_engine_only_set(Elm_Object_Item *it, Eina_Bool 
engine_only);
 
@@ -1903,7 +1903,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_item_cursor_engine_
  * @see elm_diskselector_item_cursor_engine_only_set()
  * @deprecated Use elm_object_item_cursor_engine_only_get() instead
  *
- * @ingroup Diskselector
+ * @ingroup Elm_Diskselector
  */
 EINA_DEPRECATED EAPI Eina_Bool              
elm_diskselector_item_cursor_engine_only_get(const Elm_Object_Item *it);
 
@@ -1919,7 +1919,7 @@ EINA_DEPRECATED EAPI Evas_Object 
*elm_factory_content_get(const Evas_Object *obj
  * @see elm_object_item_text_set()
  *
  * @deprecated see elm_object_item_text_get() instead
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
  */
 EINA_DEPRECATED EAPI const char *elm_flipselector_item_label_get(const 
Elm_Object_Item *it);
 
@@ -1932,7 +1932,7 @@ EINA_DEPRECATED EAPI const char 
*elm_flipselector_item_label_get(const Elm_Objec
  * @see elm_object_item_text_get()
  *
  * @deprecated see elm_object_item_text_set() instead
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
  */
 EINA_DEPRECATED EAPI void        
elm_flipselector_item_label_set(Elm_Object_Item *it, const char *label);
 
@@ -1942,7 +1942,7 @@ EINA_DEPRECATED EAPI void        
elm_flipselector_item_label_set(Elm_Object_Item
  * @param it The item to delete
  *
  * @deprecated Use elm_object_item_del() instead
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
  */
 EINA_DEPRECATED EAPI void       elm_flipselector_item_del(Elm_Object_Item *it);
 
@@ -1971,7 +1971,7 @@ EINA_DEPRECATED EAPI void       
elm_flipselector_item_del(Elm_Object_Item *it);
  * @see elm_flipselector_interval_get()
  * @deprecated Use elm_flipselector_first_interval_set()
  *
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
  */
 EINA_DEPRECATED EAPI void                        
elm_flipselector_interval_set(Evas_Object *obj, double interval);
 
@@ -1985,7 +1985,7 @@ EINA_DEPRECATED EAPI void                        
elm_flipselector_interval_set(E
  * @see elm_flipselector_interval_set() for more details
  * @deprecated Use elm_flipselector_first_interval_get()
  *
- * @ingroup Flipselector
+ * @ingroup Elm_Flipselector
  */
 EINA_DEPRECATED EAPI double                      
elm_flipselector_interval_get(const Evas_Object *obj);
 
@@ -5910,7 +5910,7 @@ EINA_DEPRECATED EAPI void                   
elm_diskselector_side_label_length_s
  *
  * @see elm_toolbar_always_select_mode_get().
  *
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  */
 EINA_DEPRECATED EAPI void                         
elm_toolbar_always_select_mode_set(Evas_Object *obj, Eina_Bool always_select);
 
@@ -5923,7 +5923,7 @@ EINA_DEPRECATED EAPI void                         
elm_toolbar_always_select_mode
  *
  * @see elm_toolbar_always_select_mode_set() for details.
  *
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  */
 EINA_DEPRECATED EAPI Eina_Bool                    
elm_toolbar_always_select_mode_get(const Evas_Object *obj);
 
@@ -5942,7 +5942,7 @@ EINA_DEPRECATED EAPI Eina_Bool                    
elm_toolbar_always_select_mode
  *
  * @see elm_toolbar_no_select_mode_get().
  *
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  */
 EINA_DEPRECATED EAPI void                         
elm_toolbar_no_select_mode_set(Evas_Object *obj, Eina_Bool no_select);
 
@@ -5955,7 +5955,7 @@ EINA_DEPRECATED EAPI void                         
elm_toolbar_no_select_mode_set
  *
  * @see elm_toolbar_no_select_mode_set() for details.
  *
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  */
 EINA_DEPRECATED EAPI Eina_Bool                    
elm_toolbar_no_select_mode_get(const Evas_Object *obj);
 
diff --git a/src/lib/elm_route.c b/src/lib/elm_route.c
index d5117be..80d714c 100644
--- a/src/lib/elm_route.c
+++ b/src/lib/elm_route.c
@@ -172,7 +172,7 @@ _elm_route_evas_object_smart_del(Eo *obj, Elm_Route_Data 
*_pd EINA_UNUSED)
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Route
+ * @ingroup Elm_Route
  */
 EAPI Evas_Object *
 elm_route_add(Evas_Object *parent)
diff --git a/src/lib/elm_route.h b/src/lib/elm_route.h
index 80ba517..74a4cb0 100644
--- a/src/lib/elm_route.h
+++ b/src/lib/elm_route.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Route Route
+ * @defgroup Elm_Route Route
  * @ingroup Elementary
  *
  * @image html route_inheritance_tree.png
diff --git a/src/lib/elm_route_legacy.h b/src/lib/elm_route_legacy.h
index b1cdd28..ad320dc 100644
--- a/src/lib/elm_route_legacy.h
+++ b/src/lib/elm_route_legacy.h
@@ -4,7 +4,7 @@
  * @param parent The parent object
  * @return The new object or NULL if it cannot be created
  *
- * @ingroup Route
+ * @ingroup Elm_Route
  */
 EAPI Evas_Object *elm_route_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_segment_control.h b/src/lib/elm_segment_control.h
index 1880fa6..6a75321 100644
--- a/src/lib/elm_segment_control.h
+++ b/src/lib/elm_segment_control.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup SegmentControl SegmentControl
+ * @defgroup Elm_SegmentControl SegmentControl
  * @ingroup Elementary
  *
  * @image html segment_control_inheritance_tree.png
@@ -57,7 +57,7 @@
  */
 
 /**
- * @addtogroup SegmentControl
+ * @addtogroup Elm_SegmentControl
  * @{
  */
 
diff --git a/src/lib/elm_segment_control_legacy.h 
b/src/lib/elm_segment_control_legacy.h
index ac012ba..e5ed202 100644
--- a/src/lib/elm_segment_control_legacy.h
+++ b/src/lib/elm_segment_control_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new segment control widget on the canvas.
  *
- * @ingroup SegmentControl
+ * @ingroup Elm_SegmentControl
  */
 EAPI Evas_Object      *elm_segment_control_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_separator.h b/src/lib/elm_separator.h
index 6e9768f..de537e7 100644
--- a/src/lib/elm_separator.h
+++ b/src/lib/elm_separator.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Separator Separator
+ * @defgroup Elm_Separator Separator
  * @ingroup Elementary
  *
  * @image html separator_inheritance_tree.png
diff --git a/src/lib/elm_separator_legacy.h b/src/lib/elm_separator_legacy.h
index 2ab53bb..82cf44e 100644
--- a/src/lib/elm_separator_legacy.h
+++ b/src/lib/elm_separator_legacy.h
@@ -5,7 +5,7 @@
  *
  * @return The separator object, or NULL upon failure
  *
- * @ingroup Separator
+ * @ingroup Elm_Separator
  */
 EAPI Evas_Object *elm_separator_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_slider.h b/src/lib/elm_slider.h
index 5a7d455..00a37c0 100644
--- a/src/lib/elm_slider.h
+++ b/src/lib/elm_slider.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Slider Slider
+ * @defgroup Elm_Slider Slider
  * @ingroup Elementary
  *
  * @image html slider_inheritance_tree.png
@@ -70,7 +70,7 @@
  */
 
 /**
- * @addtogroup Slider
+ * @addtogroup Elm_Slider
  * @{
  */
 
diff --git a/src/lib/elm_slider_common.h b/src/lib/elm_slider_common.h
index ddd074d..dc59220 100644
--- a/src/lib/elm_slider_common.h
+++ b/src/lib/elm_slider_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Slider
+ * @addtogroup Elm_Slider
  *
  * @{
  */
diff --git a/src/lib/elm_slider_legacy.h b/src/lib/elm_slider_legacy.h
index a7eec57..57cb1aa 100644
--- a/src/lib/elm_slider_legacy.h
+++ b/src/lib/elm_slider_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new slider widget on the canvas.
  *
- * @ingroup Slider
+ * @ingroup Elm_Slider
  */
 EAPI Evas_Object                 *elm_slider_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_slideshow.h b/src/lib/elm_slideshow.h
index c601878..9762f6b 100644
--- a/src/lib/elm_slideshow.h
+++ b/src/lib/elm_slideshow.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Slideshow Slideshow
+ * @defgroup Elm_Slideshow Slideshow
  * @ingroup Elementary
  *
  * @image html slideshow_inheritance_tree.png
@@ -69,7 +69,7 @@
  */
 
 /**
- * @addtogroup Slideshow
+ * @addtogroup Elm_Slideshow
  * @{
  */
 
diff --git a/src/lib/elm_slideshow_common.h b/src/lib/elm_slideshow_common.h
index c79c2a7..baecd5b 100644
--- a/src/lib/elm_slideshow_common.h
+++ b/src/lib/elm_slideshow_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Slideshow
+ * @addtogroup Elm_Slideshow
  *
  * @{
  */
diff --git a/src/lib/elm_slideshow_legacy.h b/src/lib/elm_slideshow_legacy.h
index e5c0dcc..d16ad0e 100644
--- a/src/lib/elm_slideshow_legacy.h
+++ b/src/lib/elm_slideshow_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new slideshow widget on the canvas.
  *
- * @ingroup Slideshow
+ * @ingroup Elm_Slideshow
  */
 EAPI Evas_Object          *elm_slideshow_add(Evas_Object *parent);
 
diff --git a/src/lib/elm_spinner.h b/src/lib/elm_spinner.h
index a6ced26..6da9976 100644
--- a/src/lib/elm_spinner.h
+++ b/src/lib/elm_spinner.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Spinner Spinner
+ * @defgroup Elm_Spinner Spinner
  * @ingroup Elementary
  *
  * @image html spinner_inheritance_tree.png
@@ -53,7 +53,7 @@
  */
 
 /**
- * @addtogroup Spinner
+ * @addtogroup Elm_Spinner
  * @{
  */
 
diff --git a/src/lib/elm_spinner_legacy.h b/src/lib/elm_spinner_legacy.h
index 47c2ae4..1317e9a 100644
--- a/src/lib/elm_spinner_legacy.h
+++ b/src/lib/elm_spinner_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new spinner widget on the canvas.
  *
- * @ingroup Spinner
+ * @ingroup Elm_Spinner
  *
  */
 EAPI Evas_Object *elm_spinner_add(Evas_Object *parent);
@@ -23,7 +23,7 @@ EAPI Evas_Object *elm_spinner_add(Evas_Object *parent);
  *
  * @see elm_spinner_special_value_add() for more details.
  *
- * @ingroup Spinner
+ * @ingroup Elm_Spinner
  * @since 1.8
  */
 EAPI void elm_spinner_special_value_del(Evas_Object *obj, double value);
@@ -37,7 +37,7 @@ EAPI void elm_spinner_special_value_del(Evas_Object *obj, 
double value);
  *
  * @see elm_spinner_special_value_add() for more details.
  *
- * @ingroup Spinner
+ * @ingroup Elm_Spinner
  * @since 1.8
  */
 EAPI const char *elm_spinner_special_value_get(Evas_Object *obj, double value);
diff --git a/src/lib/elm_thumb.h b/src/lib/elm_thumb.h
index 15cc8e6..6b5039d 100644
--- a/src/lib/elm_thumb.h
+++ b/src/lib/elm_thumb.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Thumb Thumbnail
+ * @defgroup Elm_Thumb Thumbnail
  * @ingroup Elementary
  *
  * @image html thumb_inheritance_tree.png
@@ -51,7 +51,7 @@
  */
 
 /**
- * @addtogroup Thumb
+ * @addtogroup Elm_Thumb
  * @{
  */
 
diff --git a/src/lib/elm_thumb_common.h b/src/lib/elm_thumb_common.h
index c65f902..11dfbfd 100644
--- a/src/lib/elm_thumb_common.h
+++ b/src/lib/elm_thumb_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Thumb
+ * @addtogroup Elm_Thumb
  *
  * @{
  */
diff --git a/src/lib/elm_thumb_legacy.h b/src/lib/elm_thumb_legacy.h
index bd68b28..e2ff8a1 100644
--- a/src/lib/elm_thumb_legacy.h
+++ b/src/lib/elm_thumb_legacy.h
@@ -7,7 +7,7 @@
  * @see elm_thumb_file_set()
  * @see elm_thumb_ethumb_client_get()
  *
- * @ingroup Thumb
+ * @ingroup Elm_Thumb
  */
 EAPI Evas_Object                *elm_thumb_add(Evas_Object *parent);
 
@@ -23,7 +23,7 @@ EAPI Evas_Object                *elm_thumb_add(Evas_Object 
*parent);
  * @see elm_thumb_reload()
  * @see elm_thumb_animate()
  *
- * @ingroup Thumb
+ * @ingroup Elm_Thumb
  *
  * @param[in] file The path to file that will be used as thumbnail source.
  * @param[in] key The key used in case of an EET file.
@@ -37,7 +37,7 @@ EAPI void elm_thumb_file_set(Eo *obj, const char *file, const 
char *key);
  * @see elm_thumb_file_set()
  * @see elm_thumb_path_get()
  *
- * @ingroup Thumb
+ * @ingroup Elm_Thumb
  *
  * @param[out] file The path to file that will be used as thumbnail source.
  * @param[out] key The key used in case of an EET file.
diff --git a/src/lib/elm_toolbar.h b/src/lib/elm_toolbar.h
index 44777ca..ef237c4 100644
--- a/src/lib/elm_toolbar.h
+++ b/src/lib/elm_toolbar.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Toolbar Toolbar
+ * @defgroup Elm_Toolbar Toolbar
  * @ingroup Elementary
  *
  * @image html toolbar_inheritance_tree.png
@@ -64,7 +64,7 @@
  */
 
 /**
- * @addtogroup Toolbar
+ * @addtogroup Elm_Toolbar
  * @{
  */
 
diff --git a/src/lib/elm_toolbar_common.h b/src/lib/elm_toolbar_common.h
index 4e1c37b..a8e1f2c 100644
--- a/src/lib/elm_toolbar_common.h
+++ b/src/lib/elm_toolbar_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Toolbar
+ * @addtogroup Elm_Toolbar
  *
  * @{
  */
diff --git a/src/lib/elm_toolbar_eo.h b/src/lib/elm_toolbar_eo.h
index 8a7c550..604ca3f 100644
--- a/src/lib/elm_toolbar_eo.h
+++ b/src/lib/elm_toolbar_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  *
  * @{
  */
diff --git a/src/lib/elm_toolbar_legacy.h b/src/lib/elm_toolbar_legacy.h
index 16d325a..7abc10f 100644
--- a/src/lib/elm_toolbar_legacy.h
+++ b/src/lib/elm_toolbar_legacy.h
@@ -7,7 +7,7 @@
  *
  * This function inserts a new toolbar widget on the canvas.
  *
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  */
 EAPI Evas_Object                 *elm_toolbar_add(Evas_Object *parent);
 
@@ -18,7 +18,7 @@ EAPI Evas_Object                 *elm_toolbar_add(Evas_Object 
*parent);
  * @param reorder_mode The reorder mode
  * (@c EINA_TRUE = on, @c EINA_FALSE = off)
  *
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  */
 EAPI void                          elm_toolbar_reorder_mode_set(Evas_Object 
*obj, Eina_Bool reorder_mode);
 
@@ -29,7 +29,7 @@ EAPI void                          
elm_toolbar_reorder_mode_set(Evas_Object *obj
  * @return The reorder mode
  * (@c EINA_TRUE = on, @c EINA_FALSE = off)
  *
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  */
 EAPI Eina_Bool                     elm_toolbar_reorder_mode_get(const 
Evas_Object *obj);
 
@@ -43,7 +43,7 @@ EAPI Eina_Bool                     
elm_toolbar_reorder_mode_get(const Evas_Objec
  * This will expand the transverse length of the item according the transverse 
length of the toolbar.
  * The default is what the transverse length of the item is set according its 
min value.
  *
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  */
 EAPI void                         
elm_toolbar_transverse_expanded_set(Evas_Object *obj, Eina_Bool 
transverse_expanded);
 
@@ -56,7 +56,7 @@ EAPI void                         
elm_toolbar_transverse_expanded_set(Evas_Objec
  *
  * @see elm_toolbar_transverse_expand_set() for details.
  *
- * @ingroup Toolbar
+ * @ingroup Elm_Toolbar
  */
 EAPI Eina_Bool                    elm_toolbar_transverse_expanded_get(const 
Evas_Object *obj);
 
diff --git a/src/lib/elm_tooltip.h b/src/lib/elm_tooltip.h
index cb508a6..81eaced 100644
--- a/src/lib/elm_tooltip.h
+++ b/src/lib/elm_tooltip.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Tooltips Tooltips
+ * @defgroup Elm_Tooltips Tooltips
  * @ingroup Elementary
  *
  * The Tooltip is an (internal, for now) smart object used to show a
@@ -15,7 +15,7 @@
  * These values should be used in conjunction to 
elm_object_tooltip_orient_set() to
  * set the position around which the tooltip should appear(relative to its 
parent)
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 typedef enum
 {
@@ -38,7 +38,7 @@ typedef enum
  *
  * @param obj The tooltip's anchor object
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  * @see elm_object_tooltip_move_freeze_pop()
  * @see elm_object_tooltip_move_freeze_get()
  * @since 1.9
@@ -50,7 +50,7 @@ EAPI void elm_object_tooltip_move_freeze_push(Evas_Object 
*obj);
  *
  * @param obj The tooltip's anchor object
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  * @see elm_object_tooltip_move_freeze_push()
  * @since 1.9
  */
@@ -64,7 +64,7 @@ EAPI void elm_object_tooltip_move_freeze_pop(Evas_Object 
*obj);
  * @param obj The tooltip's anchor object
  * @return The movement freeze count
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  * @see elm_object_tooltip_move_freeze_push()
  * @since 1.9
  */
@@ -79,7 +79,7 @@ EAPI int elm_object_tooltip_move_freeze_get(const Evas_Object 
*obj);
  * @param obj The owner widget.
  * @param orient The orientation of the tooltip.
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  * @see Elm_Tooltip_Orient for possible values.
  * @since 1.9
  */
@@ -91,7 +91,7 @@ EAPI void elm_object_tooltip_orient_set(Evas_Object *obj, 
Elm_Tooltip_Orient ori
  * @param obj The owner object
  * @return The orientation of the tooltip
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  * @see elm_object_tooltip_orient_set()
  * @ref Elm_Tooltip_Orient for possible values.
  */
@@ -125,7 +125,7 @@ typedef Evas_Object *(*Elm_Tooltip_Item_Content_Cb)(void 
*data, Evas_Object *obj
  * showed again with new content.
  * This can force show more than one tooltip at a time.
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 EAPI void        elm_object_tooltip_show(Evas_Object *obj);
 
@@ -136,7 +136,7 @@ EAPI void        elm_object_tooltip_show(Evas_Object *obj);
  *
  * Force hide the tooltip and (re)enable future mouse interations.
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 EAPI void        elm_object_tooltip_hide(Evas_Object *obj);
 
@@ -146,7 +146,7 @@ EAPI void        elm_object_tooltip_hide(Evas_Object *obj);
  * @param obj The tooltip object.
  * @param text The text to be displayed.
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 EAPI void        elm_object_tooltip_text_set(Evas_Object *obj, const char 
*text);
 EAPI void        elm_object_tooltip_domain_translatable_text_set(Evas_Object 
*obj, const char *domain, const char *text);
@@ -170,7 +170,7 @@ EAPI void        
elm_object_tooltip_domain_translatable_text_set(Evas_Object *ob
  * return a valid Evas_Object. This object is then managed fully by
  * tooltip system and is deleted when the tooltip is gone.
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 EAPI void        elm_object_tooltip_content_cb_set(Evas_Object *obj, 
Elm_Tooltip_Content_Cb func, const void *data, Evas_Smart_Cb del_cb);
 
@@ -185,7 +185,7 @@ EAPI void        
elm_object_tooltip_content_cb_set(Evas_Object *obj, Elm_Tooltip
  *
  * @see elm_object_tooltip_content_cb_set()
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 EAPI void        elm_object_tooltip_unset(Evas_Object *obj);
 
@@ -199,7 +199,7 @@ EAPI void        elm_object_tooltip_unset(Evas_Object *obj);
  * @param obj an object with tooltip already set.
  * @param style the theme style to use (default, transparent, ...)
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 EAPI void        elm_object_tooltip_style_set(Evas_Object *obj, const char 
*style);
 
@@ -210,7 +210,7 @@ EAPI void        elm_object_tooltip_style_set(Evas_Object 
*obj, const char *styl
  * @return style the theme style in use, defaults to "default". If the
  *         object does not have a tooltip set, then NULL is returned.
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 EAPI const char *elm_object_tooltip_style_get(const Evas_Object *obj);
 
@@ -224,7 +224,7 @@ EAPI const char *elm_object_tooltip_style_get(const 
Evas_Object *obj);
  * This function allows a tooltip to expand beyond its parent window's canvas.
  * It will instead be limited only by the size of the display.
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 EAPI Eina_Bool   elm_object_tooltip_window_mode_set(Evas_Object *obj, 
Eina_Bool disable);
 
@@ -238,7 +238,7 @@ EAPI Eina_Bool   
elm_object_tooltip_window_mode_set(Evas_Object *obj, Eina_Bool
  * its parent window's canvas.
  * It will instead be limited only by the size of the display.
  *
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 EAPI Eina_Bool   elm_object_tooltip_window_mode_get(const Evas_Object *obj);
 
diff --git a/src/lib/elm_video.h b/src/lib/elm_video.h
index 31a8dbd..345b9d8 100644
--- a/src/lib/elm_video.h
+++ b/src/lib/elm_video.h
@@ -1,8 +1,8 @@
 /**
- * @defgroup Video Video
+ * @defgroup Elm_Video Video
  * @ingroup Elementary
  *
- * @addtogroup Video
+ * @addtogroup Elm_Video
  * @{
  *
  * @image html video_inheritance_tree.png
diff --git a/src/lib/elm_video_legacy.h b/src/lib/elm_video_legacy.h
index 184d31a..57ca8da 100644
--- a/src/lib/elm_video_legacy.h
+++ b/src/lib/elm_video_legacy.h
@@ -8,7 +8,7 @@
  *
  * @see elm_object_part_content_set()
  *
- * @ingroup Video
+ * @ingroup Elm_Video
  */
 EAPI Evas_Object         *elm_player_add(Evas_Object *parent);
 
@@ -22,7 +22,7 @@ EAPI Evas_Object         *elm_player_add(Evas_Object *parent);
  *
  * @see elm_video_file_set()
  *
- * @ingroup Video
+ * @ingroup Elm_Video
  */
 EAPI Evas_Object         *elm_video_add(Evas_Object *parent);
 
@@ -38,7 +38,7 @@ EAPI Evas_Object         *elm_video_add(Evas_Object *parent);
  * @see elm_video_add()
  * @see elm_player_add()
  *
- * @ingroup Video
+ * @ingroup Elm_Video
  *
  * @param[in] filename The file or URI to target.
 Local files can be specified using file:// or by using full file paths.
@@ -52,7 +52,7 @@ EAPI Eina_Bool elm_video_file_set(Eo *obj, const char 
*filename);
  *
  * @brief Get the file or URI that is used as the video source.
  *
- * @ingroup Video
+ * @ingroup Elm_Video
  *
  * @param filename The file or URI.
  *
diff --git a/src/lib/elm_web.h b/src/lib/elm_web.h
index 07afb92..43099ff 100644
--- a/src/lib/elm_web.h
+++ b/src/lib/elm_web.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Web Web
+ * @defgroup Elm_Web Web
  * @ingroup Elementary
  *
  * @image html web_inheritance_tree.png
@@ -88,7 +88,7 @@
  */
 
 /**
- * @addtogroup Web
+ * @addtogroup Elm_Web
  * @{
  */
 
diff --git a/src/lib/elm_web_common.h b/src/lib/elm_web_common.h
index 04bbea2..6373f18 100644
--- a/src/lib/elm_web_common.h
+++ b/src/lib/elm_web_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Web
+ * @addtogroup Elm_Web
  *
  * @{
  */
diff --git a/src/lib/elm_web_legacy.h b/src/lib/elm_web_legacy.h
index e2c2577..ff4cf09 100644
--- a/src/lib/elm_web_legacy.h
+++ b/src/lib/elm_web_legacy.h
@@ -7,7 +7,7 @@
  * @see elm_web_url_set()
  * @see elm_web_webkit_view_get()
  *
- * @ingroup Web
+ * @ingroup Elm_Web
  */
 EAPI Evas_Object      *elm_web_add(Evas_Object *parent);
 
@@ -25,7 +25,7 @@ EAPI Evas_Object      *elm_web_add(Evas_Object *parent);
  *
  * @see elm_web_url_set()
  *
- * @ingroup Web
+ * @ingroup Elm_Web
  */
 EINA_DEPRECATED EAPI Eina_Bool         elm_web_uri_set(Evas_Object *obj, const 
char *uri);
 
@@ -43,7 +43,7 @@ EINA_DEPRECATED EAPI Eina_Bool         
elm_web_uri_set(Evas_Object *obj, const c
  *
  * @see elm_web_url_get()
  *
- * @ingroup Web
+ * @ingroup Elm_Web
  */
 EINA_DEPRECATED EAPI const char       *elm_web_uri_get(const Evas_Object *obj);
 
diff --git a/src/lib/elm_win.h b/src/lib/elm_win.h
index 28f4c09..7720b98 100644
--- a/src/lib/elm_win.h
+++ b/src/lib/elm_win.h
@@ -1,5 +1,5 @@
 /**
- * @defgroup Win Win
+ * @defgroup Elm_Win Win
  * @ingroup Elementary
  *
  * @image html win_inheritance_tree.png
diff --git a/src/lib/elm_win_common.h b/src/lib/elm_win_common.h
index 02d8bd4..a0d4fef 100644
--- a/src/lib/elm_win_common.h
+++ b/src/lib/elm_win_common.h
@@ -1,5 +1,5 @@
 /**
- * @addtogroup Win
+ * @addtogroup Elm_Win
  *
  * @{
  */
diff --git a/src/lib/elm_win_eo.h b/src/lib/elm_win_eo.h
index 3a43757..30c2bba 100644
--- a/src/lib/elm_win_eo.h
+++ b/src/lib/elm_win_eo.h
@@ -1,5 +1,5 @@
 /**
- * @ingroup Win
+ * @ingroup Elm_Win
  *
  * @{
  */
diff --git a/src/lib/elm_win_legacy.h b/src/lib/elm_win_legacy.h
index 2362ac6..e6f70b6 100644
--- a/src/lib/elm_win_legacy.h
+++ b/src/lib/elm_win_legacy.h
@@ -14,7 +14,7 @@
  *
  * @return The created object, or @c NULL on failure
  *
- * @ingroup Win
+ * @ingroup Elm_Win
  */
 EAPI Evas_Object          *elm_win_add(Evas_Object *parent, const char *name, 
Elm_Win_Type type);
 
@@ -31,7 +31,7 @@ EAPI Evas_Object          *elm_win_add(Evas_Object *parent, 
const char *name, El
  *
  * @return The created object, or @c NULL on failure
  *
- * @ingroup Win
+ * @ingroup Elm_Win
  *
  * @since 1.13
  */
@@ -52,7 +52,7 @@ EAPI Evas_Object          *elm_win_fake_add(Ecore_Evas *ee);
  *
  * @see elm_win_add()
  *
- * @ingroup Win
+ * @ingroup Elm_Win
  */
 EAPI Evas_Object          *elm_win_util_standard_add(const char *name, const 
char *title);
 
@@ -73,7 +73,7 @@ EAPI Evas_Object          *elm_win_util_standard_add(const 
char *name, const cha
  *
  * @see elm_win_add()
  *
- * @ingroup Win
+ * @ingroup Elm_Win
  * @since 1.13
  */
 EAPI Evas_Object          *elm_win_util_dialog_add(Evas_Object *parent, const 
char *name, const char *title);
@@ -90,7 +90,7 @@ EAPI Evas_Object          
*elm_win_util_dialog_add(Evas_Object *parent, const ch
  * a multi window concept in a mobile phone. The way of handling floating mode
  * window is decided by enlightenment window manager.
  *
- * @ingroup Win
+ * @ingroup Elm_Win
  * @see elm_win_floating_mode_get()
  * @since 1.8
  */
@@ -102,7 +102,7 @@ EAPI void                  
elm_win_floating_mode_set(Evas_Object *obj, Eina_Bool
  * @param obj The window object
  * @return If true, the window is floating mode
  *
- * @ingroup Win
+ * @ingroup Elm_Win
  * @see elm_win_floating_mode_set()
  * @since 1.8
  */
@@ -129,7 +129,7 @@ EAPI Eina_Bool             elm_win_floating_mode_get(const 
Evas_Object *obj);
  * @see elm_win_norender_pop()
  * @see elm_win_norender_get()
  * @see elm_win_render()
- * @ingroup Win
+ * @ingroup Elm_Win
  * @since 1.7
  */
 EAPI void                  elm_win_norender_push(Evas_Object *obj);
@@ -145,7 +145,7 @@ EAPI void                  
elm_win_norender_push(Evas_Object *obj);
  * @see elm_win_norender_push()
  * @see elm_win_norender_get()
  * @see elm_win_render()
- * @ingroup Win
+ * @ingroup Elm_Win
  * @since 1.7
  */
 EAPI void                  elm_win_norender_pop(Evas_Object *obj);
@@ -158,7 +158,7 @@ EAPI void                  elm_win_norender_pop(Evas_Object 
*obj);
  * @see elm_win_norender_push()
  * @see elm_win_norender_pop()
  * @see elm_win_render()
- * @ingroup Win
+ * @ingroup Elm_Win
  * @since 1.7
  */
 EAPI int                   elm_win_norender_get(const Evas_Object *obj);
@@ -177,7 +177,7 @@ EAPI int                   elm_win_norender_get(const 
Evas_Object *obj);
  * @see elm_win_norender_push()
  * @see elm_win_norender_pop()
  * @see elm_win_norender_get()
- * @ingroup Win
+ * @ingroup Elm_Win
  * @since 1.7
  */
 EAPI void                  elm_win_render(Evas_Object *obj);
@@ -193,7 +193,7 @@ EAPI void                  elm_win_render(Evas_Object *obj);
  *
  * @return The Ecore_Wl_Window of @p obj
  *
- * @ingroup Win
+ * @ingroup Elm_Win
  */
 EAPI Ecore_Wl2_Window *elm_win_wl_window_get(const Evas_Object *obj);
 
@@ -208,7 +208,7 @@ EAPI Ecore_Wl2_Window *elm_win_wl_window_get(const 
Evas_Object *obj);
  *
  * @return The Ecore_Win32_Window of @p obj
  *
- * @ingroup Win
+ * @ingroup Elm_Win
  *
  * @since 1.16
  */
@@ -225,7 +225,7 @@ EAPI Ecore_Win32_Window *elm_win_win32_window_get(const 
Evas_Object *obj);
  *
  * @see elm_win_wm_rotation_preferred_rotation_get()
  *
- * ingroup Win
+ * ingroup Elm_Win
  * @since 1.9
  */
 EAPI void                  elm_win_wm_rotation_preferred_rotation_set(const 
Evas_Object *obj, int rotation);
@@ -238,7 +238,7 @@ EAPI void                  
elm_win_wm_rotation_preferred_rotation_set(const Evas
  * @param obj The window object
  * @return The Ecore_Window of an Evas_Object
  *
- * @ingroup Win
+ * @ingroup Elm_Win
  * @since 1.8
  * @note Unless you are getting the window id for the purpose of communicating 
between client<->compositor over dbus,
  * this is definitely not the function you are looking for.
diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index f621e51..dbfe6ad 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -902,7 +902,7 @@ elm_tooltip_theme(Elm_Tooltip *tt)
  *        given @a data, and @c event_info is NULL.
  *
  * @internal
- * @ingroup Tooltips
+ * @ingroup Elm_Tooltips
  */
 void
 elm_object_sub_tooltip_content_cb_set(Evas_Object *eventarea, Evas_Object 
*owner, Elm_Tooltip_Content_Cb func, const void *data, Evas_Smart_Cb del_cb)

-- 


Reply via email to