4 files changed, 66 insertions, 14 deletions
diff --git a/doc/reference/shell/eshell-sections.txt b/doc/reference/shell/eshell-sections.txt
index ac6863d5c8..86321592a6 100644
--- a/doc/reference/shell/eshell-sections.txt
+++ b/doc/reference/shell/eshell-sections.txt
@@ -6,9 +6,9 @@ e_shell_view_get_name
 e_shell_view_get_action
 e_shell_view_get_title
 e_shell_view_set_title
-e_shell_view_get_view_instance
-e_shell_view_set_view_instance
-e_shell_view_is_selected
+e_shell_view_get_view_id
+e_shell_view_set_view_id
+e_shell_view_is_active
 e_shell_view_get_page_num
 e_shell_view_get_shell_content
 e_shell_view_get_shell_sidebar
@@ -202,8 +202,8 @@ e_shell_window_get_ui_manager
 e_shell_window_get_action
 e_shell_window_get_action_group
 e_shell_window_get_managed_widget
-e_shell_window_get_current_view
-e_shell_window_set_current_view
+e_shell_window_get_active_view
+e_shell_window_set_active_view
 e_shell_window_get_safe_mode
 e_shell_window_set_safe_mode
 e_shell_window_register_new_item_actions
diff --git a/doc/reference/shell/tmpl/e-shell-view.sgml b/doc/reference/shell/tmpl/e-shell-view.sgml
index 763632636d..5383ea7bc6 100644
--- a/doc/reference/shell/tmpl/e-shell-view.sgml
+++ b/doc/reference/shell/tmpl/e-shell-view.sgml
@@ -65,7 +65,7 @@ EShellView
 
 </para>
 
-<!-- ##### ARG EShellView:view-instance ##### -->
+<!-- ##### ARG EShellView:view-id ##### -->
 <para>
 
 </para>
@@ -106,7 +106,7 @@ EShellView
 @title: 
 
 
-<!-- ##### FUNCTION e_shell_view_get_view_instance ##### -->
+<!-- ##### FUNCTION e_shell_view_get_view_id ##### -->
 <para>
 
 </para>
@@ -115,16 +115,16 @@ EShellView
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_view_set_view_instance ##### -->
+<!-- ##### FUNCTION e_shell_view_set_view_id ##### -->
 <para>
 
 </para>
 
 @shell_view: 
-@instance: 
+@view_id: 
 
 
-<!-- ##### FUNCTION e_shell_view_is_selected ##### -->
+<!-- ##### FUNCTION e_shell_view_is_active ##### -->
 <para>
 
 </para>
diff --git a/doc/reference/shell/tmpl/e-shell-window.sgml b/doc/reference/shell/tmpl/e-shell-window.sgml
index dc05283d6b..a410267107 100644
--- a/doc/reference/shell/tmpl/e-shell-window.sgml
+++ b/doc/reference/shell/tmpl/e-shell-window.sgml
@@ -23,7 +23,7 @@ EShellWindow
 </para>
 
 
-<!-- ##### ARG EShellWindow:current-view ##### -->
+<!-- ##### ARG EShellWindow:active-view ##### -->
 <para>
 
 </para>
@@ -106,7 +106,7 @@ EShellWindow
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_window_get_current_view ##### -->
+<!-- ##### FUNCTION e_shell_window_get_active_view ##### -->
 <para>
 
 </para>
@@ -115,13 +115,13 @@ EShellWindow
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_window_set_current_view ##### -->
+<!-- ##### FUNCTION e_shell_window_set_active_view ##### -->
 <para>
 
 </para>
 
 @shell_window: 
-@name_or_alias: 
+@view_name: 
 
 
 <!-- ##### FUNCTION e_shell_window_get_safe_mode ##### -->
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index f913573f39..2810585883 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -424,12 +424,24 @@ intelligent
 </para>
 
 
+<!-- ##### ARG EShellView:view-instance ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT EShellViewPrivate ##### -->
 <para>
 
 </para>
 
 
+<!-- ##### ARG EShellWindow:current-view ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT EShellWindowPrivate ##### -->
 <para>
 
@@ -1719,6 +1731,30 @@ intelligent
 </para>
 
 
+<!-- ##### FUNCTION e_shell_view_get_view_instance ##### -->
+<para>
+
+</para>
+
+@shell_view: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_view_is_selected ##### -->
+<para>
+
+</para>
+
+@shell_view: 
+@Returns: 
+
+<!-- ##### FUNCTION e_shell_view_set_view_instance ##### -->
+<para>
+
+</para>
+
+@shell_view: 
+@instance: 
+
 <!-- ##### FUNCTION e_shell_window_actions_init ##### -->
 <para>
 
@@ -1741,6 +1777,14 @@ intelligent
 
 @shell_window: 
 
+<!-- ##### FUNCTION e_shell_window_get_current_view ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@Returns: 
+
 <!-- ##### FUNCTION e_shell_window_private_dispose ##### -->
 <para>
 
@@ -1762,6 +1806,14 @@ intelligent
 
 @shell_window: 
 
+<!-- ##### FUNCTION e_shell_window_set_current_view ##### -->
+<para>
+
+</para>
+
+@shell_window: 
+@view_name: 
+
 <!-- ##### FUNCTION e_shell_window_switch_to_view ##### -->
 <para>