Rename maemo6 sensors plugin.

Fixes: MOBILITY-1759

29 files changed, 285 insertions, 285 deletions

diff --git a/plugins/sensors/maemo6/Sensors.conf b/plugins/sensors/maemo6/Sensors.conf
deleted file mode 100644
index 0b1fc6e546..0000000000
--- a/plugins/sensors/maemo6/Sensors.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[Default]
-QAccelerometer=maemo6.accelerometer
-QAmbientLightSensor=maemo6.als
-QCompass=maemo6.compass
-QMagnetometer=maemo6.magnetometer
-QOrientationSensor=maemo6.orientationsensor
-QProximitySensor=maemo6.proximity
-QRotationSensor=maemo6.rotationsensor
-QTapSensor=maemo6.tapsensor
diff --git a/plugins/sensors/maemo6/maemo6.pri b/plugins/sensors/maemo6/maemo6.pri
deleted file mode 100644
index 74433873d4..0000000000
--- a/plugins/sensors/maemo6/maemo6.pri
+++ /dev/null
@@ -1,22 +0,0 @@
-HEADERS += maemo6sensorbase.h \
-    maemo6accelerometer.h \
-    maemo6als.h \
-    maemo6compass.h \
-    maemo6gyroscope.h \
-    maemo6magnetometer.h \
-    maemo6orientationsensor.h \
-    maemo6proximitysensor.h \
-    maemo6rotationsensor.h \
-    maemo6tapsensor.h
-
-SOURCES += maemo6sensorbase.cpp \
-    maemo6accelerometer.cpp \
-    maemo6als.cpp \
-    maemo6compass.cpp \
-    maemo6gyroscope.cpp \
-    maemo6magnetometer.cpp \
-    maemo6orientationsensor.cpp \
-    maemo6proximitysensor.cpp \
-    maemo6rotationsensor.cpp \
-    maemo6tapsensor.cpp \
-    main.cpp
diff --git a/plugins/sensors/maemo6/main.cpp b/plugins/sensors/maemo6/main.cpp
deleted file mode 100644
index 20de7c6629..0000000000
--- a/plugins/sensors/maemo6/main.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "maemo6accelerometer.h"
-#include "maemo6als.h"
-#include "maemo6compass.h"
-#include "maemo6magnetometer.h"
-#include "maemo6orientationsensor.h"
-#include "maemo6proximitysensor.h"
-#include "maemo6rotationsensor.h"
-#include "maemo6tapsensor.h"
-#include "maemo6gyroscope.h"
-
-#include <qsensorplugin.h>
-#include <qsensorbackend.h>
-#include <qsensormanager.h>
-#include <QDebug>
-
-class maemo6SensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory
-{
-    Q_OBJECT
-    Q_INTERFACES(QtMobility::QSensorPluginInterface)
-public:
-    void registerSensors()
-    {
-        QSensorManager::registerBackend(QAccelerometer::type, maemo6accelerometer::id, this);
-        QSensorManager::registerBackend(QAmbientLightSensor::type, maemo6als::id, this);
-        QSensorManager::registerBackend(QCompass::type, maemo6compass::id, this);
-        QSensorManager::registerBackend(QMagnetometer::type, maemo6magnetometer::id, this);
-        QSensorManager::registerBackend(QOrientationSensor::type, maemo6orientationsensor::id, this);
-        QSensorManager::registerBackend(QProximitySensor::type, maemo6proximitysensor::id, this);
-        QSensorManager::registerBackend(QRotationSensor::type, maemo6rotationsensor::id, this);
-        QSensorManager::registerBackend(QTapSensor::type, maemo6tapsensor::id, this);
-        QSensorManager::registerBackend(QGyroscope::type, maemo6gyroscope::id, this);
-        qDebug() << "Loaded the Maemo 6 sensor plugin";
-    }
-
-    QSensorBackend *createBackend(QSensor *sensor)
-    {
-        if (sensor->identifier() == maemo6accelerometer::id)
-            return new maemo6accelerometer(sensor);
-        else if (sensor->identifier() == maemo6als::id)
-            return new maemo6als(sensor);
-        else if (sensor->identifier() == maemo6compass::id)
-            return new maemo6compass(sensor);
-        else if (sensor->identifier() == maemo6magnetometer::id)
-            return new maemo6magnetometer(sensor);
-        else if (sensor->identifier() == maemo6orientationsensor::id)
-            return new maemo6orientationsensor(sensor);
-        else if (sensor->identifier() == maemo6proximitysensor::id)
-            return new maemo6proximitysensor(sensor);
-        else if (sensor->identifier() == maemo6rotationsensor::id)
-            return new maemo6rotationsensor(sensor);
-        else if (sensor->identifier() == maemo6tapsensor::id)
-            return new maemo6tapsensor(sensor);
-        else if (sensor->identifier() == maemo6gyroscope::id)
-            return new maemo6gyroscope(sensor);
-        return 0;
-    }
-};
-
-Q_EXPORT_PLUGIN2(libsensors_maemo6, maemo6SensorPlugin)
-
-#include "main.moc"
diff --git a/plugins/sensors/meego/Sensors.conf b/plugins/sensors/meego/Sensors.conf
new file mode 100644
index 0000000000..6613faacd0
--- /dev/null
+++ b/plugins/sensors/meego/Sensors.conf
@@ -0,0 +1,9 @@
+[Default]
+QAccelerometer=meego.accelerometer
+QAmbientLightSensor=meego.als
+QCompass=meego.compass
+QMagnetometer=meego.magnetometer
+QOrientationSensor=meego.orientationsensor
+QProximitySensor=meego.proximity
+QRotationSensor=meego.rotationsensor
+QTapSensor=meego.tapsensor
diff --git a/plugins/sensors/meego/main.cpp b/plugins/sensors/meego/main.cpp
new file mode 100644
index 0000000000..ce04fdb8e3
--- /dev/null
+++ b/plugins/sensors/meego/main.cpp
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "meegoaccelerometer.h"
+#include "meegoals.h"
+#include "meegocompass.h"
+#include "meegomagnetometer.h"
+#include "meegoorientationsensor.h"
+#include "meegoproximitysensor.h"
+#include "meegorotationsensor.h"
+#include "meegotapsensor.h"
+#include "meegogyroscope.h"
+
+#include <qsensorplugin.h>
+#include <qsensorbackend.h>
+#include <qsensormanager.h>
+#include <QDebug>
+
+class meegoSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorBackendFactory
+{
+    Q_OBJECT
+    Q_INTERFACES(QtMobility::QSensorPluginInterface)
+public:
+    void registerSensors()
+    {
+        QSensorManager::registerBackend(QAccelerometer::type, meegoaccelerometer::id, this);
+        QSensorManager::registerBackend(QAmbientLightSensor::type, meegoals::id, this);
+        QSensorManager::registerBackend(QCompass::type, meegocompass::id, this);
+        QSensorManager::registerBackend(QMagnetometer::type, meegomagnetometer::id, this);
+        QSensorManager::registerBackend(QOrientationSensor::type, meegoorientationsensor::id, this);
+        QSensorManager::registerBackend(QProximitySensor::type, meegoproximitysensor::id, this);
+        QSensorManager::registerBackend(QRotationSensor::type, meegorotationsensor::id, this);
+        QSensorManager::registerBackend(QTapSensor::type, meegotapsensor::id, this);
+        QSensorManager::registerBackend(QGyroscope::type, meegogyroscope::id, this);
+        qDebug() << "Loaded the MeeGo sensor plugin";
+    }
+
+    QSensorBackend *createBackend(QSensor *sensor)
+    {
+        if (sensor->identifier() == meegoaccelerometer::id)
+            return new meegoaccelerometer(sensor);
+        else if (sensor->identifier() == meegoals::id)
+            return new meegoals(sensor);
+        else if (sensor->identifier() == meegocompass::id)
+            return new meegocompass(sensor);
+        else if (sensor->identifier() == meegomagnetometer::id)
+            return new meegomagnetometer(sensor);
+        else if (sensor->identifier() == meegoorientationsensor::id)
+            return new meegoorientationsensor(sensor);
+        else if (sensor->identifier() == meegoproximitysensor::id)
+            return new meegoproximitysensor(sensor);
+        else if (sensor->identifier() == meegorotationsensor::id)
+            return new meegorotationsensor(sensor);
+        else if (sensor->identifier() == meegotapsensor::id)
+            return new meegotapsensor(sensor);
+        else if (sensor->identifier() == meegogyroscope::id)
+            return new meegogyroscope(sensor);
+        return 0;
+    }
+};
+
+Q_EXPORT_PLUGIN2(libsensors_meego, meegoSensorPlugin)
+
+#include "main.moc"
diff --git a/plugins/sensors/meego/meego.pri b/plugins/sensors/meego/meego.pri
new file mode 100644
index 0000000000..d8d5063ca2
--- /dev/null
+++ b/plugins/sensors/meego/meego.pri
@@ -0,0 +1,22 @@
+HEADERS += meegosensorbase.h \
+    meegoaccelerometer.h \
+    meegoals.h \
+    meegocompass.h \
+    meegogyroscope.h \
+    meegomagnetometer.h \
+    meegoorientationsensor.h \
+    meegoproximitysensor.h \
+    meegorotationsensor.h \
+    meegotapsensor.h
+
+SOURCES += meegosensorbase.cpp \
+    meegoaccelerometer.cpp \
+    meegoals.cpp \
+    meegocompass.cpp \
+    meegogyroscope.cpp \
+    meegomagnetometer.cpp \
+    meegoorientationsensor.cpp \
+    meegoproximitysensor.cpp \
+    meegorotationsensor.cpp \
+    meegotapsensor.cpp \
+    main.cpp
diff --git a/plugins/sensors/maemo6/maemo6.pro b/plugins/sensors/meego/meego.pro
index 953e06f5b5..265c69042e 100644
--- a/plugins/sensors/maemo6/maemo6.pro
+++ b/plugins/sensors/meego/meego.pro
@@ -4,10 +4,10 @@ PLUGIN_TYPE = sensors
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtsensors_maemo6)
+TARGET = $$qtLibraryTarget(qtsensors_meego)
 
 include(version.pri)
