Replace 'interface' with 'iface' in the code

Win32 headers have a #define for 'interface', which breaks the build
when this word is used in the code, thus replace it to 'iface',
the same way as GLib or GTK+ code use to have it. (See bug #722068.)

77 files changed, 884 insertions, 885 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 04c720b76d..2e4a85a77f 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -50,7 +50,7 @@ struct _EAddressbookTableAdapterPrivate {
 
 /* Forward Declarations */
 static void	e_addressbook_table_adapter_table_model_init
-					(ETableModelInterface *interface);
+					(ETableModelInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAddressbookTableAdapter,
@@ -324,21 +324,21 @@ e_addressbook_table_adapter_class_init (EAddressbookTableAdapterClass *class)
 }
 
 static void
-e_addressbook_table_adapter_table_model_init (ETableModelInterface *interface)
+e_addressbook_table_adapter_table_model_init (ETableModelInterface *iface)
 {
-	interface->column_count = addressbook_col_count;
-	interface->row_count = addressbook_row_count;
-	interface->append_row = addressbook_append_row;
-
-	interface->value_at = addressbook_value_at;
-	interface->set_value_at = addressbook_set_value_at;
-	interface->is_cell_editable = addressbook_is_cell_editable;
-
-	interface->duplicate_value = addressbook_duplicate_value;
-	interface->free_value = addressbook_free_value;
-	interface->initialize_value = addressbook_initialize_value;
-	interface->value_is_empty = addressbook_value_is_empty;
-	interface->value_to_string = addressbook_value_to_string;
+	iface->column_count = addressbook_col_count;
+	iface->row_count = addressbook_row_count;
+	iface->append_row = addressbook_append_row;
+
+	iface->value_at = addressbook_value_at;
+	iface->set_value_at = addressbook_set_value_at;
+	iface->is_cell_editable = addressbook_is_cell_editable;
+
+	iface->duplicate_value = addressbook_duplicate_value;
+	iface->free_value = addressbook_free_value;
+	iface->initialize_value = addressbook_initialize_value;
+	iface->value_is_empty = addressbook_value_is_empty;
+	iface->value_to_string = addressbook_value_to_string;
 }
 
 static void
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 58178747ba..2f90245874 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -115,7 +115,7 @@ static guint signals[LAST_SIGNAL];
 
 /* Forward Declarations */
 static void	e_addressbook_view_selectable_init
-					(ESelectableInterface *interface);
+					(ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAddressbookView,
@@ -891,14 +891,14 @@ e_addressbook_view_init (EAddressbookView *view)
 }
 
 static void
-e_addressbook_view_selectable_init (ESelectableInterface *interface)
+e_addressbook_view_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = addressbook_view_update_actions;
-	interface->cut_clipboard = addressbook_view_cut_clipboard;
-	interface->copy_clipboard = addressbook_view_copy_clipboard;
-	interface->paste_clipboard = addressbook_view_paste_clipboard;
-	interface->delete_selection = addressbook_view_delete_selection;
-	interface->select_all = addressbook_view_select_all;
+	iface->update_actions = addressbook_view_update_actions;
+	iface->cut_clipboard = addressbook_view_cut_clipboard;
+	iface->copy_clipboard = addressbook_view_copy_clipboard;
+	iface->paste_clipboard = addressbook_view_paste_clipboard;
+	iface->delete_selection = addressbook_view_delete_selection;
+	iface->select_all = addressbook_view_select_all;
 }
 
 GtkWidget *
diff --git a/calendar/alarm-notify/alarm-notify.c b/calendar/alarm-notify/alarm-notify.c
index dced21f2da..fc71d6917b 100644
--- a/calendar/alarm-notify/alarm-notify.c
+++ b/calendar/alarm-notify/alarm-notify.c
@@ -46,7 +46,7 @@ struct _AlarmNotifyPrivate {
 };
 
 /* Forward Declarations */
-static void	alarm_notify_initable_init	(GInitableIface *interface);
+static void	alarm_notify_initable_init	(GInitableIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	AlarmNotify, alarm_notify, GTK_TYPE_APPLICATION,
@@ -186,10 +186,10 @@ alarm_notify_class_init (AlarmNotifyClass *class)
 }
 
 static void
-alarm_notify_initable_init (GInitableIface *interface)
+alarm_notify_initable_init (GInitableIface *iface)
 {
 	/* XXX Awkward name since we're missing an 'E' prefix. */
-	interface->init = alarm_notify_initable;
+	iface->init = alarm_notify_initable;
 }
 
 static void
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index a163117a85..86bc470261 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -36,7 +36,7 @@
 
 /* Forward Declarations */
 static void	e_cal_model_calendar_table_model_init
-					(ETableModelInterface *interface);
+					(ETableModelInterface *iface);
 
 static ETableModelInterface *table_model_parent_interface;
 
@@ -512,20 +512,20 @@ e_cal_model_calendar_class_init (ECalModelCalendarClass *class)
 }
 
 static void
-e_cal_model_calendar_table_model_init (ETableModelInterface *interface)
+e_cal_model_calendar_table_model_init (ETableModelInterface *iface)
 {
 	table_model_parent_interface =
-		g_type_interface_peek_parent (interface);
-
-	interface->column_count = cal_model_calendar_column_count;
-	interface->value_at = cal_model_calendar_value_at;
-	interface->set_value_at = cal_model_calendar_set_value_at;
-	interface->is_cell_editable = cal_model_calendar_is_cell_editable;
-	interface->duplicate_value = cal_model_calendar_duplicate_value;
-	interface->free_value = cal_model_calendar_free_value;
-	interface->initialize_value = cal_model_calendar_initialize_value;
-	interface->value_is_empty = cal_model_calendar_value_is_empty;
-	interface->value_to_string = cal_model_calendar_value_to_string;
+		g_type_interface_peek_parent (iface);
+
+	iface->column_count = cal_model_calendar_column_count;
+	iface->value_at = cal_model_calendar_value_at;
+	iface->set_value_at = cal_model_calendar_set_value_at;
+	iface->is_cell_editable = cal_model_calendar_is_cell_editable;
+	iface->duplicate_value = cal_model_calendar_duplicate_value;
+	iface->free_value = cal_model_calendar_free_value;
+	iface->initialize_value = cal_model_calendar_initialize_value;
+	iface->value_is_empty = cal_model_calendar_value_is_empty;
+	iface->value_to_string = cal_model_calendar_value_to_string;
 }
 
 static void
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index aa4108ae82..22188da072 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -36,7 +36,7 @@
 
 /* Forward Declarations */
 static void	e_cal_model_memos_table_model_init
-					(ETableModelInterface *interface);
+					(ETableModelInterface *iface);
 
 static ETableModelInterface *table_model_parent_interface;
 
@@ -230,22 +230,22 @@ e_cal_model_memos_class_init (ECalModelMemosClass *class)
 }
 
 static void
-e_cal_model_memos_table_model_init (ETableModelInterface *interface)
+e_cal_model_memos_table_model_init (ETableModelInterface *iface)
 {
 	table_model_parent_interface =
-		g_type_interface_peek_parent (interface);
+		g_type_interface_peek_parent (iface);
 
-	interface->column_count = cal_model_memos_column_count;
+	iface->column_count = cal_model_memos_column_count;
 
-	interface->value_at = cal_model_memos_value_at;
-	interface->set_value_at = cal_model_memos_set_value_at;
-	interface->is_cell_editable = cal_model_memos_is_cell_editable;
+	iface->value_at = cal_model_memos_value_at;
+	iface->set_value_at = cal_model_memos_set_value_at;
+	iface->is_cell_editable = cal_model_memos_is_cell_editable;
 
-	interface->duplicate_value = cal_model_memos_duplicate_value;
-	interface->free_value = cal_model_memos_free_value;
-	interface->initialize_value = cal_model_memos_initialize_value;
-	interface->value_is_empty = cal_model_memos_value_is_empty;
-	interface->value_to_string = cal_model_memos_value_to_string;
+	iface->duplicate_value = cal_model_memos_duplicate_value;
+	iface->free_value = cal_model_memos_free_value;
+	iface->initialize_value = cal_model_memos_initialize_value;
+	iface->value_is_empty = cal_model_memos_value_is_empty;
+	iface->value_to_string = cal_model_memos_value_to_string;
 }
 
 static void
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 9f35a77079..e4737ad1a2 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -56,7 +56,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_cal_model_tasks_table_model_init
-					(ETableModelInterface *interface);
+					(ETableModelInterface *iface);
 
 static ETableModelInterface *table_model_parent_interface;
 
@@ -1232,22 +1232,22 @@ e_cal_model_tasks_class_init (ECalModelTasksClass *class)
 }
 
 static void
-e_cal_model_tasks_table_model_init (ETableModelInterface *interface)
+e_cal_model_tasks_table_model_init (ETableModelInterface *iface)
 {
 	table_model_parent_interface =
-		g_type_interface_peek_parent (interface);
+		g_type_interface_peek_parent (iface);
 
-	interface->column_count = cal_model_tasks_column_count;
+	iface->column_count = cal_model_tasks_column_count;
 
-	interface->value_at = cal_model_tasks_value_at;
-	interface->set_value_at = cal_model_tasks_set_value_at;
-	interface->is_cell_editable = cal_model_tasks_is_cell_editable;
+	iface->value_at = cal_model_tasks_value_at;
+	iface->set_value_at = cal_model_tasks_set_value_at;
+	iface->is_cell_editable = cal_model_tasks_is_cell_editable;
 
-	interface->duplicate_value = cal_model_tasks_duplicate_value;
-	interface->free_value = cal_model_tasks_free_value;
-	interface->initialize_value = cal_model_tasks_initialize_value;
-	interface->value_is_empty = cal_model_tasks_value_is_empty;
-	interface->value_to_string = cal_model_tasks_value_to_string;
+	iface->duplicate_value = cal_model_tasks_duplicate_value;
+	iface->free_value = cal_model_tasks_free_value;
+	iface->initialize_value = cal_model_tasks_initialize_value;
+	iface->value_is_empty = cal_model_tasks_value_is_empty;
+	iface->value_to_string = cal_model_tasks_value_to_string;
 }
 
 static void
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index b37be73a69..aff77fa6e4 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -194,7 +194,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_cal_model_table_model_init
-					(ETableModelInterface *interface);
+					(ETableModelInterface *iface);
 
 static guint signals[LAST_SIGNAL];
 
@@ -2008,21 +2008,21 @@ e_cal_model_class_init (ECalModelClass *class)
 }
 
 static void
-e_cal_model_table_model_init (ETableModelInterface *interface)
+e_cal_model_table_model_init (ETableModelInterface *iface)
 {
-	interface->column_count = cal_model_column_count;
-	interface->row_count = cal_model_row_count;
-	interface->append_row = cal_model_append_row;
+	iface->column_count = cal_model_column_count;
+	iface->row_count = cal_model_row_count;
+	iface->append_row = cal_model_append_row;
 
-	interface->value_at = cal_model_value_at;
-	interface->set_value_at = cal_model_set_value_at;
-	interface->is_cell_editable = cal_model_is_cell_editable;
+	iface->value_at = cal_model_value_at;
+	iface->set_value_at = cal_model_set_value_at;
+	iface->is_cell_editable = cal_model_is_cell_editable;
 
-	interface->duplicate_value = cal_model_duplicate_value;
-	interface->free_value = cal_model_free_value;
-	interface->initialize_value = cal_model_initialize_value;
-	interface->value_is_empty = cal_model_value_is_empty;
-	interface->value_to_string = cal_model_value_to_string;
+	iface->duplicate_value = cal_model_duplicate_value;
+	iface->free_value = cal_model_free_value;
+	iface->initialize_value = cal_model_initialize_value;
+	iface->value_is_empty = cal_model_value_is_empty;
+	iface->value_to_string = cal_model_value_to_string;
 }
 
 static void
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 6983303db8..ce6cfaede4 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -98,7 +98,7 @@ enum {
 
 static guint signals[LAST_SIGNAL];
 
-static void calendar_view_selectable_init (ESelectableInterface *interface);
+static void calendar_view_selectable_init (ESelectableInterface *iface);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE (
 	ECalendarView, e_calendar_view, GTK_TYPE_TABLE,
@@ -1035,13 +1035,13 @@ e_calendar_view_init (ECalendarView *calendar_view)
 }
 
 static void
-calendar_view_selectable_init (ESelectableInterface *interface)
+calendar_view_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = calendar_view_update_actions;
-	interface->cut_clipboard = calendar_view_cut_clipboard;
-	interface->copy_clipboard = calendar_view_copy_clipboard;
-	interface->paste_clipboard = calendar_view_paste_clipboard;
-	interface->delete_selection = calendar_view_delete_selection;
+	iface->update_actions = calendar_view_update_actions;
+	iface->cut_clipboard = calendar_view_cut_clipboard;
+	iface->copy_clipboard = calendar_view_copy_clipboard;
+	iface->paste_clipboard = calendar_view_paste_clipboard;
+	iface->delete_selection = calendar_view_delete_selection;
 }
 
 void
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index c7c6d5d091..ed39b43642 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -82,7 +82,7 @@ static const gchar *icon_names[] = {
 
 /* Forward Declarations */
 static void	e_memo_table_selectable_init
-					(ESelectableInterface *interface);
+					(ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMemoTable,
@@ -1182,14 +1182,14 @@ e_memo_table_init (EMemoTable *memo_table)
 }
 
 static void
-e_memo_table_selectable_init (ESelectableInterface *interface)
+e_memo_table_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = memo_table_update_actions;
-	interface->cut_clipboard = memo_table_cut_clipboard;
-	interface->copy_clipboard = memo_table_copy_clipboard;
-	interface->paste_clipboard = memo_table_paste_clipboard;
-	interface->delete_selection = memo_table_delete_selection;
-	interface->select_all = memo_table_select_all;
+	iface->update_actions = memo_table_update_actions;
+	iface->cut_clipboard = memo_table_cut_clipboard;
+	iface->copy_clipboard = memo_table_copy_clipboard;
+	iface->paste_clipboard = memo_table_paste_clipboard;
+	iface->delete_selection = memo_table_delete_selection;
+	iface->select_all = memo_table_select_all;
 }
 
 /**
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 8f6181fee2..085b1b4c04 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -89,7 +89,7 @@ static const gchar *icon_names[] = {
 
 /* Forward Declarations */
 static void	e_task_table_selectable_init
-					(ESelectableInterface *interface);
+					(ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ETaskTable,
@@ -1560,14 +1560,14 @@ e_task_table_init (ETaskTable *task_table)
 }
 
 static void
