diff --git a/adaptors/accelerometeradaptor/accelerometeradaptor.cpp b/adaptors/accelerometeradaptor/accelerometeradaptor.cpp
index c84bb6e2..83da2f49 100644
--- a/adaptors/accelerometeradaptor/accelerometeradaptor.cpp
+++ b/adaptors/accelerometeradaptor/accelerometeradaptor.cpp
@@ -44,8 +44,8 @@ AccelerometerAdaptor::AccelerometerAdaptor(const QString& id) :
     accelerometerBuffer_ = new DeviceAdaptorRingBuffer<OrientationData>(1);
     setAdaptedSensor("accelerometer", "Internal accelerometer coordinates", accelerometerBuffer_);
     setDescription("Input device accelerometer adaptor");
-    powerStatePath_ = Config::configuration()->value("accelerometer/powerstate_path").toByteArray();
-    accelMultiplier = Config::configuration()->value("accelerometer/multiplier", QVariant(1)).toReal();
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("accelerometer/powerstate_path").toByteArray();
+    accelMultiplier = SensorFrameworkConfig::configuration()->value("accelerometer/multiplier", QVariant(1)).toReal();
 }
 
 AccelerometerAdaptor::~AccelerometerAdaptor()
diff --git a/adaptors/alsadaptor-ascii/alsadaptor-ascii.cpp b/adaptors/alsadaptor-ascii/alsadaptor-ascii.cpp
index 487d29dd..eaa12a68 100644
--- a/adaptors/alsadaptor-ascii/alsadaptor-ascii.cpp
+++ b/adaptors/alsadaptor-ascii/alsadaptor-ascii.cpp
@@ -52,7 +52,7 @@ ALSAdaptorAscii::ALSAdaptorAscii(const QString& id) : SysfsAdaptor(id, SysfsAdap
     setDescription("Ambient light");
 
     // Get range from a file, if the path is found in configuration
-    QString rangeFilePath_ = Config::configuration()->value("als/range_file_path",QVariant("")).toString();
+    QString rangeFilePath_ = SensorFrameworkConfig::configuration()->value("als/range_file_path",QVariant("")).toString();
     if (rangeFilePath_ != "") {
         QFile sysFile(rangeFilePath_);
 
@@ -66,8 +66,8 @@ ALSAdaptorAscii::ALSAdaptorAscii(const QString& id) : SysfsAdaptor(id, SysfsAdap
             sensordLogT() << "Ambient light range: " << range;
         }
     }
-        powerStatePath = Config::configuration()->value("als/powerstate_path").toByteArray();
-        powerMode = Config::configuration()->value("als/mode").toByteArray();
+        powerStatePath = SensorFrameworkConfig::configuration()->value("als/powerstate_path").toByteArray();
+        powerMode = SensorFrameworkConfig::configuration()->value("als/mode").toByteArray();
 }
 
 ALSAdaptorAscii::~ALSAdaptorAscii()
diff --git a/adaptors/alsadaptor-evdev/alsevdevadaptor.cpp b/adaptors/alsadaptor-evdev/alsevdevadaptor.cpp
index 491b4d37..b64549b4 100644
--- a/adaptors/alsadaptor-evdev/alsevdevadaptor.cpp
+++ b/adaptors/alsadaptor-evdev/alsevdevadaptor.cpp
@@ -43,7 +43,7 @@ ALSAdaptorEvdev::ALSAdaptorEvdev(const QString& id) :
     alsBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("als", "Internal ambient light sensor lux values", alsBuffer_);
     setDescription("Input device als adaptor");
-    powerStatePath_ = Config::configuration()->value("als/powerstate_path").toByteArray();
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("als/powerstate_path").toByteArray();
     introduceAvailableDataRange(DataRange(0, 4095, 1));
     setDefaultInterval(10);
 }
diff --git a/adaptors/alsadaptor/alsadaptor.cpp b/adaptors/alsadaptor/alsadaptor.cpp
index a576bce9..b0e8f23d 100644
--- a/adaptors/alsadaptor/alsadaptor.cpp
+++ b/adaptors/alsadaptor/alsadaptor.cpp
@@ -62,8 +62,8 @@ ALSAdaptor::ALSAdaptor(const QString& id):
     alsBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("als", "Internal ambient light sensor lux values", alsBuffer_);
     setDescription("Ambient light");
-    deviceType_ = (DeviceType)Config::configuration()->value<int>("als/driver_type", DeviceUnknown);
-    powerStatePath_ = Config::configuration()->value("als/powerstate_path").toByteArray();
+    deviceType_ = (DeviceType)SensorFrameworkConfig::configuration()->value<int>("als/driver_type", DeviceUnknown);
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("als/powerstate_path").toByteArray();
 
 #ifdef SENSORFW_MCE_WATCHER
     dbusIfc = new QDBusInterface(MCE_SERVICE, MCE_REQUEST_PATH, MCE_REQUEST_IF,
diff --git a/adaptors/gyroscopeadaptor-evdev/gyroevdevadaptor.cpp b/adaptors/gyroscopeadaptor-evdev/gyroevdevadaptor.cpp
index 171573a9..67832812 100644
--- a/adaptors/gyroscopeadaptor-evdev/gyroevdevadaptor.cpp
+++ b/adaptors/gyroscopeadaptor-evdev/gyroevdevadaptor.cpp
@@ -43,7 +43,7 @@ GyroAdaptorEvdev::GyroAdaptorEvdev(const QString& id) :
     gyroscopeBuffer_ = new DeviceAdaptorRingBuffer<TimedXyzData>(1);
     setAdaptedSensor("gyroscope", "Internal gyroscope values", gyroscopeBuffer_);
     setDescription("Input device gyroscope adaptor");
-    powerStatePath_ = Config::configuration()->value("gyroscope/powerstate_path").toByteArray();
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("gyroscope/powerstate_path").toByteArray();
    // introduceAvailableDataRange(DataRange(0, 4095, 1));
     setDefaultInterval(10);
 }
diff --git a/adaptors/gyroscopeadaptor/gyroscopeadaptor.cpp b/adaptors/gyroscopeadaptor/gyroscopeadaptor.cpp
index 08fc4255..30b1d267 100644
--- a/adaptors/gyroscopeadaptor/gyroscopeadaptor.cpp
+++ b/adaptors/gyroscopeadaptor/gyroscopeadaptor.cpp
@@ -41,7 +41,7 @@ GyroscopeAdaptor::GyroscopeAdaptor(const QString& id) :
     gyroscopeBuffer_ = new DeviceAdaptorRingBuffer<TimedXyzData>(1);
     setAdaptedSensor("gyroscope", "l3g4200dh", gyroscopeBuffer_);
     setDescription("Sysfs Gyroscope adaptor (l3g4200dh)");   
-    dataRatePath_ = Config::configuration()->value("gyroscope/path_datarate").toByteArray();
+    dataRatePath_ = SensorFrameworkConfig::configuration()->value("gyroscope/path_datarate").toByteArray();
 }
 
 GyroscopeAdaptor::~GyroscopeAdaptor()
diff --git a/adaptors/humidityadaptor/humidityadaptor.cpp b/adaptors/humidityadaptor/humidityadaptor.cpp
index da757ae5..be348d3c 100644
--- a/adaptors/humidityadaptor/humidityadaptor.cpp
+++ b/adaptors/humidityadaptor/humidityadaptor.cpp
@@ -40,7 +40,7 @@ HumidityAdaptor::HumidityAdaptor(const QString& id) :
     humidityBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("humidity", "Relative Humidity values", humidityBuffer_);
     setDescription("Input device humidity adaptor");
-    powerStatePath_ = Config::configuration()->value("humidity/powerstate_path").toByteArray();
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("humidity/powerstate_path").toByteArray();
     introduceAvailableDataRange(DataRange(0, 4095, 1));
     setDefaultInterval(10);
 }
