diff --git a/src/lib/elementary/efl_ui_clock.h b/src/lib/elementary/efl_ui_clock.h
index b5352a8b52..95849b1334 100644
--- a/src/lib/elementary/efl_ui_clock.h
+++ b/src/lib/elementary/efl_ui_clock.h
@@ -115,11 +115,11 @@
  * The whole widget is left aligned and its size grows horizontally depending
  * on the current format and each field's visible/disabled state.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for Clock objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @b "changed" - whenever Clock field value is changed, this
  * signal is sent.
  * @li @b "language,changed" - whenever system locale changes, this
diff --git a/src/lib/elementary/efl_ui_video.h b/src/lib/elementary/efl_ui_video.h
index c4cfc55815..0db9b57cba 100644
--- a/src/lib/elementary/efl_ui_video.h
+++ b/src/lib/elementary/efl_ui_video.h
@@ -26,16 +26,16 @@
  * linked Efl_Ui_Video so it will use the video decoder, if available. It also
  * activates the "remember" function on the linked Efl_Ui_Video object.
  *
- * Both widgets inherit from the @ref Layout one, so that all the
+ * Both widgets inherit from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for video objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "focused" : When the video has received focus. (since 1.8)
  * @li @c "unfocused" : When the video has lost focus. (since 1.8)
  *
  * The player widget emits the following signals, besides the ones
- * sent from @ref Layout:
+ * sent from @ref Elm_Layout :
  *  - @c "forward,clicked" - the user clicked the forward button.
  *  - @c "info,clicked" - the user clicked the info button.
  *  - @c "next,clicked" - the user clicked the next button.
diff --git a/src/lib/elementary/elc_ctxpopup.h b/src/lib/elementary/elc_ctxpopup.h
index 6663f7e863..a55319cdcc 100644
--- a/src/lib/elementary/elc_ctxpopup.h
+++ b/src/lib/elementary/elc_ctxpopup.h
@@ -22,7 +22,7 @@
  * functions acting on it also work for context popup objects (since 1.8).
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "dismissed" - This is called when 1. the outside of ctxpopup was clicked
  * or 2. its parent area is changed or 3. the language is changed and also when
  * 4. the parent object is resized due to the window rotation. Then ctxpopup is
diff --git a/src/lib/elementary/elc_fileselector.h b/src/lib/elementary/elc_fileselector.h
index 32b8b566a0..9a936b3ec1 100644
--- a/src/lib/elementary/elc_fileselector.h
+++ b/src/lib/elementary/elc_fileselector.h
@@ -38,7 +38,7 @@
  * functions acting on it also work for file selector objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "activated" - the user activated a file. This can happen by
  *      double-clicking or pressing Enter key. (@p event_info is a
  *      pointer to the activated file path)
diff --git a/src/lib/elementary/elc_fileselector_entry.h b/src/lib/elementary/elc_fileselector_entry.h
index fe0dfde7e5..0085be89d7 100644
--- a/src/lib/elementary/elc_fileselector_entry.h
+++ b/src/lib/elementary/elc_fileselector_entry.h
@@ -20,7 +20,7 @@
  * is closed and the selected file's path string is exposed both as
  * a smart event and as the new text on the entry.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for file selector entry objects (since 1.8).
  *
  * This widget encapsulates operations on its internal file
diff --git a/src/lib/elementary/elc_multibuttonentry.h b/src/lib/elementary/elc_multibuttonentry.h
index e17c1c946f..aad3b51880 100644
--- a/src/lib/elementary/elc_multibuttonentry.h
+++ b/src/lib/elementary/elc_multibuttonentry.h
@@ -17,11 +17,11 @@
  * emails/messages to a group of addresses, each of which is an item
  * that can be clicked for further actions.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for multi-button entry objects (since 1.8).
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "item,selected" - this is called when an item is selected by
  *       api, user interaction, and etc. this is also called when a
  *       user press back space while cursor is on the first field of