-e_task_table_selectable_init (ESelectableInterface *interface)
+e_task_table_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = task_table_update_actions;
-	interface->cut_clipboard = task_table_cut_clipboard;
-	interface->copy_clipboard = task_table_copy_clipboard;
-	interface->paste_clipboard = task_table_paste_clipboard;
-	interface->delete_selection = task_table_delete_selection;
-	interface->select_all = task_table_select_all;
+	iface->update_actions = task_table_update_actions;
+	iface->cut_clipboard = task_table_cut_clipboard;
+	iface->copy_clipboard = task_table_copy_clipboard;
+	iface->paste_clipboard = task_table_paste_clipboard;
+	iface->delete_selection = task_table_delete_selection;
+	iface->select_all = task_table_select_all;
 }
 
 /**
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 35a140b5a9..0ac90e67f5 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -128,7 +128,7 @@ static void	handle_multipart_signed		(EMsgComposer *composer,
 						 GCancellable *cancellable,
 						 gint depth);
 
-static void	e_msg_composer_alert_sink_init	(EAlertSinkInterface *interface);
+static void	e_msg_composer_alert_sink_init	(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMsgComposer,
@@ -2511,9 +2511,9 @@ e_msg_composer_class_init (EMsgComposerClass *class)
 }
 
 static void
-e_msg_composer_alert_sink_init (EAlertSinkInterface *interface)
+e_msg_composer_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = msg_composer_submit_alert;
+	iface->submit_alert = msg_composer_submit_alert;
 }
 
 static void
diff --git a/e-util/e-alert-sink.c b/e-util/e-alert-sink.c
index ff94dee834..e545a7ce01 100644
--- a/e-util/e-alert-sink.c
+++ b/e-util/e-alert-sink.c
@@ -62,9 +62,9 @@ alert_sink_submit_alert (EAlertSink *alert_sink,
 }
 
 static void
-e_alert_sink_default_init (EAlertSinkInterface *interface)
+e_alert_sink_default_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = alert_sink_submit_alert;
+	iface->submit_alert = alert_sink_submit_alert;
 }
 
 /**
@@ -80,13 +80,13 @@ void
 e_alert_sink_submit_alert (EAlertSink *alert_sink,
                            EAlert *alert)
 {
-	EAlertSinkInterface *interface;
+	EAlertSinkInterface *iface;
 
 	g_return_if_fail (E_IS_ALERT_SINK (alert_sink));
 	g_return_if_fail (E_IS_ALERT (alert));
 
-	interface = E_ALERT_SINK_GET_INTERFACE (alert_sink);
-	g_return_if_fail (interface->submit_alert != NULL);
+	iface = E_ALERT_SINK_GET_INTERFACE (alert_sink);
+	g_return_if_fail (iface->submit_alert != NULL);
 
-	interface->submit_alert (alert_sink, alert);
+	iface->submit_alert (alert_sink, alert);
 }
diff --git a/e-util/e-attachment-bar.c b/e-util/e-attachment-bar.c
index 21075d15f3..3a14ba76b8 100644
--- a/e-util/e-attachment-bar.c
+++ b/e-util/e-attachment-bar.c
@@ -65,7 +65,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_attachment_bar_interface_init
-				(EAttachmentViewInterface *interface);
+				(EAttachmentViewInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAttachmentBar,
@@ -537,18 +537,18 @@ e_attachment_bar_class_init (EAttachmentBarClass *class)
 }
 
 static void
-e_attachment_bar_interface_init (EAttachmentViewInterface *interface)
+e_attachment_bar_interface_init (EAttachmentViewInterface *iface)
 {
-	interface->get_private = attachment_bar_get_private;
-	interface->get_store = attachment_bar_get_store;
-	interface->get_path_at_pos = attachment_bar_get_path_at_pos;
-	interface->get_selected_paths = attachment_bar_get_selected_paths;
-	interface->path_is_selected = attachment_bar_path_is_selected;
-	interface->select_path = attachment_bar_select_path;
-	interface->unselect_path = attachment_bar_unselect_path;
-	interface->select_all = attachment_bar_select_all;
-	interface->unselect_all = attachment_bar_unselect_all;
-	interface->update_actions = attachment_bar_update_actions;
+	iface->get_private = attachment_bar_get_private;
+	iface->get_store = attachment_bar_get_store;
+	iface->get_path_at_pos = attachment_bar_get_path_at_pos;
+	iface->get_selected_paths = attachment_bar_get_selected_paths;
+	iface->path_is_selected = attachment_bar_path_is_selected;
+	iface->select_path = attachment_bar_select_path;
+	iface->unselect_path = attachment_bar_unselect_path;
+	iface->select_all = attachment_bar_select_all;
+	iface->unselect_all = attachment_bar_unselect_all;
+	iface->update_actions = attachment_bar_update_actions;
 }
 
 static void
diff --git a/e-util/e-attachment-icon-view.c b/e-util/e-attachment-icon-view.c
index 363844cd9d..0befff00ae 100644
--- a/e-util/e-attachment-icon-view.c
+++ b/e-util/e-attachment-icon-view.c
@@ -49,7 +49,7 @@ static gint icon_size = GTK_ICON_SIZE_DIALOG;
 
 /* Forward Declarations */
 static void	e_attachment_icon_view_interface_init
-					(EAttachmentViewInterface *interface);
+					(EAttachmentViewInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAttachmentIconView,
@@ -543,23 +543,23 @@ e_attachment_icon_view_init (EAttachmentIconView *icon_view)
 }
 
 static void
-e_attachment_icon_view_interface_init (EAttachmentViewInterface *interface)
-{
-	interface->get_private = attachment_icon_view_get_private;
-	interface->get_store = attachment_icon_view_get_store;
-
-	interface->get_path_at_pos = attachment_icon_view_get_path_at_pos;
-	interface->get_selected_paths = attachment_icon_view_get_selected_paths;
-	interface->path_is_selected = attachment_icon_view_path_is_selected;
-	interface->select_path = attachment_icon_view_select_path;
-	interface->unselect_path = attachment_icon_view_unselect_path;
-	interface->select_all = attachment_icon_view_select_all;
-	interface->unselect_all = attachment_icon_view_unselect_all;
-
-	interface->drag_source_set = attachment_icon_view_drag_source_set;
-	interface->drag_dest_set = attachment_icon_view_drag_dest_set;
-	interface->drag_source_unset = attachment_icon_view_drag_source_unset;
-	interface->drag_dest_unset = attachment_icon_view_drag_dest_unset;
+e_attachment_icon_view_interface_init (EAttachmentViewInterface *iface)
+{
+	iface->get_private = attachment_icon_view_get_private;
+	iface->get_store = attachment_icon_view_get_store;
+
+	iface->get_path_at_pos = attachment_icon_view_get_path_at_pos;
+	iface->get_selected_paths = attachment_icon_view_get_selected_paths;
+	iface->path_is_selected = attachment_icon_view_path_is_selected;
+	iface->select_path = attachment_icon_view_select_path;
+	iface->unselect_path = attachment_icon_view_unselect_path;
+	iface->select_all = attachment_icon_view_select_all;
+	iface->unselect_all = attachment_icon_view_unselect_all;
+
+	iface->drag_source_set = attachment_icon_view_drag_source_set;
+	iface->drag_dest_set = attachment_icon_view_drag_dest_set;
+	iface->drag_source_unset = attachment_icon_view_drag_source_unset;
+	iface->drag_dest_unset = attachment_icon_view_drag_dest_unset;
 }
 
 GtkWidget *
diff --git a/e-util/e-attachment-paned.c b/e-util/e-attachment-paned.c
index e94763fb3c..98772db873 100644
--- a/e-util/e-attachment-paned.c
+++ b/e-util/e-attachment-paned.c
@@ -69,7 +69,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_attachment_paned_interface_init
-					(EAttachmentViewInterface *interface);
+					(EAttachmentViewInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAttachmentPaned,
@@ -760,18 +760,18 @@ e_attachment_paned_init (EAttachmentPaned *paned)
 }
 
 static void
-e_attachment_paned_interface_init (EAttachmentViewInterface *interface)
+e_attachment_paned_interface_init (EAttachmentViewInterface *iface)
 {
-	interface->get_private = attachment_paned_get_private;
-	interface->get_store = attachment_paned_get_store;
-	interface->get_path_at_pos = attachment_paned_get_path_at_pos;
-	interface->get_selected_paths = attachment_paned_get_selected_paths;
-	interface->path_is_selected = attachment_paned_path_is_selected;
-	interface->select_path = attachment_paned_select_path;
-	interface->unselect_path = attachment_paned_unselect_path;
-	interface->select_all = attachment_paned_select_all;
-	interface->unselect_all = attachment_paned_unselect_all;
-	interface->update_actions = attachment_paned_update_actions;
+	iface->get_private = attachment_paned_get_private;
+	iface->get_store = attachment_paned_get_store;
+	iface->get_path_at_pos = attachment_paned_get_path_at_pos;
+	iface->get_selected_paths = attachment_paned_get_selected_paths;
+	iface->path_is_selected = attachment_paned_path_is_selected;
+	iface->select_path = attachment_paned_select_path;
+	iface->unselect_path = attachment_paned_unselect_path;
+	iface->select_all = attachment_paned_select_all;
+	iface->unselect_all = attachment_paned_unselect_all;
+	iface->update_actions = attachment_paned_update_actions;
 }
 
 GtkWidget *
diff --git a/e-util/e-attachment-tree-view.c b/e-util/e-attachment-tree-view.c
index d6dc59eada..399b1c7ea8 100644
--- a/e-util/e-attachment-tree-view.c
+++ b/e-util/e-attachment-tree-view.c
@@ -47,7 +47,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_attachment_tree_view_interface_init
-					(EAttachmentViewInterface *interface);
+					(EAttachmentViewInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAttachmentTreeView,
@@ -596,23 +596,23 @@ e_attachment_tree_view_init (EAttachmentTreeView *tree_view)
 }
 
 static void
-e_attachment_tree_view_interface_init (EAttachmentViewInterface *interface)
-{
-	interface->get_private = attachment_tree_view_get_private;
-	interface->get_store = attachment_tree_view_get_store;
-
-	interface->get_path_at_pos = attachment_tree_view_get_path_at_pos;
-	interface->get_selected_paths = attachment_tree_view_get_selected_paths;
-	interface->path_is_selected = attachment_tree_view_path_is_selected;
-	interface->select_path = attachment_tree_view_select_path;
-	interface->unselect_path = attachment_tree_view_unselect_path;
-	interface->select_all = attachment_tree_view_select_all;
-	interface->unselect_all = attachment_tree_view_unselect_all;
-
-	interface->drag_source_set = attachment_tree_view_drag_source_set;
-	interface->drag_dest_set = attachment_tree_view_drag_dest_set;
-	interface->drag_source_unset = attachment_tree_view_drag_source_unset;
-	interface->drag_dest_unset = attachment_tree_view_drag_dest_unset;
+e_attachment_tree_view_interface_init (EAttachmentViewInterface *iface)
+{
+	iface->get_private = attachment_tree_view_get_private;
+	iface->get_store = attachment_tree_view_get_store;
+
+	iface->get_path_at_pos = attachment_tree_view_get_path_at_pos;
+	iface->get_selected_paths = attachment_tree_view_get_selected_paths;
+	iface->path_is_selected = attachment_tree_view_path_is_selected;
+	iface->select_path = attachment_tree_view_select_path;
+	iface->unselect_path = attachment_tree_view_unselect_path;
+	iface->select_all = attachment_tree_view_select_all;
+	iface->unselect_all = attachment_tree_view_unselect_all;
+
+	iface->drag_source_set = attachment_tree_view_drag_source_set;
+	iface->drag_dest_set = attachment_tree_view_drag_dest_set;
+	iface->drag_source_unset = attachment_tree_view_drag_source_unset;
+	iface->drag_dest_unset = attachment_tree_view_drag_dest_unset;
 }
 
 GtkWidget *
diff --git a/e-util/e-attachment-view.c b/e-util/e-attachment-view.c
index dbfe804110..704c0e239f 100644
--- a/e-util/e-attachment-view.c
+++ b/e-util/e-attachment-view.c
@@ -843,12 +843,12 @@ attachment_view_init_drag_dest (EAttachmentView *view)
 }
 
 static void
-e_attachment_view_default_init (EAttachmentViewInterface *interface)
+e_attachment_view_default_init (EAttachmentViewInterface *iface)
 {
-	interface->update_actions = attachment_view_update_actions;
+	iface->update_actions = attachment_view_update_actions;
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_boolean (
 			"dragging",
 			"Dragging",
@@ -857,7 +857,7 @@ e_attachment_view_default_init (EAttachmentViewInterface *interface)
 			G_PARAM_READWRITE));
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_boolean (
 			"editable",
 			"Editable",
@@ -868,7 +868,7 @@ e_attachment_view_default_init (EAttachmentViewInterface *interface)
 
 	signals[UPDATE_ACTIONS] = g_signal_new (
 		"update-actions",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		G_STRUCT_OFFSET (EAttachmentViewInterface, update_actions),
 		NULL, NULL,
@@ -984,27 +984,27 @@ e_attachment_view_finalize (EAttachmentView *view)
 EAttachmentViewPrivate *
 e_attachment_view_get_private (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->get_private != NULL, NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->get_private != NULL, NULL);
 
-	return interface->get_private (view);
+	return iface->get_private (view);
 }
 
 EAttachmentStore *
 e_attachment_view_get_store (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->get_store != NULL, NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->get_store != NULL, NULL);
 
-	return interface->get_store (view);
+	return iface->get_store (view);
 }
 
 gboolean
@@ -1385,34 +1385,34 @@ e_attachment_view_get_path_at_pos (EAttachmentView *view,
                                    gint x,
                                    gint y)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->get_path_at_pos != NULL, NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->get_path_at_pos != NULL, NULL);
 
-	return interface->get_path_at_pos (view, x, y);
+	return iface->get_path_at_pos (view, x, y);
 }
 
 GList *
 e_attachment_view_get_selected_paths (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->get_selected_paths != NULL, NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->get_selected_paths != NULL, NULL);
 
-	return interface->get_selected_paths (view);
+	return iface->get_selected_paths (view);
 }
 
 gboolean
 e_attachment_view_path_is_selected (EAttachmentView *view,
                                     GtkTreePath *path)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), FALSE);
 
@@ -1420,66 +1420,66 @@ e_attachment_view_path_is_selected (EAttachmentView *view,
 	if (path == NULL)
 		return FALSE;
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->path_is_selected != NULL, FALSE);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->path_is_selected != NULL, FALSE);
 
