Changes: Took the MeeGo keyword into use instead of DUI in the application extension support and applet support

RevBy: TrustMe

15 files changed, 109 insertions, 111 deletions

diff --git a/demos/applicationextension/demoapplicationextensioninterface.h b/demos/applicationextension/demoapplicationextensioninterface.h
index 73976427..4af814d1 100644
--- a/demos/applicationextension/demoapplicationextensioninterface.h
+++ b/demos/applicationextension/demoapplicationextensioninterface.h
@@ -54,6 +54,6 @@ public:
     virtual void setDemoApplicationControlledValue(int value) = 0;
 };
 
-Q_DECLARE_INTERFACE(DemoApplicationExtensionInterface, "com.nokia.m.core.DemoApplicationExtensionInterface/1.0")
+Q_DECLARE_INTERFACE(DemoApplicationExtensionInterface, "com.meego.core.DemoApplicationExtensionInterface/1.0")
 
 #endif /* DEMOAPPLICATIONEXTENSIONINTERFACE_H_ */
diff --git a/demos/applicationextension/demoextension/applicationextensiondemo-demoextension.desktop b/demos/applicationextension/demoextension/applicationextensiondemo-demoextension.desktop
new file mode 100644
index 00000000..cd956147
--- /dev/null
+++ b/demos/applicationextension/demoextension/applicationextensiondemo-demoextension.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=X-MeeGoApplicationExtension
+Name=DemoExtension
+
+[X-MeeGoApplicationExtension]
+Interface=com.meego.core.DemoApplicationExtensionInterface/1.0
+Extension=libapplicationextensiondemo-demoextension.so
diff --git a/demos/applicationextension/demoextension/demoextension.desktop b/demos/applicationextension/demoextension/demoextension.desktop
deleted file mode 100644
index 1650cd53..00000000
--- a/demos/applicationextension/demoextension/demoextension.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=DUIApplicationExtension
-Name=DemoExtension
-
-[X-DUI]
-DUIApplicationExtension-Interface=com.nokia.dui.core.DemoApplicationExtensionInterface/1.0
-DUIApplicationExtension-Extension=libdemoextension.so
diff --git a/demos/applicationextension/demoextension/demoextension.pro b/demos/applicationextension/demoextension/demoextension.pro
index ed30aa16..138f38a0 100644
--- a/demos/applicationextension/demoextension/demoextension.pro
+++ b/demos/applicationextension/demoextension/demoextension.pro
@@ -28,11 +28,10 @@ win32|macx {
 }
 else:LIBS += -lmeegotouchcore
 
-TARGET = $$qtLibraryTarget(demoextension)
+TARGET = $$qtLibraryTarget(applicationextensiondemo-demoextension)
 DESTDIR = ../../../lib
 target.path += $$M_APPLICATION_EXTENSION_DIR
 INSTALLS += target desktop_entry
 
 desktop_entry.path = $$M_APPLICATION_EXTENSION_DATA_DIR
 desktop_entry.files = *.desktop
-
diff --git a/demos/applicationextension/demoextension2/applicationextensiondemo-demoextension2.desktop b/demos/applicationextension/demoextension2/applicationextensiondemo-demoextension2.desktop
new file mode 100644
index 00000000..c990493c
--- /dev/null
+++ b/demos/applicationextension/demoextension2/applicationextensiondemo-demoextension2.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=X-MeeGoApplicationExtension
+Name=DemoExtension2
+
+[X-MeeGoApplicationExtension]
+Interface=com.meego.core.DemoApplicationExtensionInterface/1.0
+Extension=libapplicationextensiondemo-demoextension2.so
diff --git a/demos/applicationextension/demoextension2/demoextension2.desktop b/demos/applicationextension/demoextension2/demoextension2.desktop
deleted file mode 100644
index 9a76b0d1..00000000
--- a/demos/applicationextension/demoextension2/demoextension2.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=DUIApplicationExtension
-Name=DemoExtension2
-
-[X-DUI]
-DUIApplicationExtension-Interface=com.nokia.dui.core.DemoApplicationExtensionInterface/1.0
-DUIApplicationExtension-Extension=libdemoextension2.so
diff --git a/demos/applicationextension/demoextension2/demoextension2.pro b/demos/applicationextension/demoextension2/demoextension2.pro
index 7120885d..15bb4c53 100644
--- a/demos/applicationextension/demoextension2/demoextension2.pro
+++ b/demos/applicationextension/demoextension2/demoextension2.pro
@@ -28,7 +28,7 @@ win32|macx {
 }
 else:LIBS += -lmeegotouchcore
 
