diff --git a/src/plugin.cpp b/src/plugin.cpp
index 15a0d62..8488880 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -1,78 +1,78 @@
 /***************************************************************************
  *   Copyright (C) 2017 by Emmanuel Lepage Vallee                          *
  *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@kde.org>             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 3 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  **************************************************************************/
 #include "plugin.h"
 
 #include <QtCore/QDebug>
 
 #include "adapters/decorationadapter.h"
 #include "adapters/scrollbaradapter.h"
 #include "adapters/geometryadapter.h"
 #include "views/hierarchyview.h"
 #include "views/listview.h"
 #include "views/treeview.h"
 #include "qmodelindexwatcher.h"
 #include "qmodelindexbinder.h"
 #include "views/comboboxview.h"
 #include "views/indexview.h"
 #include "flickablescrollbar.h"
 #include "delegatechoice.h"
 #include "delegatechooser.h"
 #include "proxies/sizehintproxymodel.h"
 
 // Strategies
 #include "strategies/justintime.h"
 #include "strategies/role.h"
 #include "strategies/proxy.h"
 
 
 void KQuickView::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.kde.playground.kquickview"));
 
     qmlRegisterType<HierarchyView>(uri, 1, 0, "HierarchyView");
     qmlRegisterType<TreeView>(uri, 1, 0, "TreeView");
     qmlRegisterType<ListView>(uri, 1, 0, "ListView");
     qmlRegisterType<IndexView>(uri, 1, 0, "IndexView");
     qmlRegisterType<ScrollBarAdapter>(uri, 1, 0, "ScrollBarAdapter");
     qmlRegisterType<GeometryAdapter>(uri, 1, 0, "GeometryAdapter");
     qmlRegisterType<DecorationAdapter>(uri, 1,0, "DecorationAdapter");
     qmlRegisterType<ComboBoxView>(uri, 1, 0, "ComboBoxView");
     qmlRegisterType<FlickableScrollBar>(uri, 1, 0, "FlickableScrollBar");
     qmlRegisterType<QModelIndexWatcher>(uri, 1, 0, "QModelIndexWatcher");
     qmlRegisterType<QModelIndexBinder>(uri, 1, 0, "QModelIndexBinder");
     qmlRegisterType<SizeHintProxyModel>(uri, 1, 0, "SizeHintProxyModel");
-    qmlRegisterType<SizeHintProxyModel>(uri, 1, 0, "DelegateChoice");
-    qmlRegisterType<SizeHintProxyModel>(uri, 1, 0, "DelegateChooser");
+    qmlRegisterType<DelegateChoice>(uri, 1, 0, "DelegateChoice");
+    qmlRegisterType<DelegateChooser>(uri, 1, 0, "DelegateChooser");
     qmlRegisterUncreatableType<ListViewSections>(uri, 1, 0, "ListViewSections", "");
 
     auto suri = QString(QString(uri) + QString(".Strategies")).toLatin1();
     qmlRegisterType<GeometryStrategies::JustInTime>(suri, 1, 0, "JustInTime");
     qmlRegisterType<GeometryStrategies::Role>(suri, 1, 0, "Role");
 
     // Alias
     qmlRegisterUncreatableType<QModelIndexBinder>(
         "org.kde.playground.kquickview", 1, 0, "RoleBinder",
         "Cannot create objects of type RoleBinder, use it as an attached poperty"
     );
 }
 
 void KQuickView::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     Q_UNUSED(engine)
     Q_UNUSED(uri)
 }