diff --git a/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.cpp b/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.cpp
index 1ec7f4cf..23a967d6 100644
--- a/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.cpp
+++ b/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptor.cpp
@@ -33,7 +33,7 @@ HybrisAccelerometerAdaptor::HybrisAccelerometerAdaptor(const QString& id) :
     setAdaptedSensor("accelerometer", "Internal accelerometer coordinates", buffer);
 
     setDescription("Hybris accelerometer");
-    powerStatePath = Config::configuration()->value("accelerometer/powerstate_path").toByteArray();
+    powerStatePath = SensorFrameworkConfig::configuration()->value("accelerometer/powerstate_path").toByteArray();
 //    setDefaultInterval(50);
 }
 
diff --git a/adaptors/hybrisalsadaptor/hybrisalsadaptor.cpp b/adaptors/hybrisalsadaptor/hybrisalsadaptor.cpp
index 7a288f2e..d3fc997a 100644
--- a/adaptors/hybrisalsadaptor/hybrisalsadaptor.cpp
+++ b/adaptors/hybrisalsadaptor/hybrisalsadaptor.cpp
@@ -37,7 +37,7 @@ HybrisAlsAdaptor::HybrisAlsAdaptor(const QString& id) :
     buffer = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("als", "Internal ambient light sensor lux values", buffer);
     setDescription("Hybris als");
