diff --git a/kstyles/oxygen/oxygenstyle.cpp b/kstyles/oxygen/oxygenstyle.cpp
index 16dd2ba6..f9de64ea 100644
--- a/kstyles/oxygen/oxygenstyle.cpp
+++ b/kstyles/oxygen/oxygenstyle.cpp
@@ -123,7 +123,7 @@ namespace Oxygen
 
 }
 
-Q_EXPORT_PLUGIN2( oxygen-qt, Oxygen::StylePlugin )
+Q_EXPORT_PLUGIN( Oxygen::StylePlugin )
 
 namespace Oxygen
 {
diff --git a/kwin/clients/aurorae/src/decorationplugin.cpp b/kwin/clients/aurorae/src/decorationplugin.cpp
index 1bcfadbb..f7e8cd3b 100644
--- a/kwin/clients/aurorae/src/decorationplugin.cpp
+++ b/kwin/clients/aurorae/src/decorationplugin.cpp
@@ -18,7 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "colorhelper.h"
 #include "decorationoptions.h"
 #include <qdeclarative.h>
-Q_EXPORT_PLUGIN2(decorationplugin, DecorationPlugin)
+
+Q_EXPORT_PLUGIN(DecorationPlugin)
 
 void DecorationPlugin::registerTypes(const char *uri)
 {
diff --git a/kwin/clients/aurorae/themes/plastik/code/plastikplugin.cpp b/kwin/clients/aurorae/themes/plastik/code/plastikplugin.cpp
index 86ed3d3a..d7cdbfee 100644
--- a/kwin/clients/aurorae/themes/plastik/code/plastikplugin.cpp
+++ b/kwin/clients/aurorae/themes/plastik/code/plastikplugin.cpp
@@ -17,7 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "plastikplugin.h"
 #include "plastikbutton.h"
 #include <QDeclarativeEngine>
-Q_EXPORT_PLUGIN2(plastikplugin, PlastikPlugin)
+
+Q_EXPORT_PLUGIN(PlastikPlugin)
 
 void PlastikPlugin::registerTypes(const char *uri)
 {
diff --git a/plasma/declarativeimports/core/corebindingsplugin.h b/plasma/declarativeimports/core/corebindingsplugin.h
index fd4a75e0..8d87bdf9 100644
--- a/plasma/declarativeimports/core/corebindingsplugin.h
+++ b/plasma/declarativeimports/core/corebindingsplugin.h
@@ -36,6 +36,6 @@ public:
     void registerTypes(const char *uri);
 };
 
-Q_EXPORT_PLUGIN2(corebindingsplugin, CoreBindingsPlugin)
+Q_EXPORT_PLUGIN(CoreBindingsPlugin)
 
 #endif
diff --git a/plasma/declarativeimports/dirmodel/dirmodelplugin.h b/plasma/declarativeimports/dirmodel/dirmodelplugin.h
index 35c483da..8d069914 100644
--- a/plasma/declarativeimports/dirmodel/dirmodelplugin.h
+++ b/plasma/declarativeimports/dirmodel/dirmodelplugin.h
@@ -31,6 +31,6 @@ public:
     void registerTypes(const char *uri);
 };
 
-Q_EXPORT_PLUGIN2(dirmodelplugin, DirModelPlugin)
+Q_EXPORT_PLUGIN(DirModelPlugin)
 
 #endif
diff --git a/plasma/declarativeimports/draganddrop/draganddropplugin.cpp b/plasma/declarativeimports/draganddrop/draganddropplugin.cpp
index cd585db8..9959d533 100644
--- a/plasma/declarativeimports/draganddrop/draganddropplugin.cpp
+++ b/plasma/declarativeimports/draganddrop/draganddropplugin.cpp
@@ -39,5 +39,5 @@ void DragAndDropPlugin::registerTypes(const char *uri)
     qmlRegisterUncreatableType<DeclarativeDragDropEvent>(uri, 1, 0, "DragDropEvent", "DragDropEvent cannot be created from QML.");
 }
 
-Q_EXPORT_PLUGIN2(draganddropplugin, DragAndDropPlugin)
+Q_EXPORT_PLUGIN(DragAndDropPlugin)
 
diff --git a/plasma/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h b/plasma/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h
index 8c553975..11073cdc 100644
--- a/plasma/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h
+++ b/plasma/declarativeimports/graphicslayouts/graphicslayoutsbindingsplugin.h
@@ -33,6 +33,6 @@ public:
     void registerTypes(const char *uri);
 };
 