-	return interface->path_is_selected (view, path);
+	return iface->path_is_selected (view, path);
 }
 
 void
 e_attachment_view_select_path (EAttachmentView *view,
                                GtkTreePath *path)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 	g_return_if_fail (path != NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_if_fail (interface->select_path != NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_if_fail (iface->select_path != NULL);
 
-	interface->select_path (view, path);
+	iface->select_path (view, path);
 }
 
 void
 e_attachment_view_unselect_path (EAttachmentView *view,
                                  GtkTreePath *path)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 	g_return_if_fail (path != NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_if_fail (interface->unselect_path != NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_if_fail (iface->unselect_path != NULL);
 
-	interface->unselect_path (view, path);
+	iface->unselect_path (view, path);
 }
 
 void
 e_attachment_view_select_all (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_if_fail (interface->select_all != NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_if_fail (iface->select_all != NULL);
 
-	interface->select_all (view);
+	iface->select_all (view);
 }
 
 void
 e_attachment_view_unselect_all (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_if_fail (interface->unselect_all != NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_if_fail (iface->unselect_all != NULL);
 
-	interface->unselect_all (view);
+	iface->unselect_all (view);
 }
 
 void
@@ -1504,22 +1504,22 @@ e_attachment_view_sync_selection (EAttachmentView *view,
 void
 e_attachment_view_drag_source_set (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 	GtkTargetEntry *targets;
 	GtkTargetList *list;
 	gint n_targets;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	if (interface->drag_source_set == NULL)
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	if (iface->drag_source_set == NULL)
 		return;
 
 	list = gtk_target_list_new (NULL, 0);
 	gtk_target_list_add_uri_targets (list, 0);
 	targets = gtk_target_table_new_from_list (list, &n_targets);
 
-	interface->drag_source_set (
+	iface->drag_source_set (
 		view, GDK_BUTTON1_MASK,
 		targets, n_targets, GDK_ACTION_COPY);
 
@@ -1530,15 +1530,15 @@ e_attachment_view_drag_source_set (EAttachmentView *view)
 void
 e_attachment_view_drag_source_unset (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	if (interface->drag_source_unset == NULL)
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	if (iface->drag_source_unset == NULL)
 		return;
 
-	interface->drag_source_unset (view);
+	iface->drag_source_unset (view);
 }
 
 void
@@ -1683,14 +1683,14 @@ void
 e_attachment_view_drag_dest_set (EAttachmentView *view)
 {
 	EAttachmentViewPrivate *priv;
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 	GtkTargetEntry *targets;
 	gint n_targets;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	if (interface->drag_dest_set == NULL)
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	if (iface->drag_dest_set == NULL)
 		return;
 
 	priv = e_attachment_view_get_private (view);
@@ -1698,7 +1698,7 @@ e_attachment_view_drag_dest_set (EAttachmentView *view)
 	targets = gtk_target_table_new_from_list (
 		priv->target_list, &n_targets);
 
-	interface->drag_dest_set (
+	iface->drag_dest_set (
 		view, targets, n_targets, priv->drag_actions);
 
 	gtk_target_table_free (targets, n_targets);
@@ -1707,15 +1707,15 @@ e_attachment_view_drag_dest_set (EAttachmentView *view)
 void
 e_attachment_view_drag_dest_unset (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	if (interface->drag_dest_unset == NULL)
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	if (iface->drag_dest_unset == NULL)
 		return;
 
-	interface->drag_dest_unset (view);
+	iface->drag_dest_unset (view);
 }
 
 gboolean
diff --git a/e-util/e-data-capture.c b/e-util/e-data-capture.c
index e0413a029f..f51e682f07 100644
--- a/e-util/e-data-capture.c
+++ b/e-util/e-data-capture.c
@@ -63,7 +63,7 @@ enum {
 static guint signals[LAST_SIGNAL];
 
 /* Forward Declarations */
-static void	e_data_capture_converter_init	(GConverterIface *interface);
+static void	e_data_capture_converter_init	(GConverterIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EDataCapture,
@@ -303,10 +303,10 @@ e_data_capture_class_init (EDataCaptureClass *class)
 }
 
 static void
-e_data_capture_converter_init (GConverterIface *interface)
+e_data_capture_converter_init (GConverterIface *iface)
 {
-	interface->convert = data_capture_convert;
-	interface->reset = data_capture_reset;
+	iface->convert = data_capture_convert;
+	iface->reset = data_capture_reset;
 }
 
 static void
diff --git a/e-util/e-focus-tracker.c b/e-util/e-focus-tracker.c
index 18f4327f07..42cd634202 100644
--- a/e-util/e-focus-tracker.c
+++ b/e-util/e-focus-tracker.c
@@ -261,10 +261,10 @@ focus_tracker_selectable_update_actions (EFocusTracker *focus_tracker,
                                          GdkAtom *targets,
                                          gint n_targets)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	GtkAction *action;
 
-	interface = E_SELECTABLE_GET_INTERFACE (selectable);
+	iface = E_SELECTABLE_GET_INTERFACE (selectable);
 
 	e_selectable_update_actions (
 		selectable, focus_tracker, targets, n_targets);
@@ -276,31 +276,31 @@ focus_tracker_selectable_update_actions (EFocusTracker *focus_tracker,
 	 * ESelectable implementations. */
 
 	action = e_focus_tracker_get_cut_clipboard_action (focus_tracker);
-	if (action != NULL && interface->cut_clipboard == NULL)
+	if (action != NULL && iface->cut_clipboard == NULL)
 		gtk_action_set_sensitive (action, FALSE);
 
 	action = e_focus_tracker_get_copy_clipboard_action (focus_tracker);
-	if (action != NULL && interface->copy_clipboard == NULL)
+	if (action != NULL && iface->copy_clipboard == NULL)
 		gtk_action_set_sensitive (action, FALSE);
 
 	action = e_focus_tracker_get_paste_clipboard_action (focus_tracker);
-	if (action != NULL && interface->paste_clipboard == NULL)
+	if (action != NULL && iface->paste_clipboard == NULL)
 		gtk_action_set_sensitive (action, FALSE);
 
 	action = e_focus_tracker_get_delete_selection_action (focus_tracker);
-	if (action != NULL && interface->delete_selection == NULL)
+	if (action != NULL && iface->delete_selection == NULL)
 		gtk_action_set_sensitive (action, FALSE);
 
 	action = e_focus_tracker_get_select_all_action (focus_tracker);
-	if (action != NULL && interface->select_all == NULL)
+	if (action != NULL && iface->select_all == NULL)
 		gtk_action_set_sensitive (action, FALSE);
 
 	action = e_focus_tracker_get_undo_action (focus_tracker);
-	if (action != NULL && interface->undo == NULL)
+	if (action != NULL && iface->undo == NULL)
 		gtk_action_set_sensitive (action, FALSE);
 
 	action = e_focus_tracker_get_redo_action (focus_tracker);
-	if (action != NULL && interface->redo == NULL)
+	if (action != NULL && iface->redo == NULL)
 		gtk_action_set_sensitive (action, FALSE);
 }
 
diff --git a/e-util/e-mail-signature-editor.c b/e-util/e-mail-signature-editor.c
index bb3e1dee36..05c783d448 100644
--- a/e-util/e-mail-signature-editor.c
+++ b/e-util/e-mail-signature-editor.c
@@ -77,7 +77,7 @@ static const gchar *ui =
 
 /* Forward Declarations */
 static void	e_mail_signature_editor_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailSignatureEditor,
@@ -742,9 +742,9 @@ e_mail_signature_editor_class_init (EMailSignatureEditorClass *class)
 }
 
 static void
-e_mail_signature_editor_alert_sink_init (EAlertSinkInterface *interface)
+e_mail_signature_editor_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = mail_signature_editor_submit_alert;
+	iface->submit_alert = mail_signature_editor_submit_alert;
 }
 
 static void
diff --git a/e-util/e-photo-source.c b/e-util/e-photo-source.c
index 67deb6f1e6..56f3e427bd 100644
--- a/e-util/e-photo-source.c
+++ b/e-util/e-photo-source.c
@@ -36,7 +36,7 @@ G_DEFINE_INTERFACE (
 	G_TYPE_OBJECT)
 
 static void
-e_photo_source_default_init (EPhotoSourceInterface *interface)
+e_photo_source_default_init (EPhotoSourceInterface *iface)
 {
 }
 
@@ -60,15 +60,15 @@ e_photo_source_get_photo (EPhotoSource *photo_source,
                           GAsyncReadyCallback callback,
                           gpointer user_data)
 {
-	EPhotoSourceInterface *interface;
+	EPhotoSourceInterface *iface;
 
 	g_return_if_fail (E_IS_PHOTO_SOURCE (photo_source));
 	g_return_if_fail (email_address != NULL);
 
-	interface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
-	g_return_if_fail (interface->get_photo != NULL);
+	iface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
+	g_return_if_fail (iface->get_photo != NULL);
 
-	interface->get_photo (
+	iface->get_photo (
 		photo_source, email_address,
 		cancellable, callback, user_data);
 }
@@ -107,16 +107,16 @@ e_photo_source_get_photo_finish (EPhotoSource *photo_source,
                                  gint *out_priority,
                                  GError **error)
 {
-	EPhotoSourceInterface *interface;
+	EPhotoSourceInterface *iface;
 
 	g_return_val_if_fail (E_IS_PHOTO_SOURCE (photo_source), FALSE);
 	g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 	g_return_val_if_fail (out_stream != NULL, FALSE);
 
-	interface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
-	g_return_val_if_fail (interface->get_photo_finish != NULL, FALSE);
+	iface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
+	g_return_val_if_fail (iface->get_photo_finish != NULL, FALSE);
 
-	return interface->get_photo_finish (
+	return iface->get_photo_finish (
 		photo_source, result, out_stream, out_priority, error);
 }
 
diff --git a/e-util/e-popup-action.c b/e-util/e-popup-action.c
index cb28369a87..9a3702b8d2 100644
--- a/e-util/e-popup-action.c
+++ b/e-util/e-popup-action.c
@@ -44,7 +44,7 @@ struct _EPopupActionPrivate {
 };
 
 /* Forward Declarations */
-static void e_popup_action_activatable_init (GtkActivatableIface *interface);
+static void e_popup_action_activatable_init (GtkActivatableIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EPopupAction,
@@ -348,10 +348,10 @@ e_popup_action_init (EPopupAction *popup_action)
 }
 
 static void
-e_popup_action_activatable_init (GtkActivatableIface *interface)
+e_popup_action_activatable_init (GtkActivatableIface *iface)
 {
-	interface->update = popup_action_update;
-	interface->sync_action_properties = popup_action_sync_action_properties;
+	iface->update = popup_action_update;
+	iface->sync_action_properties = popup_action_sync_action_properties;
 }
 
 EPopupAction *
diff --git a/e-util/e-preview-pane.c b/e-util/e-preview-pane.c
index 9cdac59039..22ca775efb 100644
--- a/e-util/e-preview-pane.c
+++ b/e-util/e-preview-pane.c
@@ -50,7 +50,7 @@ static guint signals[LAST_SIGNAL];
 
 /* Forward Declarations */
 static void	e_preview_pane_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EPreviewPane,
@@ -273,9 +273,9 @@ e_preview_pane_class_init (EPreviewPaneClass *class)
 }
 
 static void
-e_preview_pane_alert_sink_init (EAlertSinkInterface *interface)
+e_preview_pane_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = preview_pane_submit_alert;
+	iface->submit_alert = preview_pane_submit_alert;
 }
 
 static void
diff --git a/e-util/e-selectable.c b/e-util/e-selectable.c
index 6b011ee33b..5e3267cf2e 100644
--- a/e-util/e-selectable.c
+++ b/e-util/e-selectable.c
@@ -30,10 +30,10 @@ G_DEFINE_INTERFACE (
 	GTK_TYPE_WIDGET)
 
 static void
-e_selectable_default_init (ESelectableInterface *interface)
+e_selectable_default_init (ESelectableInterface *iface)
 {
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_boxed (
 			"copy-target-list",
 			"Copy Target List",
@@ -42,7 +42,7 @@ e_selectable_default_init (ESelectableInterface *interface)
 			G_PARAM_READABLE));
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_boxed (
 			"paste-target-list",
 			"Paste Target List",
@@ -57,14 +57,14 @@ e_selectable_update_actions (ESelectable *selectable,
                              GdkAtom *clipboard_targets,
                              gint n_clipboard_targets)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 
 	g_return_if_fail (E_IS_SELECTABLE (selectable));
 
-	interface = E_SELECTABLE_GET_INTERFACE (selectable);
-	g_return_if_fail (interface->update_actions != NULL);
+	iface = E_SELECTABLE_GET_INTERFACE (selectable);
+	g_return_if_fail (iface->update_actions != NULL);
 
-	interface->update_actions (
+	iface->update_actions (
 		selectable, focus_tracker,
 		clipboard_targets, n_clipboard_targets);
 }
@@ -72,92 +72,92 @@ e_selectable_update_actions (ESelectable *selectable,
 void
 e_selectable_cut_clipboard (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 
 	g_return_if_fail (E_IS_SELECTABLE (selectable));
 
-	interface = E_SELECTABLE_GET_INTERFACE (selectable);
+	iface = E_SELECTABLE_GET_INTERFACE (selectable);
 
-	if (interface->cut_clipboard != NULL)
-		interface->cut_clipboard (selectable);
+	if (iface->cut_clipboard != NULL)
+		iface->cut_clipboard (selectable);
 }
 
 void
 e_selectable_copy_clipboard (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 
 	g_return_if_fail (E_IS_SELECTABLE (selectable));
 
-	interface = E_SELECTABLE_GET_INTERFACE (selectable);
+	iface = E_SELECTABLE_GET_INTERFACE (selectable);
 
-	if (interface->copy_clipboard != NULL)
-		interface->copy_clipboard (selectable);
+	if (iface->copy_clipboard != NULL)
+		iface->copy_clipboard (selectable);
 }
 
 void
 e_selectable_paste_clipboard (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 
 	g_return_if_fail (E_IS_SELECTABLE (selectable));
 
-	interface = E_SELECTABLE_GET_INTERFACE (selectable);
+	iface = E_SELECTABLE_GET_INTERFACE (selectable);
 
-	if (interface->paste_clipboard != NULL)
-		interface->paste_clipboard (selectable);
+	if (iface->paste_clipboard != NULL)
+		iface->paste_clipboard (selectable);
 }
 
 void
 e_selectable_delete_selection (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 
 	g_return_if_fail (E_IS_SELECTABLE (selectable));
 
-	interface = E_SELECTABLE_GET_INTERFACE (selectable);
+	iface = E_SELECTABLE_GET_INTERFACE (selectable);
 
-	if (interface->delete_selection != NULL)
-		interface->delete_selection (selectable);
+	if (iface->delete_selection != NULL)
+		iface->delete_selection (selectable);
 }
 
 void
 e_selectable_select_all (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 
 	g_return_if_fail (E_IS_SELECTABLE (selectable));
 
-	interface = E_SELECTABLE_GET_INTERFACE (selectable);
+	iface = E_SELECTABLE_GET_INTERFACE (selectable);
 
-	if (interface->select_all != NULL)
-		interface->select_all (selectable);
+	if (iface->select_all != NULL)
+		iface->select_all (selectable);
 }
 
 void
 e_selectable_undo (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 
 	g_return_if_fail (E_IS_SELECTABLE (selectable));
 
-	interface = E_SELECTABLE_GET_INTERFACE (selectable);
+	iface = E_SELECTABLE_GET_INTERFACE (selectable);
 
-	if (interface->undo != NULL)
-		interface->undo (selectable);
+	if (iface->undo != NULL)
+		iface->undo (selectable);
 }
 
 void
 e_selectable_redo (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 
 	g_return_if_fail (E_IS_SELECTABLE (selectable));
 
-	interface = E_SELECTABLE_GET_INTERFACE (selectable);
+	iface = E_SELECTABLE_GET_INTERFACE (selectable);
 
-	if (interface->redo != NULL)
-		interface->redo (selectable);
+	if (iface->redo != NULL)
+		iface->redo (selectable);
 }
 
 GtkTargetList *
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index c8a55c4a0f..f6109ce17f 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -22,7 +22,7 @@
 #include "e-misc-utils.h"
 
 /* Forward Declarations */
-static void	e_sorter_array_interface_init	(ESorterInterface *interface);
+static void	e_sorter_array_interface_init	(ESorterInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ESorterArray,
@@ -207,13 +207,13 @@ e_sorter_array_class_init (ESorterArrayClass *class)
 }
 
 static void
-e_sorter_array_interface_init (ESorterInterface *interface)
+e_sorter_array_interface_init (ESorterInterface *iface)
 {
-	interface->model_to_sorted = sorter_array_model_to_sorted;
-	interface->sorted_to_model = sorter_array_sorted_to_model;
-	interface->get_model_to_sorted_array = sorter_array_get_model_to_sorted_array;
-	interface->get_sorted_to_model_array = sorter_array_get_sorted_to_model_array;
-	interface->needs_sorting = sorter_array_needs_sorting;
+	iface->model_to_sorted = sorter_array_model_to_sorted;
+	iface->sorted_to_model = sorter_array_sorted_to_model;
+	iface->get_model_to_sorted_array = sorter_array_get_model_to_sorted_array;
+	iface->get_sorted_to_model_array = sorter_array_get_sorted_to_model_array;
+	iface->needs_sorting = sorter_array_needs_sorting;
 }
 
 static void
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 0d706414b9..c2181c7544 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -20,7 +20,7 @@
 G_DEFINE_INTERFACE (ESorter, e_sorter, G_TYPE_OBJECT)
 
 static void
-e_sorter_default_init (ESorterInterface *interface)
+e_sorter_default_init (ESorterInterface *iface)
 {
 }
 
@@ -28,30 +28,30 @@ gint
 e_sorter_model_to_sorted (ESorter *sorter,
                           gint row)
 {
-	ESorterInterface *interface;
+	ESorterInterface *iface;
 
 	g_return_val_if_fail (E_IS_SORTER (sorter), -1);
 	g_return_val_if_fail (row >= 0, -1);
 
-	interface = E_SORTER_GET_INTERFACE (sorter);
-	g_return_val_if_fail (interface->model_to_sorted != NULL, -1);
+	iface = E_SORTER_GET_INTERFACE (sorter);
+	g_return_val_if_fail (iface->model_to_sorted != NULL, -1);
 
-	return interface->model_to_sorted (sorter, row);
+	return iface->model_to_sorted (sorter, row);
 }
 
 gint
 e_sorter_sorted_to_model (ESorter *sorter,
                           gint row)
 {
-	ESorterInterface *interface;
+	ESorterInterface *iface;
 
 	g_return_val_if_fail (E_IS_SORTER (sorter), -1);
 	g_return_val_if_fail (row >= 0, -1);
 
-	interface = E_SORTER_GET_INTERFACE (sorter);
-	g_return_val_if_fail (interface->sorted_to_model != NULL, -1);
+	iface = E_SORTER_GET_INTERFACE (sorter);
+	g_return_val_if_fail (iface->sorted_to_model != NULL, -1);
 
-	return interface->sorted_to_model (sorter, row);
+	return iface->sorted_to_model (sorter, row);
 }
 
 void
@@ -59,14 +59,14 @@ e_sorter_get_model_to_sorted_array (ESorter *sorter,
                                     gint **array,
                                     gint *count)
 {
-	ESorterInterface *interface;
+	ESorterInterface *iface;
 
 	g_return_if_fail (E_IS_SORTER (sorter));
 
-	interface = E_SORTER_GET_INTERFACE (sorter);
-	g_return_if_fail (interface->get_model_to_sorted_array != NULL);
+	iface = E_SORTER_GET_INTERFACE (sorter);
+	g_return_if_fail (iface->get_model_to_sorted_array != NULL);
 
-	interface->get_model_to_sorted_array (sorter, array, count);
+	iface->get_model_to_sorted_array (sorter, array, count);
 }
 
 void
@@ -74,26 +74,26 @@ e_sorter_get_sorted_to_model_array (ESorter *sorter,
                                     gint **array,
                                     gint *count)
 {
-	ESorterInterface *interface;
+	ESorterInterface *iface;
 
 	g_return_if_fail (E_IS_SORTER (sorter));
 
-	interface = E_SORTER_GET_INTERFACE (sorter);
-	g_return_if_fail (interface->get_sorted_to_model_array != NULL);
+	iface = E_SORTER_GET_INTERFACE (sorter);
+	g_return_if_fail (iface->get_sorted_to_model_array != NULL);
 
-	interface->get_sorted_to_model_array (sorter, array, count);
+	iface->get_sorted_to_model_array (sorter, array, count);
 }
 
 gboolean
 e_sorter_needs_sorting (ESorter *sorter)
 {
-	ESorterInterface *interface;
+	ESorterInterface *iface;
 
 	g_return_val_if_fail (E_IS_SORTER (sorter), FALSE);
 
-	interface = E_SORTER_GET_INTERFACE (sorter);
-	g_return_val_if_fail (interface->needs_sorting != NULL, FALSE);
+	iface = E_SORTER_GET_INTERFACE (sorter);
+	g_return_val_if_fail (iface->needs_sorting != NULL, FALSE);
 
-	return interface->needs_sorting (sorter);
+	return iface->needs_sorting (sorter);
 }
 
diff --git a/e-util/e-source-config-dialog.c b/e-util/e-source-config-dialog.c
index 5c84bda2de..507f8c459b 100644
--- a/e-util/e-source-config-dialog.c
+++ b/e-util/e-source-config-dialog.c
@@ -46,7 +46,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_source_config_dialog_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ESourceConfigDialog,
@@ -360,9 +360,9 @@ e_source_config_dialog_class_init (ESourceConfigDialogClass *class)
 }
 
 static void
-e_source_config_dialog_alert_sink_init (EAlertSinkInterface *interface)
+e_source_config_dialog_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = source_config_dialog_submit_alert;
+	iface->submit_alert = source_config_dialog_submit_alert;
 }
 
 static void
diff --git a/e-util/e-table-model.c b/e-util/e-table-model.c
index 26f4b42e34..7f59db9c31 100644
--- a/e-util/e-table-model.c
+++ b/e-util/e-table-model.c
@@ -48,11 +48,11 @@ table_model_is_frozen (ETableModel *table_model)
 }
 
 static void
-e_table_model_default_init (ETableModelInterface *interface)
+e_table_model_default_init (ETableModelInterface *iface)
 {
 	signals[MODEL_NO_CHANGE] = g_signal_new (
 		"model_no_change",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETableModelInterface, model_no_change),
 		NULL, NULL, NULL,
@@ -60,7 +60,7 @@ e_table_model_default_init (ETableModelInterface *interface)
 
 	signals[MODEL_CHANGED] = g_signal_new (
 		"model_changed",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETableModelInterface, model_changed),
 		NULL, NULL, NULL,
@@ -68,7 +68,7 @@ e_table_model_default_init (ETableModelInterface *interface)
 
 	signals[MODEL_PRE_CHANGE] = g_signal_new (
 		"model_pre_change",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETableModelInterface, model_pre_change),
 		NULL, NULL, NULL,
@@ -76,7 +76,7 @@ e_table_model_default_init (ETableModelInterface *interface)
 
 	signals[MODEL_ROW_CHANGED] = g_signal_new (
 		"model_row_changed",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETableModelInterface, model_row_changed),
 		NULL, NULL, NULL,
@@ -85,7 +85,7 @@ e_table_model_default_init (ETableModelInterface *interface)
 
 	signals[MODEL_CELL_CHANGED] = g_signal_new (
 		"model_cell_changed",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETableModelInterface, model_cell_changed),
 		NULL, NULL, NULL,
@@ -95,7 +95,7 @@ e_table_model_default_init (ETableModelInterface *interface)
 
 	signals[MODEL_ROWS_INSERTED] = g_signal_new (
 		"model_rows_inserted",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETableModelInterface, model_rows_inserted),
 		NULL, NULL, NULL,
@@ -105,7 +105,7 @@ e_table_model_default_init (ETableModelInterface *interface)
 
 	signals[MODEL_ROWS_DELETED] = g_signal_new (
 		"model_rows_deleted",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETableModelInterface, model_rows_deleted),
 		NULL, NULL, NULL,
@@ -123,14 +123,14 @@ e_table_model_default_init (ETableModelInterface *interface)
 gint
 e_table_model_column_count (ETableModel *table_model)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), 0);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
-	g_return_val_if_fail (interface->column_count != NULL, 0);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	g_return_val_if_fail (iface->column_count != NULL, 0);
 
-	return interface->column_count (table_model);
+	return iface->column_count (table_model);
 }
 
 /**
@@ -142,14 +142,14 @@ e_table_model_column_count (ETableModel *table_model)
 gint
 e_table_model_row_count (ETableModel *table_model)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), 0);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
-	g_return_val_if_fail (interface->row_count != NULL, 0);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	g_return_val_if_fail (iface->row_count != NULL, 0);
 
-	return interface->row_count (table_model);
+	return iface->row_count (table_model);
 }
 
 /**
@@ -164,14 +164,14 @@ e_table_model_append_row (ETableModel *table_model,
                           ETableModel *source,
                           gint row)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_if_fail (E_IS_TABLE_MODEL (table_model));
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
 
-	if (interface->append_row != NULL)
-		interface->append_row (table_model, source, row);
+	if (iface->append_row != NULL)
+		iface->append_row (table_model, source, row);
 }
 
 /**
@@ -198,14 +198,14 @@ e_table_model_value_at (ETableModel *table_model,
                         gint col,
                         gint row)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
-	g_return_val_if_fail (interface->value_at != NULL, NULL);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	g_return_val_if_fail (iface->value_at != NULL, NULL);
 
-	return interface->value_at (table_model, col, row);
+	return iface->value_at (table_model, col, row);
 }
 
 /**
@@ -229,14 +229,14 @@ e_table_model_set_value_at (ETableModel *table_model,
                             gint row,
                             gconstpointer value)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_if_fail (E_IS_TABLE_MODEL (table_model));
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
-	g_return_if_fail (interface->set_value_at != NULL);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	g_return_if_fail (iface->set_value_at != NULL);
 
-	interface->set_value_at (table_model, col, row, value);
+	iface->set_value_at (table_model, col, row, value);
 }
 
 /**
@@ -253,14 +253,14 @@ e_table_model_is_cell_editable (ETableModel *table_model,
                                 gint col,
                                 gint row)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), FALSE);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
-	g_return_val_if_fail (interface->is_cell_editable != NULL, FALSE);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	g_return_val_if_fail (iface->is_cell_editable != NULL, FALSE);
 
-	return interface->is_cell_editable (table_model, col, row);
+	return iface->is_cell_editable (table_model, col, row);
 }
 
 gpointer
@@ -268,16 +268,16 @@ e_table_model_duplicate_value (ETableModel *table_model,
                                gint col,
                                gconstpointer value)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
 
-	if (interface->duplicate_value == NULL)
+	if (iface->duplicate_value == NULL)
 		return NULL;
 
-	return interface->duplicate_value (table_model, col, value);
+	return iface->duplicate_value (table_model, col, value);
 }
 
 void
@@ -285,76 +285,76 @@ e_table_model_free_value (ETableModel *table_model,
                           gint col,
                           gpointer value)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_if_fail (E_IS_TABLE_MODEL (table_model));
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
 
-	if (interface->free_value != NULL)
-		interface->free_value (table_model, col, value);
+	if (iface->free_value != NULL)
+		iface->free_value (table_model, col, value);
 }
 
 gboolean
 e_table_model_has_save_id (ETableModel *table_model)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), FALSE);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
 
-	if (interface->has_save_id == NULL)
+	if (iface->has_save_id == NULL)
 		return FALSE;
 
-	return interface->has_save_id (table_model);
+	return iface->has_save_id (table_model);
 }
 
 gchar *
 e_table_model_get_save_id (ETableModel *table_model,
                            gint row)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
 
-	if (interface->get_save_id == NULL)
+	if (iface->get_save_id == NULL)
 		return NULL;
 
-	return interface->get_save_id (table_model, row);
+	return iface->get_save_id (table_model, row);
 }
 
 gboolean
 e_table_model_has_change_pending (ETableModel *table_model)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), FALSE);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
 
-	if (interface->has_change_pending == NULL)
+	if (iface->has_change_pending == NULL)
 		return FALSE;
 
-	return interface->has_change_pending (table_model);
+	return iface->has_change_pending (table_model);
 }
 
 gpointer
 e_table_model_initialize_value (ETableModel *table_model,
                                 gint col)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
 
-	if (interface->initialize_value == NULL)
+	if (iface->initialize_value == NULL)
 		return NULL;
 
-	return interface->initialize_value (table_model, col);
+	return iface->initialize_value (table_model, col);
 }
 
 gboolean
@@ -362,16 +362,16 @@ e_table_model_value_is_empty (ETableModel *table_model,
                               gint col,
                               gconstpointer value)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), FALSE);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
 
-	if (interface->value_is_empty == NULL)
+	if (iface->value_is_empty == NULL)
 		return FALSE;
 
-	return interface->value_is_empty (table_model, col, value);
+	return iface->value_is_empty (table_model, col, value);
 }
 
 gchar *
@@ -379,16 +379,16 @@ e_table_model_value_to_string (ETableModel *table_model,
                                gint col,
                                gconstpointer value)
 {
-	ETableModelInterface *interface;
+	ETableModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TABLE_MODEL (table_model), NULL);
 
-	interface = E_TABLE_MODEL_GET_INTERFACE (table_model);
+	iface = E_TABLE_MODEL_GET_INTERFACE (table_model);
 
-	if (interface->value_to_string == NULL)
+	if (iface->value_to_string == NULL)
 		return g_strdup ("");
 
-	return interface->value_to_string (table_model, col, value);
+	return iface->value_to_string (table_model, col, value);
 }
 
 #if d(!)0
diff --git a/e-util/e-table-one.c b/e-util/e-table-one.c
index 9ac70237fe..5d8f104967 100644
--- a/e-util/e-table-one.c
+++ b/e-util/e-table-one.c
@@ -28,7 +28,7 @@
 
 /* Forward Declarations */
 static void	e_table_one_table_model_init
-					(ETableModelInterface *interface);
+					(ETableModelInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ETableOne,
@@ -194,20 +194,20 @@ e_table_one_class_init (ETableOneClass *class)
 }
 
 static void
-e_table_one_table_model_init (ETableModelInterface *interface)
+e_table_one_table_model_init (ETableModelInterface *iface)
 {
-	interface->column_count = table_one_column_count;
-	interface->row_count = table_one_row_count;
-
-	interface->value_at = table_one_value_at;
-	interface->set_value_at = table_one_set_value_at;
-	interface->is_cell_editable = table_one_is_cell_editable;
-
-	interface->duplicate_value = table_one_duplicate_value;
-	interface->free_value = table_one_free_value;
-	interface->initialize_value = table_one_initialize_value;
-	interface->value_is_empty = table_one_value_is_empty;
-	interface->value_to_string = table_one_value_to_string;
+	iface->column_count = table_one_column_count;
+	iface->row_count = table_one_row_count;
+
+	iface->value_at = table_one_value_at;
+	iface->set_value_at = table_one_set_value_at;
+	iface->is_cell_editable = table_one_is_cell_editable;
+
+	iface->duplicate_value = table_one_duplicate_value;
+	iface->free_value = table_one_free_value;
+	iface->initialize_value = table_one_initialize_value;
+	iface->value_is_empty = table_one_value_is_empty;
+	iface->value_to_string = table_one_value_to_string;
 }
 
 static void
diff --git a/e-util/e-table-sorter.c b/e-util/e-table-sorter.c
index 81863256f0..6087b3c07d 100644
--- a/e-util/e-table-sorter.c
+++ b/e-util/e-table-sorter.c
@@ -35,7 +35,7 @@ enum {
 };
 
 /* Forward Declarations */
-static void	e_table_sorter_interface_init	(ESorterInterface *interface);
+static void	e_table_sorter_interface_init	(ESorterInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ETableSorter,
@@ -466,13 +466,13 @@ e_table_sorter_class_init (ETableSorterClass *class)
 }
 
 static void
-e_table_sorter_interface_init (ESorterInterface *interface)
+e_table_sorter_interface_init (ESorterInterface *iface)
 {
-	interface->model_to_sorted = table_sorter_model_to_sorted;
-	interface->sorted_to_model = table_sorter_sorted_to_model;
-	interface->get_model_to_sorted_array = table_sorter_get_model_to_sorted_array;
-	interface->get_sorted_to_model_array = table_sorter_get_sorted_to_model_array;
-	interface->needs_sorting = table_sorter_needs_sorting;
+	iface->model_to_sorted = table_sorter_model_to_sorted;
+	iface->sorted_to_model = table_sorter_sorted_to_model;
+	iface->get_model_to_sorted_array = table_sorter_get_model_to_sorted_array;
+	iface->get_sorted_to_model_array = table_sorter_get_sorted_to_model_array;
+	iface->needs_sorting = table_sorter_needs_sorting;
 }
 
 static void
diff --git a/e-util/e-table-specification.c b/e-util/e-table-specification.c
index 57e4ddf805..cff94d28e0 100644
--- a/e-util/e-table-specification.c
+++ b/e-util/e-table-specification.c
@@ -40,7 +40,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_table_specification_initable_init
-						(GInitableIface *interface);
+						(GInitableIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ETableSpecification,
@@ -559,9 +559,9 @@ e_table_specification_class_init (ETableSpecificationClass *class)
 }
 
 static void
-e_table_specification_initable_init (GInitableIface *interface)
+e_table_specification_initable_init (GInitableIface *iface)
 {
-	interface->init = table_specification_initable_init;
+	iface->init = table_specification_initable_init;
 }
 
 static void
diff --git a/e-util/e-table-subset.c b/e-util/e-table-subset.c
index d0e83aca37..b00dfb6f9c 100644
--- a/e-util/e-table-subset.c
+++ b/e-util/e-table-subset.c
@@ -55,7 +55,7 @@ struct _ETableSubsetPrivate {
 
 /* Forward Declarations */
 static void	e_table_subset_table_model_init
-					(ETableModelInterface *interface);
+					(ETableModelInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ETableSubset,
@@ -416,24 +416,24 @@ e_table_subset_class_init (ETableSubsetClass *class)
 }
 
 static void
-e_table_subset_table_model_init (ETableModelInterface *interface)
+e_table_subset_table_model_init (ETableModelInterface *iface)
 {
-	interface->column_count = table_subset_column_count;
-	interface->row_count = table_subset_row_count;
-	interface->append_row = table_subset_append_row;
+	iface->column_count = table_subset_column_count;
+	iface->row_count = table_subset_row_count;
+	iface->append_row = table_subset_append_row;
 
-	interface->value_at = table_subset_value_at;
-	interface->set_value_at = table_subset_set_value_at;
-	interface->is_cell_editable = table_subset_is_cell_editable;
+	iface->value_at = table_subset_value_at;
+	iface->set_value_at = table_subset_set_value_at;
+	iface->is_cell_editable = table_subset_is_cell_editable;
 
-	interface->has_save_id = table_subset_has_save_id;
-	interface->get_save_id = table_subset_get_save_id;
+	iface->has_save_id = table_subset_has_save_id;
+	iface->get_save_id = table_subset_get_save_id;
 
-	interface->duplicate_value = table_subset_duplicate_value;
-	interface->free_value = table_subset_free_value;
-	interface->initialize_value = table_subset_initialize_value;
-	interface->value_is_empty = table_subset_value_is_empty;
-	interface->value_to_string = table_subset_value_to_string;
+	iface->duplicate_value = table_subset_duplicate_value;
+	iface->free_value = table_subset_free_value;
+	iface->initialize_value = table_subset_initialize_value;
+	iface->value_is_empty = table_subset_value_is_empty;
+	iface->value_to_string = table_subset_value_to_string;
 }
 
 static void
diff --git a/e-util/e-tree-model.c b/e-util/e-tree-model.c
index 6e86d94789..1bf702ca34 100644
--- a/e-util/e-tree-model.c
+++ b/e-util/e-tree-model.c
@@ -33,11 +33,11 @@ static guint signals[LAST_SIGNAL];
 G_DEFINE_INTERFACE (ETreeModel, e_tree_model, G_TYPE_OBJECT)
 
 static void
-e_tree_model_default_init (ETreeModelInterface *interface)
+e_tree_model_default_init (ETreeModelInterface *iface)
 {
 	signals[PRE_CHANGE] = g_signal_new (
 		"pre_change",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETreeModelInterface, pre_change),
 		NULL, NULL, NULL,
@@ -45,7 +45,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
 
 	signals[REBUILT] = g_signal_new (
 		"rebuilt",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETreeModelInterface, rebuilt),
 		NULL, NULL, NULL,
@@ -53,7 +53,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
 
 	signals[NODE_CHANGED] = g_signal_new (
 		"node_changed",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETreeModelInterface, node_changed),
 		NULL, NULL, NULL,
@@ -62,7 +62,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
 
 	signals[NODE_DATA_CHANGED] = g_signal_new (
 		"node_data_changed",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETreeModelInterface, node_data_changed),
 		NULL, NULL, NULL,
@@ -71,7 +71,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
 
 	signals[NODE_INSERTED] = g_signal_new (
 		"node_inserted",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETreeModelInterface, node_inserted),
 		NULL, NULL, NULL,
@@ -81,7 +81,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
 
 	signals[NODE_REMOVED] = g_signal_new (
 		"node_removed",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETreeModelInterface, node_removed),
 		NULL, NULL, NULL,
@@ -92,7 +92,7 @@ e_tree_model_default_init (ETreeModelInterface *interface)
 
 	signals[NODE_DELETED] = g_signal_new (
 		"node_deleted",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (ETreeModelInterface, node_deleted),
 		NULL, NULL, NULL,
@@ -231,14 +231,14 @@ e_tree_model_node_deleted (ETreeModel *tree_model,
 ETreePath
 e_tree_model_get_root (ETreeModel *tree_model)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->get_root != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->get_root != NULL, NULL);
 
-	return interface->get_root (tree_model);
+	return iface->get_root (tree_model);
 }
 
 /**
@@ -254,14 +254,14 @@ ETreePath
 e_tree_model_node_get_parent (ETreeModel *tree_model,
                               ETreePath path)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->get_parent != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->get_parent != NULL, NULL);
 
-	return interface->get_parent (tree_model, path);
+	return iface->get_parent (tree_model, path);
 }
 
 /**
@@ -277,14 +277,14 @@ ETreePath
 e_tree_model_node_get_first_child (ETreeModel *tree_model,
                                    ETreePath path)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->get_first_child != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->get_first_child != NULL, NULL);
 
-	return interface->get_first_child (tree_model, path);
+	return iface->get_first_child (tree_model, path);
 }
 
 /**
@@ -300,14 +300,14 @@ ETreePath
 e_tree_model_node_get_next (ETreeModel *tree_model,
                             ETreePath path)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->get_next != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->get_next != NULL, NULL);
 
-	return interface->get_next (tree_model, path);
+	return iface->get_next (tree_model, path);
 }
 
 /**
@@ -323,14 +323,14 @@ gboolean
 e_tree_model_node_is_root (ETreeModel *tree_model,
                            ETreePath path)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), FALSE);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->is_root != NULL, FALSE);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->is_root != NULL, FALSE);
 
-	return interface->is_root (tree_model, path);
+	return iface->is_root (tree_model, path);
 }
 
 /**
@@ -346,42 +346,42 @@ gboolean
 e_tree_model_node_is_expandable (ETreeModel *tree_model,
                                  ETreePath path)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), FALSE);
 	g_return_val_if_fail (path != NULL, FALSE);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->is_expandable != NULL, FALSE);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->is_expandable != NULL, FALSE);
 
-	return interface->is_expandable (tree_model, path);
+	return iface->is_expandable (tree_model, path);
 }
 
 guint
 e_tree_model_node_get_n_nodes (ETreeModel *tree_model)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), 0);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->get_n_nodes != NULL, 0);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->get_n_nodes != NULL, 0);
 
-	return interface->get_n_nodes (tree_model);
+	return iface->get_n_nodes (tree_model);
 }
 
 guint
 e_tree_model_node_get_n_children (ETreeModel *tree_model,
                                   ETreePath path)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), 0);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->get_n_children != NULL, 0);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->get_n_children != NULL, 0);
 
-	return interface->get_n_children (tree_model, path);
+	return iface->get_n_children (tree_model, path);
 }
 
 /**
@@ -397,14 +397,14 @@ guint
 e_tree_model_node_depth (ETreeModel *tree_model,
                          ETreePath path)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), 0);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->depth != NULL, 0);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->depth != NULL, 0);
 
-	return interface->depth (tree_model, path);
+	return iface->depth (tree_model, path);
 }
 
 /**
@@ -418,14 +418,14 @@ e_tree_model_node_depth (ETreeModel *tree_model,
 gboolean
 e_tree_model_get_expanded_default (ETreeModel *tree_model)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), FALSE);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->get_expanded_default != NULL, FALSE);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->get_expanded_default != NULL, FALSE);
 
-	return interface->get_expanded_default (tree_model);
+	return iface->get_expanded_default (tree_model);
 }
 
 /**
@@ -439,14 +439,14 @@ e_tree_model_get_expanded_default (ETreeModel *tree_model)
 gint
 e_tree_model_column_count (ETreeModel *tree_model)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), 0);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->column_count != NULL, 0);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->column_count != NULL, 0);
 
-	return interface->column_count (tree_model);
+	return iface->column_count (tree_model);
 }
 
 /**
@@ -462,14 +462,14 @@ gchar *
 e_tree_model_get_save_id (ETreeModel *tree_model,
                           ETreePath path)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->get_save_id != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->get_save_id != NULL, NULL);
 
-	return interface->get_save_id (tree_model, path);
+	return iface->get_save_id (tree_model, path);
 }
 
 /**
@@ -488,14 +488,14 @@ ETreePath
 e_tree_model_get_node_by_id (ETreeModel *tree_model,
                              const gchar *save_id)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->get_node_by_id != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->get_node_by_id != NULL, NULL);
 
-	return interface->get_node_by_id (tree_model, save_id);
+	return iface->get_node_by_id (tree_model, save_id);
 }
 
 /**
@@ -523,14 +523,14 @@ e_tree_model_sort_value_at (ETreeModel *tree_model,
                             ETreePath path,
                             gint col)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->sort_value_at != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->sort_value_at != NULL, NULL);
 
-	return interface->sort_value_at (tree_model, path, col);
+	return iface->sort_value_at (tree_model, path, col);
 }
 
 /**
@@ -557,14 +557,14 @@ e_tree_model_value_at (ETreeModel *tree_model,
                        ETreePath path,
                        gint col)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->value_at != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->value_at != NULL, NULL);
 
-	return interface->value_at (tree_model, path, col);
+	return iface->value_at (tree_model, path, col);
 }
 
 /**
@@ -581,14 +581,14 @@ e_tree_model_duplicate_value (ETreeModel *tree_model,
                               gint col,
                               gconstpointer value)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->duplicate_value != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->duplicate_value != NULL, NULL);
 
-	return interface->duplicate_value (tree_model, col, value);
+	return iface->duplicate_value (tree_model, col, value);
 }
 
 /**
@@ -605,14 +605,14 @@ e_tree_model_free_value (ETreeModel *tree_model,
                          gint col,
                          gpointer value)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_if_fail (interface->free_value != NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_if_fail (iface->free_value != NULL);
 
-	interface->free_value (tree_model, col, value);
+	iface->free_value (tree_model, col, value);
 }
 
 /**
@@ -628,14 +628,14 @@ gpointer
 e_tree_model_initialize_value (ETreeModel *tree_model,
                                gint col)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->initialize_value != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->initialize_value != NULL, NULL);
 
-	return interface->initialize_value (tree_model, col);
+	return iface->initialize_value (tree_model, col);
 }
 
 /**
@@ -652,14 +652,14 @@ e_tree_model_value_is_empty (ETreeModel *tree_model,
                              gint col,
                              gconstpointer value)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), TRUE);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->value_is_empty != NULL, TRUE);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->value_is_empty != NULL, TRUE);
 
-	return interface->value_is_empty (tree_model, col, value);
+	return iface->value_is_empty (tree_model, col, value);
 }
 
 /**
@@ -676,14 +676,14 @@ e_tree_model_value_to_string (ETreeModel *tree_model,
                               gint col,
                               gconstpointer value)
 {
-	ETreeModelInterface *interface;
+	ETreeModelInterface *iface;
 
 	g_return_val_if_fail (E_IS_TREE_MODEL (tree_model), NULL);
 
-	interface = E_TREE_MODEL_GET_INTERFACE (tree_model);
-	g_return_val_if_fail (interface->value_to_string != NULL, NULL);
+	iface = E_TREE_MODEL_GET_INTERFACE (tree_model);
+	g_return_val_if_fail (iface->value_to_string != NULL, NULL);
 
-	return interface->value_to_string (tree_model, col, value);
+	return iface->value_to_string (tree_model, col, value);
 }
 
 /**
diff --git a/e-util/e-tree-table-adapter.c b/e-util/e-tree-table-adapter.c
index 88759d0ece..7fd12bb317 100644
--- a/e-util/e-tree-table-adapter.c
+++ b/e-util/e-tree-table-adapter.c
@@ -98,7 +98,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_tree_table_adapter_table_model_init
-					(ETableModelInterface *interface);
+					(ETableModelInterface *iface);
 
 static guint signals[LAST_SIGNAL];
 
@@ -1052,24 +1052,24 @@ e_tree_table_adapter_class_init (ETreeTableAdapterClass *class)
 }
 
 static void
-e_tree_table_adapter_table_model_init (ETableModelInterface *interface)
+e_tree_table_adapter_table_model_init (ETableModelInterface *iface)
 {
-	interface->column_count = tree_table_adapter_column_count;
-	interface->row_count = tree_table_adapter_row_count;
-	interface->append_row = tree_table_adapter_append_row;
+	iface->column_count = tree_table_adapter_column_count;
+	iface->row_count = tree_table_adapter_row_count;
+	iface->append_row = tree_table_adapter_append_row;
 
-	interface->value_at = tree_table_adapter_value_at;
-	interface->set_value_at = tree_table_adapter_set_value_at;
-	interface->is_cell_editable = tree_table_adapter_is_cell_editable;
+	iface->value_at = tree_table_adapter_value_at;
+	iface->set_value_at = tree_table_adapter_set_value_at;
+	iface->is_cell_editable = tree_table_adapter_is_cell_editable;
 
-	interface->has_save_id = tree_table_adapter_has_save_id;
-	interface->get_save_id = tree_table_adapter_get_save_id;
+	iface->has_save_id = tree_table_adapter_has_save_id;
+	iface->get_save_id = tree_table_adapter_get_save_id;
 
-	interface->duplicate_value = tree_table_adapter_duplicate_value;
-	interface->free_value = tree_table_adapter_free_value;
-	interface->initialize_value = tree_table_adapter_initialize_value;
-	interface->value_is_empty = tree_table_adapter_value_is_empty;
-	interface->value_to_string = tree_table_adapter_value_to_string;
+	iface->duplicate_value = tree_table_adapter_duplicate_value;
+	iface->free_value = tree_table_adapter_free_value;
+	iface->initialize_value = tree_table_adapter_initialize_value;
+	iface->value_is_empty = tree_table_adapter_value_is_empty;
+	iface->value_to_string = tree_table_adapter_value_to_string;
 }
 
 static void
diff --git a/e-util/e-web-view-gtkhtml.c b/e-util/e-web-view-gtkhtml.c
index 63c69aa973..0dd6bce99b 100644
--- a/e-util/e-web-view-gtkhtml.c
+++ b/e-util/e-web-view-gtkhtml.c
@@ -124,8 +124,8 @@ static const gchar *ui =
 "</ui>";
 
 /* Forward Declarations */
-static void e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *interface);
-static void e_web_view_gtkhtml_selectable_init (ESelectableInterface *interface);
+static void e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *iface);
+static void e_web_view_gtkhtml_selectable_init (ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EWebViewGtkHTML,
@@ -1592,19 +1592,19 @@ e_web_view_gtkhtml_class_init (EWebViewGtkHTMLClass *class)
 }
 
 static void
-e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *interface)
+e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = web_view_gtkhtml_submit_alert;
+	iface->submit_alert = web_view_gtkhtml_submit_alert;
 }
 
 static void
-e_web_view_gtkhtml_selectable_init (ESelectableInterface *interface)
+e_web_view_gtkhtml_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = web_view_gtkhtml_selectable_update_actions;
-	interface->cut_clipboard = web_view_gtkhtml_selectable_cut_clipboard;
-	interface->copy_clipboard = web_view_gtkhtml_selectable_copy_clipboard;
-	interface->paste_clipboard = web_view_gtkhtml_selectable_paste_clipboard;
-	interface->select_all = web_view_gtkhtml_selectable_select_all;
+	iface->update_actions = web_view_gtkhtml_selectable_update_actions;
+	iface->cut_clipboard = web_view_gtkhtml_selectable_cut_clipboard;
+	iface->copy_clipboard = web_view_gtkhtml_selectable_copy_clipboard;
+	iface->paste_clipboard = web_view_gtkhtml_selectable_paste_clipboard;
+	iface->select_all = web_view_gtkhtml_selectable_select_all;
 }
 
 static void
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index b69be96eb0..8e8f852fbb 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -132,8 +132,8 @@ static const gchar *ui =
 "</ui>";
 
 /* Forward Declarations */
-static void e_web_view_alert_sink_init (EAlertSinkInterface *interface);
-static void e_web_view_selectable_init (ESelectableInterface *interface);
+static void e_web_view_alert_sink_init (EAlertSinkInterface *iface);
+static void e_web_view_selectable_init (ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EWebView,
@@ -1569,19 +1569,19 @@ e_web_view_class_init (EWebViewClass *class)
 }
 
 static void
-e_web_view_alert_sink_init (EAlertSinkInterface *interface)
+e_web_view_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = web_view_submit_alert;
+	iface->submit_alert = web_view_submit_alert;
 }
 
 static void
-e_web_view_selectable_init (ESelectableInterface *interface)
+e_web_view_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = web_view_selectable_update_actions;
-	interface->cut_clipboard = web_view_selectable_cut_clipboard;
-	interface->copy_clipboard = web_view_selectable_copy_clipboard;
-	interface->paste_clipboard = web_view_selectable_paste_clipboard;
-	interface->select_all = web_view_selectable_select_all;
+	iface->update_actions = web_view_selectable_update_actions;
+	iface->cut_clipboard = web_view_selectable_cut_clipboard;
+	iface->copy_clipboard = web_view_selectable_copy_clipboard;
+	iface->paste_clipboard = web_view_selectable_paste_clipboard;
+	iface->select_all = web_view_selectable_select_all;
 }
 
 static void
