diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 5fa4a287e..a50ed5a9e 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -2183,33 +2183,33 @@ static struct ivi_layout_interface ivi_layout_interface = {
 	/**
 	 * surface controller interfaces
 	 */
-	.add_listener_create_surface	= ivi_layout_add_listener_create_surface,
-	.add_listener_remove_surface	= ivi_layout_add_listener_remove_surface,
-	.add_listener_configure_surface	= ivi_layout_add_listener_configure_surface,
-	.add_listener_configure_desktop_surface	= ivi_layout_add_listener_configure_desktop_surface,
+	.add_listener_create_surface			= ivi_layout_add_listener_create_surface,
+	.add_listener_remove_surface			= ivi_layout_add_listener_remove_surface,
+	.add_listener_configure_surface			= ivi_layout_add_listener_configure_surface,
+	.add_listener_configure_desktop_surface		= ivi_layout_add_listener_configure_desktop_surface,
 	.add_listener_desktop_surface_ping_timeout	= ivi_layout_add_listener_desktop_surface_ping_timeout,
-	.get_surface				= shell_get_ivi_layout_surface,
-	.get_surfaces				= ivi_layout_get_surfaces,
-	.get_id_of_surface			= ivi_layout_get_id_of_surface,
-	.get_surface_from_id			= ivi_layout_get_surface_from_id,
-	.get_properties_of_surface		= ivi_layout_get_properties_of_surface,
-	.get_surfaces_on_layer			= ivi_layout_get_surfaces_on_layer,
-	.surface_set_visibility			= ivi_layout_surface_set_visibility,
-	.surface_set_opacity			= ivi_layout_surface_set_opacity,
-	.surface_set_source_rectangle		= ivi_layout_surface_set_source_rectangle,
-	.surface_set_destination_rectangle	= ivi_layout_surface_set_destination_rectangle,
-	.surface_add_listener			= ivi_layout_surface_add_listener,
-	.surface_get_weston_surface		= ivi_layout_surface_get_weston_surface,
-	.surface_set_transition			= ivi_layout_surface_set_transition,
-	.surface_set_transition_duration	= ivi_layout_surface_set_transition_duration,
-	.surface_set_id				= ivi_layout_surface_set_id,
-	.surface_activate			= ivi_layout_surface_activate,
-	.surface_is_active			= ivi_layout_surface_is_active,
+	.get_surface					= shell_get_ivi_layout_surface,
+	.get_surfaces					= ivi_layout_get_surfaces,
+	.get_id_of_surface				= ivi_layout_get_id_of_surface,
+	.get_surface_from_id				= ivi_layout_get_surface_from_id,
+	.get_properties_of_surface			= ivi_layout_get_properties_of_surface,
+	.get_surfaces_on_layer				= ivi_layout_get_surfaces_on_layer,
+	.surface_set_visibility				= ivi_layout_surface_set_visibility,
+	.surface_set_opacity				= ivi_layout_surface_set_opacity,
+	.surface_set_source_rectangle			= ivi_layout_surface_set_source_rectangle,
+	.surface_set_destination_rectangle		= ivi_layout_surface_set_destination_rectangle,
+	.surface_add_listener				= ivi_layout_surface_add_listener,
+	.surface_get_weston_surface			= ivi_layout_surface_get_weston_surface,
+	.surface_set_transition				= ivi_layout_surface_set_transition,
+	.surface_set_transition_duration		= ivi_layout_surface_set_transition_duration,
+	.surface_set_id					= ivi_layout_surface_set_id,
+	.surface_activate				= ivi_layout_surface_activate,
+	.surface_is_active				= ivi_layout_surface_is_active,
 
 	/**
 	 * layer controller interfaces
 	 */
-	.add_listener_create_layer			= ivi_layout_add_listener_create_layer,
+	.add_listener_create_layer		= ivi_layout_add_listener_create_layer,
 	.add_listener_remove_layer		= ivi_layout_add_listener_remove_layer,
 	.layer_create_with_dimension		= ivi_layout_layer_create_with_dimension,
 	.layer_destroy				= ivi_layout_layer_destroy,