diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
index 2c36c30c63a506624c314070a0a4f90d4a393d60..8b94cfcb3337886ee68dbfdeddaf76d586395c93 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
@@ -133,7 +133,7 @@ void DragTool::beginWithPoint(const QPointF &beginPoint)
 
 }
 
-void DragTool::createQmlItemNode(const ItemLibraryInfo &itemLibraryRepresentation, QmlItemNode parentNode, QPointF scenePos)
+void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlItemNode parentNode, QPointF scenePos)
 {
     QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::hide();
 
@@ -142,7 +142,7 @@ void DragTool::createQmlItemNode(const ItemLibraryInfo &itemLibraryRepresentatio
     FormEditorItem *parentItem = scene()->itemForQmlItemNode(parentNode);
     QPointF pos = parentItem->mapFromScene(scenePos);
 
-    m_dragNode = view()->createQmlItemNode(itemLibraryRepresentation, pos, parentNode);
+    m_dragNode = view()->createQmlItemNode(itemLibraryEntry, pos, parentNode);
 
     Q_ASSERT(m_dragNode.modelNode().isValid());
     Q_ASSERT(m_dragNode.isValid());
@@ -238,14 +238,14 @@ void DragTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * event)
     }
 }
 
-static ItemLibraryInfo ItemLibraryInfoFromData(const QByteArray &data)
+static ItemLibraryEntry itemLibraryEntryFromData(const QByteArray &data)
 {
     QDataStream stream(data);
 
-    ItemLibraryInfo itemLibraryInfo;
-    stream >> itemLibraryInfo;
+    ItemLibraryEntry itemLibraryEntry;
+    stream >> itemLibraryEntry;
 
-    return itemLibraryInfo;
+    return itemLibraryEntry;
 }
 
 void DragTool::dragMoveEvent(QGraphicsSceneDragDropEvent * event)
@@ -277,8 +277,8 @@ void DragTool::dragMoveEvent(QGraphicsSceneDragDropEvent * event)
 
             if (event->mimeData()->hasFormat("application/vnd.bauhaus.itemlibraryinfo")) {
                 Q_ASSERT(!event->mimeData()->data("application/vnd.bauhaus.itemlibraryinfo").isEmpty());
-                ItemLibraryInfo ItemLibraryInfo = ItemLibraryInfoFromData(event->mimeData()->data("application/vnd.bauhaus.itemlibraryinfo"));
-                createQmlItemNode(ItemLibraryInfo, parentNode, event->scenePos());
+                ItemLibraryEntry itemLibraryEntry = itemLibraryEntryFromData(event->mimeData()->data("application/vnd.bauhaus.itemlibraryinfo"));
+                createQmlItemNode(itemLibraryEntry, parentNode, event->scenePos());
             } else if (event->mimeData()->hasFormat("application/vnd.bauhaus.libraryresource")) {
                 Q_ASSERT(!event->mimeData()->data("application/vnd.bauhaus.libraryresource").isEmpty());
                 QString imageName = QString::fromLatin1((event->mimeData()->data("application/vnd.bauhaus.libraryresource")));
diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.h b/src/plugins/qmldesigner/components/formeditor/dragtool.h
index 0e3ae6cd5daad1273e2b6d4dfe59e40cb8f884b4..b029085525e558a76c0be629813bb7db66b08b84 100644
--- a/src/plugins/qmldesigner/components/formeditor/dragtool.h
+++ b/src/plugins/qmldesigner/components/formeditor/dragtool.h
@@ -86,7 +86,7 @@ protected:
 
 private:
 
-    void createQmlItemNode(const ItemLibraryInfo &ItemLibraryRepresentation, QmlItemNode parentNode, QPointF scenePos);
+    void createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlItemNode parentNode, QPointF scenePos);
     void createQmlItemNodeFromImage(const QString &imageName, QmlItemNode parentNode, QPointF scenePos);
     FormEditorItem* calculateContainer(const QPointF &point, FormEditorItem * currentItem = 0);
 
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.h b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
index dcdbd2387bdd929ecbe6f2703a854fe0045b1eb9..1c7d787c35166a9e69ae17dbc8803e7f4236c0ad 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.h
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.h
@@ -51,7 +51,7 @@ class ResizeTool;
 class AnchorTool;
 class DragTool;
 class ItemCreatorTool;
-class ItemLibraryInfo;
+class ItemLibraryEntry;
 class QmlItemNode;
 
 class  FormEditorView : public QmlModelView
