diff --git a/src/libtomahawk/playlist/AlbumView.cpp b/src/libtomahawk/playlist/AlbumView.cpp
index 11b12d8af..963812375 100644
--- a/src/libtomahawk/playlist/AlbumView.cpp
+++ b/src/libtomahawk/playlist/AlbumView.cpp
@@ -74,7 +74,7 @@ AlbumView::AlbumView( QWidget* parent )
     setStyleSheet( "QListView { background-color: #323435; }" );
 
     setAutoFitItems( true );
-    setProxyModel( new AlbumProxyModel( this ) );
+    setProxyModel( new PlayableProxyModel( this ) );
 
 /*    m_overlay->setText( tr( "After you have scanned your music collection you will find your latest album additions right here." ) );
     m_overlay->setText( tr( "This collection doesn't have any recent albums." ) );*/
@@ -95,7 +95,7 @@ AlbumView::~AlbumView()
 
 
 void
-AlbumView::setProxyModel( AlbumProxyModel* model )
+AlbumView::setProxyModel( PlayableProxyModel* model )
 {
     m_proxyModel = model;
     m_delegate = new AlbumItemDelegate( this, m_proxyModel );
diff --git a/src/libtomahawk/playlist/AlbumView.h b/src/libtomahawk/playlist/AlbumView.h
index a1f256d8b..3ca7b8d46 100644
--- a/src/libtomahawk/playlist/AlbumView.h
+++ b/src/libtomahawk/playlist/AlbumView.h
@@ -25,7 +25,7 @@
 #include <QTimer>
 
 #include "ViewPage.h"
-#include "AlbumProxyModel.h"
+#include "PlayableProxyModel.h"
 #include "widgets/OverlayWidget.h"
 #include "DllMacro.h"
 
@@ -46,10 +46,10 @@ public:
     explicit AlbumView( QWidget* parent = 0 );
     ~AlbumView();
 
-    void setProxyModel( AlbumProxyModel* model );
+    void setProxyModel( PlayableProxyModel* model );
 
     PlayableModel* model() const { return m_model; }
-    AlbumProxyModel* proxyModel() const { return m_proxyModel; }
+    PlayableProxyModel* proxyModel() const { return m_proxyModel; }
 
     bool autoFitItems() const { return m_autoFitItems; }
     void setAutoFitItems( bool b ) { m_autoFitItems = b; }
@@ -92,7 +92,7 @@ private slots:
 
 private:
     PlayableModel* m_model;
-    AlbumProxyModel* m_proxyModel;
+    PlayableProxyModel* m_proxyModel;
     AlbumItemDelegate* m_delegate;
     AnimatedSpinner* m_loadingSpinner;
     OverlayWidget* m_overlay;