--- libunity-6.12.0/tools/music-track-model-renderer.vala~	2012-10-27 18:16:03.000000000 +0200
+++ libunity-6.12.0/tools/music-track-model-renderer.vala	2016-05-05 17:50:43.227260841 +0200
@@ -28,13 +28,13 @@
     private Dee.ModelTag<int> track_model_tag;
     private int row_counter = 0;
     private ulong model_sync_sig_id = 0;
-    public ListStore track_view_model { get; construct; }
+    public Gtk.ListStore track_view_model { get; construct; }
 
     public signal void track_list_synchronized();
 
     construct
     {
-        track_view_model = new ListStore(6, typeof(string), typeof(int), typeof(string), typeof(uint), typeof(uint), typeof(double));
+        track_view_model = new Gtk.ListStore(6, typeof(string), typeof(int), typeof(string), typeof(uint), typeof(uint), typeof(double));
     }
 
     public MusicTrackModelRenderer(string dbus_model)
--- libunity-6.12.0/tools/unity-tool-ui.vala~	2012-10-27 18:16:03.000000000 +0200
+++ libunity-6.12.0/tools/unity-tool-ui.vala	2016-05-05 17:50:39.393882489 +0200
@@ -40,8 +40,8 @@
             window.destroy.connect(Gtk.main_quit);
             window.show_all();
 
-            uimodel = builder.get_object("results_model") as ListStore;
-            ui_filter_model = builder.get_object("filters_model") as ListStore;
+            uimodel = builder.get_object("results_model") as Gtk.ListStore;
+            ui_filter_model = builder.get_object("filters_model") as Gtk.ListStore;
 
             notebook = builder.get_object("notebook") as Notebook;
             search_entry = builder.get_object("search_entry") as Entry;
@@ -154,7 +154,7 @@
             builder.add_from_resource("/com/canonical/Unity/unity-tool/dbus-lens-connect.ui");
             builder.connect_signals(this);
             lens_discovery_spinner = builder.get_object("lens_discovery_spinner") as Spinner;
-            lens_list_model = builder.get_object("lens_list_model") as ListStore;
+            lens_list_model = builder.get_object("lens_list_model") as Gtk.ListStore;
             lens_list_combobox = builder.get_object("lens_list_combobox") as ComboBox;
             dbus_name_entry = builder.get_object("dbus_name_entry") as Entry;
             dbus_path_entry = builder.get_object("dbus_path_entry") as Entry;
@@ -779,9 +779,9 @@
     private Gtk.Entry dbus_name_entry = null;
     private Gtk.Entry dbus_path_entry = null;
     private Gtk.ComboBox lens_list_combobox = null;
-    private ListStore uimodel = null;
-    private ListStore ui_filter_model = null;
-    private ListStore lens_list_model = null;
+    private Gtk.ListStore uimodel = null;
+    private Gtk.ListStore ui_filter_model = null;
+    private Gtk.ListStore lens_list_model = null;
     private ulong model_sync_sig_id;
     private ulong filters_model_sync_sig_id;
     private Dee.SharedModel? dee_results_model = null;