-TARGET = $$qtLibraryTarget(demoextension2)
+TARGET = $$qtLibraryTarget(applicationextensiondemo-demoextension2)
 DESTDIR = ../../../lib
 target.path += $$M_APPLICATION_EXTENSION_DIR
 INSTALLS += target desktop_entry
diff --git a/demos/applicationextension/main.cpp b/demos/applicationextension/main.cpp
index 60e41931..6f4570f5 100644
--- a/demos/applicationextension/main.cpp
+++ b/demos/applicationextension/main.cpp
@@ -46,7 +46,7 @@ void DemoPage::createContent()
     connect(button, SIGNAL(clicked()), this, SLOT(resetExtensions()));
 
     MApplicationExtensionArea *area =
-            new MApplicationExtensionArea("com.nokia.m.core.DemoApplicationExtensionInterface/1.0");
+            new MApplicationExtensionArea("com.meego.core.DemoApplicationExtensionInterface/1.0");
     vbox->addItem(area);
 
     connect(area, SIGNAL(extensionInstantiated(MApplicationExtensionInterface*)),
diff --git a/doc/src/appletdevelopment.dox b/doc/src/appletdevelopment.dox
index 8ae107fe..6eed6c5f 100644
--- a/doc/src/appletdevelopment.dox
+++ b/doc/src/appletdevelopment.dox
@@ -24,15 +24,15 @@ From a developers point of view an applet consists of a shared library, a metada
 
 \subsection appletclasses What classes to implement
 
-From the user interface point of view an applet is a \c DuiWidget. So construct a \c DuiWidget class in whatever way fits your purposes: use one of the existing derived classes in libdui, do your own widget or whatever. This is the UI part of your applet.
+From the user interface point of view an applet is a \c MWidget. So construct a \c MWidget class in whatever way fits your purposes: use one of the existing derived classes in libdui, do your own widget or whatever. This is the UI part of your applet.
 
-Whatever approach you chose for constructing your applet \c DuiWidget, you need to offer a connection point for the host process to get a handle to it. For this you need to implement an interface called \c DuiAppletInterface. There is only a single method in this interface you need to implement:
+Whatever approach you chose for constructing your applet \c MWidget, you need to offer a connection point for the host process to get a handle to it. For this you need to implement an interface called \c MAppletInterface. There is only a single method in this interface you need to implement:
 
-\c DuiAppletInterface::constructWidget(const DuiAppletMetaData&, DuiDataStore&, DuiDataAccess&)
+\c MAppletInterface::constructWidget(const MAppletMetaData&, MDataStore&, MDataAccess&)
 
-In this method you need to return a pointer to the \c DuiWidget of your applet.
+In this method you need to return a pointer to the \c MWidget of your applet.
 
-\b Note: The ownership of the \c DuiWidget is transformed to the caller of this method, so \b you \b mustn't \b destroy the widget yourself.
+\b Note: The ownership of the \c MWidget is transformed to the caller of this method, so \b you \b mustn't \b destroy the widget yourself.
 
 You also need to use a couple of Qt macros to get things working. A complete example follows:
 
@@ -41,13 +41,13 @@ You also need to use a couple of Qt macros to get things working. A complete exa
 
 #ifndef MYAPPLET_H
 #define MYAPPLET_H
-#include <DuiAppletInterface>
+#include <MAppletInterface>
 #include <QObject>
-class MyApplet : public QObject, public DuiAppletInterface {
+class MyApplet : public QObject, public MAppletInterface {
     Q_OBJECT
-    Q_INTERFACES(DuiAppletInterface)
+    Q_INTERFACES(MAppletInterface)
 public:
-    virtual DuiWidget *constructWidget(const DuiAppletMetaData &metadata, DuiDataStore& instanceData, DuiDataAccess& settings);
+    virtual MWidget *constructWidget(const MAppletMetaData &metadata, MDataStore& instanceData, MDataAccess& settings);
 };
 #endif // MYAPPLET_H
 \endcode
@@ -56,21 +56,21 @@ public:
 // myapplet.cpp
 
 #include <QtGui>
-#include <DuiWidget>
+#include <MWidget>
 #include "myapplet.h"
 Q_EXPORT_PLUGIN2(myapplet, MyApplet)
-DuiWidget* MyApplet::constructWidget(const DuiAppletMetaData &metadata, DuiDataStore& instanceData, DuiDataAccess& settings) {
-    return new DuiWidget();
+MWidget* MyApplet::constructWidget(const MAppletMetaData &metadata, MDataStore& instanceData, MDataAccess& settings) {
+    return new MWidget();
 }
 \endcode
 
 \subsection appletmetadata Create applet metadata
 
-Applet metadata is defined in \c .desktop files following <a href="http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec">freedesktop.org desktop entry specification</a>. Applet metadata extends \c .desktop entry specification by defining a new type \b DuiApplet. Applet metadata specification follows desktop entry specification so that required keys (\em Type, \em Name and \em Exec) have to be defined in the applet metadata.
+Applet metadata is defined in \c .desktop files following <a href="http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec">freedesktop.org desktop entry specification</a>. Applet metadata extends \c .desktop entry specification by defining a new type \b X-MeeGoApplet. Applet metadata specification follows desktop entry specification so that required keys (\em Type, \em Name and \em Exec) have to be defined in the applet metadata.
 
 \b Exec key in applet metadata defines the runner binary which is launched in separate process to run the applet binary. This key needs to be defined but can be left empty. If \b Exec key is left empty the applet is ran inside the host process.
 
-Applet metadata extends the desktop specification with the following new keys. These keys need to be defined under group DUI.
+Applet metadata extends the desktop specification with the following new keys. These keys need to be defined under group X-MeeGoApplet.
 
 <table>
 <tr>
@@ -80,13 +80,13 @@ Applet metadata extends the desktop specification with the following new keys. T
  <th>Required</th>
 </tr>
 <tr>
-  <td>X-DUIApplet-Applet</td>
+  <td>Applet</td>
   <td>Defines the applet binary that will be loaded using the runner defined by the Exec key. This binary needs to be located in \c /usr/lib/dui/applets/ - directory.</td>
   <td>string</td>
   <td>YES</td>
 </tr>
 <tr>
-  <td>X-DUIApplet-Identifier</td>
+  <td>Identifier</td>
   <td>Defines an identifier for the applet. The identifier is used for example defining the applet specific style resource locations.</td>
   <td>string (can contain characters [a-zA-Z0-9_-])</td>
   <td>NO</td>
@@ -97,13 +97,13 @@ Following is an example of applet metadata specification:
 
 \code
 [Desktop Entry]
-Type=DUIApplet
+Type=X-MeeGoApplet
 Name=ExampleApplet
 Icon=Icon-music
 Exec=duiappletrunner
 
-[DUI]
-X-DUIApplet-Applet=libexampleapplet.so
+[X-MeeGoApplet]
+Applet=libexampleapplet.so
 \endcode
 
 \subsection appletinstallation Install
@@ -132,9 +132,9 @@ XB-Maemo-Desktop-File: /usr/share/dui/applets/your-applet-desktop-file.desktop
 
 \subsection appletinstancedata Applet instance data
 
-The applet system provides the applet instances with an object that can be used to store applet instance specific data to a permanent storage. Instance specific data is something that is not needed anymore when the applet instance is removed. Instance specific data includes any data that the applet needs to restore an instance. The instance data object is an object that implements the \c DuiDataStore interface.
+The applet system provides the applet instances with an object that can be used to store applet instance specific data to a permanent storage. Instance specific data is something that is not needed anymore when the applet instance is removed. Instance specific data includes any data that the applet needs to restore an instance. The instance data object is an object that implements the \c MDataStore interface.
 
-Applets don't create their own objects of the instance data classes but instead they are provided with one that they should use. The instance data object is provided to the applets via the \c DuiAppletInterface::constructWidget(const DuiAppletMetaData&, DuiDataStore&, DuiDataAccess&) call as the second argument.
+Applets don't create their own objects of the instance data classes but instead they are provided with one that they should use. The instance data object is provided to the applets via the \c MAppletInterface::constructWidget(const MAppletMetaData&, MDataStore&, MDataAccess&) call as the second argument.
 
 Whenever the state of an applet instance changes in a way that affects on how the applet instance would be restored, the applet should update the data.
 
@@ -142,7 +142,7 @@ Whenever the state of an applet instance changes in a way that affects on how th
 
 Applets can have settings which can be accessed by the user from the settings dialog. There are two different kinds of settings: \b global and \b instance settings. Global settings affect all running instances of a given applet. Instance settings on the other hand only affect the applet instance that they are associated with.
 
-The settings can be accessed by the applet code through the interface offered via the \c DuiAppletInterface::constructWidget(const DuiAppletMetaData&, DuiDataStore&, DuiDataAccess&) call as the third argument.
+The settings can be accessed by the applet code through the interface offered via the \c MAppletInterface::constructWidget(const MAppletMetaData&, MDataStore&, MDataAccess&) call as the third argument.
 
 The instance and global settings are both accessed through this same interface. The user of the settings object can't really tell the difference between instance and global settings - they are intermixed.
 
@@ -158,10 +158,10 @@ The installation location for both of these files is the <tt>/usr/share/dui/appl
 
 \subsection appletcontainer Container communication API
 
-Applet may be reparented to a DuiContainer by DuiMashupCanvas. DuiContainer can expose optional applet information on its titlebar, including icon, title and additional informative text.To make an applet reside in a container, set the container-mode property in style sheet of the mashup canvas. An example taken from base style sheet of mashup canvas looks like 
+Applet may be reparented to a MContainer by MMashupCanvas. MContainer can expose optional applet information on its titlebar, including icon, title and additional informative text.To make an applet reside in a container, set the container-mode property in style sheet of the mashup canvas. An example taken from base style sheet of mashup canvas looks like 
 
 \code
-DuiMashupCanvasStyle {
+MMashupCanvasStyle {
     container-mode:true;
 }
 \endcode
@@ -178,13 +178,13 @@ Q_PROPERTY(QString appletTitle READ title WRITE setTitle)
 Q_PROPERTY(QString appletText READ text WRITE setText)
 
 signals:
-    // change icon in DuiContainer
+    // change icon in MContainer
     void appletIconChanged(QString newIcon);
 
-    // change title in DuiContainer
+    // change title in MContainer
     void appletTitleChanged(QString newTitle);
 
-    // change additional text in DuiContainer
+    // change additional text in MContainer
     void appletTextChanged(QString newText);
 \endcode
 
@@ -195,13 +195,13 @@ The property and signal names must be as stated above. The property access funct
 Every applet has an applet identifier that is used in a few places in the applet system. The applet identifier is a string that uniquely identifies the applet. Note however that the applet identifier is not an applet instance specific identifier.
 
 The applet identifier is determined like this:
-- If an identifier (<tt>X-DUIApplet-Identifier</tt>) is specified in the  \ref appletmetadata "applet metadata" (and it is valid), that is used
+- If an identifier (<tt>Identifier</tt>) is specified in the \ref appletmetadata "applet metadata" (and it is valid), that is used
   - If the identifier in the metadata is not specified or it can't be used (e.g. it is ill-formed) an identifier is extracted from the applet shared library name:
     - Assuming your applet is packaged to a shared library called <tt>lib<strong>exampleapplet</strong>.so</tt>, the identifier will be <strong>exampleapplet</strong>.
 
 \subsection appletstyling Applet styling
 
-Applets can define their own styles just like any other applications in the DUI world. Styling is done with style sheets and images in the \ref styling "usual way". The only important thing with applets is the location of the style resources.
+Applets can define their own styles just like any other applications in the MeeGo Touch world. Styling is done with style sheets and images in the \ref styling "usual way". The only important thing with applets is the location of the style resources.
 
 The \ref appletidentifier "applet identifier" is used in the construction of the resource location. The applet identifier is used as the application name in the directory name. See \ref theme_structure for more information about the directory locations.
 
@@ -263,17 +263,17 @@ To be able to define different configurations for different purposes the applica
 should not contain this file. Instead, there should be a settings template package for the
 application which can be instantiated for different configurations. For an example how to
 achieve this refer to the duihomescreen-settings-template package. It contains example
-ConfML, XSLT and GCFML files for the DUI Home Screen package in the conf directory, the
+ConfML, XSLT and GCFML files for the MeeGo Touch Home Screen package in the conf directory, the
 necessary debian packaging files in the debian directory and tests in the tests directory.
 An instantiated version of the template, duihomescreen-settings-default, which also contains
 the sources, can be fetched with apt-get source duihomescreen-settings-default.
 
 \see
 
-- DuiMashupCanvas
-- DuiAppletInterface
-- DuiAppletMetaData
-- DuiDataStore
-- DuiDataAccess
+- MMashupCanvas
+- MAppletInterface
+- MAppletMetaData
+- MDataStore
+- MDataAccess
 */
 
diff --git a/doc/src/applicationextensions.dox b/doc/src/applicationextensions.dox
index 78f6834f..c35f1a63 100644
--- a/doc/src/applicationextensions.dox
+++ b/doc/src/applicationextensions.dox
@@ -12,21 +12,21 @@ For developing application extensions you need:
 From a developers point of view an application extension consists of a shared library, a desktop entry file and possibly some resources (such as images).
 All of these are put into a debian package to enable installation of application extensions to devices.
 
-An application extension is implemented as a Qt plugin. The interface class used as the base class of all application extensions is \c DuiApplicationExtensionInterface.
+An application extension is implemented as a Qt plugin. It is a good practice to name the shared library so that the related application is mentioned in the name in addition to the extension name (for example libmyapplication-myextension.so). The interface class used as the base class of all application extensions is \c MApplicationExtensionInterface.
 The interface provides a method for initializing the plugin, which must be implemented by the application extension:
-\code bool DuiApplicationExtensionInterface::initialize(const QString &interface) \endcode
+\code bool MApplicationExtensionInterface::initialize(const QString &interface) \endcode
 The extension gets the name of the interface as a parameter. The extension can but does not need to use this information for any purpose.
 The boolean return value should indicate whether the initialization was successful or not.
 
 The interface also has an method for returning the widget used for the UI of the application extension:
-\code DuiWidget *widget() \endcode
-In this method you need to return a pointer to the \c DuiWidget of your application extension. In case an UI is not required, this method can be left out.
-\b Note: The ownership of the \c DuiWidget is left to the application extension, so you should destroy the widget yourself in the destructor of the extension.
+\code MWidget *widget() \endcode
+In this method you need to return a pointer to the \c MWidget of your application extension. In case an UI is not required, this method can be left out.
+\b Note: The ownership of the \c MWidget is left to the application extension, so you should destroy the widget yourself in the destructor of the extension.
 
-To use application extensions of particular interface in an application, an instance of \c DuiApplicationExtensionArea is created:
+To use application extensions of particular interface in an application, an instance of \c MApplicationExtensionArea is created:
 
 \code
-new DuiApplicationExtensionArea(interface, enableInProcessExtensions, parent);
+new MApplicationExtensionArea(interface, enableInProcessExtensions, parent);
 \endcode
 
 where interface is the name of the interface the extensions in the area implement, enableInProcessExtensions is a boolean which tells whether
@@ -37,7 +37,7 @@ the area can load in-process extensions and parent is the parent QGraphicsItem.
 Developing application extensions and the application that uses them is done differently depending whether the extensions can be run in-process or out-of-process.
 
 In-process
-- direct communication between application and extension supported by subclassing DuiApplicationExtensionInterface
+- direct communication between application and extension supported by subclassing MApplicationExtensionInterface
 - the extension can open dialogs and views
 - the extension can extend the applications UI
 - the extension can crash the host application
@@ -56,15 +56,15 @@ Out-of-process
 
 #include <duiapplicationextensioninterface.h>
 
-class DemoExtensionInterface : public DuiApplicationExtensionInterface
+class DemoExtensionInterface : public MApplicationExtensionInterface
 {
-    Q_INTERFACES(DuiApplicationExtensionInterface)
+    Q_INTERFACES(MApplicationExtensionInterface)
 
 public:
     virtual void demoExtensionSpecificOperation() = 0;
 };
 
-Q_DECLARE_INTERFACE(DemoExtensionInterface, "com.nokia.dui.core.DemoExtensionInterface/1.0")
+Q_DECLARE_INTERFACE(DemoExtensionInterface, "com.meego.core.DemoExtensionInterface/1.0")
 
 #endif
 \endcode
@@ -75,14 +75,14 @@ Q_DECLARE_INTERFACE(DemoExtensionInterface, "com.nokia.dui.core.DemoExtensionInt
 #define DEMOEXTENSION_H_
 
 #include <QObject>
-#include <DuiApplicationExtensionInterface>
+#include <MApplicationExtensionInterface>
 
-class DuiButton;
+class MButton;
 
 class DemoApplicationExtension : public QObject, public DemoExtensionInterface
 {
     Q_OBJECT
-    Q_INTERFACES(DemoExtensionInterface DuiApplicationExtensionInterface)
+    Q_INTERFACES(DemoExtensionInterface MApplicationExtensionInterface)
 
 public:
     DemoApplicationExtension();
@@ -90,26 +90,26 @@ public:
 
     virtual void demoExtensionSpecificOperation();
 
-    //! methods derived from DuiApplicationExtensionInterface
+    //! methods derived from MApplicationExtensionInterface
     virtual bool initialize(const QString &interface);
-    virtual DuiWidget *widget();
+    virtual MWidget *widget();
 
 private:
-    DuiButton *button;
+    MButton *button;
 };
 
 #endif
 \endcode
 
-\b Note that the Q_INTERFACES list must include both the demo specific interface DemoExtensionInterface and the base interface DuiApplicationExtensionInterface.
+\b Note that the Q_INTERFACES list must include both the demo specific interface DemoExtensionInterface and the base interface MApplicationExtensionInterface.
 
 \code
  // demoextension.cpp
-#include <DuiButton>
+#include <MButton>
 #include "demoextension.h"
-#include <DuiLibrary>
+#include <MLibrary>
 
-DUI_LIBRARY
+M_LIBRARY
 Q_EXPORT_PLUGIN2(demoextension, DemoApplicationExtension)
 
 DemoApplicationExtension::DemoApplicationExtension() : button(0)
@@ -128,19 +128,19 @@ void DemoApplicationExtension::demoExtensionSpecificOperation()
 
 bool DemoApplicationExtension::initialize(const QString &)
 {
-    button = new DuiButton("Hello World");
+    button = new MButton("Hello World");
 
     return true;
 }
 
-DuiWidget *DemoApplicationExtension::widget()
+MWidget *DemoApplicationExtension::widget()
 {
     return button;
 }
 
 \endcode
 
-In the application that wants to use the extensions implementing the com.nokia.dui.core.DemoExtensionInterface/1.0 defined above,
+In the application that wants to use the extensions implementing the com.meego.core.DemoExtensionInterface/1.0 defined above,
 the application should create an application extension area like this:
 
 \code
@@ -150,18 +150,18 @@ the application should create an application extension area like this:
 ...
 void DemoApp::createExtensionArea()
 {
-    DuiApplicationExtensionArea *extensionArea =
-        new DuiApplicationExtensionArea("com.nokia.dui.core.DemoApplicationExtensionInterface/1.0");
+    MApplicationExtensionArea *extensionArea =
+        new MApplicationExtensionArea("com.meego.core.DemoApplicationExtensionInterface/1.0");
     layout->addItem(extensionArea);
 
     // Listen to signals about new and removed extensions
-    connect(area, SIGNAL(extensionInstantiated(DuiApplicationExtensionInterface*)),
-            this, SLOT(addExtension(DuiApplicationExtensionInterface*)));
-    connect(area, SIGNAL(extensionRemoved(DuiApplicationExtensionInterface*)),
-            this, SLOT(removeExtension(DuiApplicationExtensionInterface*)));
+    connect(area, SIGNAL(extensionInstantiated(MApplicationExtensionInterface*)),
+            this, SLOT(addExtension(MApplicationExtensionInterface*)));
+    connect(area, SIGNAL(extensionRemoved(MApplicationExtensionInterface*)),
+            this, SLOT(removeExtension(MApplicationExtensionInterface*)));
 }
 
-void DemoApp::addExtension(DuiApplicationExtensionInterface *extension)
+void DemoApp::addExtension(MApplicationExtensionInterface *extension)
 {
     DemoExtensionInterface *demoExtension = static_cast<DemoExtensionInterface *>(extension);
 
@@ -175,10 +175,10 @@ void DemoApp::addExtension(DuiApplicationExtensionInterface *extension)
 \subsection appextensiondesktopfile Application extension desktop file
 
 Application extension must have a \c .desktop file written according to <a href="http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec">freedesktop.org desktop entry specification</a>.
-The keys \c Type and \c Name are required as specified in the desktop entry specification.
-The \c Exec key is optionally used to specify a runner binary (usually duiapplicationextensionrunner) which is launched in separate process to run the application extension binary. If the key is not used, the application extension is run inside the host process.
+The keys \c Type and \c Name are required as specified in the desktop entry specification. The type must be \c X-MeeGoApplicationExtension.
+The \c Exec key is optionally used to specify a runner binary (usually mapplicationextensionrunner) which is launched in separate process to run the application extension binary. If the key is not used, the application extension is run inside the host process.
 
-Application extensions extend the specification by defining a new type \b DuiApplicationExtension and the following new keys that are put inside the X-DUI group:
+Application extensions extend the specification by defining a new type \b MApplicationExtension and the following new keys that are put inside the X-MeeGoApplicationExtension group:
 
 <table>
 <tr>
@@ -188,19 +188,19 @@ Application extensions extend the specification by defining a new type \b DuiApp
  <th>Required</th>
 </tr>
 <tr>
-  <td>DUIApplicationExtension-Interface</td>
+  <td>Interface</td>
   <td>Defines the name of the interface implemented by this extension.</td>
   <td>string</td>
   <td>YES</td>
 </tr>
 <tr>
-  <td>DUIApplicationExtension-Extension</td>
+  <td>Extension</td>
   <td>Defines the application extension binary. This binary needs to be located in \c /usr/lib/dui/applicationextensions/ - directory.</td>
   <td>string</td>
   <td>YES</td>
 </tr>
 <tr>
-  <td>DUIApplicationExtension-Identifier</td>
+  <td>Identifier</td>
   <td>Defines an identifier for the application extension.
   The identifier is used for example defining the application extension specific style resource locations when it's run as out-of-process.</td>
   <td>string (can contain characters [a-zA-Z0-9_-])</td>
@@ -212,23 +212,23 @@ Following is an example of application extension desktop file:
 
 \code
 [Desktop Entry]
-Type=DuiApplicationExtension
+Type=X-MeeGoApplicationExtension
 Name=ExampleExtension
-Exec=duiapplicationextensionrunner
+Exec=mapplicationextensionrunner
 
-[X-DUI]
-DUIApplicationExtension-Interface=com.nokia.dui.core.DemoExtensionInterface/1.0
-DUIApplicationExtension-Extension=libdemoextension.so
+[X-MeeGoApplicationExtension]
+Interface=com.meego.core.DemoExtensionInterface/1.0
+Extension=libdemoapplication-demoextension.so
 \endcode
 
 \subsection appextensioncontainer Container communication API
 
-Application extension widgets are by default reparented to a DuiContainer.
-DuiContainer can expose optional application extension information on its titlebar, including icon, title and additional informative text.
+Application extension widgets are by default reparented to a MContainer.
+MContainer can expose optional application extension information on its titlebar, including icon, title and additional informative text.
 To make an application extension not reside in a container, set the container-mode property of the application extension area to false:
 
 \code
-DuiApplicationExtensionAreaStyle {
+MApplicationExtensionAreaStyle {
     container-mode: false;
 }
 \endcode
@@ -241,13 +241,13 @@ Q_PROPERTY(QString applicationExtensionTitle READ title WRITE setTitle)
 Q_PROPERTY(QString applicationExtensionText  READ text  WRITE setText)
 
 signals:
-    // change icon in DuiContainer
+    // change icon in MContainer
     void applicationExtensionIconChanged(QString newIcon);
 
-    // change title in DuiContainer
+    // change title in MContainer
     void applicationExtensionTitleChanged(QString newTitle);
 
-    // change additional text in DuiContainer
+    // change additional text in MContainer
     void applicationExtensionTextChanged(QString newText);
 \endcode
 
diff --git a/src/extensions/applicationextension/mapplicationextensioninterface.h b/src/extensions/applicationextension/mapplicationextensioninterface.h
index 10a87b1b..777bcc0f 100644
--- a/src/extensions/applicationextension/mapplicationextensioninterface.h
+++ b/src/extensions/applicationextension/mapplicationextensioninterface.h
@@ -67,6 +67,6 @@ public:
     virtual MWidget *widget() { return NULL; }
 };
 
-Q_DECLARE_INTERFACE(MApplicationExtensionInterface, "com.nokia.m.core.ApplicationExtensionInterface/1.0")
+Q_DECLARE_INTERFACE(MApplicationExtensionInterface, "com.meego.core.MApplicationExtensionInterface/1.0")
 
 #endif // MAPPLICATIONEXTENSIONINTERFACE_H
diff --git a/src/extensions/applicationextension/mapplicationextensionmanager.cpp b/src/extensions/applicationextension/mapplicationextensionmanager.cpp
index 4cfc6677..374355ed 100644
--- a/src/extensions/applicationextension/mapplicationextensionmanager.cpp
+++ b/src/extensions/applicationextension/mapplicationextensionmanager.cpp
@@ -74,7 +74,7 @@ void MApplicationExtensionManager::updateAvailableExtensions(const QString &path
         foreach(const QString &fileName, applicationExtensionsDir.entryList(filter, QDir::Files)) {
             const QString desktopFile = QFileInfo(applicationExtensionsDir, fileName).absoluteFilePath();
             QSharedPointer<MApplicationExtensionMetaData> metadata(new MApplicationExtensionMetaData(desktopFile));
-            if (metadata->isValid() && metadata->interface() == interface) {
+            if (metadata->isValid() && metadata->type() == "X-MeeGoApplicationExtension" && metadata->interface() == interface) {
                 currentExtensionsList.append(fileName);
 
                 if (!extensionMetaDatas.contains(fileName)) {
diff --git a/src/extensions/applicationextension/mapplicationextensionmetadata.cpp b/src/extensions/applicationextension/mapplicationextensionmetadata.cpp
index 6fcb433d..cd73f112 100644
--- a/src/extensions/applicationextension/mapplicationextensionmetadata.cpp
+++ b/src/extensions/applicationextension/mapplicationextensionmetadata.cpp
@@ -21,9 +21,9 @@
 #include <QDir>
 #include <MDebug>
 
-const QString ExtensionBinaryKey("X-M/MApplicationExtension-Extension");
-const QString IdentifierKey("X-M/MApplicationExtension-Identifier");
-const QString InterfaceKey("X-M/MApplicationExtension-Interface");
+const QString ExtensionBinaryKey("X-MeeGoApplicationExtension/Extension");
+const QString IdentifierKey("X-MeeGoApplicationExtension/Identifier");
+const QString InterfaceKey("X-MeeGoApplicationExtension/Interface");
 
 MApplicationExtensionMetaData::MApplicationExtensionMetaData(const QString &fileName) : MDesktopEntry(fileName)
 {
diff --git a/src/extensions/mashup/appletinterface/mappletinterface.h b/src/extensions/mashup/appletinterface/mappletinterface.h
index 277fb1c5..074a3012 100644
--- a/src/extensions/mashup/appletinterface/mappletinterface.h
+++ b/src/extensions/mashup/appletinterface/mappletinterface.h
@@ -60,6 +60,6 @@ public:
     virtual MWidget *constructWidget(const MAppletMetaData &metadata, MDataStore &instanceData, MDataAccess &settings) = 0;
 };
 
-Q_DECLARE_INTERFACE(MAppletInterface, "com.nokia.m.core.AppletInterface/1.0")
+Q_DECLARE_INTERFACE(MAppletInterface, "com.meego.core.MAppletInterface/1.0")
 
 #endif // MAPPLETINTERFACE_H
diff --git a/src/extensions/mashup/appletinterface/mappletmetadata.cpp b/src/extensions/mashup/appletinterface/mappletmetadata.cpp
index 5db28da9..925ab807 100644
--- a/src/extensions/mashup/appletinterface/mappletmetadata.cpp
+++ b/src/extensions/mashup/appletinterface/mappletmetadata.cpp
@@ -21,9 +21,8 @@
 #include <QDir>
 #include <MDebug>
 
-
-const QString AppletBinaryKey("M/X-MApplet-Applet");
-const QString IdentifierKey("M/X-MApplet-Identifier");
+const QString AppletBinaryKey("X-MeeGoApplet/Applet");
+const QString IdentifierKey("X-MeeGoApplet/Identifier");
 const QString IconKey("Desktop Entry/Icon");
 
 // Required desktop entry keys in an applet metadata file