-Q_EXPORT_PLUGIN2(graphicslayoutsbindingsplugin, GraphicsLayoutsBindingsPlugin)
+Q_EXPORT_PLUGIN(GraphicsLayoutsBindingsPlugin)
 
 #endif
diff --git a/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h b/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h
index 46a9f5d8..10274e21 100644
--- a/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h
+++ b/plasma/declarativeimports/graphicswidgets/graphicswidgetsbindingsplugin.h
@@ -44,6 +44,6 @@ public:
     void registerTypes(const char *uri);
 };
 
-Q_EXPORT_PLUGIN2(graphicswidgetsbindingsplugin, GraphicsWidgetsBindingsPlugin)
+Q_EXPORT_PLUGIN(GraphicsWidgetsBindingsPlugin)
 
 #endif
diff --git a/plasma/declarativeimports/krunnermodel/runnermodelplugin.h b/plasma/declarativeimports/krunnermodel/runnermodelplugin.h
index 2f92a7e0..88163b6b 100644
--- a/plasma/declarativeimports/krunnermodel/runnermodelplugin.h
+++ b/plasma/declarativeimports/krunnermodel/runnermodelplugin.h
@@ -33,6 +33,6 @@ public:
     void registerTypes(const char *uri);
 };
 
-Q_EXPORT_PLUGIN2(datamodelsplugin, RunnerModelPlugin)
+Q_EXPORT_PLUGIN(RunnerModelPlugin)
 
 #endif
diff --git a/plasma/declarativeimports/locale/localebindingsplugin.h b/plasma/declarativeimports/locale/localebindingsplugin.h
index 9f56d5ba..1d9d619b 100644
--- a/plasma/declarativeimports/locale/localebindingsplugin.h
+++ b/plasma/declarativeimports/locale/localebindingsplugin.h
@@ -31,6 +31,6 @@ public:
     void registerTypes(const char *uri);
 };
 
-Q_EXPORT_PLUGIN2(localebindingsplugin, LocaleBindingsPlugin)
+Q_EXPORT_PLUGIN(LocaleBindingsPlugin)
 
 #endif
diff --git a/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp b/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
index 163d1c3c..e6cf30ae 100644
--- a/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
+++ b/plasma/declarativeimports/plasmacomponents/plasmacomponentsplugin.cpp
@@ -38,7 +38,7 @@
 #include "fullscreensheet.h"
 #include "units.h"
 
-Q_EXPORT_PLUGIN2(plasmacomponentsplugin, PlasmaComponentsPlugin)
+Q_EXPORT_PLUGIN(PlasmaComponentsPlugin)
 
 class BKSingleton
 {
diff --git a/plasma/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h b/plasma/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h
index c30ba00d..b7e1bf4d 100644
--- a/plasma/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h
+++ b/plasma/declarativeimports/plasmaextracomponents/plasmaextracomponentsplugin.h
@@ -34,6 +34,6 @@ public:
     void registerTypes(const char *uri);
 };
 
-Q_EXPORT_PLUGIN2(plasmaexracomponentsplugin, PlasmaExtraComponentsPlugin);
+Q_EXPORT_PLUGIN(PlasmaExtraComponentsPlugin);
 
 #endif
diff --git a/plasma/declarativeimports/qtextracomponents/qtextracomponentsplugin.h b/plasma/declarativeimports/qtextracomponents/qtextracomponentsplugin.h
index 8b1353ce..88d46808 100644
--- a/plasma/declarativeimports/qtextracomponents/qtextracomponentsplugin.h
+++ b/plasma/declarativeimports/qtextracomponents/qtextracomponentsplugin.h
@@ -33,6 +33,6 @@ public:
     void registerTypes(const char *uri);
 };
 
-Q_EXPORT_PLUGIN2(qtextracomponentsplugin, QtExtraComponentsPlugin);
+Q_EXPORT_PLUGIN(QtExtraComponentsPlugin);
 
 #endif
diff --git a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
index 1a938f24..4a311d04 100644
--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
@@ -381,7 +381,7 @@ private slots:
     }
 };
 
-Q_EXPORT_PLUGIN2(KQGuiPlatformPlugin, KQGuiPlatformPlugin)
+Q_EXPORT_PLUGIN(KQGuiPlatformPlugin)
 
 #include "qguiplatformplugin_kde.moc"