-    powerStatePath = Config::configuration()->value("als/powerstate_path").toByteArray();
+    powerStatePath = SensorFrameworkConfig::configuration()->value("als/powerstate_path").toByteArray();
     if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
     {
     	sensordLogW() << "Path does not exists: " << powerStatePath;
diff --git a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.cpp b/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.cpp
index 4c15e40b..5e58ad9d 100644
--- a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.cpp
+++ b/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.cpp
@@ -35,7 +35,7 @@ HybrisGyroscopeAdaptor::HybrisGyroscopeAdaptor(const QString& id) :
     setAdaptedSensor("gyroscopeadaptor", "Internal gyroscope coordinates", buffer);
 
     setDescription("Hybris gyroscope");
-    powerStatePath = Config::configuration()->value("gyroscope/powerstate_path").toByteArray();
+    powerStatePath = SensorFrameworkConfig::configuration()->value("gyroscope/powerstate_path").toByteArray();
     if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
     {
     	sensordLogW() << "Path does not exists: " << powerStatePath;
diff --git a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.cpp b/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.cpp
index 38873a5f..0cf3fe77 100644
--- a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.cpp
+++ b/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.cpp
@@ -31,7 +31,7 @@ HybrisMagnetometerAdaptor::HybrisMagnetometerAdaptor(const QString& id) :
     setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", buffer);
 
     setDescription("Hybris magnetometer");
-    powerStatePath = Config::configuration()->value("magnetometer/powerstate_path").toByteArray();
+    powerStatePath = SensorFrameworkConfig::configuration()->value("magnetometer/powerstate_path").toByteArray();
     if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
     {
     	sensordLogW() << "Path does not exists: " << powerStatePath;
diff --git a/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp b/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp
index d06d3d64..ede6eb51 100644
--- a/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp
+++ b/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.cpp
@@ -48,7 +48,7 @@ HybrisOrientationAdaptor::HybrisOrientationAdaptor(const QString& id) :
     setAdaptedSensor("hybrisorientation", "Internal orientation coordinates", buffer);
 
     setDescription("Hybris orientation");
-    powerStatePath = Config::configuration()->value("orientation/powerstate_path").toByteArray();
+    powerStatePath = SensorFrameworkConfig::configuration()->value("orientation/powerstate_path").toByteArray();
     if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
     {
     	sensordLogW() << "Path does not exists: " << powerStatePath;
diff --git a/adaptors/hybrispressureadaptor/hybrispressureadaptor.cpp b/adaptors/hybrispressureadaptor/hybrispressureadaptor.cpp
index b77b30cd..49831137 100644
--- a/adaptors/hybrispressureadaptor/hybrispressureadaptor.cpp
+++ b/adaptors/hybrispressureadaptor/hybrispressureadaptor.cpp
@@ -35,7 +35,7 @@ HybrisPressureAdaptor::HybrisPressureAdaptor(const QString& id) :
     buffer = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("pressure", "Internal ambient pressure sensor values", buffer);
     setDescription("Hybris pressure");
-    powerStatePath = Config::configuration()->value("pressure/powerstate_path").toByteArray();
+    powerStatePath = SensorFrameworkConfig::configuration()->value("pressure/powerstate_path").toByteArray();
     if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
     {
         sensordLogW() << "Path does not exists: " << powerStatePath;
diff --git a/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.cpp b/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.cpp
index 316bc0c9..a64f9f50 100644
--- a/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.cpp
+++ b/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.cpp
@@ -39,7 +39,7 @@ HybrisProximityAdaptor::HybrisProximityAdaptor(const QString& id) :
         setAdaptedSensor("proximity", "Internal proximity coordinates", buffer);
 
         setDescription("Hybris proximity");
-        powerStatePath = Config::configuration()->value("proximity/powerstate_path").toByteArray();
+        powerStatePath = SensorFrameworkConfig::configuration()->value("proximity/powerstate_path").toByteArray();
 	if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
 	{
 	    sensordLogW() << "Path does not exists: " << powerStatePath;
diff --git a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp b/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp
index 6d2828ab..f32c3edd 100644
--- a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp
+++ b/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.cpp
@@ -41,7 +41,7 @@ HybrisStepCounterAdaptor::HybrisStepCounterAdaptor(const QString& id) :
     buffer = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("stepcounter", "Internal step counter steps since reboot", buffer);
     setDescription("Hybris step counter");
-    powerStatePath = Config::configuration()->value("stepcounter/powerstate_path").toByteArray();
+    powerStatePath = SensorFrameworkConfig::configuration()->value("stepcounter/powerstate_path").toByteArray();
     if (!powerStatePath.isEmpty() && !QFile::exists(powerStatePath))
     {
     	sensordLogW() << "Path does not exists: " << powerStatePath;
diff --git a/adaptors/iioadaptor/iioadaptor.cpp b/adaptors/iioadaptor/iioadaptor.cpp
index 813215a2..bcbc4146 100644
--- a/adaptors/iioadaptor/iioadaptor.cpp
+++ b/adaptors/iioadaptor/iioadaptor.cpp
@@ -81,7 +81,7 @@ void IioAdaptor::setup()
 
     if (deviceId.startsWith("accel")) {
         const QString name = "accelerometer";
-        const QString inputMatch = Config::configuration()->value<QString>(name + "/input_match");
+        const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
         qDebug() << "input_match" << inputMatch;
 
         devNodeNumber = findSensor(inputMatch);
@@ -96,7 +96,7 @@ void IioAdaptor::setup()
     }
     else if (deviceId.startsWith("gyro")) {
         const QString name = "gyroscope";
-        const QString inputMatch = Config::configuration()->value<QString>(name + "/input_match");
+        const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
         qDebug() << "input_match" << inputMatch;
 
         devNodeNumber = findSensor(inputMatch);
@@ -110,7 +110,7 @@ void IioAdaptor::setup()
     }
     else if (deviceId.startsWith("mag")) {
         const QString name = "magnetometer";
-        const QString inputMatch = Config::configuration()->value<QString>(name + "/input_match");
+        const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
         qDebug() << "input_match" << inputMatch;
 
         devNodeNumber = findSensor(inputMatch);
@@ -125,7 +125,7 @@ void IioAdaptor::setup()
     }
     else if (deviceId.startsWith("als")) {
         const QString name = "als";
-        const QString inputMatch = Config::configuration()->value<QString>(name + "/input_match");
+        const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
 
         devNodeNumber = findSensor(inputMatch);
         if (devNodeNumber!= -1) {
diff --git a/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.cpp b/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.cpp
index a0360bef..aa02fa83 100644
--- a/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.cpp
+++ b/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.cpp
@@ -47,7 +47,7 @@ LidSensorAdaptorEvdev::LidSensorAdaptorEvdev(const QString& id) :
 {
     lidBuffer_ = new DeviceAdaptorRingBuffer<LidData>(1);
     setAdaptedSensor("lidsensor", "Lid state", lidBuffer_);
-    powerStatePath_ = Config::configuration()->value("lidsensor/powerstate_path").toByteArray();
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("lidsensor/powerstate_path").toByteArray();
 
 }
 
@@ -76,7 +76,7 @@ LidSensorAdaptorEvdev::~LidSensorAdaptorEvdev()
 void LidSensorAdaptorEvdev::init()
 {
     qDebug() << Q_FUNC_INFO << name();
-    QStringList strList = Config::configuration()->value<QStringList>(name() + "/input_match");
+    QStringList strList = SensorFrameworkConfig::configuration()->value<QStringList>(name() + "/input_match");
     qDebug() << strList;
     foreach (const QString str, strList) {
         if (!getInputDevices(str)) {
diff --git a/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.cpp b/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.cpp
index c7242c0a..20d2e412 100644
--- a/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.cpp
+++ b/adaptors/magnetometeradaptor-evdev/magnetometerevdevadaptor.cpp
@@ -42,7 +42,7 @@ MagAdaptorEvdev::MagAdaptorEvdev(const QString& id) :
     magnetometerBuffer_ = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(1);
     setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", magnetometerBuffer_);
     setDescription("Input device magnetometer adaptor");
-    powerStatePath_ = Config::configuration()->value("magnetometer/powerstate_path").toByteArray();
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("magnetometer/powerstate_path").toByteArray();
   //  introduceAvailableDataRange(DataRange(0, 4095, 1));
     setDefaultInterval(10);
 }
diff --git a/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.cpp b/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.cpp
index df1cd0ca..b72c3182 100644
--- a/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.cpp
+++ b/adaptors/magnetometeradaptor-ncdk/magnetometeradaptor-ncdk.cpp
@@ -34,9 +34,9 @@ MagnetometerAdaptorNCDK::MagnetometerAdaptorNCDK(const QString& id) :
     SysfsAdaptor(id, SysfsAdaptor::IntervalMode),
     powerState_(false)
 {
-    intervalCompensation_ = Config::configuration()->value<int>("magnetometer/interval_compensation", 0);
-    powerStateFilePath_ = Config::configuration()->value<QByteArray>("magnetometer/path_power_state", "");
-    sensAdjFilePath_ = Config::configuration()->value<QByteArray>("magnetometer/path_sens_adjust", "");
+    intervalCompensation_ = SensorFrameworkConfig::configuration()->value<int>("magnetometer/interval_compensation", 0);
+    powerStateFilePath_ = SensorFrameworkConfig::configuration()->value<QByteArray>("magnetometer/path_power_state", "");
+    sensAdjFilePath_ = SensorFrameworkConfig::configuration()->value<QByteArray>("magnetometer/path_sens_adjust", "");
     magnetometerBuffer_ = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(128);
     setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", magnetometerBuffer_);
     setDescription("Magnetometer adaptor (ak8975) for NCDK");
@@ -44,7 +44,7 @@ MagnetometerAdaptorNCDK::MagnetometerAdaptorNCDK(const QString& id) :
     //get sensitivity adjustment
     getSensitivityAdjustment(x_adj, y_adj, z_adj);
 
-    overflowLimit_ = Config::configuration()->value<int>("magnetometer/overflow_limit", 8000);
+    overflowLimit_ = SensorFrameworkConfig::configuration()->value<int>("magnetometer/overflow_limit", 8000);
 }
 
 MagnetometerAdaptorNCDK::~MagnetometerAdaptorNCDK()
diff --git a/adaptors/magnetometeradaptor/magnetometeradaptor.cpp b/adaptors/magnetometeradaptor/magnetometeradaptor.cpp
index b9372123..78b11ca8 100644
--- a/adaptors/magnetometeradaptor/magnetometeradaptor.cpp
+++ b/adaptors/magnetometeradaptor/magnetometeradaptor.cpp
@@ -46,10 +46,10 @@ struct ak8974_data {
 MagnetometerAdaptor::MagnetometerAdaptor(const QString& id) :
     SysfsAdaptor(id, SysfsAdaptor::IntervalMode, false)
 {
-    intervalCompensation_ = Config::configuration()->value<int>("magnetometer/interval_compensation", 0);
+    intervalCompensation_ = SensorFrameworkConfig::configuration()->value<int>("magnetometer/interval_compensation", 0);
     magnetometerBuffer_ = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(1);
     setAdaptedSensor("magnetometer", "Internal magnetometer coordinates", magnetometerBuffer_);
-    overflowLimit_ = Config::configuration()->value<int>("magnetometer/overflow_limit", 8000);
+    overflowLimit_ = SensorFrameworkConfig::configuration()->value<int>("magnetometer/overflow_limit", 8000);
     setDescription("Input device Magnetometer adaptor (ak897x)");
 }
 
diff --git a/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptor.cpp b/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptor.cpp
index 06b26635..f3e03ab0 100644
--- a/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptor.cpp
+++ b/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptor.cpp
@@ -40,21 +40,21 @@ Mpu6050AccelAdaptor::Mpu6050AccelAdaptor (const QString& id) :
 {
     struct stat st;
 
-    QString xAxisPath = Config::configuration()->value("accelerometer/x_axis_path").toString ();
+    QString xAxisPath = SensorFrameworkConfig::configuration()->value("accelerometer/x_axis_path").toString ();
     if ( lstat (xAxisPath.toLatin1().constData(), &st) < 0 ) {
         sensordLogW () << "x_axis_path: " << xAxisPath << " not found";
         return;
     }
     addPath(xAxisPath, X_AXIS);
 
-    QString yAxisPath = Config::configuration()->value("accelerometer/y_axis_path").toString ();
+    QString yAxisPath = SensorFrameworkConfig::configuration()->value("accelerometer/y_axis_path").toString ();
     if ( lstat (yAxisPath.toLatin1().constData(), &st) < 0 ) {
         sensordLogW () << "y_axis_path: " << yAxisPath << " not found";
         return;
     }
     addPath(yAxisPath, Y_AXIS);
 
-    QString zAxisPath = Config::configuration()->value("accelerometer/z_axis_path").toString ();
+    QString zAxisPath = SensorFrameworkConfig::configuration()->value("accelerometer/z_axis_path").toString ();
     if ( lstat (zAxisPath.toLatin1().constData(), &st) < 0 ) {
         sensordLogW () << "z_axis_path: " << zAxisPath << " not found";
         return;
diff --git a/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptor.cpp b/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptor.cpp
index 575bc9aa..0927aa60 100644
--- a/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptor.cpp
+++ b/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptor.cpp
@@ -13,7 +13,7 @@ OaktrailAccelAdaptor::OaktrailAccelAdaptor (const QString& id) :
 {
     struct stat st;
 
-    devPath = Config::configuration ()->value ("oaktrail_acc_sys_path").toString ();
+    devPath = SensorFrameworkConfig::configuration ()->value ("oaktrail_acc_sys_path").toString ();
     if ( lstat (devPath.toLatin1().constData(), &st) < 0 ) {
         sensordLogW () << devPath << "no found";
         return;
diff --git a/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptor.cpp b/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptor.cpp
index db633b89..0306b9f7 100644
--- a/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptor.cpp
+++ b/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptor.cpp
@@ -13,7 +13,7 @@ OemtabletAccelAdaptor::OemtabletAccelAdaptor (const QString& id) :
 {
     struct stat st;
 
-    devPath = Config::configuration ()->value ("oem_tablet_acc_sys_path").toString ();
+    devPath = SensorFrameworkConfig::configuration ()->value ("oem_tablet_acc_sys_path").toString ();
     if ( lstat (devPath.toLatin1().constData(), &st) < 0 ) {
         sensordLogW () << devPath << "no found";
         return;
diff --git a/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-ascii.cpp b/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-ascii.cpp
index dee16939..c61e3901 100644
--- a/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-ascii.cpp
+++ b/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-ascii.cpp
@@ -16,7 +16,7 @@ OEMTabletALSAdaptorAscii::OEMTabletALSAdaptorAscii(const QString& id) : SysfsAda
     const unsigned int DEFAULT_RANGE = 65535;
 
     int range = DEFAULT_RANGE;
-    QFile sysFile(Config::configuration()->value("als-ascii_range_sysfs_path").toString());
+    QFile sysFile(SensorFrameworkConfig::configuration()->value("als-ascii_range_sysfs_path").toString());
 
     if (!(sysFile.open(QIODevice::ReadOnly))) {
         sensordLogW() << "Unable to config ALS range from sysfs, using default value: " << DEFAULT_RANGE;
@@ -28,7 +28,7 @@ OEMTabletALSAdaptorAscii::OEMTabletALSAdaptorAscii(const QString& id) : SysfsAda
     sensordLogT() << "Ambient light range: " << range;
 
     // Locate the actual handle
-    QString devPath = Config::configuration()->value("als-ascii_sysfs_path").toString();
+    QString devPath = SensorFrameworkConfig::configuration()->value("als-ascii_sysfs_path").toString();
 
     if (devPath.isEmpty())
     {
diff --git a/adaptors/pressureadaptor/pressureadaptor.cpp b/adaptors/pressureadaptor/pressureadaptor.cpp
index 02b01f2b..06847149 100644
--- a/adaptors/pressureadaptor/pressureadaptor.cpp
+++ b/adaptors/pressureadaptor/pressureadaptor.cpp
@@ -40,7 +40,7 @@ PressureAdaptor::PressureAdaptor(const QString& id) :
     pressureBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("pressure", "Pressure values", pressureBuffer_);
     setDescription("Input device pressure adaptor");
-    powerStatePath_ = Config::configuration()->value("pressure/powerstate_path").toByteArray();
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("pressure/powerstate_path").toByteArray();
     introduceAvailableDataRange(DataRange(0, 4095, 1));
     setDefaultInterval(10);
 }
diff --git a/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp b/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp
index ccec9d6f..4c01f87f 100644
--- a/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp
+++ b/adaptors/proximityadaptor-evdev/proximityadaptor-evdev.cpp
@@ -46,7 +46,7 @@ ProximityAdaptorEvdev::ProximityAdaptorEvdev(const QString& id) :
 {
     proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
     setAdaptedSensor("proximity", "Proximity state", proximityBuffer_);
-    powerStatePath_ = Config::configuration()->value("proximity/powerstate_path").toByteArray();
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("proximity/powerstate_path").toByteArray();
 }
 
 ProximityAdaptorEvdev::~ProximityAdaptorEvdev()
diff --git a/adaptors/proximityadaptor/proximityadaptor.cpp b/adaptors/proximityadaptor/proximityadaptor.cpp
index 08482238..52f6b5cf 100644
--- a/adaptors/proximityadaptor/proximityadaptor.cpp
+++ b/adaptors/proximityadaptor/proximityadaptor.cpp
@@ -53,9 +53,9 @@ struct apds990x_data {
 ProximityAdaptor::ProximityAdaptor(const QString& id) :
     SysfsAdaptor(id, SysfsAdaptor::SelectMode, false)
 {
-    deviceType_ = (DeviceType)Config::configuration()->value<int>("proximity/driver_type", 0);
-    threshold_ = Config::configuration()->value<int>("proximity/threshold", 35);
-    powerStatePath_ = Config::configuration()->value("proximity/powerstate_path").toByteArray();
+    deviceType_ = (DeviceType)SensorFrameworkConfig::configuration()->value<int>("proximity/driver_type", 0);
+    threshold_ = SensorFrameworkConfig::configuration()->value<int>("proximity/threshold", 35);
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("proximity/powerstate_path").toByteArray();
     proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
     setAdaptedSensor("proximity", "Proximity state", proximityBuffer_);
     setDescription("Proximity sensor readings (Dipro sensor)");
diff --git a/adaptors/steaccelerometeradaptor/steaccelerometeradaptor.cpp b/adaptors/steaccelerometeradaptor/steaccelerometeradaptor.cpp
index 519f0891..b3949687 100644
--- a/adaptors/steaccelerometeradaptor/steaccelerometeradaptor.cpp
+++ b/adaptors/steaccelerometeradaptor/steaccelerometeradaptor.cpp
@@ -26,8 +26,8 @@ range
 1: +/- 4g (2 mg/LSB)
 2: +/- 8g (4 mg/LSB)
 */
-    QByteArray rangePath = Config::configuration()->value("accelerometer/range_path").toByteArray();
-    range = Config::configuration()->value("accelerometer/range_mode").toByteArray();
+    QByteArray rangePath = SensorFrameworkConfig::configuration()->value("accelerometer/range_path").toByteArray();
+    range = SensorFrameworkConfig::configuration()->value("accelerometer/range_mode").toByteArray();
     if(!rangePath.isEmpty()) {
         writeToFile(rangePath, range);
     }
@@ -44,8 +44,8 @@ power_state/frequency
      7: 400 Hz
      */
 
-    powerStatePath = Config::configuration()->value("accelerometer/mode_path").toByteArray();
-    frequency = Config::configuration()->value("accelerometer/frequency_mode").toInt();
+    powerStatePath = SensorFrameworkConfig::configuration()->value("accelerometer/mode_path").toByteArray();
+    frequency = SensorFrameworkConfig::configuration()->value("accelerometer/frequency_mode").toInt();
 
     setDescription("ste accelerometer");
 }
diff --git a/adaptors/temperatureadaptor/temperatureadaptor.cpp b/adaptors/temperatureadaptor/temperatureadaptor.cpp
index d799ef14..08eea513 100644
--- a/adaptors/temperatureadaptor/temperatureadaptor.cpp
+++ b/adaptors/temperatureadaptor/temperatureadaptor.cpp
@@ -40,7 +40,7 @@ TemperatureAdaptor::TemperatureAdaptor(const QString& id) :
     temperatureBuffer_ = new DeviceAdaptorRingBuffer<TimedUnsigned>(1);
     setAdaptedSensor("temperature", "Temperature values", temperatureBuffer_);
     setDescription("Input device temperature adaptor");
-    powerStatePath_ = Config::configuration()->value("temperature/powerstate_path").toByteArray();
+    powerStatePath_ = SensorFrameworkConfig::configuration()->value("temperature/powerstate_path").toByteArray();
     introduceAvailableDataRange(DataRange(0, 4095, 1));
     setDefaultInterval(10);
 }
diff --git a/chains/accelerometerchain/accelerometerchain.cpp b/chains/accelerometerchain/accelerometerchain.cpp
index ac90a1f4..592c0fe7 100644
--- a/chains/accelerometerchain/accelerometerchain.cpp
+++ b/chains/accelerometerchain/accelerometerchain.cpp
@@ -52,7 +52,7 @@ AccelerometerChain::AccelerometerChain(const QString& id) :
     accelerometerReader_ = new BufferReader<AccelerationData>(1);
 
     // Get the transformation matrix from config file
-    QString aconvString = Config::configuration()->value<QString>("accelerometer/transformation_matrix", "");
+    QString aconvString = SensorFrameworkConfig::configuration()->value<QString>("accelerometer/transformation_matrix", "");
     if (aconvString.size() > 0)
     {
         if (!setMatrixFromString(aconvString))
diff --git a/chains/compasschain/compasschainplugin.cpp b/chains/compasschain/compasschainplugin.cpp
index 8a046812..3e86246c 100644
--- a/chains/compasschain/compasschainplugin.cpp
+++ b/chains/compasschain/compasschainplugin.cpp
@@ -37,7 +37,7 @@ void CompassChainPlugin::Register(class Loader&)
 }
 
 QStringList CompassChainPlugin::Dependencies() {
-    QByteArray orientationConfiguration = Config::configuration()->value("plugins/orientationadaptor").toByteArray();
+    QByteArray orientationConfiguration = SensorFrameworkConfig::configuration()->value("plugins/orientationadaptor").toByteArray();
     if (orientationConfiguration.isEmpty()) {
         return QString("accelerometerchain:magcalibrationchain:declinationfilter:downsamplefilter:avgaccfilter").split(":", QString::SkipEmptyParts);
     } else {
diff --git a/chains/magcalibrationchain/calibrationfilter.cpp b/chains/magcalibrationchain/calibrationfilter.cpp
index f40c02a6..0bd73f22 100644
--- a/chains/magcalibrationchain/calibrationfilter.cpp
+++ b/chains/magcalibrationchain/calibrationfilter.cpp
@@ -47,7 +47,7 @@ CalibrationFilter::CalibrationFilter() :
     minMaxList.insert(1,qMakePair(0,0));
     minMaxList.insert(2,qMakePair(0,0));
 
-    manualCalibration = Config::configuration()->value<bool>("magnetometer/needs_calibration", false);
+    manualCalibration = SensorFrameworkConfig::configuration()->value<bool>("magnetometer/needs_calibration", false);
 
     qDebug() << Q_FUNC_INFO << manualCalibration;
 #ifdef CALIBRATE_DATA
diff --git a/chains/magcalibrationchain/magcalibrationchain.cpp b/chains/magcalibrationchain/magcalibrationchain.cpp
index 73e6e762..e2b16d66 100644
--- a/chains/magcalibrationchain/magcalibrationchain.cpp
+++ b/chains/magcalibrationchain/magcalibrationchain.cpp
@@ -54,16 +54,16 @@ MagCalibrationChain::MagCalibrationChain(const QString& id) :
     if (magAdaptor)
         setValid(magAdaptor->isValid());
 
-// Config::configuration()->value<int>("magnetometer/interval_compensation", 16);
+// SensorFrameworkConfig::configuration()->value<int>("magnetometer/interval_compensation", 16);
     // Get the transformation matrix from config file
-    QString aconvString = Config::configuration()->value<QString>("magnetometer/transformation_matrix", "");
+    QString aconvString = SensorFrameworkConfig::configuration()->value<QString>("magnetometer/transformation_matrix", "");
     if (aconvString.size() > 0) {
         if (!setMatrixFromString(aconvString)) {
             sensordLogW() << "Failed to parse 'transformation_matrix' configuration key. Coordinate alignment may be invalid";
         }
     }
 
-    needsCalibration = Config::configuration()->value<bool>("magnetometer/needs_calibration", true);
+    needsCalibration = SensorFrameworkConfig::configuration()->value<bool>("magnetometer/needs_calibration", true);
 
     calibratedMagnetometerData = new RingBuffer<CalibratedMagneticFieldData>(1);
     nameOutputBuffer("calibratedmagnetometerdata", calibratedMagnetometerData);
diff --git a/core/config.cpp b/core/config.cpp
index 20db3e31..e4c8182d 100644
--- a/core/config.cpp
+++ b/core/config.cpp
@@ -33,23 +33,23 @@
 #include <QDir>
 #include <QList>
 
-static Config *static_configuration = 0;
+static SensorFrameworkConfig *static_configuration = 0;
 
-Config::Config() {
+SensorFrameworkConfig::SensorFrameworkConfig() {
 }
 
-Config::~Config() {
+SensorFrameworkConfig::~SensorFrameworkConfig() {
 }
 
-void Config::clearConfig() {
+void SensorFrameworkConfig::clearConfig() {
     m_settings.clear();
 }
 
-bool Config::loadConfig(const QString &defConfigPath, const QString &configDPath) {
+bool SensorFrameworkConfig::loadConfig(const QString &defConfigPath, const QString &configDPath) {
     /* Not having config files is ok, failing to load one that exists is not */
     bool ret = true;
     if (!static_configuration) {
-        static_configuration = new Config();
+        static_configuration = new SensorFrameworkConfig();
     }
     /* Process config.d dir in alnum order */
     if (!configDPath.isEmpty()) {
@@ -68,7 +68,7 @@ bool Config::loadConfig(const QString &defConfigPath, const QString &configDPath
     return ret;
 }
 
-bool Config::loadConfigFile(const QString &configFileName) {
+bool SensorFrameworkConfig::loadConfigFile(const QString &configFileName) {
     /* Success means the file was loaded and processed without hiccups */
     bool loaded = false;
     if (!QFile::exists(configFileName)) {
@@ -90,7 +90,7 @@ bool Config::loadConfigFile(const QString &configFileName) {
     return loaded;
 }
 
-QVariant Config::value(const QString &key) const {
+QVariant SensorFrameworkConfig::value(const QString &key) const {
     QVariant var = m_settings.value(key, QVariant());
     if(var.isValid()) {
         sensordLogT() << "Value for key" << key << ":" << var.toString();
@@ -98,25 +98,25 @@ QVariant Config::value(const QString &key) const {
     return var;
 }
 
-QStringList Config::groups() const
+QStringList SensorFrameworkConfig::groups() const
 {
     QStringList groups = m_settings.childGroups();
     return groups;
 }
 
-Config *Config::configuration() {
+SensorFrameworkConfig *SensorFrameworkConfig::configuration() {
     if (!static_configuration) {
         sensordLogW() << "Configuration has not been loaded";
     }
     return static_configuration;
 }
 
-void Config::close() {
+void SensorFrameworkConfig::close() {
     delete static_configuration;
     static_configuration = 0;
 }
 
-bool Config::exists(const QString &key) const
+bool SensorFrameworkConfig::exists(const QString &key) const
 {
     return value(key).isValid();
 }
diff --git a/core/config.h b/core/config.h
index 0a17d5e0..3b3b68cb 100644
--- a/core/config.h
+++ b/core/config.h
@@ -35,16 +35,16 @@
 
 /**
  * Sensord configuration parser. Configuration is read and parsed with
- * the QSettings class. Config is a singleton instance to which configuration
+ * the QSettings class. SensorFrameworkConfig is a singleton instance to which configuration
  * is loaded once during startup.
  */
-class Config
+class SensorFrameworkConfig
 {
 public:
     /**
      * Destructor.
      */
-    ~Config();
+    ~SensorFrameworkConfig();
 
     /**
      * Find value for given key. Default QVariant is returned if key does
@@ -86,7 +86,7 @@ class Config
      *
      * @return configuration instance.
      */
-    static Config *configuration();
+    static SensorFrameworkConfig *configuration();
 
     /**
      * Load configuration from given paths and append them to singleton
@@ -106,14 +106,14 @@ class Config
     /**
      * Constructor.
      */
-    Config();
+    SensorFrameworkConfig();
 
     /**
      * Copy constructor.
      *
      * @param c source object.
      */
-    Config(const Config &c);
+    SensorFrameworkConfig(const SensorFrameworkConfig &c);
 
     /**
      * Assignment operator.
@@ -121,7 +121,7 @@ class Config
      * @param c source object.
      * @return current object.
      */
-    Config& operator=(const Config &c);
+    SensorFrameworkConfig& operator=(const SensorFrameworkConfig &c);
 
     /**
      * Load configuration file from given path.
@@ -140,7 +140,7 @@ class Config
 };
 
 template<typename T>
-T Config::value(const QString &key, const T &def) const
+T SensorFrameworkConfig::value(const QString &key, const T &def) const
 {
     QVariant val(value(key));
     if(!val.isValid())
diff --git a/core/inputdevadaptor.cpp b/core/inputdevadaptor.cpp
index 9486f417..70d49bd8 100644
--- a/core/inputdevadaptor.cpp
+++ b/core/inputdevadaptor.cpp
@@ -59,14 +59,14 @@ InputDevAdaptor::~InputDevAdaptor()
 int InputDevAdaptor::getInputDevices(const QString& typeName)
 {
     qDebug() << Q_FUNC_INFO << typeName;
-    QString deviceSysPathString = Config::configuration()->value("global/device_sys_path").toString();
-    QString devicePollFilePath = Config::configuration()->value("global/device_poll_file_path").toString();
+    QString deviceSysPathString = SensorFrameworkConfig::configuration()->value("global/device_sys_path").toString();
+    QString devicePollFilePath = SensorFrameworkConfig::configuration()->value("global/device_poll_file_path").toString();
 
     int deviceNumber = 0;
     deviceString_ = typeName;
 
     // Check if this device name is defined in configuration
-    QString deviceName = Config::configuration()->value<QString>(typeName + "/device", "");
+    QString deviceName = SensorFrameworkConfig::configuration()->value<QString>(typeName + "/device", "");
 
     // Do not perform strict checks for the input device
     if (deviceName.size() && checkInputDevice(deviceName, typeName, false)) {
@@ -90,8 +90,8 @@ qDebug() << deviceNumber << deviceCount_ << maxDeviceCount_;
     }
 
     QString pollConfigKey = QString(typeName + "/poll_file");
-    if (Config::configuration()->exists(pollConfigKey)) {
-        usedDevicePollFilePath_ = Config::configuration()->value<QString>(pollConfigKey, "");
+    if (SensorFrameworkConfig::configuration()->exists(pollConfigKey)) {
+        usedDevicePollFilePath_ = SensorFrameworkConfig::configuration()->value<QString>(pollConfigKey, "");
     } else {
         usedDevicePollFilePath_ = devicePollFilePath.arg(deviceNumber);
     }
@@ -191,7 +191,7 @@ bool InputDevAdaptor::setInterval(const unsigned int value, const int sessionId)
 void InputDevAdaptor::init()
 {
     qDebug() << Q_FUNC_INFO << name();
-    if (!getInputDevices(Config::configuration()->value<QString>(name() + "/input_match", name()))) {
+    if (!getInputDevices(SensorFrameworkConfig::configuration()->value<QString>(name() + "/input_match", name()))) {
         sensordLogW() << "Input device not found.";
         SysfsAdaptor::init();
     }
diff --git a/core/loader.cpp b/core/loader.cpp
index 6b45c2a9..3c929571 100644
--- a/core/loader.cpp
+++ b/core/loader.cpp
@@ -192,7 +192,7 @@ void Loader::scanAvailablePlugins()
             int end = file.size() - suffix.size();
             const QString name(file.mid(beg, end-beg));
             QString key = QString("available/%1").arg(name);
-            QString val = Config::configuration()->value(key).toString();
+            QString val = SensorFrameworkConfig::configuration()->value(key).toString();
             if( evaluateAvailabilityValue(name, val) ) {
                 res.append(name);
             }
@@ -235,7 +235,7 @@ void Loader::invalidatePlugin(const QString &name)
 QString Loader::resolveRealPluginName(const QString& pluginName) const
 {
     QString key = QString("plugins/%1").arg(pluginName);
-    QString nameFromConfig = Config::configuration()->value(key).toString();
+    QString nameFromConfig = SensorFrameworkConfig::configuration()->value(key).toString();
     if (nameFromConfig.isEmpty()) {
         sensordLogT() << "Plugin setting for " << pluginName << " not found from configuration. Using key as value.";
         return pluginName;
diff --git a/core/nodebase.cpp b/core/nodebase.cpp
index 137c2c84..1a877693 100644
--- a/core/nodebase.cpp
+++ b/core/nodebase.cpp
@@ -87,7 +87,7 @@ void NodeBase::introduceAvailableDataRange(const DataRange& range)
 
 void NodeBase::introduceAvailableDataRanges(const QString& typeName)
 {
-    QVariant ranges = Config::configuration()->value(typeName + "/dataranges");
+    QVariant ranges = SensorFrameworkConfig::configuration()->value(typeName + "/dataranges");
     if(ranges.isValid())
     {
         DataRangeList list(parseDataRangeList(ranges.toString(), 1));
@@ -280,7 +280,7 @@ void NodeBase::introduceAvailableInterval(const DataRange& interval)
 
 void NodeBase::introduceAvailableIntervals(const QString& typeName)
 {
-    QVariant ranges = Config::configuration()->value(typeName + "/intervals");
+    QVariant ranges = SensorFrameworkConfig::configuration()->value(typeName + "/intervals");
     if(ranges.isValid())
     {
         DataRangeList list(parseDataRangeList(ranges.toString(), 0));
diff --git a/core/sysfsadaptor.cpp b/core/sysfsadaptor.cpp
index a4b2fbd8..82674cfa 100644
--- a/core/sysfsadaptor.cpp
+++ b/core/sysfsadaptor.cpp
@@ -478,7 +478,7 @@ void SysfsAdaptorReader::run()
 
 void SysfsAdaptor::init()
 {
-    QString path = Config::configuration()->value(name() + "/path").toString();
+    QString path = SensorFrameworkConfig::configuration()->value(name() + "/path").toString();
     if(!path.isEmpty())
     {
         addPath(path);
@@ -487,10 +487,10 @@ void SysfsAdaptor::init()
     {
         sensordLogW() << "No sysfs path defined for: " << name();
     }
-    mode_ = (PollMode)Config::configuration()->value<int>(name() + "/mode", mode_);
-    doSeek_ = Config::configuration()->value<bool>(name() + "/seek", doSeek_);
+    mode_ = (PollMode)SensorFrameworkConfig::configuration()->value<int>(name() + "/mode", mode_);
+    doSeek_ = SensorFrameworkConfig::configuration()->value<bool>(name() + "/seek", doSeek_);
 
     introduceAvailableDataRanges(name());
     introduceAvailableIntervals(name());
-    setDefaultInterval(Config::configuration()->value<int>(name() + "/default_interval", 0));
+    setDefaultInterval(SensorFrameworkConfig::configuration()->value<int>(name() + "/default_interval", 0));
 }
diff --git a/debian/changelog b/debian/changelog
index e330d7e8..4eab68ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -94,13 +94,13 @@ sensorfw-qt5 (0.7.1) unstable; urgency=low
   * Proximity sensor dataflow now uses datatype ProximityData. 
   * ProximitySensorChannelInterface provides signal and accessor for getting proximity reading with reflectance value.
   * c-api removed from doxygen targets.
-  * Config-class now better handles errors.
+  * SensorFrameworkConfig-class now better handles errors.
   * AccelerometerAdaptor used for some reason OrientationData. Should have
     been AccelerometerData. Only cosmetic change.
   * Implemented new downsampling logic (Fixes: NB#234563):
     - AccelerometerAdaptor, MagnetometerAdaptor and RotationSensorChannel interval rangelist has been limited to certain sizes.
     - AccelerometerSensorChannel, RotationSensorChannel and MagnetometerSensorChannel downsamples data before propagating it.
-  * Config-class has now more friendly API.
+  * SensorFrameworkConfig-class has now more friendly API.
   * sensorfw-qt5testapp improvements.
   * API documentation improvements.
   * Improved dataflowtests.
@@ -431,7 +431,7 @@ sensorfw-qt5 (0.6.25) unstable; urgency=low
     - Replaced direct usage of qDebug() with logging macros.
     - Improved error-handling in Loader.
     - Sensorfw-Qt5Logger now correctly prints QStrings.
-    - Config/Logging singletons are now unloaded before exitting from main().
+    - SensorFrameworkConfig/Logging singletons are now unloaded before exitting from main().
 
  -- Timo Rongas <ext-timo.2.rongas@nokia.com>  Tue, 21 Sep 2010 10:32:41 +0300
 
diff --git a/filters/declinationfilter/declinationfilter.cpp b/filters/declinationfilter/declinationfilter.cpp
index cef516f7..cc44c282 100644
--- a/filters/declinationfilter/declinationfilter.cpp
+++ b/filters/declinationfilter/declinationfilter.cpp
@@ -37,7 +37,7 @@ DeclinationFilter::DeclinationFilter() :
         Filter<CompassData, DeclinationFilter, CompassData>(this, &DeclinationFilter::correct),
         declinationCorrection_(0)
 {
-    updateInterval_ = Config::configuration()->value<quint64>("compass/declination_update_interval", 1000 * 60 * 60) * 1000;
+    updateInterval_ = SensorFrameworkConfig::configuration()->value<quint64>("compass/declination_update_interval", 1000 * 60 * 60) * 1000;
     loadSettings();
 }
 
diff --git a/filters/orientationinterpreter/orientationinterpreter.cpp b/filters/orientationinterpreter/orientationinterpreter.cpp
index 86554de5..705eb1a5 100644
--- a/filters/orientationinterpreter/orientationinterpreter.cpp
+++ b/filters/orientationinterpreter/orientationinterpreter.cpp
@@ -59,13 +59,13 @@ OrientationInterpreter::OrientationInterpreter() :
     addSource(&faceSource, "face");
     addSource(&orientationSource, "orientation");
 
-    minLimit = Config::configuration()->value("orientation/overflow_min", QVariant(OVERFLOW_MIN)).toInt();
-    maxLimit = Config::configuration()->value("orientation/overflow_max", QVariant(OVERFLOW_MAX)).toInt();
+    minLimit = SensorFrameworkConfig::configuration()->value("orientation/overflow_min", QVariant(OVERFLOW_MIN)).toInt();
+    maxLimit = SensorFrameworkConfig::configuration()->value("orientation/overflow_max", QVariant(OVERFLOW_MAX)).toInt();
 
-    angleThresholdPortrait = Config::configuration()->value("orientation/threshold_portrait",QVariant(THRESHOLD_PORTRAIT)).toInt();
-    angleThresholdLandscape = Config::configuration()->value("orientation/threshold_landscape",QVariant(THRESHOLD_LANDSCAPE)).toInt();
-    discardTime = Config::configuration()->value("orientation/discard_time", QVariant(DISCARD_TIME)).toUInt();
-    maxBufferSize = Config::configuration()->value("orientation/buffer_size", QVariant(AVG_BUFFER_MAX_SIZE)).toInt();
+    angleThresholdPortrait = SensorFrameworkConfig::configuration()->value("orientation/threshold_portrait",QVariant(THRESHOLD_PORTRAIT)).toInt();
+    angleThresholdLandscape = SensorFrameworkConfig::configuration()->value("orientation/threshold_landscape",QVariant(THRESHOLD_LANDSCAPE)).toInt();
+    discardTime = SensorFrameworkConfig::configuration()->value("orientation/discard_time", QVariant(DISCARD_TIME)).toUInt();
+    maxBufferSize = SensorFrameworkConfig::configuration()->value("orientation/buffer_size", QVariant(AVG_BUFFER_MAX_SIZE)).toInt();
 
     // Open the handle for boosting cpu on changes that affect orientation
     if (cpuBoostFile.exists()) {
diff --git a/sensord/calibrationhandler.cpp b/sensord/calibrationhandler.cpp
index d32a5817..92e595ae 100644
--- a/sensord/calibrationhandler.cpp
+++ b/sensord/calibrationhandler.cpp
@@ -41,8 +41,8 @@ CalibrationHandler::CalibrationHandler(QObject* parent) :
 {
     m_timer.setSingleShot(true);
 
-    m_calibRate = Config::configuration()->value<int>("magnetometer/calibration_rate", 100);
-    m_calibTimeout = Config::configuration()->value<int>("magnetometer/calibration_timeout", 60000);
+    m_calibRate = SensorFrameworkConfig::configuration()->value<int>("magnetometer/calibration_rate", 100);
+    m_calibTimeout = SensorFrameworkConfig::configuration()->value<int>("magnetometer/calibration_timeout", 60000);
 }
 
 CalibrationHandler::~CalibrationHandler()
diff --git a/sensord/main.cpp b/sensord/main.cpp
index 89b2b489..4e01bc48 100644
--- a/sensord/main.cpp
+++ b/sensord/main.cpp
@@ -227,10 +227,10 @@ int main(int argc, char *argv[])
         defConfigDir = parser.configDirPath();
     }
 
-    if (!Config::loadConfig(defConfigFile, defConfigDir))
+    if (!SensorFrameworkConfig::loadConfig(defConfigFile, defConfigDir))
     {
-        sensordLogC() << "Config file error! Load using default paths.";
-        if (!Config::loadConfig(CONFIG_FILE_PATH, CONFIG_DIR_PATH))
+        sensordLogC() << "SensorFrameworkConfig file error! Load using default paths.";
+        if (!SensorFrameworkConfig::loadConfig(CONFIG_FILE_PATH, CONFIG_DIR_PATH))
         {
             sensordLogC() << "Which also failed. Bailing out";
             return 1;
@@ -287,7 +287,7 @@ int main(int argc, char *argv[])
     delete signalNotifier; signalNotifier = 0;
 
     sensordLogD() << "Exiting...";
-    Config::close();
+    SensorFrameworkConfig::close();
     return ret;
 }
 
diff --git a/sensors/contextplugin/orientationbin.cpp b/sensors/contextplugin/orientationbin.cpp
index 3c659233..e2ca6d29 100644
--- a/sensors/contextplugin/orientationbin.cpp
+++ b/sensors/contextplugin/orientationbin.cpp
@@ -101,7 +101,7 @@ void OrientationBin::startRun()
     start();
     orientationChain->start();
 
-    unsigned int pollInterval = Config::configuration()->value("context/orientation_poll_interval", QVariant(POLL_INTERVAL)).toUInt();
+    unsigned int pollInterval = SensorFrameworkConfig::configuration()->value("context/orientation_poll_interval", QVariant(POLL_INTERVAL)).toUInt();
     orientationChain->setIntervalRequest(sessionId, pollInterval);
 }
 
diff --git a/sensors/contextplugin/screeninterpreterfilter.cpp b/sensors/contextplugin/screeninterpreterfilter.cpp
index 4301460f..ff0b8134 100644
--- a/sensors/contextplugin/screeninterpreterfilter.cpp
+++ b/sensors/contextplugin/screeninterpreterfilter.cpp
@@ -47,7 +47,7 @@ ScreenInterpreterFilter::ScreenInterpreterFilter(
     topEdge("top")
 {
     // Get offset from config
-    offset = Config::configuration()->value("context/orientation_offset", QVariant(0)).toInt();
+    offset = SensorFrameworkConfig::configuration()->value("context/orientation_offset", QVariant(0)).toInt();
 }
 
 void ScreenInterpreterFilter::interpret(unsigned, const PoseData* data)
diff --git a/sensors/contextplugin/stabilityfilter.cpp b/sensors/contextplugin/stabilityfilter.cpp
index 8bf90eb1..de1a61f1 100644
--- a/sensors/contextplugin/stabilityfilter.cpp
+++ b/sensors/contextplugin/stabilityfilter.cpp
@@ -38,7 +38,7 @@ StabilityFilter::StabilityFilter(Property* stableProperty, Property* unstablePro
       unstableProperty(unstableProperty)
 {
     connect(&timer, SIGNAL(timeout()), this, SLOT(timeoutTriggered()));
-    timeout = Config::configuration()->value("context/stability_timeout", QVariant(defaultTimeout)).toInt() * 1000;
+    timeout = SensorFrameworkConfig::configuration()->value("context/stability_timeout", QVariant(defaultTimeout)).toInt() * 1000;
 }
 
 void StabilityFilter::interpret(unsigned, const QPair<double, double>* data)
diff --git a/sensors/magnetometersensor/magnetometerscalefilter.cpp b/sensors/magnetometersensor/magnetometerscalefilter.cpp
index 761b9055..1a361071 100644
--- a/sensors/magnetometersensor/magnetometerscalefilter.cpp
+++ b/sensors/magnetometersensor/magnetometerscalefilter.cpp
@@ -30,7 +30,7 @@
 MagnetometerScaleFilter::MagnetometerScaleFilter() :
         Filter<CalibratedMagneticFieldData, MagnetometerScaleFilter, CalibratedMagneticFieldData>(this, &MagnetometerScaleFilter::filter)
 {
-    factor = Config::configuration()->value("magnetometer/scale_coefficient", QVariant(1)).toInt();
+    factor = SensorFrameworkConfig::configuration()->value("magnetometer/scale_coefficient", QVariant(1)).toInt();
 }
 
 void MagnetometerScaleFilter::filter(unsigned, const CalibratedMagneticFieldData* data)
diff --git a/sensors/magnetometersensor/magnetometersensor.cpp b/sensors/magnetometersensor/magnetometersensor.cpp
index 19e6015d..8e4892b8 100644
--- a/sensors/magnetometersensor/magnetometersensor.cpp
+++ b/sensors/magnetometersensor/magnetometersensor.cpp
@@ -49,7 +49,7 @@ MagnetometerSensorChannel::MagnetometerSensorChannel(const QString& id) :
 
     magnetometerReader_ = new BufferReader<CalibratedMagneticFieldData>(1);
 
-    scaleCoefficient_ = Config::configuration()->value("magnetometer/scale_coefficient", QVariant(300)).toInt();
+    scaleCoefficient_ = SensorFrameworkConfig::configuration()->value("magnetometer/scale_coefficient", QVariant(300)).toInt();
 
     if (scaleCoefficient_ != 1)
     {
diff --git a/tests/adaptors/adaptortest.cpp b/tests/adaptors/adaptortest.cpp
index d2528449..d73e0ef8 100644
--- a/tests/adaptors/adaptortest.cpp
+++ b/tests/adaptors/adaptortest.cpp
@@ -45,7 +45,7 @@
 
 void AdaptorTest::initTestCase()
 {
-    Config::loadConfig("/etc/sensorfw/sensord.conf", "/etc/sensorfw/sensord.conf.d");
+    SensorFrameworkConfig::loadConfig("/etc/sensorfw/sensord.conf", "/etc/sensorfw/sensord.conf.d");
 }
 
 void AdaptorTest::init() {}
diff --git a/tests/chains/chainstest.cpp b/tests/chains/chainstest.cpp
index ee7dd9bf..23cd97d2 100644
--- a/tests/chains/chainstest.cpp
+++ b/tests/chains/chainstest.cpp
@@ -33,7 +33,7 @@
 
 void ChainTest::initTestCase()
 {
-    Config::loadConfig("/etc/sensorfw/sensord.conf", "/etc/sensorfw/sensord.conf.d");
+    SensorFrameworkConfig::loadConfig("/etc/sensorfw/sensord.conf", "/etc/sensorfw/sensord.conf.d");
 }
 
 void ChainTest::init() {}
diff --git a/tests/dataflow/dataflowtests.cpp b/tests/dataflow/dataflowtests.cpp
index a1302425..1ca788a5 100644
--- a/tests/dataflow/dataflowtests.cpp
+++ b/tests/dataflow/dataflowtests.cpp
@@ -47,7 +47,7 @@
 
 void DataFlowTest::initTestCase()
 {
-    Config::loadConfig("/etc/sensorfw/sensord.conf", "/etc/sensorfw/sensord.conf.d");
+    SensorFrameworkConfig::loadConfig("/etc/sensorfw/sensord.conf", "/etc/sensorfw/sensord.conf.d");
 
     // Initialise sensormanager
     SensorManager& sm = SensorManager::instance();
diff --git a/tests/filters/filtertests.cpp b/tests/filters/filtertests.cpp
index b124e93a..44d20ada 100644
--- a/tests/filters/filtertests.cpp
+++ b/tests/filters/filtertests.cpp
@@ -44,7 +44,7 @@
 
 void FilterApiTest::initTestCase()
 {
-    Config::loadConfig(CONFIG_FILE_PATH, CONFIG_DIR_PATH);
+    SensorFrameworkConfig::loadConfig(CONFIG_FILE_PATH, CONFIG_DIR_PATH);
 }
 
 /**
diff --git a/tests/testapp/abstractsensorhandler.cpp b/tests/testapp/abstractsensorhandler.cpp
index b60fc0b3..53c0ea85 100644
--- a/tests/testapp/abstractsensorhandler.cpp
+++ b/tests/testapp/abstractsensorhandler.cpp
@@ -38,13 +38,13 @@ AbstractSensorHandler::AbstractSensorHandler(const QString& sensorName, QObject
     frameCount_(0),
     downsample_(false)
 {
-    if (Config::configuration() != NULL)
+    if (SensorFrameworkConfig::configuration() != NULL)
     {
-        interval_ = Config::configuration()->value(sensorName_ + "/interval", 100);
-        bufferinterval_ = Config::configuration()->value(sensorName_ + "/bufferinterval", 0);
-        standbyoverride_ = Config::configuration()->value(sensorName_ + "/standbyoverride", false);
-        buffersize_ = Config::configuration()->value(sensorName_ + "/buffersize", 0);
-        downsample_ = Config::configuration()->value(sensorName_ + "/downsample", false);
+        interval_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/interval", 100);
+        bufferinterval_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/bufferinterval", 0);
+        standbyoverride_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/standbyoverride", false);
+        buffersize_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/buffersize", 0);
+        downsample_ = SensorFrameworkConfig::configuration()->value(sensorName_ + "/downsample", false);
     }
 }
 
diff --git a/tests/testapp/clientadmin.cpp b/tests/testapp/clientadmin.cpp
index 5a430375..8191831e 100644
--- a/tests/testapp/clientadmin.cpp
+++ b/tests/testapp/clientadmin.cpp
@@ -51,24 +51,24 @@ void ClientAdmin::init()
     if (parser.configFileInput())
     {
         QString defConfigFile = parser.configFilePath();
-        if (Config::loadConfig(defConfigFile, ""))
-            sensordLogT() << "Config file is loading successfully.";
+        if (SensorFrameworkConfig::loadConfig(defConfigFile, ""))
+            sensordLogT() << "SensorFrameworkConfig file is loading successfully.";
         else
         {
-            sensordLogW() << "Config file error! Load using default path.";
-            Config::loadConfig(CONFIG_FILE_PATH, "");
+            sensordLogW() << "SensorFrameworkConfig file error! Load using default path.";
+            SensorFrameworkConfig::loadConfig(CONFIG_FILE_PATH, "");
         }
     } else {
-        Config::loadConfig(CONFIG_FILE_PATH, "");
+        SensorFrameworkConfig::loadConfig(CONFIG_FILE_PATH, "");
     }
 
-    if (Config::configuration() == NULL)
+    if (SensorFrameworkConfig::configuration() == NULL)
     {
         sensordLogC() << "Failed to load configuration. Aborting.";
         exit(EXIT_FAILURE);
     }
 
-    if (!SensorHandler::init(Config::configuration()->groups()))
+    if (!SensorHandler::init(SensorFrameworkConfig::configuration()->groups()))
     {
         sensordLogC() << "Failed to initialize SensorHandler. Aborting.";
         exit(EXIT_FAILURE);
@@ -79,9 +79,9 @@ void ClientAdmin::runClients()
 {
     init();
 
-    foreach (const QString& sensorName, Config::configuration()->groups())
+    foreach (const QString& sensorName, SensorFrameworkConfig::configuration()->groups())
     {
-        int count = Config::configuration()->value<int>(sensorName + "/instances", 0);
+        int count = SensorFrameworkConfig::configuration()->value<int>(sensorName + "/instances", 0);
         for(int i = 0; i < count; ++i)
         {
             SensorHandler* handler = new SensorHandler(sensorName, this);
@@ -120,5 +120,5 @@ ClientAdmin::~ClientAdmin()
         }
         delete handler;
     }
-    Config::close();
+    SensorFrameworkConfig::close();
 }