diff --git a/src/libtomahawk/playlist/albumproxymodel.cpp b/src/libtomahawk/playlist/albumproxymodel.cpp
index c3b3fe29c..f35aa9b26 100644
--- a/src/libtomahawk/playlist/albumproxymodel.cpp
+++ b/src/libtomahawk/playlist/albumproxymodel.cpp
@@ -38,7 +38,7 @@ AlbumProxyModel::AlbumProxyModel( QObject* parent )
     setSortCaseSensitivity( Qt::CaseInsensitive );
     setDynamicSortFilter( true );
 
-    setSourceModel( 0 );
+    setSourceAlbumModel( 0 );
 }
 
 void
diff --git a/src/libtomahawk/playlist/albumview.cpp b/src/libtomahawk/playlist/albumview.cpp
index 9f6ad1a57..351fd8ea2 100644
--- a/src/libtomahawk/playlist/albumview.cpp
+++ b/src/libtomahawk/playlist/albumview.cpp
@@ -87,7 +87,7 @@ AlbumView::setAlbumModel( AlbumModel* model )
 
     if ( m_proxyModel )
     {
-        m_proxyModel->setSourceModel( m_model );
+        m_proxyModel->setSourceAlbumModel( m_model );
         m_proxyModel->sort( 0 );
     }
 
diff --git a/src/libtomahawk/playlist/collectionview.cpp b/src/libtomahawk/playlist/collectionview.cpp
index ff538e3c1..6d93742f6 100644
--- a/src/libtomahawk/playlist/collectionview.cpp
+++ b/src/libtomahawk/playlist/collectionview.cpp
@@ -62,7 +62,7 @@ CollectionView::setModel( QAbstractItemModel* model )
 void
 CollectionView::setTrackModel( TrackModel* model )
 {
-    TrackView::setModel( model );
+    TrackView::setTrackModel( model );
     setGuid( "collectionview" );
 
     connect( model, SIGNAL( trackCountChanged( unsigned int ) ), SLOT( onTrackCountChanged( unsigned int ) ) );
diff --git a/src/libtomahawk/playlist/playlistmanager.cpp b/src/libtomahawk/playlist/playlistmanager.cpp
index 1fada1bc0..a1fec6071 100644
--- a/src/libtomahawk/playlist/playlistmanager.cpp
+++ b/src/libtomahawk/playlist/playlistmanager.cpp
@@ -89,7 +89,7 @@ PlaylistManager::PlaylistManager( QObject* parent )
 
     m_queueView = new QueueView( m_splitter );
     m_queueModel = new PlaylistModel( m_queueView );
-    m_queueView->queue()->setModel( m_queueModel );
+    m_queueView->queue()->setPlaylistModel( m_queueModel );
     AudioEngine::instance()->setQueue( m_queueView->queue()->proxyModel() );
 
     m_splitter->addWidget( m_queueView );
@@ -102,14 +102,14 @@ PlaylistManager::PlaylistManager( QObject* parent )
 
     m_superCollectionView = new CollectionView();
     m_superCollectionFlatModel = new CollectionFlatModel( m_superCollectionView );
-    m_superCollectionView->setModel( m_superCollectionFlatModel );
+    m_superCollectionView->setTrackModel( m_superCollectionFlatModel );
     m_superCollectionView->setFrameShape( QFrame::NoFrame );
     m_superCollectionView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
     m_superCollectionView->proxyModel()->setShowOfflineResults( false );
 
     m_superAlbumView = new AlbumView();
     m_superAlbumModel = new AlbumModel( m_superAlbumView );
-    m_superAlbumView->setModel( m_superAlbumModel );
+    m_superAlbumView->setAlbumModel( m_superAlbumModel );
     m_superAlbumView->setFrameShape( QFrame::NoFrame );
     m_superAlbumView->setAttribute( Qt::WA_MacShowFocusRect, 0 );
 
diff --git a/src/libtomahawk/playlist/playlistview.cpp b/src/libtomahawk/playlist/playlistview.cpp
index 0ba3373db..175d0705a 100644
--- a/src/libtomahawk/playlist/playlistview.cpp
+++ b/src/libtomahawk/playlist/playlistview.cpp
@@ -58,7 +58,7 @@ PlaylistView::setPlaylistModel( PlaylistModel* model )
 {
     m_model = model;
 
-    TrackView::setModel( m_model );
+    TrackView::setTrackModel( m_model );
     setColumnHidden( 5, true ); // Hide age column per default
 
     if ( !m_model->playlist().isNull() )
diff --git a/src/libtomahawk/playlist/trackproxymodel.cpp b/src/libtomahawk/playlist/trackproxymodel.cpp
index 2c11bcd6d..91283c7ad 100644
--- a/src/libtomahawk/playlist/trackproxymodel.cpp
+++ b/src/libtomahawk/playlist/trackproxymodel.cpp
@@ -40,7 +40,7 @@ TrackProxyModel::TrackProxyModel( QObject* parent )
     setSortCaseSensitivity( Qt::CaseInsensitive );
     setDynamicSortFilter( true );
 
-    setSourceModel( 0 );
+    setSourceTrackModel( 0 );
 }
 
 
diff --git a/src/libtomahawk/playlist/trackview.cpp b/src/libtomahawk/playlist/trackview.cpp
index ce1240b1b..4016382d8 100644
--- a/src/libtomahawk/playlist/trackview.cpp
+++ b/src/libtomahawk/playlist/trackview.cpp
@@ -124,7 +124,7 @@ TrackView::setTrackModel( TrackModel* model )
 
     if ( m_proxyModel )
     {
-        m_proxyModel->setSourceModel( m_model );
+        m_proxyModel->setSourceTrackModel( m_model );
     }
 
     connect( m_model, SIGNAL( itemSizeChanged( QModelIndex ) ), SLOT( onItemResized( QModelIndex ) ) );
diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp
index 55154e32f..5297710e5 100644
--- a/src/libtomahawk/widgets/welcomewidget.cpp
+++ b/src/libtomahawk/widgets/welcomewidget.cpp
@@ -47,7 +47,7 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
     ui->tracksView->overlay()->setEnabled( false );
 
     m_tracksModel = new PlaylistModel( ui->tracksView );
-    ui->tracksView->setModel( m_tracksModel );
+    ui->tracksView->setPlaylistModel( m_tracksModel );
     m_tracksModel->loadHistory( Tomahawk::source_ptr(), HISTORY_TRACK_ITEMS );
 
     m_timer = new QTimer( this );