diff --git a/examples/cpp/marbleQuick2/main.cpp b/examples/cpp/marbleQuick2/main.cpp
--- a/examples/cpp/marbleQuick2/main.cpp
+++ b/examples/cpp/marbleQuick2/main.cpp
@@ -68,7 +68,7 @@
     void start()
     {
         MarbleDeclarativePlugin plugin;
-        plugin.registerTypes("org.kde.edu.marble");
+        plugin.registerTypes("org.kde.marble");
         setSource(QUrl("qrc:/main.qml"));
 
         if(status()!=QQuickView::Ready)
diff --git a/examples/cpp/marbleQuick2/main.qml b/examples/cpp/marbleQuick2/main.qml
--- a/examples/cpp/marbleQuick2/main.qml
+++ b/examples/cpp/marbleQuick2/main.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Rectangle {
     id: mainRect
diff --git a/examples/qml/cloud-sync/cloudsync.qml b/examples/qml/cloud-sync/cloudsync.qml
--- a/examples/qml/cloud-sync/cloudsync.qml
+++ b/examples/qml/cloud-sync/cloudsync.qml
@@ -7,7 +7,7 @@
 // Copyright 2013      Dennis Nienhüser <nienhueser@kde.org>
 
 import QtQuick 1.0
-import org.kde.edu.marble 0.11
+import org.kde.marble 0.20
 
 Rectangle {
     id: screen
diff --git a/examples/qml/data-layers/DynamicLayer.qml b/examples/qml/data-layers/DynamicLayer.qml
--- a/examples/qml/data-layers/DynamicLayer.qml
+++ b/examples/qml/data-layers/DynamicLayer.qml
@@ -7,7 +7,7 @@
 // Copyright 2012 Dennis Nienhüser <nienhueser@kde.org>
 
 import QtQuick 1.1
-import org.kde.edu.marble 0.11
+import org.kde.marble 0.20
 
 MarbleWidget {
     width: 800;
diff --git a/examples/qml/data-layers/StaticLayer.qml b/examples/qml/data-layers/StaticLayer.qml
--- a/examples/qml/data-layers/StaticLayer.qml
+++ b/examples/qml/data-layers/StaticLayer.qml
@@ -7,7 +7,7 @@
 // Copyright 2012 Dennis Nienhüser <nienhueser@kde.org>
 
 import QtQuick 1.1
-import org.kde.edu.marble 0.11
+import org.kde.marble 0.20
 
 MarbleWidget {
     width: 800;
diff --git a/examples/qml/explore/explore.qml b/examples/qml/explore/explore.qml
--- a/examples/qml/explore/explore.qml
+++ b/examples/qml/explore/explore.qml
@@ -9,7 +9,7 @@
 //
 
 import Qt 4.7
-import org.kde.edu.marble 0.11
+import org.kde.marble 0.20
 
 Rectangle {
   id: screen
diff --git a/examples/qml/google-search/google-search.qml b/examples/qml/google-search/google-search.qml
--- a/examples/qml/google-search/google-search.qml
+++ b/examples/qml/google-search/google-search.qml
@@ -9,7 +9,7 @@
 //
 
 import Qt 4.7
-import org.kde.edu.marble 0.11
+import org.kde.marble 0.20
 
 Rectangle {
     width: 700
diff --git a/examples/qml/position-tracking/position-tracking.qml b/examples/qml/position-tracking/position-tracking.qml
--- a/examples/qml/position-tracking/position-tracking.qml
+++ b/examples/qml/position-tracking/position-tracking.qml
@@ -10,7 +10,7 @@
 // using a small ghost image. The visibility of the track can be toggled.
 
 import Qt 4.7
-import org.kde.edu.marble 0.11
+import org.kde.marble 0.20
 
 Rectangle {
     id: screen
diff --git a/examples/qml/where-is-that/where-is-that.qml b/examples/qml/where-is-that/where-is-that.qml
--- a/examples/qml/where-is-that/where-is-that.qml
+++ b/examples/qml/where-is-that/where-is-that.qml
@@ -9,7 +9,7 @@
 //
 
 import Qt 4.7
-import org.kde.edu.marble 0.11
+import org.kde.marble 0.20
 
 Rectangle {
   id: screen
diff --git a/src/apps/behaim/MainScreen.qml b/src/apps/behaim/MainScreen.qml
--- a/src/apps/behaim/MainScreen.qml
+++ b/src/apps/behaim/MainScreen.qml
@@ -14,7 +14,7 @@
 import QtQuick.Window 2.2
 import QtQuick.Layouts 1.1
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 ApplicationWindow {
     id: root
diff --git a/src/apps/behaim/main.cpp b/src/apps/behaim/main.cpp
--- a/src/apps/behaim/main.cpp
+++ b/src/apps/behaim/main.cpp
@@ -27,7 +27,7 @@
 #endif
 
     MarbleDeclarativePlugin declarativePlugin;
-    const char uri[] = "org.kde.edu.marble";
+    const char uri[] = "org.kde.marble";
     declarativePlugin.registerTypes(uri);
 
     QQmlApplicationEngine engine;
diff --git a/src/apps/marble-maps/DeveloperDialog.qml b/src/apps/marble-maps/DeveloperDialog.qml
--- a/src/apps/marble-maps/DeveloperDialog.qml
+++ b/src/apps/marble-maps/DeveloperDialog.qml
@@ -13,7 +13,7 @@
 import QtQuick.Window 2.2
 import QtQuick.Layouts 1.1
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Item {
     id: root
diff --git a/src/apps/marble-maps/IconText.qml b/src/apps/marble-maps/IconText.qml
--- a/src/apps/marble-maps/IconText.qml
+++ b/src/apps/marble-maps/IconText.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.3
 import QtQuick.Window 2.2
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Item {
     id: root
diff --git a/src/apps/marble-maps/MainScreen.qml b/src/apps/marble-maps/MainScreen.qml
--- a/src/apps/marble-maps/MainScreen.qml
+++ b/src/apps/marble-maps/MainScreen.qml
@@ -15,7 +15,7 @@
 import QtQuick.Controls 1.3
 import QtQuick.Window 2.2
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 ApplicationWindow {
     id: root
diff --git a/src/apps/marble-maps/NavigationManager.qml b/src/apps/marble-maps/NavigationManager.qml
--- a/src/apps/marble-maps/NavigationManager.qml
+++ b/src/apps/marble-maps/NavigationManager.qml
@@ -13,7 +13,7 @@
 import QtQuick.Controls 1.3
 import QtQuick.Window 2.2
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Item {
     id: root
diff --git a/src/apps/marble-maps/PlacemarkDialog.qml b/src/apps/marble-maps/PlacemarkDialog.qml
--- a/src/apps/marble-maps/PlacemarkDialog.qml
+++ b/src/apps/marble-maps/PlacemarkDialog.qml
@@ -13,7 +13,7 @@
 import QtQuick.Window 2.2
 import QtQuick.Layouts 1.1
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Item {
     id: root
diff --git a/src/apps/marble-maps/ProfileSelectorMenu.qml b/src/apps/marble-maps/ProfileSelectorMenu.qml
--- a/src/apps/marble-maps/ProfileSelectorMenu.qml
+++ b/src/apps/marble-maps/ProfileSelectorMenu.qml
@@ -14,7 +14,7 @@
 import QtQuick.Layouts 1.1
 import QtQuick.Window 2.2
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Item {
     id: root
diff --git a/src/apps/marble-maps/RouteEditor.qml b/src/apps/marble-maps/RouteEditor.qml
--- a/src/apps/marble-maps/RouteEditor.qml
+++ b/src/apps/marble-maps/RouteEditor.qml
@@ -14,7 +14,7 @@
 import QtQuick.Window 2.2
 import QtQuick.Layouts 1.1
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Item {
     id: root
diff --git a/src/apps/marble-maps/RoutingManager.qml b/src/apps/marble-maps/RoutingManager.qml
--- a/src/apps/marble-maps/RoutingManager.qml
+++ b/src/apps/marble-maps/RoutingManager.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.3
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Routing {
     id: root
diff --git a/src/apps/marble-maps/Search.qml b/src/apps/marble-maps/Search.qml
--- a/src/apps/marble-maps/Search.qml
+++ b/src/apps/marble-maps/Search.qml
@@ -12,7 +12,7 @@
 import QtQuick.Controls 1.3
 import QtQuick.Window 2.2
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Item {
     id: root
diff --git a/src/apps/marble-maps/Waypoint.qml b/src/apps/marble-maps/Waypoint.qml
--- a/src/apps/marble-maps/Waypoint.qml
+++ b/src/apps/marble-maps/Waypoint.qml
@@ -12,7 +12,7 @@
 import QtGraphicalEffects 1.0
 import QtQuick.Window 2.2
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Item {
     id: root
diff --git a/src/apps/marble-maps/WaypointImage.qml b/src/apps/marble-maps/WaypointImage.qml
--- a/src/apps/marble-maps/WaypointImage.qml
+++ b/src/apps/marble-maps/WaypointImage.qml
@@ -12,7 +12,7 @@
 import QtGraphicalEffects 1.0
 import QtQuick.Window 2.2
 
-import org.kde.edu.marble 0.20
+import org.kde.marble 0.20
 
 Item {
     id: root
diff --git a/src/apps/marble-maps/main.cpp b/src/apps/marble-maps/main.cpp
--- a/src/apps/marble-maps/main.cpp
+++ b/src/apps/marble-maps/main.cpp
@@ -32,7 +32,7 @@
 #endif
 
     MarbleDeclarativePlugin declarativePlugin;
-    const char uri[] = "org.kde.edu.marble";
+    const char uri[] = "org.kde.marble";
     declarativePlugin.registerTypes(uri);
     qmlRegisterType<MarbleMaps>(uri, 0, 20, "MarbleMaps");
 
diff --git a/src/lib/marble/declarative/MarbleDeclarativePlugin.h b/src/lib/marble/declarative/MarbleDeclarativePlugin.h
--- a/src/lib/marble/declarative/MarbleDeclarativePlugin.h
+++ b/src/lib/marble/declarative/MarbleDeclarativePlugin.h
@@ -21,7 +21,7 @@
   */
 class MARBLE_DECLARATIVE_EXPORT MarbleDeclarativePlugin : public QQmlExtensionPlugin
 {
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.MarbleDeclarativePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.MarbleDeclarativePlugin")
     Q_OBJECT
 public:
     /** Overriding QQmlExtensionPlugin to register types */
diff --git a/src/lib/marble/declarative/MarbleDeclarativePlugin.cpp b/src/lib/marble/declarative/MarbleDeclarativePlugin.cpp
--- a/src/lib/marble/declarative/MarbleDeclarativePlugin.cpp
+++ b/src/lib/marble/declarative/MarbleDeclarativePlugin.cpp
@@ -41,7 +41,7 @@
 {
     qRegisterMetaType<Marble::MarbleMap*>("MarbleMap*");
 
-    //@uri org.kde.edu.marble
+    //@uri org.kde.marble
     qmlRegisterType<Coordinate>( uri, 0, 20, "Coordinate" );
     qmlRegisterType<Marble::Placemark>( uri, 0, 20, "Placemark" );
     qmlRegisterType<Marble::PositionSource>( uri, 0, 20, "PositionSource" );
diff --git a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.h b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.h
--- a/src/plugins/designer/latloneditwidget/LatLonEditPlugin.h
+++ b/src/plugins/designer/latloneditwidget/LatLonEditPlugin.h
@@ -22,7 +22,7 @@
                          public QDesignerCustomWidgetInterface
 {
 	Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.LatLonEditPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.LatLonEditPlugin")
 	Q_INTERFACES(QDesignerCustomWidgetInterface)
 public:
 	explicit LatLonEditPlugin(QObject *parent = 0);
diff --git a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.h b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.h
--- a/src/plugins/designer/marblewidget/MarbleWidgetPlugin.h
+++ b/src/plugins/designer/marblewidget/MarbleWidgetPlugin.h
@@ -25,7 +25,7 @@
 class MarbleWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.MarbleWidgetPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.MarbleWidgetPlugin")
     Q_INTERFACES(QDesignerCustomWidgetInterface)
 
 public:
diff --git a/src/plugins/designer/navigator/MarbleNavigatorPlugin.h b/src/plugins/designer/navigator/MarbleNavigatorPlugin.h
--- a/src/plugins/designer/navigator/MarbleNavigatorPlugin.h
+++ b/src/plugins/designer/navigator/MarbleNavigatorPlugin.h
@@ -25,7 +25,7 @@
 class MarbleNavigatorPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.MarbleNavigatorPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.MarbleNavigatorPlugin")
     Q_INTERFACES(QDesignerCustomWidgetInterface)
 
 public:
diff --git a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h
--- a/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h
+++ b/src/plugins/positionprovider/flightgear/FlightGearPositionProviderPlugin.h
@@ -22,7 +22,7 @@
 class FlightGearPositionProviderPlugin : public PositionProviderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.FlightGearPositionProviderPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.FlightGearPositionProviderPlugin")
     Q_INTERFACES( Marble::PositionProviderPluginInterface )
 
  public:
diff --git a/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.h b/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.h
--- a/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.h
+++ b/src/plugins/positionprovider/geoclue/GeoCluePositionProviderPlugin.h
@@ -29,7 +29,7 @@
 class GeoCluePositionProviderPlugin: public PositionProviderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.GeoCluePositionProviderPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.GeoCluePositionProviderPlugin")
     Q_INTERFACES( Marble::PositionProviderPluginInterface )
 
  public:
diff --git a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h
--- a/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h
+++ b/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.h
@@ -26,7 +26,7 @@
 class GpsdPositionProviderPlugin: public PositionProviderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.GpsdPositionProviderPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.GpsdPositionProviderPlugin")
     Q_INTERFACES( Marble::PositionProviderPluginInterface )
 
  public:
diff --git a/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.h b/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.h
--- a/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.h
+++ b/src/plugins/positionprovider/qtpositioning/QtPositioningPositionProviderPlugin.h
@@ -22,7 +22,7 @@
 class QtPositioningPositionProviderPlugin: public PositionProviderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.QtPositioningPositionProviderPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.QtPositioningPositionProviderPlugin")
     Q_INTERFACES( Marble::PositionProviderPluginInterface )
 
 public:
diff --git a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.h b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.h
--- a/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.h
+++ b/src/plugins/positionprovider/wlocate/WlocatePositionProviderPlugin.h
@@ -21,7 +21,7 @@
 class WlocatePositionProviderPlugin: public PositionProviderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.WlocatePositionProviderPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.WlocatePositionProviderPlugin")
     Q_INTERFACES( Marble::PositionProviderPluginInterface )
 
 public:
diff --git a/src/plugins/render/annotate/AnnotatePlugin.h b/src/plugins/render/annotate/AnnotatePlugin.h
--- a/src/plugins/render/annotate/AnnotatePlugin.h
+++ b/src/plugins/render/annotate/AnnotatePlugin.h
@@ -44,7 +44,7 @@
 class AnnotatePlugin :  public RenderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.AnnotatePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.AnnotatePlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( AnnotatePlugin )
 
diff --git a/src/plugins/render/aprs/AprsPlugin.h b/src/plugins/render/aprs/AprsPlugin.h
--- a/src/plugins/render/aprs/AprsPlugin.h
+++ b/src/plugins/render/aprs/AprsPlugin.h
@@ -38,7 +38,7 @@
     class AprsPlugin : public RenderPlugin, public DialogConfigurationInterface
     {
         Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.AprsPlugin" )
+        Q_PLUGIN_METADATA(IID "org.kde.marble.AprsPlugin")
         Q_INTERFACES( Marble::RenderPluginInterface )
         Q_INTERFACES( Marble::DialogConfigurationInterface )
         MARBLE_PLUGIN( AprsPlugin )
diff --git a/src/plugins/render/atmosphere/AtmospherePlugin.h b/src/plugins/render/atmosphere/AtmospherePlugin.h
--- a/src/plugins/render/atmosphere/AtmospherePlugin.h
+++ b/src/plugins/render/atmosphere/AtmospherePlugin.h
@@ -22,7 +22,7 @@
 class AtmospherePlugin : public RenderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.AtmospherePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.AtmospherePlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( AtmospherePlugin )
 
diff --git a/src/plugins/render/compass/CompassFloatItem.h b/src/plugins/render/compass/CompassFloatItem.h
--- a/src/plugins/render/compass/CompassFloatItem.h
+++ b/src/plugins/render/compass/CompassFloatItem.h
@@ -33,7 +33,7 @@
 class CompassFloatItem  : public AbstractFloatItem, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.CompassFloatItem" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.CompassFloatItem")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( CompassFloatItem )
diff --git a/src/plugins/render/crosshairs/CrosshairsPlugin.h b/src/plugins/render/crosshairs/CrosshairsPlugin.h
--- a/src/plugins/render/crosshairs/CrosshairsPlugin.h
+++ b/src/plugins/render/crosshairs/CrosshairsPlugin.h
@@ -40,7 +40,7 @@
 class CrosshairsPlugin : public RenderPlugin, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.CrosshairsPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.CrosshairsPlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN(CrosshairsPlugin)
diff --git a/src/plugins/render/earthquake/EarthquakePlugin.h b/src/plugins/render/earthquake/EarthquakePlugin.h
--- a/src/plugins/render/earthquake/EarthquakePlugin.h
+++ b/src/plugins/render/earthquake/EarthquakePlugin.h
@@ -27,7 +27,7 @@
 class EarthquakePlugin : public AbstractDataPlugin, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.EarthquakePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.EarthquakePlugin")
 
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.h b/src/plugins/render/eclipses/EclipsesPlugin.h
--- a/src/plugins/render/eclipses/EclipsesPlugin.h
+++ b/src/plugins/render/eclipses/EclipsesPlugin.h
@@ -39,7 +39,7 @@
                        public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.EclipsesPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.EclipsesPlugin")
 
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h
--- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h
+++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatItem.h
@@ -48,7 +48,7 @@
 class ElevationProfileFloatItem : public AbstractFloatItem, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.ElevationProfileFloatItem" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.ElevationProfileFloatItem")
 
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
diff --git a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.h b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.h
--- a/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.h
+++ b/src/plugins/render/elevationprofilemarker/ElevationProfileMarker.h
@@ -27,7 +27,7 @@
 class ElevationProfileMarker : public RenderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.ElevationProfileMarker" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.ElevationProfileMarker")
 
     Q_INTERFACES( Marble::RenderPluginInterface )
 
diff --git a/src/plugins/render/fileview/FileViewFloatItem.h b/src/plugins/render/fileview/FileViewFloatItem.h
--- a/src/plugins/render/fileview/FileViewFloatItem.h
+++ b/src/plugins/render/fileview/FileViewFloatItem.h
@@ -29,7 +29,7 @@
 class FileViewFloatItem: public AbstractFloatItem
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.FileViewFloatItem" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.FileViewFloatItem")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN(FileViewFloatItem)
 
diff --git a/src/plugins/render/foursquare/FoursquarePlugin.h b/src/plugins/render/foursquare/FoursquarePlugin.h
--- a/src/plugins/render/foursquare/FoursquarePlugin.h
+++ b/src/plugins/render/foursquare/FoursquarePlugin.h
@@ -18,7 +18,7 @@
 class FoursquarePlugin : public AbstractDataPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.FoursquarePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.FoursquarePlugin" )
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( FoursquarePlugin )
 
diff --git a/src/plugins/render/gpsinfo/GpsInfo.h b/src/plugins/render/gpsinfo/GpsInfo.h
--- a/src/plugins/render/gpsinfo/GpsInfo.h
+++ b/src/plugins/render/gpsinfo/GpsInfo.h
@@ -36,7 +36,7 @@
 class GpsInfo : public AbstractFloatItem
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.GpsInfo" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.GpsInfo")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( GpsInfo )
     
diff --git a/src/plugins/render/graticule/GraticulePlugin.h b/src/plugins/render/graticule/GraticulePlugin.h
--- a/src/plugins/render/graticule/GraticulePlugin.h
+++ b/src/plugins/render/graticule/GraticulePlugin.h
@@ -51,7 +51,7 @@
 class GraticulePlugin : public RenderPlugin, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.GraticulePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.GraticulePlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( GraticulePlugin )
diff --git a/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.h b/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.h
--- a/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.h
+++ b/src/plugins/render/inhibit-screensaver/InhibitScreensaverPlugin.h
@@ -26,7 +26,7 @@
 {
 
 Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.InhibitScreensaverPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.InhibitScreensaverPlugin")
 Q_INTERFACES( Marble::RenderPluginInterface )
 
 MARBLE_PLUGIN( InhibitScreensaverPlugin )
diff --git a/src/plugins/render/license/License.h b/src/plugins/render/license/License.h
--- a/src/plugins/render/license/License.h
+++ b/src/plugins/render/license/License.h
@@ -31,7 +31,7 @@
 class License : public AbstractFloatItem
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.License" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.License")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( License )
 public:
diff --git a/src/plugins/render/mapscale/MapScaleFloatItem.h b/src/plugins/render/mapscale/MapScaleFloatItem.h
--- a/src/plugins/render/mapscale/MapScaleFloatItem.h
+++ b/src/plugins/render/mapscale/MapScaleFloatItem.h
@@ -30,7 +30,7 @@
 class MapScaleFloatItem : public AbstractFloatItem, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.MapScaleFloatItem" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.MapScaleFloatItem")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( MapScaleFloatItem )
diff --git a/src/plugins/render/measure/MeasureToolPlugin.h b/src/plugins/render/measure/MeasureToolPlugin.h
--- a/src/plugins/render/measure/MeasureToolPlugin.h
+++ b/src/plugins/render/measure/MeasureToolPlugin.h
@@ -35,7 +35,7 @@
 class MeasureToolPlugin : public RenderPlugin, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.MeasureToolPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.MeasureToolPlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( MeasureToolPlugin )
diff --git a/src/plugins/render/navigation/NavigationFloatItem.h b/src/plugins/render/navigation/NavigationFloatItem.h
--- a/src/plugins/render/navigation/NavigationFloatItem.h
+++ b/src/plugins/render/navigation/NavigationFloatItem.h
@@ -36,7 +36,7 @@
 class NavigationFloatItem: public AbstractFloatItem
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.NavigationFloatItem" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.NavigationFloatItem")
 
     Q_INTERFACES( Marble::RenderPluginInterface )
 
diff --git a/src/plugins/render/opencaching/OpenCachingPlugin.h b/src/plugins/render/opencaching/OpenCachingPlugin.h
--- a/src/plugins/render/opencaching/OpenCachingPlugin.h
+++ b/src/plugins/render/opencaching/OpenCachingPlugin.h
@@ -31,7 +31,7 @@
 class OpenCachingPlugin : public AbstractDataPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.OpenCachingPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.OpenCachingPlugin")
 
     Q_INTERFACES( Marble::RenderPluginInterface )
 
diff --git a/src/plugins/render/opencachingcom/OpenCachingComPlugin.h b/src/plugins/render/opencachingcom/OpenCachingComPlugin.h
--- a/src/plugins/render/opencachingcom/OpenCachingComPlugin.h
+++ b/src/plugins/render/opencachingcom/OpenCachingComPlugin.h
@@ -29,7 +29,7 @@
 class OpenCachingComPlugin : public AbstractDataPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.OpenCachingComPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.OpenCachingComPlugin")
 
     Q_INTERFACES( Marble::RenderPluginInterface )
 
diff --git a/src/plugins/render/opendesktop/OpenDesktopPlugin.h b/src/plugins/render/opendesktop/OpenDesktopPlugin.h
--- a/src/plugins/render/opendesktop/OpenDesktopPlugin.h
+++ b/src/plugins/render/opendesktop/OpenDesktopPlugin.h
@@ -26,7 +26,7 @@
 {
 
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.OpenDesktopPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.OpenDesktopPlugin")
 
     Q_INTERFACES(Marble::RenderPluginInterface)
     Q_INTERFACES(Marble::DialogConfigurationInterface)
diff --git a/src/plugins/render/overviewmap/OverviewMap.h b/src/plugins/render/overviewmap/OverviewMap.h
--- a/src/plugins/render/overviewmap/OverviewMap.h
+++ b/src/plugins/render/overviewmap/OverviewMap.h
@@ -37,7 +37,7 @@
 class OverviewMap : public AbstractFloatItem, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.OverviewMap" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.OverviewMap")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( OverviewMap )
diff --git a/src/plugins/render/panoramio/PanoramioPlugin.h b/src/plugins/render/panoramio/PanoramioPlugin.h
--- a/src/plugins/render/panoramio/PanoramioPlugin.h
+++ b/src/plugins/render/panoramio/PanoramioPlugin.h
@@ -19,7 +19,7 @@
 class PanoramioPlugin : public AbstractDataPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.PanoramioPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.PanoramioPlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( PanoramioPlugin )
 
diff --git a/src/plugins/render/photo/PhotoPlugin.h b/src/plugins/render/photo/PhotoPlugin.h
--- a/src/plugins/render/photo/PhotoPlugin.h
+++ b/src/plugins/render/photo/PhotoPlugin.h
@@ -29,7 +29,7 @@
 class PhotoPlugin : public AbstractDataPlugin, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.PhotoPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.PhotoPlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( PhotoPlugin )
diff --git a/src/plugins/render/positionmarker/PositionMarker.h b/src/plugins/render/positionmarker/PositionMarker.h
--- a/src/plugins/render/positionmarker/PositionMarker.h
+++ b/src/plugins/render/positionmarker/PositionMarker.h
@@ -35,7 +35,7 @@
 class PositionMarker  : public RenderPlugin, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.PositionMarker" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.PositionMarker")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( PositionMarker )
diff --git a/src/plugins/render/postalcode/PostalCodePlugin.h b/src/plugins/render/postalcode/PostalCodePlugin.h
--- a/src/plugins/render/postalcode/PostalCodePlugin.h
+++ b/src/plugins/render/postalcode/PostalCodePlugin.h
@@ -19,7 +19,7 @@
 
 class PostalCodePlugin : public AbstractDataPlugin {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.PostalCodePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.PostalCodePlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( PostalCodePlugin )
 
diff --git a/src/plugins/render/progress/ProgressFloatItem.h b/src/plugins/render/progress/ProgressFloatItem.h
--- a/src/plugins/render/progress/ProgressFloatItem.h
+++ b/src/plugins/render/progress/ProgressFloatItem.h
@@ -27,7 +27,7 @@
 class ProgressFloatItem  : public AbstractFloatItem
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.ProgressFloatItem" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.ProgressFloatItem")
 
     Q_INTERFACES( Marble::RenderPluginInterface )
 
diff --git a/src/plugins/render/routing/RoutingPlugin.h b/src/plugins/render/routing/RoutingPlugin.h
--- a/src/plugins/render/routing/RoutingPlugin.h
+++ b/src/plugins/render/routing/RoutingPlugin.h
@@ -23,7 +23,7 @@
 class RoutingPlugin : public AbstractFloatItem, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.RoutingPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.RoutingPlugin")
 
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
diff --git a/src/plugins/render/satellites/SatellitesPlugin.h b/src/plugins/render/satellites/SatellitesPlugin.h
--- a/src/plugins/render/satellites/SatellitesPlugin.h
+++ b/src/plugins/render/satellites/SatellitesPlugin.h
@@ -30,7 +30,7 @@
                          public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.SatellitesPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.SatellitesPlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( SatellitesPlugin )
diff --git a/src/plugins/render/speedometer/Speedometer.h b/src/plugins/render/speedometer/Speedometer.h
--- a/src/plugins/render/speedometer/Speedometer.h
+++ b/src/plugins/render/speedometer/Speedometer.h
@@ -34,7 +34,7 @@
 class Speedometer : public AbstractFloatItem
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.Speedometer" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.Speedometer")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( Speedometer )
     
diff --git a/src/plugins/render/stars/StarsPlugin.h b/src/plugins/render/stars/StarsPlugin.h
--- a/src/plugins/render/stars/StarsPlugin.h
+++ b/src/plugins/render/stars/StarsPlugin.h
@@ -125,7 +125,7 @@
 class StarsPlugin : public RenderPlugin, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.StarsPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.StarsPlugin")
     Q_INTERFACES(Marble::RenderPluginInterface)
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN(StarsPlugin)
diff --git a/src/plugins/render/sun/SunPlugin.h b/src/plugins/render/sun/SunPlugin.h
--- a/src/plugins/render/sun/SunPlugin.h
+++ b/src/plugins/render/sun/SunPlugin.h
@@ -27,7 +27,7 @@
 class SunPlugin : public RenderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.SunPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.SunPlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( SunPlugin )
  public:
diff --git a/src/plugins/render/test/TestPlugin.h b/src/plugins/render/test/TestPlugin.h
--- a/src/plugins/render/test/TestPlugin.h
+++ b/src/plugins/render/test/TestPlugin.h
@@ -28,7 +28,7 @@
 class TestPlugin : public RenderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.TestPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.TestPlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN( TestPlugin )
 
diff --git a/src/plugins/render/twitter/twitterPlugin.h b/src/plugins/render/twitter/twitterPlugin.h
--- a/src/plugins/render/twitter/twitterPlugin.h
+++ b/src/plugins/render/twitter/twitterPlugin.h
@@ -40,7 +40,7 @@
 class twitterPlugin : public RenderPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.twitterPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.twitterPlugin")
     Q_INTERFACES(Marble::RenderPluginInterface)
     MARBLE_PLUGIN(twitterPlugin)
 
diff --git a/src/plugins/render/weather/WeatherPlugin.h b/src/plugins/render/weather/WeatherPlugin.h
--- a/src/plugins/render/weather/WeatherPlugin.h
+++ b/src/plugins/render/weather/WeatherPlugin.h
@@ -29,7 +29,7 @@
 class WeatherPlugin : public AbstractDataPlugin, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.WeatherPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.WeatherPlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( WeatherPlugin )
diff --git a/src/plugins/render/wikipedia/WikipediaPlugin.h b/src/plugins/render/wikipedia/WikipediaPlugin.h
--- a/src/plugins/render/wikipedia/WikipediaPlugin.h
+++ b/src/plugins/render/wikipedia/WikipediaPlugin.h
@@ -30,7 +30,7 @@
 class WikipediaPlugin : public AbstractDataPlugin, public DialogConfigurationInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.WikipediaPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.WikipediaPlugin")
     Q_INTERFACES( Marble::RenderPluginInterface )
     Q_INTERFACES( Marble::DialogConfigurationInterface )
     MARBLE_PLUGIN( WikipediaPlugin )
diff --git a/src/plugins/runner/cache/CachePlugin.h b/src/plugins/runner/cache/CachePlugin.h
--- a/src/plugins/runner/cache/CachePlugin.h
+++ b/src/plugins/runner/cache/CachePlugin.h
@@ -18,7 +18,7 @@
 class CachePlugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.CachePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.CachePlugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.h b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.h
--- a/src/plugins/runner/cyclestreets/CycleStreetsPlugin.h
+++ b/src/plugins/runner/cyclestreets/CycleStreetsPlugin.h
@@ -20,7 +20,7 @@
 class CycleStreetsPlugin : public RoutingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.CycleStreetsPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.CycleStreetsPlugin")
     Q_INTERFACES( Marble::RoutingRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/geouri/GeoUriPlugin.h b/src/plugins/runner/geouri/GeoUriPlugin.h
--- a/src/plugins/runner/geouri/GeoUriPlugin.h
+++ b/src/plugins/runner/geouri/GeoUriPlugin.h
@@ -19,7 +19,7 @@
 class GeoUriPlugin : public SearchRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.GeoUriPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.GeoUriPlugin")
     Q_INTERFACES( Marble::SearchRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.h b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.h
--- a/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.h
+++ b/src/plugins/runner/gosmore-reversegeocoding/GosmoreReverseGeocodingPlugin.h
@@ -21,7 +21,7 @@
 class GosmorePlugin : public ReverseGeocodingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.GosmoreReverseGeocodingPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.GosmoreReverseGeocodingPlugin")
     Q_INTERFACES( Marble::ReverseGeocodingRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.h b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.h
--- a/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.h
+++ b/src/plugins/runner/gosmore-routing/GosmoreRoutingPlugin.h
@@ -20,7 +20,7 @@
 class GosmorePlugin : public RoutingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.GosmoreRoutingPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.GosmoreRoutingPlugin")
     Q_INTERFACES( Marble::RoutingRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/gpsbabel/GpsbabelPlugin.h b/src/plugins/runner/gpsbabel/GpsbabelPlugin.h
--- a/src/plugins/runner/gpsbabel/GpsbabelPlugin.h
+++ b/src/plugins/runner/gpsbabel/GpsbabelPlugin.h
@@ -18,7 +18,7 @@
 class GpsbabelPlugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.GpsbabelPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.GpsbabelPlugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/gpx/GpxPlugin.h b/src/plugins/runner/gpx/GpxPlugin.h
--- a/src/plugins/runner/gpx/GpxPlugin.h
+++ b/src/plugins/runner/gpx/GpxPlugin.h
@@ -18,7 +18,7 @@
 class GpxPlugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.GpxPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.GpxPlugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/hostip/HostipPlugin.h b/src/plugins/runner/hostip/HostipPlugin.h
--- a/src/plugins/runner/hostip/HostipPlugin.h
+++ b/src/plugins/runner/hostip/HostipPlugin.h
@@ -20,7 +20,7 @@
 class HostipPlugin : public SearchRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.HostipPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.HostipPlugin")
     Q_INTERFACES( Marble::SearchRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/json/JsonPlugin.h b/src/plugins/runner/json/JsonPlugin.h
--- a/src/plugins/runner/json/JsonPlugin.h
+++ b/src/plugins/runner/json/JsonPlugin.h
@@ -19,7 +19,7 @@
 class JsonPlugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.JsonPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.JsonPlugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/kml/KmlPlugin.h b/src/plugins/runner/kml/KmlPlugin.h
--- a/src/plugins/runner/kml/KmlPlugin.h
+++ b/src/plugins/runner/kml/KmlPlugin.h
@@ -18,7 +18,7 @@
 class KmlPlugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.KmlPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.KmlPlugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/latlon/LatLonPlugin.h b/src/plugins/runner/latlon/LatLonPlugin.h
--- a/src/plugins/runner/latlon/LatLonPlugin.h
+++ b/src/plugins/runner/latlon/LatLonPlugin.h
@@ -20,7 +20,7 @@
 class LatLonPlugin : public SearchRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.LatLonPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.LatLonPlugin")
     Q_INTERFACES( Marble::SearchRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.h b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.h
--- a/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.h
+++ b/src/plugins/runner/local-osm-search/LocalOsmSearchPlugin.h
@@ -24,7 +24,7 @@
 class LocalOsmSearchPlugin : public SearchRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.LocalOsmSearchPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.LocalOsmSearchPlugin")
     Q_INTERFACES( Marble::SearchRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/localdatabase/LocalDatabasePlugin.h b/src/plugins/runner/localdatabase/LocalDatabasePlugin.h
--- a/src/plugins/runner/localdatabase/LocalDatabasePlugin.h
+++ b/src/plugins/runner/localdatabase/LocalDatabasePlugin.h
@@ -20,7 +20,7 @@
 class LocalDatabasePlugin : public SearchRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.LocalDatabasePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.LocalDatabasePlugin")
     Q_INTERFACES( Marble::SearchRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/log/LogPlugin.h b/src/plugins/runner/log/LogPlugin.h
--- a/src/plugins/runner/log/LogPlugin.h
+++ b/src/plugins/runner/log/LogPlugin.h
@@ -18,7 +18,7 @@
 class LogfilePlugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.LogPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.LogPlugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/mapquest/MapQuestPlugin.h b/src/plugins/runner/mapquest/MapQuestPlugin.h
--- a/src/plugins/runner/mapquest/MapQuestPlugin.h
+++ b/src/plugins/runner/mapquest/MapQuestPlugin.h
@@ -20,7 +20,7 @@
 class MapQuestPlugin : public RoutingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.MapQuestPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.MapQuestPlugin")
     Q_INTERFACES( Marble::RoutingRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/monav/MonavPlugin.h b/src/plugins/runner/monav/MonavPlugin.h
--- a/src/plugins/runner/monav/MonavPlugin.h
+++ b/src/plugins/runner/monav/MonavPlugin.h
@@ -23,7 +23,7 @@
 class MonavPlugin : public RoutingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.MonavPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.MonavPlugin")
     Q_INTERFACES( Marble::RoutingRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.h b/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.h
--- a/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.h
+++ b/src/plugins/runner/nominatim-reversegeocoding/NominatimReverseGeocodingPlugin.h
@@ -21,7 +21,7 @@
 class NominatimPlugin : public ReverseGeocodingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.NominatimReverseGeocodingPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.NominatimReverseGeocodingPlugin")
     Q_INTERFACES( Marble::ReverseGeocodingRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/nominatim-search/NominatimSearchPlugin.h b/src/plugins/runner/nominatim-search/NominatimSearchPlugin.h
--- a/src/plugins/runner/nominatim-search/NominatimSearchPlugin.h
+++ b/src/plugins/runner/nominatim-search/NominatimSearchPlugin.h
@@ -21,7 +21,7 @@
 class NominatimPlugin : public SearchRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.NominatimSearchPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.NominatimSearchPlugin")
     Q_INTERFACES( Marble::SearchRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/open-source-routing-machine/OSRMPlugin.h b/src/plugins/runner/open-source-routing-machine/OSRMPlugin.h
--- a/src/plugins/runner/open-source-routing-machine/OSRMPlugin.h
+++ b/src/plugins/runner/open-source-routing-machine/OSRMPlugin.h
@@ -20,7 +20,7 @@
 class OSRMPlugin : public RoutingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.OSRMPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.OSRMPlugin")
     Q_INTERFACES( Marble::RoutingRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.h b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.h
--- a/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.h
+++ b/src/plugins/runner/openlocation-code-search/OpenLocationCodeSearchPlugin.h
@@ -17,7 +17,7 @@
 class OpenLocationCodeSearchPlugin : public SearchRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.OpenLocationCodeSearchPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.OpenLocationCodeSearchPlugin")
     Q_INTERFACES( Marble::SearchRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.h b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.h
--- a/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.h
+++ b/src/plugins/runner/openrouteservice/OpenRouteServicePlugin.h
@@ -20,7 +20,7 @@
 class OpenRouteServicePlugin : public RoutingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.OpenRouteServicePlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.OpenRouteServicePlugin")
     Q_INTERFACES( Marble::RoutingRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/osm/OsmPlugin.h b/src/plugins/runner/osm/OsmPlugin.h
--- a/src/plugins/runner/osm/OsmPlugin.h
+++ b/src/plugins/runner/osm/OsmPlugin.h
@@ -18,7 +18,7 @@
 class OsmPlugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.OsmPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.OsmPlugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/pn2/Pn2Plugin.h b/src/plugins/runner/pn2/Pn2Plugin.h
--- a/src/plugins/runner/pn2/Pn2Plugin.h
+++ b/src/plugins/runner/pn2/Pn2Plugin.h
@@ -18,7 +18,7 @@
 class Pn2Plugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.Pn2Plugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.Pn2Plugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/pnt/PntPlugin.h b/src/plugins/runner/pnt/PntPlugin.h
--- a/src/plugins/runner/pnt/PntPlugin.h
+++ b/src/plugins/runner/pnt/PntPlugin.h
@@ -18,7 +18,7 @@
 class PntPlugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.PntPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.PntPlugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/routino/RoutinoPlugin.h b/src/plugins/runner/routino/RoutinoPlugin.h
--- a/src/plugins/runner/routino/RoutinoPlugin.h
+++ b/src/plugins/runner/routino/RoutinoPlugin.h
@@ -23,7 +23,7 @@
 class RoutinoPlugin : public RoutingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.RoutinoPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.RoutinoPlugin")
     Q_INTERFACES( Marble::RoutingRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/shp/ShpPlugin.h b/src/plugins/runner/shp/ShpPlugin.h
--- a/src/plugins/runner/shp/ShpPlugin.h
+++ b/src/plugins/runner/shp/ShpPlugin.h
@@ -18,7 +18,7 @@
 class ShpPlugin : public ParseRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.ShpPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.ShpPlugin")
     Q_INTERFACES( Marble::ParseRunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.h b/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.h
--- a/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.h
+++ b/src/plugins/runner/traveling-salesman/TravelingSalesmanPlugin.h
@@ -20,7 +20,7 @@
 class TravelingSalesmanPlugin : public RunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.TravelingSalesmanPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.TravelingSalesmanPlugin")
     Q_INTERFACES( Marble::RunnerPlugin )
 
 public:
diff --git a/src/plugins/runner/yours/YoursPlugin.h b/src/plugins/runner/yours/YoursPlugin.h
--- a/src/plugins/runner/yours/YoursPlugin.h
+++ b/src/plugins/runner/yours/YoursPlugin.h
@@ -20,7 +20,7 @@
 class YoursPlugin : public RoutingRunnerPlugin
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.YoursPlugin" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.YoursPlugin")
     Q_INTERFACES( Marble::RoutingRunnerPlugin )
 
 public:
diff --git a/src/plugins/templates/floatitem/FITemplateFloatItem.h b/src/plugins/templates/floatitem/FITemplateFloatItem.h
--- a/src/plugins/templates/floatitem/FITemplateFloatItem.h
+++ b/src/plugins/templates/floatitem/FITemplateFloatItem.h
@@ -35,7 +35,7 @@
 class FITemplateFloatItem  : public AbstractFloatItem
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA( IID "org.kde.edu.marble.FITemplateFloatItem" )
+    Q_PLUGIN_METADATA(IID "org.kde.marble.FITemplateFloatItem")
     Q_INTERFACES( Marble::RenderPluginInterface )
     MARBLE_PLUGIN(FITemplateFloatItem)