diff --git a/src/lib/elementary/elc_naviframe.h b/src/lib/elementary/elc_naviframe.h
index 71f213de85..a07688ff33 100644
--- a/src/lib/elementary/elc_naviframe.h
+++ b/src/lib/elementary/elc_naviframe.h
@@ -55,7 +55,7 @@
  *
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "transition,finished" - When the transition is finished in
  *                                changing the item
  * @li @c "title,transition,finished" - When the title area's transition
diff --git a/src/lib/elementary/elc_popup.h b/src/lib/elementary/elc_popup.h
index 5671369ab8..15f27b26bc 100644
--- a/src/lib/elementary/elc_popup.h
+++ b/src/lib/elementary/elc_popup.h
@@ -68,11 +68,11 @@
  * evas_object_show on popup should be called after setting all the contents
  * and buttons of popup.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for popup objects (since 1.8).
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "timeout" - whenever popup is closed as a result of timeout.
  * @li @c "block,clicked" - whenever user taps on Blocked Event area.
  * @li @c "focused" - When the popup has received focus. (since 1.8)
diff --git a/src/lib/elementary/elm_actionslider.h b/src/lib/elementary/elm_actionslider.h
index 55abc02138..f8129fc369 100644
--- a/src/lib/elementary/elm_actionslider.h
+++ b/src/lib/elementary/elm_actionslider.h
@@ -25,11 +25,11 @@
  *
  * @note By default all positions are set as enabled.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for actionslider objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "selected" - when user selects an enabled position (the
  *              label is passed as event info).
  * @li @c "pos_changed" - when the indicator reaches any of the
diff --git a/src/lib/elementary/elm_bg.h b/src/lib/elementary/elm_bg.h
index 030f83e53a..f6e1c0669b 100644
--- a/src/lib/elementary/elm_bg.h
+++ b/src/lib/elementary/elm_bg.h
@@ -17,7 +17,7 @@
  * properties useful to a background, like setting it to tiled,
  * centered, scaled or stretched.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for background objects.
  *
  * Default content parts of the bg widget that you can use for are:
diff --git a/src/lib/elementary/elm_bubble.h b/src/lib/elementary/elm_bubble.h
index 328540d9bb..522ee8a438 100644
--- a/src/lib/elementary/elm_bubble.h
+++ b/src/lib/elementary/elm_bubble.h
@@ -32,11 +32,11 @@
  * @li "bottom_left"
  * @li "bottom_right"
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for bubble objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "clicked" - This is called when a user has clicked the bubble.
  * @li @c "focused" - When the bubble has received focus. (since 1.8)
  * @li @c "unfocused" - When the bubble has lost focus. (since 1.8)
diff --git a/src/lib/elementary/elm_clock.h b/src/lib/elementary/elm_clock.h
index 8d6bff54e7..f3d4b10252 100644
--- a/src/lib/elementary/elm_clock.h
+++ b/src/lib/elementary/elm_clock.h
@@ -33,11 +33,11 @@
  * am/pm indicator may be optionally shown, too, when it will
  * switch to 12h.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for clock objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "changed" - the clock's user changed the time
  * - @c "focused" - When the clock ehas received focus. (since 1.8)
  * - @c "unfocused" - When the clock has lost focus. (since 1.8)
diff --git a/src/lib/elementary/elm_datetime.h b/src/lib/elementary/elm_datetime.h
index b775130a76..e88a896b76 100644
--- a/src/lib/elementary/elm_datetime.h
+++ b/src/lib/elementary/elm_datetime.h
@@ -174,11 +174,11 @@
  *
  * <b>export ELM_MODULES="datetime_input_ctxpopup>datetime/api"</b>
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for datetime objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @b "changed" - whenever Datetime field value is changed, this
  * signal is sent.
  * @li @b "language,changed" - whenever system locale changes, this
diff --git a/src/lib/elementary/elm_dayselector.h b/src/lib/elementary/elm_dayselector.h
index b96967d194..b6de2b599b 100644
--- a/src/lib/elementary/elm_dayselector.h
+++ b/src/lib/elementary/elm_dayselector.h
@@ -54,11 +54,11 @@
  * the elm_object_part_content_set/get APIs thus providing a way to handle
  * the different check styles for individual days.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for dayselector objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "dayselector,changed" - when the user changes the state of a day.
  * @li @c "language,changed" - the program's language changed
  *
