diff --git a/dataengines/powermanagement/powermanagementengine.cpp b/dataengines/powermanagement/powermanagementengine.cpp
index 1b1cb5e33..26f7baeaf 100644
--- a/dataengines/powermanagement/powermanagementengine.cpp
+++ b/dataengines/powermanagement/powermanagementengine.cpp
@@ -139,13 +139,13 @@ bool PowermanagementEngine::sourceRequestEvent(const QString &name)
                     SLOT(updateBatteryChargeState(int,QString)));
             connect(battery, SIGNAL(chargePercentChanged(int,QString)), this,
                     SLOT(updateBatteryChargePercent(int,QString)));
-            connect(battery, SIGNAL(plugStateChanged(bool,QString)), this,
-                    SLOT(updateBatteryPlugState(bool,QString)));
+            connect(battery, SIGNAL(presentStateChanged(bool,QString)), this,
+                    SLOT(updateBatteryPresentState(bool,QString)));
 
             // Set initial values
             updateBatteryChargeState(battery->chargeState(), deviceBattery.udi());
             updateBatteryChargePercent(battery->chargePercent(), deviceBattery.udi());
-            updateBatteryPlugState(battery->isPlugged(), deviceBattery.udi());
+            updateBatteryPresentState(battery->isPresent(), deviceBattery.udi());
             updateBatteryPowerSupplyState(battery->isPowerSupply(), deviceBattery.udi());
 
             setData(source, "Vendor", deviceBattery.vendor());
@@ -296,10 +296,10 @@ void PowermanagementEngine::updateBatteryChargeState(int newState, const QString
     setData(source, "State", state);
 }
 
-void PowermanagementEngine::updateBatteryPlugState(bool newState, const QString& udi)
+void PowermanagementEngine::updateBatteryPresentState(bool newState, const QString& udi)
 {
     const QString source = m_batterySources[udi];
-    setData(source, "Plugged in", newState);
+    setData(source, "Plugged in", newState); // FIXME This needs to be renamed and Battery Monitor adjusted
 }
 
 void PowermanagementEngine::updateBatteryChargePercent(int newValue, const QString& udi)
@@ -390,15 +390,15 @@ void PowermanagementEngine::deviceAdded(const QString& udi)
                     SLOT(updateBatteryChargeState(int,QString)));
             connect(battery, SIGNAL(chargePercentChanged(int,QString)), this,
                     SLOT(updateBatteryChargePercent(int,QString)));
-            connect(battery, SIGNAL(plugStateChanged(bool,QString)), this,
-                    SLOT(updateBatteryPlugState(bool,QString)));
+            connect(battery, SIGNAL(presentStateChanged(bool,QString)), this,
+                    SLOT(updateBatteryPresentState(bool,QString)));
             connect(battery, SIGNAL(powerSupplyStateChanged(bool,QString)), this,
                     SLOT(updateBatteryPowerSupplyState(bool,QString)));
 
             // Set initial values
             updateBatteryChargeState(battery->chargeState(), device.udi());
             updateBatteryChargePercent(battery->chargePercent(), device.udi());
-            updateBatteryPlugState(battery->isPlugged(), device.udi());
+            updateBatteryPresentState(battery->isPresent(), device.udi());
             updateBatteryPowerSupplyState(battery->isPowerSupply(), device.udi());
 
             setData(source, "Vendor", device.vendor());
diff --git a/dataengines/powermanagement/powermanagementengine.h b/dataengines/powermanagement/powermanagementengine.h
index 9429ade8a..0027e659f 100644
--- a/dataengines/powermanagement/powermanagementengine.h
+++ b/dataengines/powermanagement/powermanagementengine.h
@@ -51,7 +51,7 @@ protected:
 
 private Q_SLOTS:
     void updateBatteryChargeState(int newState, const QString& udi);
-    void updateBatteryPlugState(bool newState, const QString& udi);
+    void updateBatteryPresentState(bool newState, const QString& udi);
     void updateBatteryChargePercent(int newValue, const QString& udi);
     void updateBatteryPowerSupplyState(bool newState, const QString& udi);
     void updateAcPlugState(bool newState);
diff --git a/dataengines/soliddevice/soliddeviceengine.cpp b/dataengines/soliddevice/soliddeviceengine.cpp
index 97d7c8de9..1f0d56e0c 100644
--- a/dataengines/soliddevice/soliddeviceengine.cpp
+++ b/dataengines/soliddevice/soliddeviceengine.cpp
@@ -414,7 +414,7 @@ bool SolidDeviceEngine::populateDeviceData(const QString &name)
         QStringList chargestate;
         chargestate << I18N_NOOP("Fully Charged") << I18N_NOOP("Charging") << I18N_NOOP("Discharging");
 
-        setData(name, I18N_NOOP("Plugged In"), battery->isPlugged());
+        setData(name, I18N_NOOP("Plugged In"), battery->isPresent()); // FIXME Rename when interested parties are adjusted
         setData(name, I18N_NOOP("Type"), batterytype.at((int)battery->type()));
         setData(name, I18N_NOOP("Charge Percent"), battery->chargePercent());
         setData(name, I18N_NOOP("Rechargeable"), battery->isRechargeable());