diff --git a/e-util/evolution-source-viewer.c b/e-util/evolution-source-viewer.c
index 8d6db0a615..71f76d61e8 100644
--- a/e-util/evolution-source-viewer.c
+++ b/e-util/evolution-source-viewer.c
@@ -116,7 +116,7 @@ gboolean	e_source_viewer_set_selected_source
 GNode *		e_source_viewer_build_display_tree
 						(ESourceViewer *viewer);
 
-static void	e_source_viewer_initable_init	(GInitableIface *interface);
+static void	e_source_viewer_initable_init	(GInitableIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ESourceViewer,
@@ -909,9 +909,9 @@ e_source_viewer_class_init (ESourceViewerClass *class)
 }
 
 static void
-e_source_viewer_initable_init (GInitableIface *interface)
+e_source_viewer_initable_init (GInitableIface *iface)
 {
-	interface->init = source_viewer_initable_init;
+	iface->init = source_viewer_initable_init;
 }
 
 static void
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 6f3545bfe4..0c9694299c 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -767,7 +767,7 @@ e_mail_formatter_init (EMailFormatter *formatter)
 }
 
 static void
-e_mail_formatter_extensible_interface_init (EExtensibleInterface *interface)
+e_mail_formatter_extensible_interface_init (EExtensibleInterface *iface)
 {
 
 }