diff --git a/src/lib/elementary/elm_diskselector.h b/src/lib/elementary/elm_diskselector.h
index c8418263e2..b2791a99c4 100644
--- a/src/lib/elementary/elm_diskselector.h
+++ b/src/lib/elementary/elm_diskselector.h
@@ -26,7 +26,7 @@
  * major release).
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "selected" - when item is selected, i.e. scroller stops.
  * @li @c "clicked" - This is called when a user clicks an item (since 1.8)
  * @li @c "scroll,anim,start" - scrolling animation has started
diff --git a/src/lib/elementary/elm_flipselector.h b/src/lib/elementary/elm_flipselector.h
index 40e8d07e7c..dc36f2fc05 100644
--- a/src/lib/elementary/elm_flipselector.h
+++ b/src/lib/elementary/elm_flipselector.h
@@ -16,11 +16,11 @@
  * so that it helps the user to reach an item which is distant from
  * the current selection.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for flip selector objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "selected" - when the widget's selected text item is changed. The @c
  *   event_info parameter is the item that was selected.
  * - @c "overflowed" - when the widget's current selection is changed
diff --git a/src/lib/elementary/elm_frame.h b/src/lib/elementary/elm_frame.h
index 3ae891cb98..053dacdbef 100644
--- a/src/lib/elementary/elm_frame.h
+++ b/src/lib/elementary/elm_frame.h
@@ -22,11 +22,11 @@
  *
  * Of all this styles only default shows the title.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for frame objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "clicked" - The user has clicked the frame's label
  * - @c "language,changed" - the program's language changed (since 1.9)
  *
diff --git a/src/lib/elementary/elm_gengrid.h b/src/lib/elementary/elm_gengrid.h
index 0e781fa584..6d328033de 100644
--- a/src/lib/elementary/elm_gengrid.h
+++ b/src/lib/elementary/elm_gengrid.h
@@ -16,7 +16,7 @@
  * view) or via the keyboard, navigating through item with the
  * arrow keys.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for gengrid objects.
  *
  * This widget implements the @ref elm-scrollable-interface
@@ -162,7 +162,7 @@
  * @section Gengrid_Smart_Events Gengrid smart events
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "activated" - The user has double-clicked or pressed
  *   (enter|return|spacebar) on an item. The @p event_info parameter
  *   is the gengrid item that was activated.
diff --git a/src/lib/elementary/elm_genlist.h b/src/lib/elementary/elm_genlist.h
index 8a1691c0d9..918b9585a5 100644
--- a/src/lib/elementary/elm_genlist.h
+++ b/src/lib/elementary/elm_genlist.h
@@ -19,7 +19,7 @@
  * trying to be both expansive, powerful and efficient. First we will begin
  * an overview on the theory behind genlist.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for genlist objects.
  *
  * This widget implements the @ref elm-scrollable-interface
@@ -250,7 +250,7 @@
  * @section Genlist_Smart_Events Genlist smart events
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "activated" - The user has double-clicked or pressed
  *   (enter|return|spacebar) on an item. The @p event_info parameter is the
  *   item that was activated.
diff --git a/src/lib/elementary/elm_hover.h b/src/lib/elementary/elm_hover.h
index 342b3e3ba6..eeac7708c9 100644
--- a/src/lib/elementary/elm_hover.h
+++ b/src/lib/elementary/elm_hover.h
@@ -27,11 +27,11 @@
  * @li menu
  * @li hoversel_vertical
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for hover objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "clicked" - the user clicked the empty space in the hover to dismiss
  * @li @c "dismissed" - the user clicked the empty space in the hover to dismiss (since 1.8)
  * @li @c "smart,changed" - a content object placed under the "smart"
diff --git a/src/lib/elementary/elm_inwin.h b/src/lib/elementary/elm_inwin.h
index d5fba32e52..a461094899 100644
--- a/src/lib/elementary/elm_inwin.h
+++ b/src/lib/elementary/elm_inwin.h
@@ -31,9 +31,9 @@
  * possible, but it's sized vertically the most it needs to fit its\
  * contents.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for inner windown objects. It also