-include(maemo6.pri)
+include(meego.pri)
 include(../../../common.pri)
 
 QT = core dbus network
diff --git a/plugins/sensors/maemo6/maemo6accelerometer.cpp b/plugins/sensors/meego/meegoaccelerometer.cpp
index aff4ee51c6..0caa702599 100644
--- a/plugins/sensors/maemo6/maemo6accelerometer.cpp
+++ b/plugins/sensors/meego/meegoaccelerometer.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "maemo6accelerometer.h"
+#include "meegoaccelerometer.h"
 
-char const * const maemo6accelerometer::id("maemo6.accelerometer");
-bool maemo6accelerometer::m_initDone = false;
+char const * const meegoaccelerometer::id("meego.accelerometer");
+bool meegoaccelerometer::m_initDone = false;
 
-maemo6accelerometer::maemo6accelerometer(QSensor *sensor)
-    : maemo6sensorbase(sensor)
+meegoaccelerometer::meegoaccelerometer(QSensor *sensor)
+    : meegosensorbase(sensor)
 {
     initSensor<AccelerometerSensorChannelInterface>(m_initDone);
     setDescription(QLatin1String("x, y, and z axes accelerations in m/s^2"));
@@ -53,7 +53,7 @@ maemo6accelerometer::maemo6accelerometer(QSensor *sensor)
     setReading<QAccelerometerReading>(&m_reading);
 }
 