diff --git a/libemail-engine/e-mail-authenticator.c b/libemail-engine/e-mail-authenticator.c
index 794c0ce4a7..095bebce15 100644
--- a/libemail-engine/e-mail-authenticator.c
+++ b/libemail-engine/e-mail-authenticator.c
@@ -37,7 +37,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_authenticator_interface_init
-				(ESourceAuthenticatorInterface *interface);
+				(ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailAuthenticator,
@@ -226,9 +226,9 @@ e_mail_authenticator_class_init (EMailAuthenticatorClass *class)
 }
 
 static void
-e_mail_authenticator_interface_init (ESourceAuthenticatorInterface *interface)
+e_mail_authenticator_interface_init (ESourceAuthenticatorInterface *iface)
 {
-	interface->try_password_sync = mail_authenticator_try_password_sync;
+	iface->try_password_sync = mail_authenticator_try_password_sync;
 }
 
 static void
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index 4301eb6e25..cfcbbc9caa 100644
--- a/mail/e-mail-account-store.c
+++ b/mail/e-mail-account-store.c
@@ -70,7 +70,7 @@ static guint signals[LAST_SIGNAL];
 
 /* Forward Declarations */
 static void	e_mail_account_store_interface_init
-						(GtkTreeModelIface *interface);
+						(GtkTreeModelIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailAccountStore,
@@ -943,10 +943,10 @@ e_mail_account_store_class_init (EMailAccountStoreClass *class)
 }
 
 static void
-e_mail_account_store_interface_init (GtkTreeModelIface *interface)
+e_mail_account_store_interface_init (GtkTreeModelIface *iface)
 {
-	interface->row_changed = mail_account_store_row_changed;
-	interface->row_inserted = mail_account_store_row_inserted;
+	iface->row_changed = mail_account_store_row_changed;
+	iface->row_inserted = mail_account_store_row_inserted;
 }
 
 static void
diff --git a/mail/e-mail-autoconfig.c b/mail/e-mail-autoconfig.c
index 8e4d403238..93261c4107 100644
--- a/mail/e-mail-autoconfig.c
+++ b/mail/e-mail-autoconfig.c
@@ -114,7 +114,7 @@ enum {
 };
 
 /* Forward Declarations */
-static void	e_mail_autoconfig_initable_init	(GInitableIface *interface);
+static void	e_mail_autoconfig_initable_init	(GInitableIface *iface);
 
 /* By default, the GAsyncInitable interface calls GInitable.init()
  * from a separate thread, so we only have to override GInitable. */
@@ -723,9 +723,9 @@ e_mail_autoconfig_class_init (EMailAutoconfigClass *class)
 }
 
 static void