- * emits the signals inherited from @ref Layout.
+ * emits the signals inherited from @ref Elm_Layout.
  *
  * Default content parts of the inwin that you can use for are:
  * @li "default" A content of the inwin
diff --git a/src/lib/elementary/elm_label.h b/src/lib/elementary/elm_label.h
index 13b52124dc..7bfa3db11f 100644
--- a/src/lib/elementary/elm_label.h
+++ b/src/lib/elementary/elm_label.h
@@ -28,11 +28,11 @@
  * Custom themes can of course invent new markup tags and style them any way
  * they like.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for label objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "language,changed": The program's language changed.
  * @li @c "slide,end": The slide is end.
  *
diff --git a/src/lib/elementary/elm_list.h b/src/lib/elementary/elm_list.h
index 07147b4cf7..83bb09cdd3 100644
--- a/src/lib/elementary/elm_list.h
+++ b/src/lib/elementary/elm_list.h
@@ -19,11 +19,11 @@
  * A list is a very simple type of list widget. For more robust lists,
  * @ref Genlist should probably be used.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for list objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "activated" - The user has double-clicked or pressed
  *   (enter|return|spacebar) on an item. The @p event_info parameter
  *   is the item that was activated.
diff --git a/src/lib/elementary/elm_panel.h b/src/lib/elementary/elm_panel.h
index c94d9fc584..5dbdcbddac 100644
--- a/src/lib/elementary/elm_panel.h
+++ b/src/lib/elementary/elm_panel.h
@@ -18,11 +18,11 @@
  * @li #ELM_PANEL_ORIENT_RIGHT
  * @li #ELM_PANEL_ORIENT_BOTTOM
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for panel objects (since 1.8).
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "toggled" : When the panel has been toggled. (since 1.18)
  * @li @c "scroll" : When the content has been scrolled (moved). (since 1.10)
  *        This signal is emitted only when the panel is scrollable.