diff --git a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
index b6e6a0df291c25154c389ac5387f1b79d4ccc59a..6a1fb2f85b450002260802ae1362ec39273dfb98 100644
--- a/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/itemcreatortool.cpp
@@ -170,8 +170,8 @@ void ItemCreatorTool::createAtItem(const QRectF &rect)
         return;
     if (list.first() == "item") {
         RewriterTransaction transaction = view()->beginRewriterTransaction();
-        ItemLibraryInfo itemLibraryRepresentation = view()->model()->metaInfo().itemLibraryRepresentation(list.at(1));
-        QmlItemNode newNode = view()->createQmlItemNode(itemLibraryRepresentation, pos, parentNode);
+        ItemLibraryEntry itemLibraryEntry = view()->model()->metaInfo().itemLibraryEntry(list.at(1));
+        QmlItemNode newNode = view()->createQmlItemNode(itemLibraryEntry, pos, parentNode);
         newNode.modelNode().variantProperty("width") = rect.width();
         newNode.modelNode().variantProperty("height") = rect.height();
         QList<QmlItemNode> nodeList;
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
index e5803f011482e4fb1351a971cec26d75bbcfe94a..de0c1d531bceba77551f6410759b98852489684c 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.h
@@ -36,7 +36,7 @@ namespace QmlDesigner {
 
 class ItemLibraryPrivate;
 class MetaInfo;
-class ItemLibraryInfo;
+class ItemLibraryEntry;
 
 class ItemLibrary : public QFrame
 {
@@ -47,7 +47,7 @@ public:
     ItemLibrary(QWidget *parent = 0);
     virtual ~ItemLibrary();
 
-    void addItemLibraryInfo(const ItemLibraryInfo &ItemLibraryInfo);
+    void addItemLibraryEntry(const ItemLibraryEntry &itemLibraryEntry);
     void setMetaInfo(const MetaInfo &metaInfo);
 
 public Q_SLOTS:
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index 01f04206df05cd92ca2c3825feb02ada7bab94db..22f2a3e9718e745589889a6ae5444155692b4bfb 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -404,9 +404,9 @@ void ItemLibraryModel::update(const MetaInfo &metaInfo)
     }
 
     foreach (const QString &type, metaInfo.itemLibraryItems()) {
-        foreach (const ItemLibraryInfo &itemLibraryRepresentation, itemLibraryRepresentations(type)) {
+        foreach (const ItemLibraryEntry &itemLibraryEntry, itemLibraryEntrys(type)) {
 
-            QString itemSectionName = itemLibraryRepresentation.category();
+            QString itemSectionName = itemLibraryEntry.category();
             ItemLibrarySectionModel *sectionModel;
             ItemLibraryItemModel *itemModel;
             int itemId = m_nextLibId++, sectionId;
@@ -421,10 +421,10 @@ void ItemLibraryModel::update(const MetaInfo &metaInfo)
                 sections.insert(itemSectionName, sectionId);
             }
 
-            m_itemInfos.insert(itemId, itemLibraryRepresentation);
+            m_itemInfos.insert(itemId, itemLibraryEntry);
 
-            itemModel = new ItemLibraryItemModel(m_scriptEngine.data(), itemId, itemLibraryRepresentation.name());
-            itemModel->setItemIcon(itemLibraryRepresentation.icon());
+            itemModel = new ItemLibraryItemModel(m_scriptEngine.data(), itemId, itemLibraryEntry.name());
+            itemModel->setItemIcon(itemLibraryEntry.icon());
             itemModel->setItemIconSize(m_itemIconSize);
             sectionModel->addSectionEntry(itemModel);
             m_sections.insert(itemId, sectionId);
@@ -499,9 +499,9 @@ void ItemLibraryModel::updateVisibility()
         emit visibilityChanged();
 }
 
-static inline int getWidth(const ItemLibraryInfo &itemLibraryRepresentation)
+static inline int getWidth(const ItemLibraryEntry &itemLibraryEntry)
 {
-    foreach (const ItemLibraryInfo::Property &property, itemLibraryRepresentation.properties())
+    foreach (const ItemLibraryEntry::Property &property, itemLibraryEntry.properties())
     {
         if (property.name() == QLatin1String("width"))
             return property.value().toInt();
@@ -509,9 +509,9 @@ static inline int getWidth(const ItemLibraryInfo &itemLibraryRepresentation)
     return 64;
 }
 
-static inline int getHeight(const ItemLibraryInfo &itemLibraryRepresentation)
+static inline int getHeight(const ItemLibraryEntry &itemLibraryEntry)
 {
-    foreach (const ItemLibraryInfo::Property &property, itemLibraryRepresentation.properties())
+    foreach (const ItemLibraryEntry::Property &property, itemLibraryEntry.properties())
     {
         if (property.name() == QLatin1String("height"))
             return property.value().toInt();
@@ -531,51 +531,51 @@ static inline QPixmap createDragPixmap(int width, int height)
     return QPixmap::fromImage(dragImage);
 }
 
-QList<ItemLibraryInfo> ItemLibraryModel::itemLibraryRepresentations(const QString &type)
+QList<ItemLibraryEntry> ItemLibraryModel::itemLibraryEntrys(const QString &type)
 {
-    QList<ItemLibraryInfo> itemLibraryRepresentationList;
+    QList<ItemLibraryEntry> itemLibraryEntryList;
     NodeMetaInfo nodeInfo = m_metaInfo->nodeMetaInfo(type);
 
     if (nodeInfo.isQmlGraphicsItem()) {
-        itemLibraryRepresentationList = m_metaInfo->itemLibraryRepresentations(nodeInfo);
+        itemLibraryEntryList = m_metaInfo->itemLibraryEntrys(nodeInfo);
 
         if (!m_metaInfo->hasNodeMetaInfo(type))
             qWarning() << "ItemLibrary: type not declared: " << type;
 
         static QIcon defaultIcon(QLatin1String(":/ItemLibrary/images/item-default-icon.png"));
 
-        if (itemLibraryRepresentationList.isEmpty() || !m_metaInfo->hasNodeMetaInfo(type)) {
+        if (itemLibraryEntryList.isEmpty() || !m_metaInfo->hasNodeMetaInfo(type)) {
             QIcon icon = nodeInfo.icon();
             if (icon.isNull())
                 icon = defaultIcon;
 
-            ItemLibraryInfo itemLibraryInfo;
-            itemLibraryInfo.setName(type);
-            itemLibraryInfo.setTypeName(nodeInfo.typeName());
-            itemLibraryInfo.setCategory(nodeInfo.category());
-            itemLibraryInfo.setIcon(icon);
-            itemLibraryInfo.setDragIcon(createDragPixmap(64, 64));
-            itemLibraryInfo.setMajorVersion(nodeInfo.majorVersion());
-            itemLibraryInfo.setMinorVersion(nodeInfo.minorVersion());
-            itemLibraryRepresentationList.append(itemLibraryInfo);
+            ItemLibraryEntry itemLibraryEntry;
+            itemLibraryEntry.setName(type);
+            itemLibraryEntry.setTypeName(nodeInfo.typeName());
+            itemLibraryEntry.setCategory(nodeInfo.category());
+            itemLibraryEntry.setIcon(icon);
+            itemLibraryEntry.setDragIcon(createDragPixmap(64, 64));
+            itemLibraryEntry.setMajorVersion(nodeInfo.majorVersion());
+            itemLibraryEntry.setMinorVersion(nodeInfo.minorVersion());
+            itemLibraryEntryList.append(itemLibraryEntry);
         }
         else {
-            foreach (ItemLibraryInfo itemLibraryRepresentation, itemLibraryRepresentationList) {
+            foreach (ItemLibraryEntry itemLibraryEntry, itemLibraryEntryList) {
                 
-                QIcon icon = itemLibraryRepresentation.icon();
-                if (itemLibraryRepresentation.icon().isNull())
-                    itemLibraryRepresentation.setIcon(defaultIcon);
+                QIcon icon = itemLibraryEntry.icon();
+                if (itemLibraryEntry.icon().isNull())
+                    itemLibraryEntry.setIcon(defaultIcon);
 
-                if (itemLibraryRepresentation.dragIcon().isNull())
-                    itemLibraryRepresentation.setDragIcon(createDragPixmap(getWidth(itemLibraryRepresentation), getHeight(itemLibraryRepresentation)));
+                if (itemLibraryEntry.dragIcon().isNull())
+                    itemLibraryEntry.setDragIcon(createDragPixmap(getWidth(itemLibraryEntry), getHeight(itemLibraryEntry)));
 
-                if (itemLibraryRepresentation.category().isEmpty())
-                    itemLibraryRepresentation.setCategory(nodeInfo.category());
+                if (itemLibraryEntry.category().isEmpty())
+                    itemLibraryEntry.setCategory(nodeInfo.category());
             }
         }
     }
 
-    return itemLibraryRepresentationList;
+    return itemLibraryEntryList;
 }
 
 } // namespace Internal
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
index 5391d0d83a6077f4e02edaf75b85ab32c2a7665c..4e9d8ea333ada63a003545a80346e96f5c13e879 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h
@@ -41,7 +41,7 @@ QT_FORWARD_DECLARE_CLASS(QMimeData);
 namespace QmlDesigner {
 
 class MetaInfo;
-class ItemLibraryInfo;
+class ItemLibraryEntry;
 
 namespace Internal {
 
@@ -153,11 +153,11 @@ signals:
 
 private:
     void updateVisibility();
-    QList<ItemLibraryInfo> itemLibraryRepresentations(const QString &type);
+    QList<ItemLibraryEntry> itemLibraryEntrys(const QString &type);
 
     QWeakPointer<QScriptEngine> m_scriptEngine;
     MetaInfo *m_metaInfo;
-    QMap<int, ItemLibraryInfo> m_itemInfos;
+    QMap<int, ItemLibraryEntry> m_itemInfos;
     QMap<int, int> m_sections;
 
     QString m_searchText;
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
index 1fa3796d6b6533d0c7f4fb39b0714d6f36cd3304..8c65e0bade4ac58b1f80ff3f8380514c4bfd0b81 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreeview.cpp
@@ -171,8 +171,8 @@ void IdItemDelegate::paint(QPainter *painter,
         if (icon.isNull())
         {
             // if node has no own icon, search for it in the itemlibrary
-            QList <ItemLibraryInfo> InfoList = node.metaInfo().metaInfo().itemLibraryRepresentations(node.metaInfo());
-            foreach (const ItemLibraryInfo &entry, InfoList)
+            QList <ItemLibraryEntry> InfoList = node.metaInfo().metaInfo().itemLibraryEntrys(node.metaInfo());
+            foreach (const ItemLibraryEntry &entry, InfoList)
             {
                 if (entry.typeName()==node.metaInfo().typeName()) {
                     icon = entry.icon();
diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
index c82202426e4bc50eb3e40a055ff18b7bfdbf6c51..f086cbf1a801c885a6135e22cd98198b3a93c532 100644
--- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
+++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
@@ -27,8 +27,8 @@
 **
 **************************************************************************/
 
-#ifndef ItemLibraryINFO_H
-#define ItemLibraryINFO_H
+#ifndef ITEMLIBRARYINFO_H
+#define ITEMLIBRARYINFO_H
 
 #include "corelib_global.h"
 
@@ -45,23 +45,23 @@ class NodeMetaInfo;
 
 namespace Internal {
 
-class ItemLibraryInfoData;
+class ItemLibraryEntryData;
 }
 
-class ItemLibraryInfo;
+class ItemLibraryEntry;
 
-CORESHARED_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryInfo& ItemLibraryInfo);
-CORESHARED_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryInfo& ItemLibraryInfo);
+CORESHARED_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
+CORESHARED_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
 
-class CORESHARED_EXPORT ItemLibraryInfo
+class CORESHARED_EXPORT ItemLibraryEntry
 {
     friend class QmlDesigner::MetaInfo;
     friend class QmlDesigner::Internal::MetaInfoParser;
-    friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator<<(QDataStream& stream, const ItemLibraryInfo& image);
-    friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator>>(QDataStream& stream, ItemLibraryInfo& image);
+    friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
+    friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
 public:
-    ItemLibraryInfo();
-    ~ItemLibraryInfo();
+    ItemLibraryEntry();
+    ~ItemLibraryEntry();
 
     QString name() const;
     QString typeName() const;
@@ -72,8 +72,8 @@ public:
     QIcon dragIcon() const;
     QString qml() const;
 
-    ItemLibraryInfo(const ItemLibraryInfo &other);
-    ItemLibraryInfo& operator=(const ItemLibraryInfo &other);
+    ItemLibraryEntry(const ItemLibraryEntry &other);
+    ItemLibraryEntry& operator=(const ItemLibraryEntry &other);
 
     typedef QmlDesigner::PropertyContainer Property;
 
@@ -90,11 +90,11 @@ public:
     void setCategory(const QString &category);
     void setQml(const QString &qml);
 private:
-    QExplicitlySharedDataPointer<Internal::ItemLibraryInfoData> m_data;
+    QExplicitlySharedDataPointer<Internal::ItemLibraryEntryData> m_data;
 };
 
 }
 
-Q_DECLARE_METATYPE(QmlDesigner::ItemLibraryInfo)
+Q_DECLARE_METATYPE(QmlDesigner::ItemLibraryEntry)
 
-#endif // ItemLibraryINFO_H
+#endif // ITEMLIBRARYINFO_H
diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h
index f4c776ae9d1ca3499c14fe4ce15982144b561356..8ca1f71bd4529408de9eac4bbf9459c77c4cc73d 100644
--- a/src/plugins/qmldesigner/designercore/include/metainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/metainfo.h
@@ -83,8 +83,8 @@ public:
     EnumeratorMetaInfo enumerator(const QString &enumeratorName) const;
 
     QStringList itemLibraryItems() const;
-    QList<ItemLibraryInfo> itemLibraryRepresentations(const NodeMetaInfo &nodeMetaInfo) const;
-    ItemLibraryInfo itemLibraryRepresentation(const QString &name) const;
+    QList<ItemLibraryEntry> itemLibraryEntrys(const NodeMetaInfo &nodeMetaInfo) const;
+    ItemLibraryEntry itemLibraryEntry(const QString &name) const;
     QString fromQtTypes(const QString &type) const;
 
 public:
@@ -107,7 +107,7 @@ private:
 
     EnumeratorMetaInfo addEnumerator(const QString &enumeratorScope, const QString &enumeratorName);
     EnumeratorMetaInfo addFlag(const QString &enumeratorScope, const QString &enumeratorName);
-    ItemLibraryInfo addItemLibraryInfo(const NodeMetaInfo &nodeMetaInfo, const QString &itemLibraryRepresentationName);
+    ItemLibraryEntry addItemLibraryEntry(const NodeMetaInfo &nodeMetaInfo, const QString &itemLibraryEntryName);
 
     bool isGlobal() const;
 
diff --git a/src/plugins/qmldesigner/designercore/include/metainfoparser.h b/src/plugins/qmldesigner/designercore/include/metainfoparser.h
index 1b5e999871a25fb823a3fb305bfee34dedd053cb..1a0877713070d2d96abdbffe55d2d7a81a136825 100644
--- a/src/plugins/qmldesigner/designercore/include/metainfoparser.h
+++ b/src/plugins/qmldesigner/designercore/include/metainfoparser.h
@@ -40,7 +40,7 @@ namespace QmlDesigner {
 
 class NodeMetaInfo;
 class EnumeratorMetaInfo;
-class ItemLibraryInfo;
+class ItemLibraryEntry;
 
 namespace Internal {
 
@@ -63,10 +63,10 @@ protected:
     void handleFlagElementElement(QXmlStreamReader &reader, EnumeratorMetaInfo &enumeratorMetaInfo);
     void handleNodeElement(QXmlStreamReader &reader);
     void handleNodeInheritElement(QXmlStreamReader &reader, const QString &className);
-    void handleNodeItemLibraryRepresentationElement(QXmlStreamReader &reader, const QString &className);
+    void handleNodeItemLibraryEntryElement(QXmlStreamReader &reader, const QString &className);
     void handleAbstractPropertyElement(QXmlStreamReader &reader, NodeMetaInfo &nodeMetaInfo);
     void handleAbstractPropertyDefaultValueElement(QXmlStreamReader &reader, NodeMetaInfo &nodeMetaInfo);
-    void handleItemLibraryInfoPropertyElement(QXmlStreamReader &reader, ItemLibraryInfo &ItemLibraryInfo);
+    void handleItemLibraryEntryPropertyElement(QXmlStreamReader &reader, ItemLibraryEntry &itemLibraryEntry);
 
 private:
     MetaInfo m_metaInfo;
diff --git a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
index 17a740119df1c64e306942de5cd07616bc4dc0b8..f8bb982cca64ede0d4a6b1dde7179b2d1e2433ee 100644
--- a/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
+++ b/src/plugins/qmldesigner/designercore/include/nodemetainfo.h
@@ -52,7 +52,7 @@ namespace Internal {
     class MetaInfoParser;
     class NodeMetaInfoData;
     class SubComponentManagerPrivate;
-    class ItemLibraryInfoData;
+    class ItemLibraryEntryData;
 }
 
 class PropertyMetaInfo;
@@ -60,7 +60,7 @@ class PropertyMetaInfo;
 class CORESHARED_EXPORT NodeMetaInfo
 {
     friend class QmlDesigner::MetaInfo;
-    friend class QmlDesigner::Internal::ItemLibraryInfoData;
+    friend class QmlDesigner::Internal::ItemLibraryEntryData;
     friend class QmlDesigner::Internal::MetaInfoPrivate;
     friend class QmlDesigner::Internal::MetaInfoParser;
     friend class QmlDesigner::Internal::SubComponentManagerPrivate;
diff --git a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
index 8406b7f03decc6739ea228041939c92a7bf1b1eb..f48f76fc31f53eb1214428b542faa85bdabd976e 100644
--- a/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
+++ b/src/plugins/qmldesigner/designercore/include/qmlmodelview.h
@@ -40,7 +40,7 @@
 
 namespace QmlDesigner {
 
-class ItemLibraryInfo;
+class ItemLibraryEntry;
 
 class CORESHARED_EXPORT QmlModelView : public ForwardView<NodeInstanceView>
 {
@@ -66,7 +66,7 @@ public:
                                     int minorVersion,
                                     const PropertyListType &propertyList = PropertyListType());
 
-    QmlItemNode createQmlItemNode(const ItemLibraryInfo &ItemLibraryRepresentation, const QPointF &position, QmlItemNode parentNode);
+    QmlItemNode createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, const QPointF &position, QmlItemNode parentNode);
     QmlItemNode createQmlItemNodeFromImage(const QString &imageName, const QPointF &position, QmlItemNode parentNode);
 
     QmlObjectNode rootQmlObjectNode() const;
diff --git a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
index 988096933fbf9f7e223fb0ac16354b129015b9db..837f5d489badc5137880d5698e3f6a0063a4e961 100644
--- a/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
+++ b/src/plugins/qmldesigner/designercore/include/subcomponentmanager.h
@@ -54,8 +54,6 @@ public:
     QStringList qmlFiles() const;
     QStringList directories() const;
 
-signals:
-    void qmlFilesChanged(const QStringList &oldPathList, const QStringList &newPathList);
 
 private:
     friend class Internal::SubComponentManagerPrivate;
diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
index 2a780de6ffa86c33f29aa34959d5625f897553e0..21d6335979f8ccf69d3a80407c80a615ed0903bf 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
@@ -40,10 +40,10 @@ namespace QmlDesigner {
 
 namespace Internal {
 
-class ItemLibraryInfoData : public QSharedData
+class ItemLibraryEntryData : public QSharedData
 {
 public:
-    ItemLibraryInfoData() : majorVersion(-1), minorVersion(-1)
+    ItemLibraryEntryData() : majorVersion(-1), minorVersion(-1)
     { }
     QString name;
     QString typeName;
@@ -57,12 +57,12 @@ public:
 };
 }
 
-ItemLibraryInfo::ItemLibraryInfo(const ItemLibraryInfo &other)
+ItemLibraryEntry::ItemLibraryEntry(const ItemLibraryEntry &other)
     : m_data(other.m_data)
 {
 }
 
-ItemLibraryInfo& ItemLibraryInfo::operator=(const ItemLibraryInfo &other)
+ItemLibraryEntry& ItemLibraryEntry::operator=(const ItemLibraryEntry &other)
 {
     if (this !=&other)
         m_data = other.m_data;
@@ -70,136 +70,136 @@ ItemLibraryInfo& ItemLibraryInfo::operator=(const ItemLibraryInfo &other)
     return *this;
 }
 
-void ItemLibraryInfo::setDragIcon(const QIcon &icon)
+void ItemLibraryEntry::setDragIcon(const QIcon &icon)
 {
     m_data->dragIcon = icon;
 }
 
-QIcon ItemLibraryInfo::dragIcon() const
+QIcon ItemLibraryEntry::dragIcon() const
 {
     return m_data->dragIcon;
 }
 
-void ItemLibraryInfo::addProperty(const Property &property)
+void ItemLibraryEntry::addProperty(const Property &property)
 {
     m_data->properties.append(property);
 }
 
-QList<ItemLibraryInfo::Property> ItemLibraryInfo::properties() const
+QList<ItemLibraryEntry::Property> ItemLibraryEntry::properties() const
 {
     return m_data->properties;
 }
 
-ItemLibraryInfo::ItemLibraryInfo() : m_data(new Internal::ItemLibraryInfoData)
+ItemLibraryEntry::ItemLibraryEntry() : m_data(new Internal::ItemLibraryEntryData)
 {
     m_data->name.clear();
 }
 
-ItemLibraryInfo::~ItemLibraryInfo()
+ItemLibraryEntry::~ItemLibraryEntry()
 {
 }
 
-QString ItemLibraryInfo::name() const
+QString ItemLibraryEntry::name() const
 {
     return m_data->name;
 }
 
-QString ItemLibraryInfo::typeName() const
+QString ItemLibraryEntry::typeName() const
 {
     return m_data->typeName;
 }
 
-QString ItemLibraryInfo::qml() const
+QString ItemLibraryEntry::qml() const
 {
     return m_data->qml;
 }
 
-int ItemLibraryInfo::majorVersion() const
+int ItemLibraryEntry::majorVersion() const
 {
     return m_data->majorVersion;
 }
 
-int ItemLibraryInfo::minorVersion() const
+int ItemLibraryEntry::minorVersion() const
 {
     return m_data->minorVersion;
 }
 
-QString ItemLibraryInfo::category() const
+QString ItemLibraryEntry::category() const
 {
     return m_data->category;
 }
 
-void ItemLibraryInfo::setCategory(const QString &category)
+void ItemLibraryEntry::setCategory(const QString &category)
 {
     m_data->category = category;
 }
 
-QIcon ItemLibraryInfo::icon() const
+QIcon ItemLibraryEntry::icon() const
 {
     return m_data->icon;
 }
 
-void ItemLibraryInfo::setName(const QString &name)
+void ItemLibraryEntry::setName(const QString &name)
 {
      m_data->name = name;
 }
 
-void ItemLibraryInfo::setTypeName(const QString &typeName)
+void ItemLibraryEntry::setTypeName(const QString &typeName)
 {
     m_data->typeName = typeName;
 }
 
-void ItemLibraryInfo::setIcon(const QIcon &icon)
+void ItemLibraryEntry::setIcon(const QIcon &icon)
 {
     m_data->icon = icon;
 }
 
-void ItemLibraryInfo::setMajorVersion(int majorVersion)
+void ItemLibraryEntry::setMajorVersion(int majorVersion)
 {
     m_data->majorVersion = majorVersion;
 }
 
-void ItemLibraryInfo::setMinorVersion(int minorVersion)
+void ItemLibraryEntry::setMinorVersion(int minorVersion)
 {
      m_data->minorVersion = minorVersion;
 }
 
-void ItemLibraryInfo::setQml(const QString &qml)
+void ItemLibraryEntry::setQml(const QString &qml)
 {
     m_data->qml = qml;
 }
 
-void ItemLibraryInfo::addProperty(QString &name, QString &type, QString &value)
+void ItemLibraryEntry::addProperty(QString &name, QString &type, QString &value)
 {
     Property property;
     property.set(name, type, value);
     addProperty(property);
 }
 
-QDataStream& operator<<(QDataStream& stream, const ItemLibraryInfo& itemLibraryInfo)
+QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry)
 {
-    stream << itemLibraryInfo.name();
-    stream << itemLibraryInfo.typeName();
-    stream << itemLibraryInfo.majorVersion();
-    stream << itemLibraryInfo.minorVersion();
-    stream << itemLibraryInfo.icon();
-    stream << itemLibraryInfo.category();
-    stream << itemLibraryInfo.dragIcon();
-    stream << itemLibraryInfo.m_data->properties;
+    stream << itemLibraryEntry.name();
+    stream << itemLibraryEntry.typeName();
+    stream << itemLibraryEntry.majorVersion();
+    stream << itemLibraryEntry.minorVersion();
+    stream << itemLibraryEntry.icon();
+    stream << itemLibraryEntry.category();
+    stream << itemLibraryEntry.dragIcon();
+    stream << itemLibraryEntry.m_data->properties;
 
     return stream;
 }
 
-QDataStream& operator>>(QDataStream& stream, ItemLibraryInfo& itemLibraryInfo)
+QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry)
 {
-    stream >> itemLibraryInfo.m_data->name;
-    stream >> itemLibraryInfo.m_data->typeName;
-    stream >> itemLibraryInfo.m_data->majorVersion;
-    stream >> itemLibraryInfo.m_data->minorVersion;
-    stream >> itemLibraryInfo.m_data->icon;
-    stream >> itemLibraryInfo.m_data->category;
-    stream >> itemLibraryInfo.m_data->dragIcon;
-    stream >> itemLibraryInfo.m_data->properties;
+    stream >> itemLibraryEntry.m_data->name;
+    stream >> itemLibraryEntry.m_data->typeName;
+    stream >> itemLibraryEntry.m_data->majorVersion;
+    stream >> itemLibraryEntry.m_data->minorVersion;
+    stream >> itemLibraryEntry.m_data->icon;
+    stream >> itemLibraryEntry.m_data->category;
+    stream >> itemLibraryEntry.m_data->dragIcon;
+    stream >> itemLibraryEntry.m_data->properties;
 
     return stream;
 }
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
index b4ba27e26053c29a43cebf0c7221fcd131751b3e..ad62f2838ac7fdbe504f59f4e20aeca17a565c4b 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
@@ -82,8 +82,8 @@ public:
     QMultiHash<QString, QString> m_superClassHash; // the list of direct superclasses
     QHash<QString, NodeMetaInfo> m_nodeMetaInfoHash;
     QHash<QString, EnumeratorMetaInfo> m_enumeratorMetaInfoHash;
-    QMultiHash<NodeMetaInfo, ItemLibraryInfo> m_itemLibraryInfoHash;
-    QHash<QString, ItemLibraryInfo> m_itemLibraryInfoHashAll;
+    QMultiHash<NodeMetaInfo, ItemLibraryEntry> m_itemLibraryInfoHash;
+    QHash<QString, ItemLibraryEntry> m_itemLibraryInfoHashAll;
     QHash<QString, QString> m_QtTypesToQmlTypes;
 
     MetaInfo *m_q;
@@ -484,21 +484,21 @@ QList<NodeMetaInfo> MetaInfo::directSuperClasses(const NodeMetaInfo &nodeInfo) c
     return superClassList;
 }
 
-QList<ItemLibraryInfo> MetaInfo::itemLibraryRepresentations(const NodeMetaInfo &nodeMetaInfo) const
+QList<ItemLibraryEntry> MetaInfo::itemLibraryEntrys(const NodeMetaInfo &nodeMetaInfo) const
 {
-    QList<ItemLibraryInfo> itemLibraryItems = m_p->m_itemLibraryInfoHash.values(nodeMetaInfo);
+    QList<ItemLibraryEntry> itemLibraryItems = m_p->m_itemLibraryInfoHash.values(nodeMetaInfo);
     if (!isGlobal())
-        itemLibraryItems += global().itemLibraryRepresentations(nodeMetaInfo);
+        itemLibraryItems += global().itemLibraryEntrys(nodeMetaInfo);
     return itemLibraryItems;
 }
 
-ItemLibraryInfo MetaInfo::itemLibraryRepresentation(const QString &name) const
+ItemLibraryEntry MetaInfo::itemLibraryEntry(const QString &name) const
 {
     if (m_p->m_itemLibraryInfoHashAll.contains(name))
         return m_p->m_itemLibraryInfoHashAll.value(name);
     if (!isGlobal())
-        return global().itemLibraryRepresentation(name);
-    return ItemLibraryInfo();
+        return global().itemLibraryEntry(name);
+    return ItemLibraryEntry();
 }
 
 QString MetaInfo::fromQtTypes(const QString &type) const
@@ -680,16 +680,16 @@ EnumeratorMetaInfo MetaInfo::addFlag(const QString &enumeratorScope, const QStri
     return enumeratorMetaInfo;
 }
 
-ItemLibraryInfo MetaInfo::addItemLibraryInfo(const NodeMetaInfo &nodeMetaInfo, const QString &itemLibraryRepresentationName)
+ItemLibraryEntry MetaInfo::addItemLibraryEntry(const NodeMetaInfo &nodeMetaInfo, const QString &itemLibraryEntryName)
 {
-    ItemLibraryInfo itemLibraryInfo;
-    itemLibraryInfo.setName(itemLibraryRepresentationName);
-    itemLibraryInfo.setTypeName(nodeMetaInfo.typeName());
-    itemLibraryInfo.setMajorVersion(nodeMetaInfo.majorVersion());
-    itemLibraryInfo.setMinorVersion(nodeMetaInfo.minorVersion());
-    m_p->m_itemLibraryInfoHash.insert(nodeMetaInfo, itemLibraryInfo);
-    m_p->m_itemLibraryInfoHashAll.insert(itemLibraryRepresentationName, itemLibraryInfo);
-    return itemLibraryInfo;
+    ItemLibraryEntry itemLibraryEntry;
+    itemLibraryEntry.setName(itemLibraryEntryName);
+    itemLibraryEntry.setTypeName(nodeMetaInfo.typeName());
+    itemLibraryEntry.setMajorVersion(nodeMetaInfo.majorVersion());
+    itemLibraryEntry.setMinorVersion(nodeMetaInfo.minorVersion());
+    m_p->m_itemLibraryInfoHash.insert(nodeMetaInfo, itemLibraryEntry);
+    m_p->m_itemLibraryInfoHashAll.insert(itemLibraryEntryName, itemLibraryEntry);
+    return itemLibraryEntry;
 }
 
 bool MetaInfo::isGlobal() const
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
index 99dd5c90229a4378e53cea2323522ba576758ce4..97ac37f9e6e6b5bdf425461374e159bacc93527e 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
@@ -200,29 +200,29 @@ void MetaInfoParser::handleNodeElement(QXmlStreamReader &reader)
         handleNodeInheritElement(reader, className);
         handleAbstractPropertyElement(reader, nodeMetaInfo);
         handleAbstractPropertyDefaultValueElement(reader, nodeMetaInfo);
-        handleNodeItemLibraryRepresentationElement(reader, className);
+        handleNodeItemLibraryEntryElement(reader, className);
     }
 }
 
-void MetaInfoParser::handleNodeItemLibraryRepresentationElement(QXmlStreamReader &reader, const QString & className)
+void MetaInfoParser::handleNodeItemLibraryEntryElement(QXmlStreamReader &reader, const QString & className)
 {
-    if (reader.isStartElement() && reader.name() == "itemlibraryrepresentation")
+    if (reader.isStartElement() && reader.name() == "itemlibraryentry")
     {
         QString name = reader.attributes().value("name").toString();
-        ItemLibraryInfo ItemLibraryInfo = m_metaInfo.addItemLibraryInfo(m_metaInfo.nodeMetaInfo(className), name);
+        ItemLibraryEntry itemLibraryEntry = m_metaInfo.addItemLibraryEntry(m_metaInfo.nodeMetaInfo(className), name);
 
         QString iconPath = reader.attributes().value("icon").toString();
         if (!iconPath.isEmpty())
-            ItemLibraryInfo.setIcon(QIcon(iconPath));
+            itemLibraryEntry.setIcon(QIcon(iconPath));
 
-        while (!reader.atEnd() && !(reader.isEndElement() && reader.name() == "itemlibraryrepresentation")) {
+        while (!reader.atEnd() && !(reader.isEndElement() && reader.name() == "itemlibraryentry")) {
             reader.readNext();
-            handleItemLibraryInfoPropertyElement(reader, ItemLibraryInfo);
+            handleItemLibraryEntryPropertyElement(reader, itemLibraryEntry);
         }
     }
 }
 
-void MetaInfoParser::handleNodeInheritElement(QXmlStreamReader &reader, const QString & className)
+void MetaInfoParser::handleNodeInheritElement(QXmlStreamReader &reader, const QString &className)
 {
     if (reader.isStartElement() && reader.name() == "inherits")
     {
@@ -233,7 +233,7 @@ void MetaInfoParser::handleNodeInheritElement(QXmlStreamReader &reader, const QS
     }
 }
 
-void MetaInfoParser::handleItemLibraryInfoPropertyElement(QXmlStreamReader &reader, ItemLibraryInfo &ItemLibraryInfo)
+void MetaInfoParser::handleItemLibraryEntryPropertyElement(QXmlStreamReader &reader, ItemLibraryEntry &itemLibraryEntry)
 {
     if (reader.isStartElement() && reader.name() == "property")
     {
@@ -241,7 +241,7 @@ void MetaInfoParser::handleItemLibraryInfoPropertyElement(QXmlStreamReader &read
         QString name = attributes.value("name").toString();
         QString type = attributes.value("type").toString();
         QString value = attributes.value("value").toString();
-        ItemLibraryInfo.addProperty(name, type, value);
+        itemLibraryEntry.addProperty(name, type, value);
 
         reader.readNext();
     }
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index d5e7ad2cb5d5cfe2b8e4164d4538029cc07eb317..cd7d8892a089d377b4b210e55d5a7baca2f92dbb 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -306,7 +306,7 @@ void SubComponentManagerPrivate::registerQmlFile(const QFileInfo &fileInfo, cons
     nodeInfo.setCategory(tr("QML Components"));
     nodeInfo.setIsVisibleToItemLibrary(true);
 
-    m_metaInfo.addItemLibraryInfo(nodeInfo, componentName);
+    m_metaInfo.addItemLibraryEntry(nodeInfo, componentName);
     m_metaInfo.addNodeInfo(nodeInfo, baseType);
 
     foreach (const QDeclarativeDomDynamicProperty &dynamicProperty, document.rootObject().dynamicProperties()) {
diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
index 08fa7bb6d25af9d3c8321fcc13acb807d6a1ba54..01c6d2eec178049e1e44408d707b0bc40ec533b6 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
@@ -133,7 +133,7 @@ QmlItemNode QmlModelView::createQmlItemNodeFromImage(const QString &imageName, c
     return newNode;
 }
 
-QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryInfo &itemLibraryRepresentation, const QPointF &position, QmlItemNode parentNode)
+QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, const QPointF &position, QmlItemNode parentNode)
 {
     if (!parentNode.isValid())
         parentNode = rootQmlItemNode();
@@ -148,17 +148,17 @@ QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryInfo &itemLibraryRe
         propertyPairList.append(qMakePair(QString("x"), QVariant(round(position.x(), 4))));
         propertyPairList.append(qMakePair(QString("y"), QVariant(round(position.y(), 4))));
 
-        foreach (const PropertyContainer &property, itemLibraryRepresentation.properties())
+        foreach (const PropertyContainer &property, itemLibraryEntry.properties())
             propertyPairList.append(qMakePair(property.name(), property.value()));
 
-        newNode = createQmlItemNode(itemLibraryRepresentation.typeName(), itemLibraryRepresentation.majorVersion(), itemLibraryRepresentation.minorVersion(), propertyPairList);
+        newNode = createQmlItemNode(itemLibraryEntry.typeName(), itemLibraryEntry.majorVersion(), itemLibraryEntry.minorVersion(), propertyPairList);
         parentNode.nodeAbstractProperty("data").reparentHere(newNode);
 
         Q_ASSERT(newNode.isValid());
 
         QString id;
         int i = 1;
-        QString name(itemLibraryRepresentation.name().toLower());
+        QString name(itemLibraryEntry.name().toLower());
         name.remove(QLatin1Char(' '));
         do {
             id = name + QString::number(i);
diff --git a/src/plugins/qmldesigner/fxplugin/fx.metainfo b/src/plugins/qmldesigner/fxplugin/fx.metainfo
index 4d63e62eb862b31b256febf0f602b6b7ce4752fd..3cf9d922a4a5e79bc422a6db31b00bbfc2954220 100644
--- a/src/plugins/qmldesigner/fxplugin/fx.metainfo
+++ b/src/plugins/qmldesigner/fxplugin/fx.metainfo
@@ -2,123 +2,123 @@
   <node name="Qt/Item" showInItemLibrary="true" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/item-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="600"/>
     <propertyDefaultValue name="height" type="int" defaultValue="400"/>
-    <itemlibraryrepresentation name="Item" icon=":/fxplugin/images/item-icon.png">
+    <itemlibraryentry name="Item" icon=":/fxplugin/images/item-icon.png">
       <property name="width" type="int" value="200"/>
       <property name="height" type="int" value="200"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/Rectangle" showInItemLibrary="true" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/rect-icon16.png">
-    <itemlibraryrepresentation name="Rectangle" icon=":/fxplugin/images/rect-icon.png">
+    <itemlibraryentry name="Rectangle" icon=":/fxplugin/images/rect-icon.png">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="100"/>
       <property name="color" type="QColor" value="#ffffff"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/Text" showInItemLibrary="true" category="Qt - Basic" icon=":/fxplugin/images/text-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="80"/>
     <propertyDefaultValue name="height" type="int" defaultValue="20"/>
-    <itemlibraryrepresentation name="Text" icon=":/fxplugin/images/text-icon.png">
+    <itemlibraryentry name="Text" icon=":/fxplugin/images/text-icon.png">
       <property name="width" type="int" value="80"/>
       <property name="height" type="int" value="20"/>
       <property name="text" type="QString" value="text"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/TextEdit" showInItemLibrary="true" category="Qt - Basic" isContainer="false" icon=":/fxplugin/images/text-edit-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="80"/>
     <propertyDefaultValue name="height" type="int" defaultValue="20"/>
-    <itemlibraryrepresentation name="Text Edit" icon=":/fxplugin/images/text-edit-icon.png">
+    <itemlibraryentry name="Text Edit" icon=":/fxplugin/images/text-edit-icon.png">
       <property name="width" type="int" value="80"/>
       <property name="height" type="int" value="20"/>
       <property name="text" type="QString" value="textEdit"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/TextInput" showInItemLibrary="true" category="Qt - Basic" isContainer="false" icon=":/fxplugin/images/text-input-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="80"/>
     <propertyDefaultValue name="height" type="int" defaultValue="20"/>
-    <itemlibraryrepresentation name="Text Input" icon=":/fxplugin/images/text-input-icon.png">
+    <itemlibraryentry name="Text Input" icon=":/fxplugin/images/text-input-icon.png">
       <property name="width" type="int" value="80"/>
       <property name="height" type="int" value="20"/>
       <property name="text" type="QString" value="textInput"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/MouseArea" showInItemLibrary="true" category="Qt - Interaction" icon=":/fxplugin/images/mouse-area-icon16.png">
     <inherits name="Item" />
-    <itemlibraryrepresentation name="Mouse Area" icon=":/fxplugin/images/mouse-area-icon.png">
+    <itemlibraryentry name="Mouse Area" icon=":/fxplugin/images/mouse-area-icon.png">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="100"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/Image" showInItemLibrary="true" category="Qt - Basic" isContainer="true" icon=":/fxplugin/images/image-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="200"/>
     <propertyDefaultValue name="height" type="int" defaultValue="200"/>
-    <itemlibraryrepresentation name="Image" icon=":/fxplugin/images/image-icon.png">
+    <itemlibraryentry name="Image" icon=":/fxplugin/images/image-icon.png">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="100"/>
       <property name="source" type="QUrl" value="qrc:/fxplugin/images/template_image.png"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/BorderImage" showInItemLibrary="true" category="Qt - Basic" icon=":/fxplugin/images/border-image-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="200"/>
     <propertyDefaultValue name="height" type="int" defaultValue="200"/>
-    <itemlibraryrepresentation name="Border Image" icon=":/fxplugin/images/border-image-icon.png">
+    <itemlibraryentry name="Border Image" icon=":/fxplugin/images/border-image-icon.png">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="100"/>
       <property name="source" type="QUrl" value="qrc:/fxplugin/images/template_image.png"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/Flickable" showInItemLibrary="true" category="Qt - Widgets" icon=":/fxplugin/images/flickable-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="300"/>
     <propertyDefaultValue name="height" type="int" defaultValue="300"/>
-    <itemlibraryrepresentation name="Flickable" icon=":/fxplugin/images/flickable-icon.png">
+    <itemlibraryentry name="Flickable" icon=":/fxplugin/images/flickable-icon.png">
       <property name="width" type="int" value="300"/>
       <property name="height" type="int" value="300"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/Flipable" showInItemLibrary="true" category="Qt - Widgets" icon=":/fxplugin/images/flipable-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="300"/>
     <propertyDefaultValue name="height" type="int" defaultValue="300"/>
-    <itemlibraryrepresentation name="Flipable" icon=":/fxplugin/images/flipable-icon.png">
+    <itemlibraryentry name="Flipable" icon=":/fxplugin/images/flipable-icon.png">
       <property name="width" type="int" value="300"/>
       <property name="height" type="int" value="300"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
   <node name="Qt/GridView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/gridview-icon16.png">
-    <itemlibraryrepresentation name="Grid View" icon=":/fxplugin/images/gridview-icon.png">
+    <itemlibraryentry name="Grid View" icon=":/fxplugin/images/gridview-icon.png">
       <property name="width" type="int" value="300"/>
       <property name="height" type="int" value="300"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
 
   <node name="Qt/ListView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/listview-icon16.png">
-    <itemlibraryrepresentation name="List View" icon=":/fxplugin/images/listview-icon.png">
+    <itemlibraryentry name="List View" icon=":/fxplugin/images/listview-icon.png">
       <property name="width" type="int" value="300"/>
       <property name="height" type="int" value="300"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
 
   <node name="Qt/PathView" showInItemLibrary="true" category="Qt - Views" icon=":/fxplugin/images/pathview-icon16.png">
-    <itemlibraryrepresentation name="Path View" icon=":/fxplugin/images/pathview-icon.png">
+    <itemlibraryentry name="Path View" icon=":/fxplugin/images/pathview-icon.png">
       <property name="width" type="int" value="300"/>
       <property name="height" type="int" value="300"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
 
   <node name="Qt/FocusScope" showInItemLibrary="true" category="Qt - Interaction" icon=":/fxplugin/images/focusscope-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="100"/>
     <propertyDefaultValue name="height" type="int" defaultValue="100"/>
-    <itemlibraryrepresentation name="Focus Scope" icon=":/fxplugin/images/focusscope-icon.png">
+    <itemlibraryentry name="Focus Scope" icon=":/fxplugin/images/focusscope-icon.png">
       <property name="width" type="int" value="100"/>
       <property name="height" type="int" value="100"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
 
   <node name="Qt/WebView" showInItemLibrary="true" category="Qt - Widgets" icon=":/fxplugin/images/webview-icon16.png">
     <propertyDefaultValue name="width" type="int" defaultValue="300"/>
     <propertyDefaultValue name="height" type="int" defaultValue="300"/>
-    <itemlibraryrepresentation name="Web View" icon=":/fxplugin/images/webview-icon.png">
+    <itemlibraryentry name="Web View" icon=":/fxplugin/images/webview-icon.png">
       <property name="width" type="int" value="300"/>
       <property name="height" type="int" value="300"/>
       <property name="url" type="QString" value="http://www.trolltech.com"/>
-    </itemlibraryrepresentation>
+    </itemlibraryentry>
   </node>
 </metainfo>