-e_mail_autoconfig_initable_init (GInitableIface *interface)
+e_mail_autoconfig_initable_init (GInitableIface *iface)
 {
-	interface->init = mail_autoconfig_initable_init;
+	iface->init = mail_autoconfig_initable_init;
 }
 
 static void
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 549892b2ca..8d0982d52c 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -101,7 +101,7 @@ static const gchar *ui =
 "</ui>";
 
 static void	e_mail_browser_reader_init
-					(EMailReaderInterface *interface);
+					(EMailReaderInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailBrowser,
@@ -838,7 +838,7 @@ static void
 mail_browser_set_message (EMailReader *reader,
                           const gchar *uid)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 	EMailBrowser *browser;
 	CamelMessageInfo *info;
 	CamelFolder *folder;
@@ -846,8 +846,8 @@ mail_browser_set_message (EMailReader *reader,
 	browser = E_MAIL_BROWSER (reader);
 
 	/* Chain up to parent's set_message() method. */
-	interface = g_type_default_interface_peek (E_TYPE_MAIL_READER);
-	interface->set_message (reader, uid);
+	iface = g_type_default_interface_peek (E_TYPE_MAIL_READER);
+	iface->set_message (reader, uid);
 
 	if (uid == NULL) {
 		e_mail_browser_close (browser);
@@ -1010,18 +1010,18 @@ e_mail_browser_class_init (EMailBrowserClass *class)
 }
 
 static void
-e_mail_browser_reader_init (EMailReaderInterface *interface)
+e_mail_browser_reader_init (EMailReaderInterface *iface)
 {
-	interface->get_action_group = mail_browser_get_action_group;
-	interface->get_backend = mail_browser_get_backend;
-	interface->get_mail_display = mail_browser_get_mail_display;
-	interface->get_hide_deleted = mail_browser_get_hide_deleted;
-	interface->get_message_list = mail_browser_get_message_list;
-	interface->get_popup_menu = mail_browser_get_popup_menu;
-	interface->get_preview_pane = mail_browser_get_preview_pane;
-	interface->get_window = mail_browser_get_window;
-	interface->set_message = mail_browser_set_message;
-	interface->composer_created = mail_browser_composer_created;
+	iface->get_action_group = mail_browser_get_action_group;
+	iface->get_backend = mail_browser_get_backend;
+	iface->get_mail_display = mail_browser_get_mail_display;
+	iface->get_hide_deleted = mail_browser_get_hide_deleted;
+	iface->get_message_list = mail_browser_get_message_list;
+	iface->get_popup_menu = mail_browser_get_popup_menu;
+	iface->get_preview_pane = mail_browser_get_preview_pane;
+	iface->get_window = mail_browser_get_window;
+	iface->set_message = mail_browser_set_message;
+	iface->composer_created = mail_browser_composer_created;
 }
 
 static void
diff --git a/mail/e-mail-config-activity-page.c b/mail/e-mail-config-activity-page.c
index a5db47b349..c925216453 100644
--- a/mail/e-mail-config-activity-page.c
+++ b/mail/e-mail-config-activity-page.c
@@ -30,7 +30,7 @@ struct _EMailConfigActivityPagePrivate {
 
 /* Forward Declarations */
 static void	e_mail_config_activity_page_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE (
 	EMailConfigActivityPage,
@@ -133,9 +133,9 @@ e_mail_config_activity_page_class_init (EMailConfigActivityPageClass *class)
 }
 
 static void
-e_mail_config_activity_page_alert_sink_init (EAlertSinkInterface *interface)
+e_mail_config_activity_page_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = mail_config_activity_page_submit_alert;
+	iface->submit_alert = mail_config_activity_page_submit_alert;
 }
 
 static void
diff --git a/mail/e-mail-config-confirm-page.c b/mail/e-mail-config-confirm-page.c
index 94ff2b4ed5..b1767a6a09 100644
--- a/mail/e-mail-config-confirm-page.c
+++ b/mail/e-mail-config-confirm-page.c
@@ -37,7 +37,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_confirm_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigConfirmPage,
@@ -163,11 +163,11 @@ e_mail_config_confirm_page_class_init (EMailConfigConfirmPageClass *class)
 }
 
 static void
-e_mail_config_confirm_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_confirm_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Done");
-	interface->page_type = GTK_ASSISTANT_PAGE_CONFIRM;
-	interface->sort_order = E_MAIL_CONFIG_CONFIRM_PAGE_SORT_ORDER;
+	iface->title = _("Done");
+	iface->page_type = GTK_ASSISTANT_PAGE_CONFIRM;
+	iface->sort_order = E_MAIL_CONFIG_CONFIRM_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/mail/e-mail-config-defaults-page.c b/mail/e-mail-config-defaults-page.c
index 50cda447d7..7298e09fd6 100644
--- a/mail/e-mail-config-defaults-page.c
+++ b/mail/e-mail-config-defaults-page.c
@@ -50,7 +50,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_defaults_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigDefaultsPage,
@@ -851,10 +851,10 @@ e_mail_config_defaults_page_class_init (EMailConfigDefaultsPageClass *class)
 }
 
 static void
-e_mail_config_defaults_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_defaults_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Defaults");
-	interface->sort_order = E_MAIL_CONFIG_DEFAULTS_PAGE_SORT_ORDER;
+	iface->title = _("Defaults");
+	iface->sort_order = E_MAIL_CONFIG_DEFAULTS_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/mail/e-mail-config-identity-page.c b/mail/e-mail-config-identity-page.c
index edec711098..6c9072f3bf 100644
--- a/mail/e-mail-config-identity-page.c
+++ b/mail/e-mail-config-identity-page.c
@@ -49,7 +49,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_identity_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigIdentityPage,
@@ -672,11 +672,11 @@ e_mail_config_identity_page_class_init (EMailConfigIdentityPageClass *class)
 }
 
 static void
-e_mail_config_identity_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_identity_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Identity");
-	interface->sort_order = E_MAIL_CONFIG_IDENTITY_PAGE_SORT_ORDER;
-	interface->check_complete = mail_config_identity_page_check_complete;
+	iface->title = _("Identity");
+	iface->sort_order = E_MAIL_CONFIG_IDENTITY_PAGE_SORT_ORDER;
+	iface->check_complete = mail_config_identity_page_check_complete;
 }
 
 static void
diff --git a/mail/e-mail-config-lookup-page.c b/mail/e-mail-config-lookup-page.c
index a5036e2eac..8986469530 100644
--- a/mail/e-mail-config-lookup-page.c
+++ b/mail/e-mail-config-lookup-page.c
@@ -22,7 +22,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_lookup_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigLookupPage,
@@ -86,14 +86,14 @@ e_mail_config_lookup_page_class_init (EMailConfigLookupPageClass *class)
 }
 
 static void
-e_mail_config_lookup_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_lookup_page_interface_init (EMailConfigPageInterface *iface)
 {
 	/* Do not set a title.  We don't want this
 	 * page listed in a GtkAssistant sidebar. */
-	interface->title = "";
-	interface->sort_order = E_MAIL_CONFIG_LOOKUP_PAGE_SORT_ORDER;
-	interface->page_type = GTK_ASSISTANT_PAGE_CUSTOM;
-	interface->check_complete = mail_config_lookup_page_check_complete;
+	iface->title = "";
+	iface->sort_order = E_MAIL_CONFIG_LOOKUP_PAGE_SORT_ORDER;
+	iface->page_type = GTK_ASSISTANT_PAGE_CUSTOM;
+	iface->check_complete = mail_config_lookup_page_check_complete;
 }
 
 static void
diff --git a/mail/e-mail-config-page.c b/mail/e-mail-config-page.c
index cfef05dedb..a6047b9d04 100644
--- a/mail/e-mail-config-page.c
+++ b/mail/e-mail-config-page.c
@@ -120,19 +120,19 @@ mail_config_page_check_complete_accumulator (GSignalInvocationHint *ihint,
 }
 
 static void
-e_mail_config_page_default_init (EMailConfigPageInterface *interface)
+e_mail_config_page_default_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Untitled");
-	interface->page_type = GTK_ASSISTANT_PAGE_CONTENT;
+	iface->title = _("Untitled");
+	iface->page_type = GTK_ASSISTANT_PAGE_CONTENT;
 
-	interface->check_complete = mail_config_page_check_complete;
-	interface->submit_sync = mail_config_page_submit_sync;
-	interface->submit = mail_config_page_submit;
-	interface->submit_finish = mail_config_page_submit_finish;
+	iface->check_complete = mail_config_page_check_complete;
+	iface->submit_sync = mail_config_page_submit_sync;
+	iface->submit = mail_config_page_submit;
+	iface->submit_finish = mail_config_page_submit_finish;
 
 	signals[CHANGED] = g_signal_new (
 		"changed",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailConfigPageInterface, changed),
 		NULL, NULL,
@@ -141,7 +141,7 @@ e_mail_config_page_default_init (EMailConfigPageInterface *interface)
 
 	signals[SETUP_DEFAULTS] = g_signal_new (
 		"setup-defaults",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailConfigPageInterface, setup_defaults),
 		NULL, NULL,
@@ -150,7 +150,7 @@ e_mail_config_page_default_init (EMailConfigPageInterface *interface)
 
 	signals[CHECK_COMPLETE] = g_signal_new (
 		"check-complete",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailConfigPageInterface, check_complete),
 		mail_config_page_check_complete_accumulator, NULL,
@@ -159,7 +159,7 @@ e_mail_config_page_default_init (EMailConfigPageInterface *interface)
 
 	signals[COMMIT_CHANGES] = g_signal_new (
 		"commit-changes",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailConfigPageInterface, commit_changes),
 		NULL, NULL,
@@ -243,14 +243,14 @@ e_mail_config_page_submit_sync (EMailConfigPage *page,
                                 GCancellable *cancellable,
                                 GError **error)
 {
-	EMailConfigPageInterface *interface;
+	EMailConfigPageInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_CONFIG_PAGE (page), FALSE);
 
-	interface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
-	g_return_val_if_fail (interface->submit_sync != NULL, FALSE);
+	iface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
+	g_return_val_if_fail (iface->submit_sync != NULL, FALSE);
 
-	return interface->submit_sync (page, cancellable, error);
+	return iface->submit_sync (page, cancellable, error);
 }
 
 void
@@ -259,14 +259,14 @@ e_mail_config_page_submit (EMailConfigPage *page,
                            GAsyncReadyCallback callback,
                            gpointer user_data)
 {
-	EMailConfigPageInterface *interface;
+	EMailConfigPageInterface *iface;
 
 	g_return_if_fail (E_IS_MAIL_CONFIG_PAGE (page));
 
-	interface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
-	g_return_if_fail (interface->submit != NULL);
+	iface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
+	g_return_if_fail (iface->submit != NULL);
 
-	return interface->submit (page, cancellable, callback, user_data);
+	return iface->submit (page, cancellable, callback, user_data);
 }
 
 gboolean
@@ -274,14 +274,14 @@ e_mail_config_page_submit_finish (EMailConfigPage *page,
                                   GAsyncResult *result,
                                   GError **error)
 {
-	EMailConfigPageInterface *interface;
+	EMailConfigPageInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_CONFIG_PAGE (page), FALSE);
 	g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-	interface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
-	g_return_val_if_fail (interface->submit_finish != NULL, FALSE);
+	iface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
+	g_return_val_if_fail (iface->submit_finish != NULL, FALSE);
 
-	return interface->submit_finish (page, result, error);
+	return iface->submit_finish (page, result, error);
 }
 
diff --git a/mail/e-mail-config-provider-page.c b/mail/e-mail-config-provider-page.c
index c43fdcc696..0bd0033d6b 100644
--- a/mail/e-mail-config-provider-page.c
+++ b/mail/e-mail-config-provider-page.c
@@ -42,7 +42,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_provider_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigProviderPage,
@@ -694,10 +694,10 @@ e_mail_config_provider_page_class_init (EMailConfigProviderPageClass *class)
 }
 
 static void
-e_mail_config_provider_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_provider_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Receiving Options");
-	interface->sort_order = E_MAIL_CONFIG_PROVIDER_PAGE_SORT_ORDER;
+	iface->title = _("Receiving Options");
+	iface->sort_order = E_MAIL_CONFIG_PROVIDER_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/mail/e-mail-config-receiving-page.c b/mail/e-mail-config-receiving-page.c
index 10bb3b06e4..b289ef8554 100644
--- a/mail/e-mail-config-receiving-page.c
+++ b/mail/e-mail-config-receiving-page.c
@@ -22,7 +22,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_receiving_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigReceivingPage,
@@ -44,10 +44,10 @@ e_mail_config_receiving_page_class_init (EMailConfigReceivingPageClass *class)
 }
 
 static void
-e_mail_config_receiving_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_receiving_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Receiving Email");
-	interface->sort_order = E_MAIL_CONFIG_RECEIVING_PAGE_SORT_ORDER;
+	iface->title = _("Receiving Email");
+	iface->sort_order = E_MAIL_CONFIG_RECEIVING_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/mail/e-mail-config-security-page.c b/mail/e-mail-config-security-page.c
index c6b2de3c91..3250576f75 100644
--- a/mail/e-mail-config-security-page.c
+++ b/mail/e-mail-config-security-page.c
@@ -42,7 +42,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_security_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigSecurityPage,
@@ -640,10 +640,10 @@ e_mail_config_security_page_class_init (EMailConfigSecurityPageClass *class)
 }
 
 static void
-e_mail_config_security_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_security_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Security");
-	interface->sort_order = E_MAIL_CONFIG_SECURITY_PAGE_SORT_ORDER;
+	iface->title = _("Security");
+	iface->sort_order = E_MAIL_CONFIG_SECURITY_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/mail/e-mail-config-sending-page.c b/mail/e-mail-config-sending-page.c
index 1ac39ffe68..56d39de30a 100644
--- a/mail/e-mail-config-sending-page.c
+++ b/mail/e-mail-config-sending-page.c
@@ -22,7 +22,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_sending_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigSendingPage,
@@ -44,10 +44,10 @@ e_mail_config_sending_page_class_init (EMailConfigSendingPageClass *class)
 }
 
 static void
-e_mail_config_sending_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_sending_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Sending Email");
-	interface->sort_order = E_MAIL_CONFIG_SENDING_PAGE_SORT_ORDER;
+	iface->title = _("Sending Email");
+	iface->sort_order = E_MAIL_CONFIG_SENDING_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/mail/e-mail-config-service-page.c b/mail/e-mail-config-service-page.c
index 7e62ced82a..a27fac0d2e 100644
--- a/mail/e-mail-config-service-page.c
+++ b/mail/e-mail-config-service-page.c
@@ -86,7 +86,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_service_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE (
 	EMailConfigServicePage,
@@ -559,11 +559,11 @@ e_mail_config_service_page_class_init (EMailConfigServicePageClass *class)
 }
 
 static void
-e_mail_config_service_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_service_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->setup_defaults = mail_config_service_page_setup_defaults;
-	interface->check_complete = mail_config_service_page_check_complete;
-	interface->commit_changes = mail_config_service_page_commit_changes;
+	iface->setup_defaults = mail_config_service_page_setup_defaults;
+	iface->check_complete = mail_config_service_page_check_complete;
+	iface->commit_changes = mail_config_service_page_commit_changes;
 }
 
 static void
diff --git a/mail/e-mail-config-summary-page.c b/mail/e-mail-config-summary-page.c
index bfee28a254..79a04e287c 100644
--- a/mail/e-mail-config-summary-page.c
+++ b/mail/e-mail-config-summary-page.c
@@ -70,7 +70,7 @@ static gulong signals[LAST_SIGNAL];
 
 /* Forward Declarations */
 static void	e_mail_config_summary_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigSummaryPage,
@@ -781,12 +781,12 @@ e_mail_config_summary_page_class_init (EMailConfigSummaryPageClass *class)
 }
 
 static void
-e_mail_config_summary_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_summary_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Account Summary");
-	interface->sort_order = E_MAIL_CONFIG_SUMMARY_PAGE_SORT_ORDER;
-	interface->check_complete = mail_config_summary_page_check_complete;
-	interface->commit_changes = mail_config_summary_page_commit_changes;
+	iface->title = _("Account Summary");
+	iface->sort_order = E_MAIL_CONFIG_SUMMARY_PAGE_SORT_ORDER;
+	iface->check_complete = mail_config_summary_page_check_complete;
+	iface->commit_changes = mail_config_summary_page_commit_changes;
 }
 
 static void
diff --git a/mail/e-mail-config-welcome-page.c b/mail/e-mail-config-welcome-page.c
index 401a2c9ec9..4459a23e46 100644
--- a/mail/e-mail-config-welcome-page.c
+++ b/mail/e-mail-config-welcome-page.c
@@ -37,7 +37,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_welcome_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigWelcomePage,
@@ -161,11 +161,11 @@ e_mail_config_welcome_page_class_init (EMailConfigWelcomePageClass *class)
 }
 
 static void