-void maemo6accelerometer::slotDataAvailable(const XYZ& data)
+void meegoaccelerometer::slotDataAvailable(const XYZ& data)
 {
     // Convert from milli-Gs to meters per second per second
     // Using 1 G = 9.80665 m/s^2
@@ -64,14 +64,14 @@ void maemo6accelerometer::slotDataAvailable(const XYZ& data)
     newReadingAvailable();
 }
 
-void maemo6accelerometer::slotFrameAvailable(const QVector<XYZ>&  frame)
+void meegoaccelerometer::slotFrameAvailable(const QVector<XYZ>&  frame)
 {
     for (int i=0, l=frame.size(); i<l; i++){
         slotDataAvailable(frame.at(i));
     }
 }
 
-bool maemo6accelerometer::doConnect(){
+bool meegoaccelerometer::doConnect(){
     if (m_bufferSize==1?
                 QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))):
                 QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector<XYZ>& )),this, SLOT(slotFrameAvailable(const QVector<XYZ>& ))))
@@ -80,6 +80,6 @@ bool maemo6accelerometer::doConnect(){
 }
 
 
-const QString maemo6accelerometer::sensorName(){
+const QString meegoaccelerometer::sensorName(){
     return "accelerometersensor";
 }
diff --git a/plugins/sensors/maemo6/maemo6accelerometer.h b/plugins/sensors/meego/meegoaccelerometer.h
index 473ef2eb4e..8d71715918 100644
--- a/plugins/sensors/maemo6/maemo6accelerometer.h
+++ b/plugins/sensors/meego/meegoaccelerometer.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6ACCELEROMETER_H
-#define MAEMO6ACCELEROMETER_H
+#ifndef MEEGOACCELEROMETER_H
+#define MEEGOACCELEROMETER_H
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 #include <qaccelerometer.h>
 
 #include <accelerometersensor_i.h>
@@ -50,13 +50,13 @@
 
 QTM_USE_NAMESPACE
 
-class maemo6accelerometer : public maemo6sensorbase
+class meegoaccelerometer : public meegosensorbase
 {
     Q_OBJECT
 
 public:
     static char const * const id;
-    maemo6accelerometer(QSensor *sensor);
+    meegoaccelerometer(QSensor *sensor);
 protected:
     virtual bool doConnect();
     virtual const QString sensorName();
diff --git a/plugins/sensors/maemo6/maemo6als.cpp b/plugins/sensors/meego/meegoals.cpp
index a567f75690..8964e96c39 100644
--- a/plugins/sensors/maemo6/maemo6als.cpp
+++ b/plugins/sensors/meego/meegoals.cpp
@@ -39,13 +39,13 @@
 **
 ****************************************************************************/
 
-#include "maemo6als.h"
+#include "meegoals.h"
 
-char const * const maemo6als::id("maemo6.als");
-bool maemo6als::m_initDone = false;
+char const * const meegoals::id("meego.als");
+bool meegoals::m_initDone = false;
 
-maemo6als::maemo6als(QSensor *sensor)
-    : maemo6sensorbase(sensor)
+meegoals::meegoals(QSensor *sensor)
+    : meegosensorbase(sensor)
 {
     initSensor<ALSSensorChannelInterface>(m_initDone);
     setReading<QAmbientLightReading>(&m_reading);
@@ -54,7 +54,7 @@ maemo6als::maemo6als(QSensor *sensor)
     addOutputRange(0, 5, 1);
 }
 
-void maemo6als::slotDataAvailable(const Unsigned& data)
+void meegoals::slotDataAvailable(const Unsigned& data)
 {
     // Convert from integer to fixed levels
     // TODO: verify levels
@@ -80,7 +80,7 @@ void maemo6als::slotDataAvailable(const Unsigned& data)
     }
 }
 
-bool maemo6als::doConnect(){
+bool meegoals::doConnect(){
     if (!(QObject::connect(m_sensorInterface, SIGNAL(ALSChanged(const Unsigned&)),
                            this, SLOT(slotDataAvailable(const Unsigned&))))){
         return false;
@@ -89,6 +89,6 @@ bool maemo6als::doConnect(){
 }
 
 
-const QString maemo6als::sensorName(){
+const QString meegoals::sensorName(){
     return "alssensor";
 }
diff --git a/plugins/sensors/maemo6/maemo6als.h b/plugins/sensors/meego/meegoals.h
index 4d3be8c182..135139cd4a 100644
--- a/plugins/sensors/maemo6/maemo6als.h
+++ b/plugins/sensors/meego/meegoals.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6ALS_H
-#define MAEMO6ALS_H
+#ifndef MEEGOALS_H
+#define MEEGOALS_H
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 #include <qambientlightsensor.h>
 
 #include <alssensor_i.h>
@@ -50,13 +50,13 @@
 
 QTM_USE_NAMESPACE
 
-class maemo6als : public maemo6sensorbase
+class meegoals : public meegosensorbase
 {
     Q_OBJECT
 
 public:
     static char const * const id;
-    maemo6als(QSensor *sensor);
+    meegoals(QSensor *sensor);
 protected:
     virtual bool doConnect();
     virtual const QString sensorName();
diff --git a/plugins/sensors/maemo6/maemo6compass.cpp b/plugins/sensors/meego/meegocompass.cpp
index 0f1eb1ad5c..bbb14372a3 100644
--- a/plugins/sensors/maemo6/maemo6compass.cpp
+++ b/plugins/sensors/meego/meegocompass.cpp
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#include "maemo6compass.h"
+#include "meegocompass.h"
 
-char const * const maemo6compass::id("maemo6.compass");
-bool maemo6compass::m_initDone = false;
+char const * const meegocompass::id("meego.compass");
+bool meegocompass::m_initDone = false;
 
-maemo6compass::maemo6compass(QSensor *sensor)
-    : maemo6sensorbase(sensor)
+meegocompass::meegocompass(QSensor *sensor)
+    : meegosensorbase(sensor)
 {
     initSensor<CompassSensorChannelInterface>(m_initDone);
     setReading<QCompassReading>(&m_reading);
 }
 
-void maemo6compass::slotDataAvailable(const Compass& data)
+void meegocompass::slotDataAvailable(const Compass& data)
 {
     // The scale for level is [0,3], where 3 is the best
     // Qt: Measured as a value from 0 to 1 with higher values being better.
@@ -66,7 +66,7 @@ void maemo6compass::slotDataAvailable(const Compass& data)
 }
 
 
-bool maemo6compass::doConnect(){
+bool meegocompass::doConnect(){
     if (!(QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const Compass&)),
                            this, SLOT(slotDataAvailable(const Compass&))))){
         return false;
@@ -74,7 +74,7 @@ bool maemo6compass::doConnect(){
     return true;
 }
 
-const QString maemo6compass::sensorName(){
+const QString meegocompass::sensorName(){
     return "compasssensor";
 }
 
diff --git a/plugins/sensors/maemo6/maemo6compass.h b/plugins/sensors/meego/meegocompass.h
index c33ef348f8..e2c7cf34fa 100644
--- a/plugins/sensors/maemo6/maemo6compass.h
+++ b/plugins/sensors/meego/meegocompass.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6COMPASS_H
-#define MAEMO6COMPASS_H
+#ifndef MEEGOCOMPASS_H
+#define MEEGOCOMPASS_H
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 #include <qcompass.h>
 
 #include <compasssensor_i.h>
@@ -50,13 +50,13 @@
 
 QTM_USE_NAMESPACE
 
-class maemo6compass : public maemo6sensorbase
+class meegocompass : public meegosensorbase
 {
     Q_OBJECT
 
 public:
     static char const * const id;
-    maemo6compass(QSensor *sensor);
+    meegocompass(QSensor *sensor);
 protected:
     virtual bool doConnect();
     virtual const QString sensorName();
diff --git a/plugins/sensors/maemo6/maemo6gyroscope.cpp b/plugins/sensors/meego/meegogyroscope.cpp
index 70591f7cff..d179337fae 100644
--- a/plugins/sensors/maemo6/maemo6gyroscope.cpp
+++ b/plugins/sensors/meego/meegogyroscope.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "maemo6gyroscope.h"
+#include "meegogyroscope.h"
 
-char const * const maemo6gyroscope::id("maemo6.gyroscope");
-const float maemo6gyroscope::MILLI = 0.001;
-bool maemo6gyroscope::m_initDone = false;
+char const * const meegogyroscope::id("meego.gyroscope");
+const float meegogyroscope::MILLI = 0.001;
+bool meegogyroscope::m_initDone = false;
 
-maemo6gyroscope::maemo6gyroscope(QSensor *sensor)
-    : maemo6sensorbase(sensor)
+meegogyroscope::meegogyroscope(QSensor *sensor)
+    : meegosensorbase(sensor)
 {
 //    initSensor<GyroscopeSensorChannelInterface>(m_initDone);
     setDescription(QLatin1String("angular velocities around x, y, and z axis in degrees per second"));
@@ -54,7 +54,7 @@ maemo6gyroscope::maemo6gyroscope(QSensor *sensor)
     setReading<QGyroscopeReading>(&m_reading);
 }
 
-void maemo6gyroscope::slotDataAvailable(const XYZ& data)
+void meegogyroscope::slotDataAvailable(const XYZ& data)
 {
     m_reading.setX((qreal)(data.x()*MILLI));
     m_reading.setY((qreal)(data.y()*MILLI));
@@ -63,14 +63,14 @@ void maemo6gyroscope::slotDataAvailable(const XYZ& data)
     newReadingAvailable();
 }
 
-void maemo6gyroscope::slotFrameAvailable(const QVector<XYZ>&  frame)
+void meegogyroscope::slotFrameAvailable(const QVector<XYZ>&  frame)
 {
     for (int i=0, l=frame.size(); i<l; i++){
         slotDataAvailable(frame.at(i));
     }
 }
 
-bool maemo6gyroscope::doConnect(){
+bool meegogyroscope::doConnect(){
     if (m_bufferSize==1?
                 QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))):
                 QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector<XYZ>& )),this, SLOT(slotFrameAvailable(const QVector<XYZ>& ))))
@@ -78,6 +78,6 @@ bool maemo6gyroscope::doConnect(){
     return false;
 }
 
-const QString maemo6gyroscope::sensorName(){
+const QString meegogyroscope::sensorName(){
     return "gyroscopesensor";
 }
diff --git a/plugins/sensors/maemo6/maemo6gyroscope.h b/plugins/sensors/meego/meegogyroscope.h
index 6be8345b63..6faf3d4e0d 100644
--- a/plugins/sensors/maemo6/maemo6gyroscope.h
+++ b/plugins/sensors/meego/meegogyroscope.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6GYROSCOPE_H
-#define MAEMO6GYROSCOPE_H
+#ifndef MEEGOGYROSCOPE_H
+#define MEEGOGYROSCOPE_H
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 #include <qgyroscope.h>
 #include <datatypes/xyz.h>
 //#include <gyroscopesensor_i.h>
@@ -50,13 +50,13 @@
 
 QTM_USE_NAMESPACE
 
-class maemo6gyroscope : public maemo6sensorbase
+class meegogyroscope : public meegosensorbase
 {
     Q_OBJECT
 
 public:
     static char const * const id;
-    maemo6gyroscope(QSensor *sensor);
+    meegogyroscope(QSensor *sensor);
 protected:
     virtual bool doConnect();
     virtual const QString sensorName();
@@ -72,4 +72,4 @@ private slots:
 };
 
 
-#endif // MAEMO6GYROSCOPE_H
+#endif // MEEGOGYROSCOPE_H
diff --git a/plugins/sensors/maemo6/maemo6magnetometer.cpp b/plugins/sensors/meego/meegomagnetometer.cpp
index 710b32b47d..76577bc478 100644
--- a/plugins/sensors/maemo6/maemo6magnetometer.cpp
+++ b/plugins/sensors/meego/meegomagnetometer.cpp
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "maemo6magnetometer.h"
+#include "meegomagnetometer.h"
 
-char const * const maemo6magnetometer::id("maemo6.magnetometer");
-bool maemo6magnetometer::m_initDone = false;
-const float maemo6magnetometer::NANO = 0.000000001;
+char const * const meegomagnetometer::id("meego.magnetometer");
+bool meegomagnetometer::m_initDone = false;
+const float meegomagnetometer::NANO = 0.000000001;
 
 
-maemo6magnetometer::maemo6magnetometer(QSensor *sensor)
-    : maemo6sensorbase(sensor)
+meegomagnetometer::meegomagnetometer(QSensor *sensor)
+    : meegosensorbase(sensor)
 {
     initSensor<MagnetometerSensorChannelInterface>(m_initDone);
     setDescription(QLatin1String("magnetic flux density in teslas (T)"));
@@ -55,7 +55,7 @@ maemo6magnetometer::maemo6magnetometer(QSensor *sensor)
     setReading<QMagnetometerReading>(&m_reading);
 }
 
-void maemo6magnetometer::start(){
+void meegomagnetometer::start(){
     QVariant v = sensor()->property("returnGeoValues");
     if (!(v.isValid())){
         sensor()->setProperty("returnGeoValues", false); //Set to false (the default) to return raw magnetic flux density
@@ -63,10 +63,10 @@ void maemo6magnetometer::start(){
     }
     else m_isGeoMagnetometer =  v.toBool();
 
-    maemo6sensorbase::start();
+    meegosensorbase::start();
 }
 
-void maemo6magnetometer::slotDataAvailable(const MagneticField& data)
+void meegomagnetometer::slotDataAvailable(const MagneticField& data)
 {
     //nanoTeslas given, divide with 10^9 to get Teslas
     m_reading.setX( NANO * m_isGeoMagnetometer?data.x():data.rx());
@@ -78,14 +78,14 @@ void maemo6magnetometer::slotDataAvailable(const MagneticField& data)
 }
 
 
-void maemo6magnetometer::slotFrameAvailable(const QVector<MagneticField>&   frame)
+void meegomagnetometer::slotFrameAvailable(const QVector<MagneticField>&   frame)
 {
     for (int i=0, l=frame.size(); i<l; i++){
         slotDataAvailable(frame.at(i));
     }
 }
 
-bool maemo6magnetometer::doConnect(){
+bool meegomagnetometer::doConnect(){
     if (m_bufferSize==1?
                 QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const MagneticField&)), this, SLOT(slotDataAvailable(const MagneticField&))):
                 QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector<MagneticField>& )),this, SLOT(slotFrameAvailable(const QVector<MagneticField>& ))))
@@ -93,6 +93,6 @@ bool maemo6magnetometer::doConnect(){
     return false;
 }
 
-const QString maemo6magnetometer::sensorName(){
+const QString meegomagnetometer::sensorName(){
     return "magnetometersensor";
 }
diff --git a/plugins/sensors/maemo6/maemo6magnetometer.h b/plugins/sensors/meego/meegomagnetometer.h
index e9cef7d60a..1f26cfb52b 100644
--- a/plugins/sensors/maemo6/maemo6magnetometer.h
+++ b/plugins/sensors/meego/meegomagnetometer.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6MAGNETOMETER_H
-#define MAEMO6MAGNETOMETER_H
+#ifndef MEEGOMAGNETOMETER_H
+#define MEEGOMAGNETOMETER_H
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 #include <qmagnetometer.h>
 
 #include <magnetometersensor_i.h>
@@ -50,13 +50,13 @@
 
 QTM_USE_NAMESPACE
 
-class maemo6magnetometer : public maemo6sensorbase
+class meegomagnetometer : public meegosensorbase
 {
     Q_OBJECT
 
 public:
     static char const * const id;
-    maemo6magnetometer(QSensor *sensor);
+    meegomagnetometer(QSensor *sensor);
 protected:
     virtual bool doConnect();
     virtual void start();
diff --git a/plugins/sensors/maemo6/maemo6orientationsensor.cpp b/plugins/sensors/meego/meegoorientationsensor.cpp
index 1d2bbbd6b1..311945542b 100644
--- a/plugins/sensors/maemo6/maemo6orientationsensor.cpp
+++ b/plugins/sensors/meego/meegoorientationsensor.cpp
@@ -39,21 +39,21 @@
 **
 ****************************************************************************/
 
-#include "maemo6orientationsensor.h"
+#include "meegoorientationsensor.h"
 
 #include <posedata.h>
 
-char const * const maemo6orientationsensor::id("maemo6.orientationsensor");
-bool maemo6orientationsensor::m_initDone = false;
+char const * const meegoorientationsensor::id("meego.orientationsensor");
+bool meegoorientationsensor::m_initDone = false;
 
-maemo6orientationsensor::maemo6orientationsensor(QSensor *sensor)
-    : maemo6sensorbase(sensor)
+meegoorientationsensor::meegoorientationsensor(QSensor *sensor)
+    : meegosensorbase(sensor)
 {
     initSensor<OrientationSensorChannelInterface>(m_initDone);
     setReading<QOrientationReading>(&m_reading);
 }
 
-void maemo6orientationsensor::slotDataAvailable(const Unsigned& data)
+void meegoorientationsensor::slotDataAvailable(const Unsigned& data)
 {
     QOrientationReading::Orientation o;
     switch (data.x()) {
@@ -70,7 +70,7 @@ void maemo6orientationsensor::slotDataAvailable(const Unsigned& data)
     newReadingAvailable();
 }
 
-bool maemo6orientationsensor::doConnect(){
+bool meegoorientationsensor::doConnect(){
     if (!(QObject::connect(m_sensorInterface, SIGNAL(orientationChanged(const Unsigned&)),
                            this, SLOT(slotDataAvailable(const Unsigned&))))){
         return false;
@@ -78,7 +78,7 @@ bool maemo6orientationsensor::doConnect(){
     return true;
 }
 
-const QString maemo6orientationsensor::sensorName(){
+const QString meegoorientationsensor::sensorName(){
     return "orientationsensor";
 }
 
diff --git a/plugins/sensors/maemo6/maemo6orientationsensor.h b/plugins/sensors/meego/meegoorientationsensor.h
index 092b421128..ef167849d0 100644
--- a/plugins/sensors/maemo6/maemo6orientationsensor.h
+++ b/plugins/sensors/meego/meegoorientationsensor.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6ORIENTATIONSENSOR_H
-#define MAEMO6ORIENTATIONSENSOR_H
+#ifndef MEEGOORIENTATIONSENSOR_H
+#define MEEGOORIENTATIONSENSOR_H
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 #include <qorientationsensor.h>
 
 #include <orientationsensor_i.h>
@@ -50,13 +50,13 @@
 
 QTM_USE_NAMESPACE
 
-class maemo6orientationsensor : public maemo6sensorbase
+class meegoorientationsensor : public meegosensorbase
 {
     Q_OBJECT
 
 public:
     static char const * const id;
-    maemo6orientationsensor(QSensor *sensor);
+    meegoorientationsensor(QSensor *sensor);
 protected:
     virtual bool doConnect();
     virtual const QString sensorName();
diff --git a/plugins/sensors/maemo6/maemo6proximitysensor.cpp b/plugins/sensors/meego/meegoproximitysensor.cpp
index bc4bc6eb8d..5b7b3b5874 100644
--- a/plugins/sensors/maemo6/maemo6proximitysensor.cpp
+++ b/plugins/sensors/meego/meegoproximitysensor.cpp
@@ -39,26 +39,26 @@
 **
 ****************************************************************************/
 
-#include "maemo6proximitysensor.h"
+#include "meegoproximitysensor.h"
 
-char const * const maemo6proximitysensor::id("maemo6.proximity");
-bool maemo6proximitysensor::m_initDone = false;
+char const * const meegoproximitysensor::id("meego.proximity");
+bool meegoproximitysensor::m_initDone = false;
 
-maemo6proximitysensor::maemo6proximitysensor(QSensor *sensor)
-    : maemo6sensorbase(sensor)
+meegoproximitysensor::meegoproximitysensor(QSensor *sensor)
+    : meegosensorbase(sensor)
 {
     initSensor<ProximitySensorChannelInterface>(m_initDone);
     setReading<QProximityReading>(&m_reading);
 }
 
-void maemo6proximitysensor::slotDataAvailable(const Unsigned& data)
+void meegoproximitysensor::slotDataAvailable(const Unsigned& data)
 {
     m_reading.setClose(data.x()? true: false);
     m_reading.setTimestamp(data.UnsignedData().timestamp_);
     newReadingAvailable();
 }
 
-bool maemo6proximitysensor::doConnect(){
+bool meegoproximitysensor::doConnect(){
     if (!(QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const Unsigned&)),
                            this, SLOT(slotDataAvailable(const Unsigned&))))){
         return false;
@@ -67,6 +67,6 @@ bool maemo6proximitysensor::doConnect(){
 }
 
 
-const QString maemo6proximitysensor::sensorName(){
+const QString meegoproximitysensor::sensorName(){
     return "proximitysensor";
 }
diff --git a/plugins/sensors/maemo6/maemo6proximitysensor.h b/plugins/sensors/meego/meegoproximitysensor.h
index 7d32e62565..00b0ef5131 100644
--- a/plugins/sensors/maemo6/maemo6proximitysensor.h
+++ b/plugins/sensors/meego/meegoproximitysensor.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6PROXIMITYSENSOR_H
-#define MAEMO6PROXIMITYSENSOR_H
+#ifndef MEEGOPROXIMITYSENSOR_H
+#define MEEGOPROXIMITYSENSOR_H
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 #include <qproximitysensor.h>
 
 #include <proximitysensor_i.h>
@@ -50,13 +50,13 @@
 
 QTM_USE_NAMESPACE
 
-class maemo6proximitysensor : public maemo6sensorbase
+class meegoproximitysensor : public meegosensorbase
 {
     Q_OBJECT
 
 public:
     static char const * const id;
-    maemo6proximitysensor(QSensor *sensor);
+    meegoproximitysensor(QSensor *sensor);
 protected:
     virtual bool doConnect();
     virtual const QString sensorName();
diff --git a/plugins/sensors/maemo6/maemo6rotationsensor.cpp b/plugins/sensors/meego/meegorotationsensor.cpp
index b8ec5389ce..5a1943373a 100644
--- a/plugins/sensors/maemo6/maemo6rotationsensor.cpp
+++ b/plugins/sensors/meego/meegorotationsensor.cpp
@@ -39,20 +39,20 @@
 **
 ****************************************************************************/
 
-#include "maemo6rotationsensor.h"
+#include "meegorotationsensor.h"
 
-char const * const maemo6rotationsensor::id("maemo6.rotationsensor");
-bool maemo6rotationsensor::m_initDone = false;
+char const * const meegorotationsensor::id("meego.rotationsensor");
+bool meegorotationsensor::m_initDone = false;
 
-maemo6rotationsensor::maemo6rotationsensor(QSensor *sensor)
-    : maemo6sensorbase(sensor)
+meegorotationsensor::meegorotationsensor(QSensor *sensor)
+    : meegosensorbase(sensor)
 {
     initSensor<RotationSensorChannelInterface>(m_initDone);
     setReading<QRotationReading>(&m_reading);
     sensor->setProperty("hasZ", true);
 }
 
-void maemo6rotationsensor::slotDataAvailable(const XYZ& data)
+void meegorotationsensor::slotDataAvailable(const XYZ& data)
 {
     m_reading.setX(data.x());
     m_reading.setY(data.y());
@@ -61,14 +61,14 @@ void maemo6rotationsensor::slotDataAvailable(const XYZ& data)
     newReadingAvailable();
 }
 
-void maemo6rotationsensor::slotFrameAvailable(const QVector<XYZ>&  frame)
+void meegorotationsensor::slotFrameAvailable(const QVector<XYZ>&  frame)
 {
     for (int i=0, l=frame.size(); i<l; i++){
         slotDataAvailable(frame.at(i));
     }
 }
 
-bool maemo6rotationsensor::doConnect(){
+bool meegorotationsensor::doConnect(){
     if (m_bufferSize==1?
                 QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const XYZ&)), this, SLOT(slotDataAvailable(const XYZ&))):
                 QObject::connect(m_sensorInterface, SIGNAL(frameAvailable(const QVector<XYZ>& )),this, SLOT(slotFrameAvailable(const QVector<XYZ>& ))))
@@ -76,6 +76,6 @@ bool maemo6rotationsensor::doConnect(){
     return false;
 }
 
-const QString maemo6rotationsensor::sensorName(){
+const QString meegorotationsensor::sensorName(){
     return "rotationsensor";
 }
diff --git a/plugins/sensors/maemo6/maemo6rotationsensor.h b/plugins/sensors/meego/meegorotationsensor.h
index 93e766eef8..52b01eca14 100644
--- a/plugins/sensors/maemo6/maemo6rotationsensor.h
+++ b/plugins/sensors/meego/meegorotationsensor.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6ROTATION_H
-#define MAEMO6ROTATION_H
+#ifndef MEEGOROTATION_H
+#define MEEGOROTATION_H
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 #include <qrotationsensor.h>
 
 #include <rotationsensor_i.h>
@@ -50,13 +50,13 @@
 
 QTM_USE_NAMESPACE
 
-class maemo6rotationsensor : public maemo6sensorbase
+class meegorotationsensor : public meegosensorbase
 {
     Q_OBJECT
 
 public:
     static char const * const id;
-    maemo6rotationsensor(QSensor *sensor);
+    meegorotationsensor(QSensor *sensor);
 protected:
     virtual bool doConnect();
     virtual const QString sensorName();
diff --git a/plugins/sensors/maemo6/maemo6sensorbase.cpp b/plugins/sensors/meego/meegosensorbase.cpp
index ef95607d57..1ae57d527e 100644
--- a/plugins/sensors/maemo6/maemo6sensorbase.cpp
+++ b/plugins/sensors/meego/meegosensorbase.cpp
@@ -39,28 +39,28 @@
 **
 ****************************************************************************/
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 
 
-SensorManagerInterface* maemo6sensorbase::m_remoteSensorManager = 0;
+SensorManagerInterface* meegosensorbase::m_remoteSensorManager = 0;
 
 
-const float maemo6sensorbase::GRAVITY_EARTH = 9.80665;
-const float maemo6sensorbase::GRAVITY_EARTH_THOUSANDTH = 0.00980665;
-const int maemo6sensorbase::KErrNotFound=-1;
-const char* const maemo6sensorbase::ALWAYS_ON = "alwaysOn";
-const char* const maemo6sensorbase::BUFFER_SIZE = "bufferSize";
-const char* const maemo6sensorbase::MAX_BUFFER_SIZE = "maxBufferSize";
-const char* const maemo6sensorbase::EFFICIENT_BUFFER_SIZE = "efficientBufferSize";
+const float meegosensorbase::GRAVITY_EARTH = 9.80665;
+const float meegosensorbase::GRAVITY_EARTH_THOUSANDTH = 0.00980665;
+const int meegosensorbase::KErrNotFound=-1;
+const char* const meegosensorbase::ALWAYS_ON = "alwaysOn";
+const char* const meegosensorbase::BUFFER_SIZE = "bufferSize";
+const char* const meegosensorbase::MAX_BUFFER_SIZE = "maxBufferSize";
+const char* const meegosensorbase::EFFICIENT_BUFFER_SIZE = "efficientBufferSize";
 
-maemo6sensorbase::maemo6sensorbase(QSensor *sensor)
+meegosensorbase::meegosensorbase(QSensor *sensor)
     : QSensorBackend(sensor), m_sensorInterface(0), m_bufferSize(-1), m_prevOutputRange(-1), m_efficientBufferSize(1), m_maxBufferSize(1)
 {
     if (!m_remoteSensorManager)
         m_remoteSensorManager = &SensorManagerInterface::instance();    
 }
 
-maemo6sensorbase::~maemo6sensorbase()
+meegosensorbase::~meegosensorbase()
 {
     if (m_sensorInterface) {
         stop();
@@ -69,7 +69,7 @@ maemo6sensorbase::~maemo6sensorbase()
     }
 }
 
-void maemo6sensorbase::start()
+void meegosensorbase::start()
 {
     if (m_sensorInterface) {
         // dataRate
@@ -111,12 +111,12 @@ void maemo6sensorbase::start()
     sensorStopped();
 }
 
-void maemo6sensorbase::stop()
+void meegosensorbase::stop()
 {
     if (m_sensorInterface) m_sensorInterface->stop();
 }
 
-void maemo6sensorbase::setRanges(qreal correctionFactor){
+void meegosensorbase::setRanges(qreal correctionFactor){
     if (!m_sensorInterface) return;
 
     QList<DataRange> ranges = m_sensorInterface->getAvailableDataRanges();
@@ -131,7 +131,7 @@ void maemo6sensorbase::setRanges(qreal correctionFactor){
 }
 
 
-bool maemo6sensorbase::doConnectAfterCheck(){
+bool meegosensorbase::doConnectAfterCheck(){
     if (!m_sensorInterface) return false;
 
     // buffer size
@@ -157,7 +157,7 @@ bool maemo6sensorbase::doConnectAfterCheck(){
 
 
 
-const int maemo6sensorbase::bufferSize(){
+const int meegosensorbase::bufferSize(){
     QVariant bufferVariant = sensor()->property(BUFFER_SIZE);
     int bufferSize = bufferVariant.isValid()?bufferVariant.toInt():1;
     if (bufferSize==1) return 1;
diff --git a/plugins/sensors/maemo6/maemo6sensorbase.h b/plugins/sensors/meego/meegosensorbase.h
index 78133e2799..4b7de04c6f 100644
--- a/plugins/sensors/maemo6/maemo6sensorbase.h
+++ b/plugins/sensors/meego/meegosensorbase.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6SENSORBASE_H
-#define MAEMO6SENSORBASE_H
+#ifndef MEEGOSENSORBASE_H
+#define MEEGOSENSORBASE_H
 
 #include <qsensorbackend.h>
 #include <sensormanagerinterface.h>
@@ -48,11 +48,11 @@
 
 QTM_USE_NAMESPACE
 
-        class maemo6sensorbase : public QSensorBackend
+        class meegosensorbase : public QSensorBackend
 {
 public:
-    maemo6sensorbase(QSensor *sensor);
-    virtual ~maemo6sensorbase();
+    meegosensorbase(QSensor *sensor);
+    virtual ~meegosensorbase();
 
 
 protected:
diff --git a/plugins/sensors/maemo6/maemo6tapsensor.cpp b/plugins/sensors/meego/meegotapsensor.cpp
index 4bf104876f..9d631657f3 100644
--- a/plugins/sensors/maemo6/maemo6tapsensor.cpp
+++ b/plugins/sensors/meego/meegotapsensor.cpp
@@ -39,20 +39,20 @@
 **
 ****************************************************************************/
 
-#include "maemo6tapsensor.h"
+#include "meegotapsensor.h"
 
-char const * const maemo6tapsensor::id("maemo6.tapsensor");
-bool maemo6tapsensor::m_initDone = false;
+char const * const meegotapsensor::id("meego.tapsensor");
+bool meegotapsensor::m_initDone = false;
 
-maemo6tapsensor::maemo6tapsensor(QSensor *sensor)
-    : maemo6sensorbase(sensor)
+meegotapsensor::meegotapsensor(QSensor *sensor)
+    : meegosensorbase(sensor)
 {
     initSensor<TapSensorChannelInterface>(m_initDone);
     setReading<QTapReading>(&m_reading);
 }
 
 
-void maemo6tapsensor::start(){
+void meegotapsensor::start(){
     QVariant v = sensor()->property("returnDoubleTapEvents");
     if (!(v.isValid())){
         sensor()->setProperty("returnDoubleTapEvents", true); //by default doubles
@@ -60,13 +60,13 @@ void maemo6tapsensor::start(){
     }
     else m_isDoubleTapSensor =  v.toBool();
 
-    maemo6sensorbase::start();
+    meegosensorbase::start();
     // Set tap type (single/double)
     m_reading.setDoubleTap(m_isDoubleTapSensor);
 }
 
 
-void maemo6tapsensor::slotDataAvailable(const Tap& data)
+void meegotapsensor::slotDataAvailable(const Tap& data)
 {
     if (data.type() == TapData::DoubleTap){
         if (!m_isDoubleTapSensor) return;
@@ -94,7 +94,7 @@ void maemo6tapsensor::slotDataAvailable(const Tap& data)
 }
 
 
-bool maemo6tapsensor::doConnect(){
+bool meegotapsensor::doConnect(){
     if (!(QObject::connect(m_sensorInterface, SIGNAL(dataAvailable(const Tap&)),
                            this, SLOT(slotDataAvailable(const Tap&))))){
         return false;
@@ -103,6 +103,6 @@ bool maemo6tapsensor::doConnect(){
 }
 
 
-const QString maemo6tapsensor::sensorName(){
+const QString meegotapsensor::sensorName(){
     return "tapsensor";
 }
diff --git a/plugins/sensors/maemo6/maemo6tapsensor.h b/plugins/sensors/meego/meegotapsensor.h
index 28ff531a4b..332f6b5abf 100644
--- a/plugins/sensors/maemo6/maemo6tapsensor.h
+++ b/plugins/sensors/meego/meegotapsensor.h
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef MAEMO6TAPSENSOR_H
-#define MAEMO6TAPSENSOR_H
+#ifndef MEEGOTAPSENSOR_H
+#define MEEGOTAPSENSOR_H
 
-#include "maemo6sensorbase.h"
+#include "meegosensorbase.h"
 #include <qtapsensor.h>
 
 #include <tapsensor_i.h>
@@ -50,13 +50,13 @@
 
 QTM_USE_NAMESPACE
 
-class maemo6tapsensor : public maemo6sensorbase
+class meegotapsensor : public meegosensorbase
 {
     Q_OBJECT
 
 public:
     static char const * const id;
-    maemo6tapsensor(QSensor *sensor);
+    meegotapsensor(QSensor *sensor);
 protected:
     virtual bool doConnect();
     virtual void start();
diff --git a/plugins/sensors/maemo6/version.pri b/plugins/sensors/meego/version.pri
index f69ac304e9..f69ac304e9 100644
--- a/plugins/sensors/maemo6/version.pri
+++ b/plugins/sensors/meego/version.pri
diff --git a/plugins/sensors/sensors.pro b/plugins/sensors/sensors.pro
index 9d7b1707ff..409329ce9a 100644
--- a/plugins/sensors/sensors.pro
+++ b/plugins/sensors/sensors.pro
@@ -8,7 +8,7 @@ maemo5 {
 
 maemo6|meego {
     equals(sensord_enabled,yes) {
-        SUBDIRS += maemo6
+        SUBDIRS += meego
     } else {
         message("sensord library missing")
     }