diff --git a/src/lib/elementary/elm_panes.h b/src/lib/elementary/elm_panes.h
index 9704b39c4d..fb510b7e0a 100644
--- a/src/lib/elementary/elm_panes.h
+++ b/src/lib/elementary/elm_panes.h
@@ -17,11 +17,11 @@
  * Panes can be split vertically or horizontally, and contents
  * size proportion can be customized (homogeneous by default).
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for panes objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "press" - The panes has been pressed (button wasn't released yet).
  * - @c "unpress" - The panes was released after being pressed.
  * - @c "clicked" - The panes has been clicked>
diff --git a/src/lib/elementary/elm_progressbar.h b/src/lib/elementary/elm_progressbar.h
index 8c57fcf76a..bd051e39e6 100644
--- a/src/lib/elementary/elm_progressbar.h
+++ b/src/lib/elementary/elm_progressbar.h
@@ -30,11 +30,11 @@
  * Applications can query the progress bar for its value with
  * elm_progressbar_value_get().
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for progress bar objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "changed" - when the value is changed (since 1.7)
  * @li @c "focused" - When the progressbar has received focus. (since 1.8)
  * @li @c "unfocused" - When the progressbar has lost focus. (since 1.8)
diff --git a/src/lib/elementary/elm_radio.h b/src/lib/elementary/elm_radio.h
index dfedb190c9..e3edae0f11 100644
--- a/src/lib/elementary/elm_radio.h
+++ b/src/lib/elementary/elm_radio.h
@@ -33,11 +33,11 @@
  * The radio objects will modify this directly. That implies the pointer must
  * point to valid memory for as long as the radio objects exist.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for radio objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * @li @c "changed" - This is called when the radio object is selected. If you
  * want to trace the state change of a radio group, you should add this callback
  * to all the radio objects in that group.
diff --git a/src/lib/elementary/elm_scroller.h b/src/lib/elementary/elm_scroller.h
index b12de04b6c..fe44c2254c 100644
--- a/src/lib/elementary/elm_scroller.h
+++ b/src/lib/elementary/elm_scroller.h
@@ -12,7 +12,7 @@
  * always have a small minimum size by default as it won't be limited
  * by the contents of the scroller.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for scroller objects.
  *
  * This widget emits the following signals, besides the ones sent from
diff --git a/src/lib/elementary/elm_segment_control.h b/src/lib/elementary/elm_segment_control.h
index fdfa2dd79d..1ad286b050 100644
--- a/src/lib/elementary/elm_segment_control.h
+++ b/src/lib/elementary/elm_segment_control.h
@@ -21,11 +21,11 @@
  * Only one segment item can be at selected state. A segment item can display
  * combination of Text and any Evas_Object like Images or other widget.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for segment control objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "changed" - When the user clicks on a segment item which is not
  *   previously selected and get selected. The event_info parameter is the
  *   segment item pointer.
diff --git a/src/lib/elementary/elm_separator.h b/src/lib/elementary/elm_separator.h
index 40d39dce13..5a46b76f8c 100644
--- a/src/lib/elementary/elm_separator.h
+++ b/src/lib/elementary/elm_separator.h
@@ -9,10 +9,10 @@
  *
  * A separator can be vertical or horizontal.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for separator objects.
  *
- * This widget emits the signals coming from @ref Layout.
+ * This widget emits the signals coming from @ref Elm_Layout.
  *
  * @ref tutorial_separator is a good example of how to use a separator.
  * @{
diff --git a/src/lib/elementary/elm_slider.h b/src/lib/elementary/elm_slider.h
index 2895342fcd..edcc03b803 100644
--- a/src/lib/elementary/elm_slider.h
+++ b/src/lib/elementary/elm_slider.h
@@ -29,11 +29,11 @@
  * the object or applications scaling factor. At any point code can query the
  * slider for its value with elm_slider_value_get().
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for slider objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "changed" - Whenever the slider value is changed by the user.
  * - @c "slider,drag,start" - dragging the slider indicator around has started.
  * - @c "slider,drag,stop" - dragging the slider indicator around has stopped.
diff --git a/src/lib/elementary/elm_slideshow.h b/src/lib/elementary/elm_slideshow.h
index b13edf960e..70954dba98 100644
--- a/src/lib/elementary/elm_slideshow.h
+++ b/src/lib/elementary/elm_slideshow.h
@@ -48,11 +48,11 @@
  * cached @b before and @b after the current item, in the widget's
  * item list.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for slideshow objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "changed" - when the slideshow switches its view to a new
  *   item. event_info parameter in callback contains the current visible item
  * - @c "transition,end" - when a slide transition ends. event_info parameter
diff --git a/src/lib/elementary/elm_spinner.h b/src/lib/elementary/elm_spinner.h
index bbfe2f2fa4..36433c3994 100644
--- a/src/lib/elementary/elm_spinner.h
+++ b/src/lib/elementary/elm_spinner.h
@@ -21,11 +21,11 @@
  *
  * It also allows specific values to be replaced by pre-defined labels.
  *
- * This widget inherits from the @ref Layout one, so that all the
+ * This widget inherits from the @ref Elm_Layout one, so that all the
  * functions acting on it also work for spinner objects.
  *
  * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
+ * @ref Elm_Layout :
  * - @c "changed" - Whenever the spinner value is changed.
  * - @c "delay,changed" - A short time after the value is changed by
  *    the user.  This will be called only when the user stops dragging
diff --git a/src/lib/elementary/elm_widget_layout.h b/src/lib/elementary/elm_widget_layout.h
index a024656c7d..461962ca53 100644
--- a/src/lib/elementary/elm_widget_layout.h
+++ b/src/lib/elementary/elm_widget_layout.h
@@ -15,7 +15,7 @@
  *
  * @section elm-layout-class The Elementary Layout Class
  *
- * Elementary, besides having the @ref Layout widget, exposes its
+ * Elementary, besides having the @ref Elm_Layout widget, exposes its
  * foundation -- the Elementary Layout Class -- in order to create
  * other widgets which are, basically, a certain layout with some more
  * logic on top.