-e_mail_config_welcome_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_welcome_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Welcome");
-	interface->page_type = GTK_ASSISTANT_PAGE_INTRO;
-	interface->sort_order = E_MAIL_CONFIG_WELCOME_PAGE_SORT_ORDER;
+	iface->title = _("Welcome");
+	iface->page_type = GTK_ASSISTANT_PAGE_INTRO;
+	iface->sort_order = E_MAIL_CONFIG_WELCOME_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/mail/e-mail-config-window.c b/mail/e-mail-config-window.c
index 1608e67867..e200132f43 100644
--- a/mail/e-mail-config-window.c
+++ b/mail/e-mail-config-window.c
@@ -56,7 +56,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_window_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 static guint signals[LAST_SIGNAL];
 
@@ -492,9 +492,9 @@ e_mail_config_window_class_init (EMailConfigWindowClass *class)
 }
 
 static void
-e_mail_config_window_alert_sink_init (EAlertSinkInterface *interface)
+e_mail_config_window_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = mail_config_window_submit_alert;
+	iface->submit_alert = mail_config_window_submit_alert;
 }
 
 static void
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index 0ef9c352c1..3d9a1a8784 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -62,7 +62,7 @@ static struct {
 
 /* Forward Declarations */
 static void	e_mail_label_list_store_interface_init
-						(GtkTreeModelIface *interface);
+						(GtkTreeModelIface *iface);
 static void	labels_settings_changed_cb	(GSettings *settings,
 						 const gchar *key,
 						 gpointer user_data);
@@ -437,9 +437,9 @@ e_mail_label_list_store_class_init (EMailLabelListStoreClass *class)
 }
 
 static void
-e_mail_label_list_store_interface_init (GtkTreeModelIface *interface)
+e_mail_label_list_store_interface_init (GtkTreeModelIface *iface)
 {
-	interface->row_inserted = mail_label_list_store_row_inserted;
+	iface->row_inserted = mail_label_list_store_row_inserted;
 }
 
 static void
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index d0d58240f2..0a9a0c0f1a 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -71,7 +71,7 @@ enum {
 #define STATE_GROUP_GLOBAL_FOLDER	"GlobalFolder"
 
 /* Forward Declarations */
-static void e_mail_paned_view_reader_init (EMailReaderInterface *interface);
+static void e_mail_paned_view_reader_init (EMailReaderInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailPanedView, e_mail_paned_view, E_TYPE_MAIL_VIEW,
@@ -1034,19 +1034,19 @@ e_mail_paned_view_class_init (EMailPanedViewClass *class)
 }
 
 static void
-e_mail_paned_view_reader_init (EMailReaderInterface *interface)
+e_mail_paned_view_reader_init (EMailReaderInterface *iface)
 {
-	interface->get_action_group = mail_paned_view_get_action_group;
-	interface->get_alert_sink = mail_paned_view_get_alert_sink;
-	interface->get_backend = mail_paned_view_get_backend;
-	interface->get_mail_display = mail_paned_view_get_mail_display;
-	interface->get_hide_deleted = mail_paned_view_get_hide_deleted;
-	interface->get_message_list = mail_paned_view_get_message_list;
-	interface->get_popup_menu = mail_paned_view_get_popup_menu;
-	interface->get_preview_pane = mail_paned_view_get_preview_pane;
-	interface->get_window = mail_paned_view_get_window;
-	interface->set_folder = mail_paned_view_set_folder;
-	interface->open_selected_mail = mail_paned_view_reader_open_selected_mail;
+	iface->get_action_group = mail_paned_view_get_action_group;
+	iface->get_alert_sink = mail_paned_view_get_alert_sink;
+	iface->get_backend = mail_paned_view_get_backend;
+	iface->get_mail_display = mail_paned_view_get_mail_display;
+	iface->get_hide_deleted = mail_paned_view_get_hide_deleted;
+	iface->get_message_list = mail_paned_view_get_message_list;
+	iface->get_popup_menu = mail_paned_view_get_popup_menu;
+	iface->get_preview_pane = mail_paned_view_get_preview_pane;
+	iface->get_window = mail_paned_view_get_window;
+	iface->set_folder = mail_paned_view_set_folder;
+	iface->open_selected_mail = mail_paned_view_reader_open_selected_mail;
 }
 
 static void
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 5537954267..b3dadcf6d5 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -3613,24 +3613,24 @@ mail_reader_init_charset_actions (EMailReader *reader,
 }
 
 static void
-e_mail_reader_default_init (EMailReaderInterface *interface)
+e_mail_reader_default_init (EMailReaderInterface *iface)
 {
 	quark_private = g_quark_from_static_string ("e-mail-reader-private");
 
-	interface->get_alert_sink = mail_reader_get_alert_sink;
-	interface->get_selected_uids = mail_reader_get_selected_uids;
-	interface->ref_folder = mail_reader_ref_folder;
-	interface->set_folder = mail_reader_set_folder;
-	interface->set_message = mail_reader_set_message;
-	interface->open_selected_mail = e_mail_reader_open_selected;
-	interface->folder_loaded = mail_reader_folder_loaded;
-	interface->message_loaded = mail_reader_message_loaded;
-	interface->message_seen = mail_reader_message_seen;
-	interface->show_search_bar = mail_reader_show_search_bar;
-	interface->update_actions = mail_reader_update_actions;
+	iface->get_alert_sink = mail_reader_get_alert_sink;
+	iface->get_selected_uids = mail_reader_get_selected_uids;
+	iface->ref_folder = mail_reader_ref_folder;
+	iface->set_folder = mail_reader_set_folder;
+	iface->set_message = mail_reader_set_message;
+	iface->open_selected_mail = e_mail_reader_open_selected;
+	iface->folder_loaded = mail_reader_folder_loaded;
+	iface->message_loaded = mail_reader_message_loaded;
+	iface->message_seen = mail_reader_message_seen;
+	iface->show_search_bar = mail_reader_show_search_bar;
+	iface->update_actions = mail_reader_update_actions;
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_enum (
 			"forward-style",
 			"Forward Style",
@@ -3640,7 +3640,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface)
 			G_PARAM_READWRITE));
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_boolean (
 			"group-by-threads",
 			"Group by Threads",
@@ -3649,7 +3649,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface)
 			G_PARAM_READWRITE));
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_enum (
 			"reply-style",
 			"Reply Style",
@@ -3660,7 +3660,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface)
 
 	signals[CHANGED] = g_signal_new (
 		"changed",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST,
 		0, NULL, NULL,
 		g_cclosure_marshal_VOID__VOID,
@@ -3668,7 +3668,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface)
 
 	signals[COMPOSER_CREATED] = g_signal_new (
 		"composer-created",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (EMailReaderInterface, composer_created),
 		NULL, NULL, NULL,
@@ -3678,7 +3678,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface)
 
 	signals[FOLDER_LOADED] = g_signal_new (
 		"folder-loaded",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (EMailReaderInterface, folder_loaded),
 		NULL, NULL,
@@ -3687,7 +3687,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface)
 
 	signals[MESSAGE_LOADED] = g_signal_new (
 		"message-loaded",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailReaderInterface, message_loaded),
 		NULL, NULL,
@@ -3698,7 +3698,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface)
 
 	signals[MESSAGE_SEEN] = g_signal_new (
 		"message-seen",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailReaderInterface, message_seen),
 		NULL, NULL,
@@ -3709,7 +3709,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface)
 
 	signals[SHOW_SEARCH_BAR] = g_signal_new (
 		"show-search-bar",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		G_STRUCT_OFFSET (EMailReaderInterface, show_search_bar),
 		NULL, NULL,
@@ -3718,7 +3718,7 @@ e_mail_reader_default_init (EMailReaderInterface *interface)
 
 	signals[UPDATE_ACTIONS] = g_signal_new (
 		"update-actions",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		G_STRUCT_OFFSET (EMailReaderInterface, update_actions),
 		NULL, NULL,
@@ -4261,185 +4261,185 @@ GtkActionGroup *
 e_mail_reader_get_action_group (EMailReader *reader,
                                 EMailReaderActionGroup group)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_action_group != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_action_group != NULL, NULL);
 
-	return interface->get_action_group (reader, group);
+	return iface->get_action_group (reader, group);
 }
 
 EAlertSink *
 e_mail_reader_get_alert_sink (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_alert_sink != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_alert_sink != NULL, NULL);
 
-	return interface->get_alert_sink (reader);
+	return iface->get_alert_sink (reader);
 }
 
 EMailBackend *
 e_mail_reader_get_backend (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_backend != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_backend != NULL, NULL);
 
-	return interface->get_backend (reader);
+	return iface->get_backend (reader);
 }
 
 EMailDisplay *
 e_mail_reader_get_mail_display (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_mail_display != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_mail_display != NULL, NULL);
 
-	return interface->get_mail_display (reader);
+	return iface->get_mail_display (reader);
 }
 
 gboolean
 e_mail_reader_get_hide_deleted (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), FALSE);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_hide_deleted != NULL, FALSE);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_hide_deleted != NULL, FALSE);
 
-	return interface->get_hide_deleted (reader);
+	return iface->get_hide_deleted (reader);
 }
 
 GtkWidget *
 e_mail_reader_get_message_list (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_message_list != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_message_list != NULL, NULL);
 
-	return interface->get_message_list (reader);
+	return iface->get_message_list (reader);
 }
 
 GtkMenu *
 e_mail_reader_get_popup_menu (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_popup_menu != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_popup_menu != NULL, NULL);
 
-	return interface->get_popup_menu (reader);
+	return iface->get_popup_menu (reader);
 }
 
 EPreviewPane *
 e_mail_reader_get_preview_pane (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_preview_pane != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_preview_pane != NULL, NULL);
 
-	return interface->get_preview_pane (reader);
+	return iface->get_preview_pane (reader);
 }
 
 GPtrArray *
 e_mail_reader_get_selected_uids (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_selected_uids != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_selected_uids != NULL, NULL);
 
-	return interface->get_selected_uids (reader);
+	return iface->get_selected_uids (reader);
 }
 
 GtkWindow *
 e_mail_reader_get_window (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_window != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_window != NULL, NULL);
 
-	return interface->get_window (reader);
+	return iface->get_window (reader);
 }
 
 CamelFolder *
 e_mail_reader_ref_folder (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->ref_folder != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->ref_folder != NULL, NULL);
 
-	return interface->ref_folder (reader);
+	return iface->ref_folder (reader);
 }
 
 void
 e_mail_reader_set_folder (EMailReader *reader,
                           CamelFolder *folder)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_if_fail (E_IS_MAIL_READER (reader));
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_if_fail (interface->set_folder != NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_if_fail (iface->set_folder != NULL);
 
-	interface->set_folder (reader, folder);
+	iface->set_folder (reader, folder);
 }
 
 void
 e_mail_reader_set_message (EMailReader *reader,
                            const gchar *message_uid)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_if_fail (E_IS_MAIL_READER (reader));
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_if_fail (interface->set_message != NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_if_fail (iface->set_message != NULL);
 
-	interface->set_message (reader, message_uid);
+	iface->set_message (reader, message_uid);
 }
 
 guint
 e_mail_reader_open_selected_mail (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), 0);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->open_selected_mail != NULL, 0);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->open_selected_mail != NULL, 0);
 
-	return interface->open_selected_mail (reader);
+	return iface->open_selected_mail (reader);
 }
 
 EMailForwardStyle
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 3a094e6735..be0bc766f8 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -174,7 +174,7 @@ struct _folder_tree_selection_data {
 };
 
 /* Forward Declarations */
-static void em_folder_tree_selectable_init (ESelectableInterface *interface);
+static void em_folder_tree_selectable_init (ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMFolderTree,
@@ -1681,14 +1681,14 @@ folder_tree_selectable_update_actions (ESelectable *selectable,
 	g_return_if_fail (folder_tree != NULL);
 
 	if (folder_tree->priv->selectable != NULL) {
-		ESelectableInterface *interface;
+		ESelectableInterface *iface;
 		ESelectable *selectable;
 
 		selectable = E_SELECTABLE (folder_tree->priv->selectable);
-		interface = E_SELECTABLE_GET_INTERFACE (selectable);
-		g_return_if_fail (interface->update_actions != NULL);
+		iface = E_SELECTABLE_GET_INTERFACE (selectable);
+		g_return_if_fail (iface->update_actions != NULL);
 
-		interface->update_actions (
+		iface->update_actions (
 			selectable, focus_tracker,
 			clipboard_targets, n_clipboard_targets);
 	}
@@ -1697,7 +1697,7 @@ folder_tree_selectable_update_actions (ESelectable *selectable,
 static void
 folder_tree_selectable_cut_clipboard (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1707,21 +1707,21 @@ folder_tree_selectable_cut_clipboard (ESelectable *selectable)
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->cut_clipboard == NULL)
+	if (iface->cut_clipboard == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->cut_clipboard (E_SELECTABLE (proxy));
+	iface->cut_clipboard (E_SELECTABLE (proxy));
 }
 
 static void
 folder_tree_selectable_copy_clipboard (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1731,21 +1731,21 @@ folder_tree_selectable_copy_clipboard (ESelectable *selectable)
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->copy_clipboard == NULL)
+	if (iface->copy_clipboard == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->copy_clipboard (E_SELECTABLE (proxy));
+	iface->copy_clipboard (E_SELECTABLE (proxy));
 }
 
 static void
 folder_tree_selectable_paste_clipboard (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1755,21 +1755,21 @@ folder_tree_selectable_paste_clipboard (ESelectable *selectable)
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->paste_clipboard == NULL)
+	if (iface->paste_clipboard == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->paste_clipboard (E_SELECTABLE (proxy));
+	iface->paste_clipboard (E_SELECTABLE (proxy));
 }
 
 static void
 folder_tree_selectable_delete_selection (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1779,21 +1779,21 @@ folder_tree_selectable_delete_selection (ESelectable *selectable)
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->delete_selection == NULL)
+	if (iface->delete_selection == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->delete_selection (E_SELECTABLE (proxy));
+	iface->delete_selection (E_SELECTABLE (proxy));
 }
 
 static void
 folder_tree_selectable_select_all (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1803,26 +1803,26 @@ folder_tree_selectable_select_all (ESelectable *selectable)
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->select_all == NULL)
+	if (iface->select_all == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->select_all (E_SELECTABLE (proxy));
+	iface->select_all (E_SELECTABLE (proxy));
 }
 
 static void
-em_folder_tree_selectable_init (ESelectableInterface *interface)
-{
-	interface->update_actions = folder_tree_selectable_update_actions;
-	interface->cut_clipboard = folder_tree_selectable_cut_clipboard;
-	interface->copy_clipboard = folder_tree_selectable_copy_clipboard;
-	interface->paste_clipboard = folder_tree_selectable_paste_clipboard;
-	interface->delete_selection = folder_tree_selectable_delete_selection;
-	interface->select_all = folder_tree_selectable_select_all;
+em_folder_tree_selectable_init (ESelectableInterface *iface)
+{
+	iface->update_actions = folder_tree_selectable_update_actions;
+	iface->cut_clipboard = folder_tree_selectable_cut_clipboard;
+	iface->copy_clipboard = folder_tree_selectable_copy_clipboard;
+	iface->paste_clipboard = folder_tree_selectable_paste_clipboard;
+	iface->delete_selection = folder_tree_selectable_delete_selection;
+	iface->select_all = folder_tree_selectable_select_all;
 }
 
 GtkWidget *
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 48f05b1665..5a938ab41b 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -37,7 +37,6 @@
 #define DATADIR windows_DATADIR
 #include <windows.h>
 #undef DATADIR
-#undef interface
 #endif
 
 #include <libebook/libebook.h>
diff --git a/mail/message-list.c b/mail/message-list.c
index 81d1bb4182..28296f4e5d 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -173,9 +173,9 @@ enum {
 
 /* Forward Declarations */
 static void	message_list_selectable_init
-					(ESelectableInterface *interface);
+					(ESelectableInterface *iface);
 static void	message_list_tree_model_init
-					(ETreeModelInterface *interface);
+					(ETreeModelInterface *iface);
 static gboolean	message_list_get_hide_deleted
 					(MessageList *message_list,
 					 CamelFolder *folder);
@@ -3257,35 +3257,35 @@ message_list_class_init (MessageListClass *class)
 }
 
 static void
-message_list_selectable_init (ESelectableInterface *interface)
+message_list_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = message_list_selectable_update_actions;
-	interface->select_all = message_list_selectable_select_all;
+	iface->update_actions = message_list_selectable_update_actions;
+	iface->select_all = message_list_selectable_select_all;
 }
 
 static void
-message_list_tree_model_init (ETreeModelInterface *interface)
-{
-	interface->get_root = message_list_get_root;
-	interface->get_parent = message_list_get_parent;
-	interface->get_first_child = message_list_get_first_child;
-	interface->get_next = message_list_get_next;
-	interface->is_root = message_list_is_root;
-	interface->is_expandable = message_list_is_expandable;
-	interface->get_n_nodes = message_list_get_n_nodes;
-	interface->get_n_children = message_list_get_n_children;
-	interface->depth = message_list_depth;
-	interface->get_expanded_default = message_list_get_expanded_default;
-	interface->column_count = message_list_column_count;
-	interface->get_save_id = message_list_get_save_id;
-	interface->get_node_by_id = message_list_get_node_by_id;
-	interface->sort_value_at = message_list_sort_value_at;
-	interface->value_at = message_list_value_at;
-	interface->duplicate_value = message_list_duplicate_value;
-	interface->free_value = message_list_free_value;
-	interface->initialize_value = message_list_initialize_value;
-	interface->value_is_empty = message_list_value_is_empty;
-	interface->value_to_string = message_list_value_to_string;
+message_list_tree_model_init (ETreeModelInterface *iface)
+{
+	iface->get_root = message_list_get_root;
+	iface->get_parent = message_list_get_parent;
+	iface->get_first_child = message_list_get_first_child;
+	iface->get_next = message_list_get_next;
+	iface->is_root = message_list_is_root;
+	iface->is_expandable = message_list_is_expandable;
+	iface->get_n_nodes = message_list_get_n_nodes;
+	iface->get_n_children = message_list_get_n_children;
+	iface->depth = message_list_depth;
+	iface->get_expanded_default = message_list_get_expanded_default;
+	iface->column_count = message_list_column_count;
+	iface->get_save_id = message_list_get_save_id;
+	iface->get_node_by_id = message_list_get_node_by_id;
+	iface->sort_value_at = message_list_sort_value_at;
+	iface->value_at = message_list_value_at;
+	iface->duplicate_value = message_list_duplicate_value;
+	iface->free_value = message_list_free_value;
+	iface->initialize_value = message_list_initialize_value;
+	iface->value_is_empty = message_list_value_is_empty;
+	iface->value_to_string = message_list_value_to_string;
 }
 
 static void
diff --git a/modules/backup-restore/e-mail-config-restore-page.c b/modules/backup-restore/e-mail-config-restore-page.c
index 01e70d018c..e39c2dfe8c 100644
--- a/modules/backup-restore/e-mail-config-restore-page.c
+++ b/modules/backup-restore/e-mail-config-restore-page.c
@@ -46,9 +46,9 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_restore_page_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 static void	e_mail_config_restore_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailConfigRestorePage,
@@ -299,17 +299,17 @@ e_mail_config_restore_page_class_finalize (EMailConfigRestorePageClass *class)
 }
 
 static void
-e_mail_config_restore_page_alert_sink_init (EAlertSinkInterface *interface)
+e_mail_config_restore_page_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = mail_config_restore_page_submit_alert;
+	iface->submit_alert = mail_config_restore_page_submit_alert;
 }
 
 static void
-e_mail_config_restore_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_restore_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Restore from Backup");
-	interface->sort_order = E_MAIL_CONFIG_RESTORE_PAGE_SORT_ORDER;
-	interface->check_complete = mail_config_restore_page_check_complete;
+	iface->title = _("Restore from Backup");
+	iface->sort_order = E_MAIL_CONFIG_RESTORE_PAGE_SORT_ORDER;
+	iface->check_complete = mail_config_restore_page_check_complete;
 }
 
 static void
diff --git a/modules/backup-restore/e-mail-config-restore-ready-page.c b/modules/backup-restore/e-mail-config-restore-ready-page.c
index fc4d86ef14..2638391bac 100644
--- a/modules/backup-restore/e-mail-config-restore-ready-page.c
+++ b/modules/backup-restore/e-mail-config-restore-ready-page.c
@@ -27,7 +27,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_restore_ready_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailConfigRestoreReadyPage,
@@ -49,12 +49,12 @@ e_mail_config_restore_ready_page_class_finalize (EMailConfigRestoreReadyPageClas
 }
 
 static void
-e_mail_config_restore_ready_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_restore_ready_page_interface_init (EMailConfigPageInterface *iface)
 {
 	/* Keep the title identical to EMailConfigRestorePage
 	 * so it's only shown once in the assistant sidebar. */
-	interface->title = _("Restore from Backup");
-	interface->sort_order = E_MAIL_CONFIG_RESTORE_READY_PAGE_SORT_ORDER;
+	iface->title = _("Restore from Backup");
+	iface->sort_order = E_MAIL_CONFIG_RESTORE_READY_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c
index 7cc39213e0..4b061b6526 100644
--- a/modules/bogofilter/evolution-bogofilter.c
+++ b/modules/bogofilter/evolution-bogofilter.c
@@ -63,7 +63,7 @@ void e_module_unload (GTypeModule *type_module);
 
 /* Forward Declarations */
 GType e_bogofilter_get_type (void);
-static void e_bogofilter_interface_init (CamelJunkFilterInterface *interface);
+static void e_bogofilter_interface_init (CamelJunkFilterInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EBogofilter,
@@ -490,11 +490,11 @@ e_bogofilter_class_finalize (EBogofilterClass *class)
 }
 
 static void
-e_bogofilter_interface_init (CamelJunkFilterInterface *interface)
+e_bogofilter_interface_init (CamelJunkFilterInterface *iface)
 {
-	interface->classify = bogofilter_classify;
-	interface->learn_junk = bogofilter_learn_junk;
-	interface->learn_not_junk = bogofilter_learn_not_junk;
+	iface->classify = bogofilter_classify;
+	iface->learn_junk = bogofilter_learn_junk;
+	iface->learn_not_junk = bogofilter_learn_not_junk;
 }
 
 static void
diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c
index d6f349257c..2c4f4110b5 100644
--- a/modules/cal-config-caldav/e-caldav-chooser.c
+++ b/modules/cal-config-caldav/e-caldav-chooser.c
@@ -95,7 +95,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_caldav_chooser_authenticator_init
-				(ESourceAuthenticatorInterface *interface);
+				(ESourceAuthenticatorInterface *iface);
 static void	caldav_chooser_get_collection_details
 				(SoupSession *session,
 				 SoupMessage *message,
@@ -1514,9 +1514,9 @@ e_caldav_chooser_class_finalize (ECaldavChooserClass *class)
 }
 
 static void
-e_caldav_chooser_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_caldav_chooser_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-	interface->try_password_sync = caldav_chooser_try_password_sync;
+	iface->try_password_sync = caldav_chooser_try_password_sync;
 }
 
 static void
diff --git a/modules/contact-photos/e-contact-photo-source.c b/modules/contact-photos/e-contact-photo-source.c
index ad27d05377..910bc12d3a 100644
--- a/modules/contact-photos/e-contact-photo-source.c
+++ b/modules/contact-photos/e-contact-photo-source.c
@@ -44,7 +44,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_contact_photo_source_interface_init
-					(EPhotoSourceInterface *interface);
+					(EPhotoSourceInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EContactPhotoSource,
@@ -415,10 +415,10 @@ e_contact_photo_source_class_finalize (EContactPhotoSourceClass *class)
 }
 
 static void
-e_contact_photo_source_interface_init (EPhotoSourceInterface *interface)
+e_contact_photo_source_interface_init (EPhotoSourceInterface *iface)
 {
-	interface->get_photo = contact_photo_source_get_photo;
-	interface->get_photo_finish = contact_photo_source_get_photo_finish;
+	iface->get_photo = contact_photo_source_get_photo;
+	iface->get_photo_finish = contact_photo_source_get_photo_finish;
 }
 
 static void
diff --git a/modules/gravatar/e-gravatar-photo-source.c b/modules/gravatar/e-gravatar-photo-source.c
index 8e3a5339f0..5ca4d2483e 100644
--- a/modules/gravatar/e-gravatar-photo-source.c
+++ b/modules/gravatar/e-gravatar-photo-source.c
@@ -35,7 +35,7 @@ struct _AsyncContext {
 
 /* Forward Declarations */
 static void	e_gravatar_photo_source_interface_init
-					(EPhotoSourceInterface *interface);
+					(EPhotoSourceInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EGravatarPhotoSource,
@@ -201,10 +201,10 @@ e_gravatar_photo_source_class_finalize (EGravatarPhotoSourceClass *class)
 }
 
 static void
-e_gravatar_photo_source_interface_init (EPhotoSourceInterface *interface)
+e_gravatar_photo_source_interface_init (EPhotoSourceInterface *iface)
 {
-	interface->get_photo = gravatar_photo_source_get_photo;
-	interface->get_photo_finish = gravatar_photo_source_get_photo_finish;
+	iface->get_photo = gravatar_photo_source_get_photo;
+	iface->get_photo_finish = gravatar_photo_source_get_photo_finish;
 }
 
 static void
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 47e2fb30cb..bd631f12f8 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -55,7 +55,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_shell_content_reader_init
-					(EMailReaderInterface *interface);
+					(EMailReaderInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailShellContent,
@@ -432,18 +432,18 @@ e_mail_shell_content_class_finalize (EMailShellContentClass *class)
 }
 
 static void
-e_mail_shell_content_reader_init (EMailReaderInterface *interface)
+e_mail_shell_content_reader_init (EMailReaderInterface *iface)
 {
-	interface->get_action_group = mail_shell_content_get_action_group;
-	interface->get_backend = mail_shell_content_get_backend;
-	interface->get_mail_display = mail_shell_content_get_mail_display;
-	interface->get_hide_deleted = mail_shell_content_get_hide_deleted;
-	interface->get_message_list = mail_shell_content_get_message_list;
-	interface->get_popup_menu = mail_shell_content_get_popup_menu;
-	interface->get_preview_pane = mail_shell_content_get_preview_pane;
-	interface->get_window = mail_shell_content_get_window;
-	interface->set_folder = mail_shell_content_set_folder;
-	interface->open_selected_mail = mail_shell_content_open_selected_mail;
+	iface->get_action_group = mail_shell_content_get_action_group;
+	iface->get_backend = mail_shell_content_get_backend;
+	iface->get_mail_display = mail_shell_content_get_mail_display;
+	iface->get_hide_deleted = mail_shell_content_get_hide_deleted;
+	iface->get_message_list = mail_shell_content_get_message_list;
+	iface->get_popup_menu = mail_shell_content_get_popup_menu;
+	iface->get_preview_pane = mail_shell_content_get_preview_pane;
+	iface->get_window = mail_shell_content_get_window;
+	iface->set_folder = mail_shell_content_set_folder;
+	iface->open_selected_mail = mail_shell_content_open_selected_mail;
 }
 
 static void
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 858d78eadb..868d056e80 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -61,7 +61,7 @@ void e_module_unload (GTypeModule *type_module);
 
 /* Forward Declarations */
 GType e_spam_assassin_get_type (void);
-static void e_spam_assassin_interface_init (CamelJunkFilterInterface *interface);
+static void e_spam_assassin_interface_init (CamelJunkFilterInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	ESpamAssassin,
@@ -575,12 +575,12 @@ e_spam_assassin_class_finalize (ESpamAssassinClass *class)
 }
 
 static void
-e_spam_assassin_interface_init (CamelJunkFilterInterface *interface)
+e_spam_assassin_interface_init (CamelJunkFilterInterface *iface)
 {
-	interface->classify = spam_assassin_classify;
-	interface->learn_junk = spam_assassin_learn_junk;
-	interface->learn_not_junk = spam_assassin_learn_not_junk;
-	interface->synchronize = spam_assassin_synchronize;
+	iface->classify = spam_assassin_classify;
+	iface->learn_junk = spam_assassin_learn_junk;
+	iface->learn_not_junk = spam_assassin_learn_not_junk;
+	iface->synchronize = spam_assassin_synchronize;
 }
 
 static void
diff --git a/modules/startup-wizard/e-mail-config-import-page.c b/modules/startup-wizard/e-mail-config-import-page.c
index bf3bc29a5f..61e5bb0c94 100644
--- a/modules/startup-wizard/e-mail-config-import-page.c
+++ b/modules/startup-wizard/e-mail-config-import-page.c
@@ -42,7 +42,7 @@ struct _AsyncContext {
 
 /* Forward Declarations */
 static void	e_mail_config_import_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 static gboolean	mail_config_import_page_next	(gpointer user_data);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
@@ -256,10 +256,10 @@ e_mail_config_import_page_class_finalize (EMailConfigImportPageClass *class)
 }
 
 static void
-e_mail_config_import_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_import_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Importing Files");
-	interface->sort_order = E_MAIL_CONFIG_IMPORT_PAGE_SORT_ORDER;
+	iface->title = _("Importing Files");
+	iface->sort_order = E_MAIL_CONFIG_IMPORT_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/modules/startup-wizard/e-mail-config-import-progress-page.c b/modules/startup-wizard/e-mail-config-import-progress-page.c
index 6dbc4b7f1c..5d96a16f20 100644
--- a/modules/startup-wizard/e-mail-config-import-progress-page.c
+++ b/modules/startup-wizard/e-mail-config-import-progress-page.c
@@ -38,7 +38,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_import_progress_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailConfigImportProgressPage,
@@ -333,14 +333,14 @@ e_mail_config_import_progress_page_class_finalize (EMailConfigImportProgressPage
 }
 
 static void
-e_mail_config_import_progress_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_import_progress_page_interface_init (EMailConfigPageInterface *iface)
 {
 	/* Keep the title identical to EMailConfigImportPage
 	 * so it's only shown once in the assistant sidebar. */
-	interface->title = _("Importing Files");
-	interface->sort_order = E_MAIL_CONFIG_IMPORT_PROGRESS_PAGE_SORT_ORDER;
-	interface->page_type = GTK_ASSISTANT_PAGE_PROGRESS;
-	interface->check_complete = mail_config_import_progress_page_check_complete;
+	iface->title = _("Importing Files");
+	iface->sort_order = E_MAIL_CONFIG_IMPORT_PROGRESS_PAGE_SORT_ORDER;
+	iface->page_type = GTK_ASSISTANT_PAGE_PROGRESS;
+	iface->check_complete = mail_config_import_progress_page_check_complete;
 }
 
 static void
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index de4a58d6c3..8509668b80 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -61,7 +61,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_shell_content_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShellContent,
@@ -481,9 +481,9 @@ e_shell_content_class_init (EShellContentClass *class)
 }
 
 static void
-e_shell_content_alert_sink_init (EAlertSinkInterface *interface)
+e_shell_content_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = shell_content_submit_alert;
+	iface->submit_alert = shell_content_submit_alert;
 }
 
 static void
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index 8afad7a533..268eaf3373 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -59,7 +59,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_shell_sidebar_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShellSidebar,
@@ -423,9 +423,9 @@ e_shell_sidebar_class_init (EShellSidebarClass *class)
 }
 
 static void
-e_shell_sidebar_alert_sink_init (EAlertSinkInterface *interface)
+e_shell_sidebar_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = shell_sidebar_submit_alert;
+	iface->submit_alert = shell_sidebar_submit_alert;
 }
 
 static void
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 845d21018f..69eef7d40f 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -55,7 +55,7 @@ static gulong signals[LAST_SIGNAL];
 
 /* Forward Declarations */
 static void	e_shell_window_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShellWindow,
@@ -1039,9 +1039,9 @@ e_shell_window_class_init (EShellWindowClass *class)
 }
 
 static void
-e_shell_window_alert_sink_init (EAlertSinkInterface *interface)
+e_shell_window_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = shell_window_submit_alert;
+	iface->submit_alert = shell_window_submit_alert;
 }
 
 static void
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 7c1893e12d..9f4c9ecc3f 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -103,7 +103,7 @@ static gpointer default_shell;
 static guint signals[LAST_SIGNAL];
 
 /* Forward Declarations */
-static void e_shell_initable_init (GInitableIface *interface);
+static void e_shell_initable_init (GInitableIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShell,
@@ -1132,9 +1132,9 @@ e_shell_class_init (EShellClass *class)
 }
 
 static void
-e_shell_initable_init (GInitableIface *interface)
+e_shell_initable_init (GInitableIface *iface)
 {
-	interface->init = shell_initable_init;
+	iface->init = shell_initable_init;
 }
 
 static void
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index 55f35f8858..fc00b58057 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -100,7 +100,7 @@ struct _ECertPrivate {
 
 /* Forward Declarations */
 static void	e_cert_gcr_certificate_init
-					(GcrCertificateIface *interface);
+					(GcrCertificateIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ECert,
@@ -191,9 +191,9 @@ e_cert_class_init (ECertClass *class)
 }
 
 static void
-e_cert_gcr_certificate_init (GcrCertificateIface *interface)
+e_cert_gcr_certificate_init (GcrCertificateIface *iface)
 {
-	interface->get_der_data = cert_get_der_data;
+	iface->get_der_data = cert_get_der_data;
 }
 
 static void