3 files changed, 15 insertions, 11 deletions
diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php
index 3117122c96..1800849fcf 100644
--- a/plugins/DevicesDetection/API.php
+++ b/plugins/DevicesDetection/API.php
@@ -12,6 +12,7 @@
 use Piwik\Archive;
 use Piwik\Metrics;
 use Piwik\Piwik;
+use Piwik\DataTable;
 
 /**
  * The DevicesDetection API lets you access reports on your visitors devices, brands, models, Operating system, Browsers.
@@ -58,7 +59,7 @@ class Piwik_DevicesDetection_API
      * @param string $period
      * @param string $date
      * @param bool|string $segment
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getType($idSite, $period, $date, $segment = false)
     {
@@ -75,7 +76,7 @@ class Piwik_DevicesDetection_API
      * @param string $period
      * @param string $date
      * @param bool|string $segment
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getBrand($idSite, $period, $date, $segment = false)
     {
@@ -91,7 +92,7 @@ class Piwik_DevicesDetection_API
      * @param string $period
      * @param string $date
      * @param bool|string $segment
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getModel($idSite, $period, $date, $segment = false)
     {
@@ -106,7 +107,7 @@ class Piwik_DevicesDetection_API
      * @param string $period
      * @param string $date
      * @param bool|string $segment
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getOsFamilies($idSite, $period, $date, $segment = false)
     {
@@ -122,7 +123,7 @@ class Piwik_DevicesDetection_API
      * @param string $period
      * @param string $date
      * @param bool|string $segment
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getOsVersions($idSite, $period, $date, $segment = false)
     {
@@ -139,7 +140,7 @@ class Piwik_DevicesDetection_API
      * @param string $period
      * @param string $date
      * @param bool|string $segment
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getBrowserFamilies($idSite, $period, $date, $segment = false)
     {
@@ -155,7 +156,7 @@ class Piwik_DevicesDetection_API
      * @param string $period
      * @param string $date
      * @param bool|string $segment
-     * @return Piwik_DataTable
+     * @return DataTable
      */
     public function getBrowserVersions($idSite, $period, $date, $segment = false)
     {
diff --git a/plugins/DevicesDetection/Archiver.php b/plugins/DevicesDetection/Archiver.php
index 6bf0288894..73a66fb67d 100644
--- a/plugins/DevicesDetection/Archiver.php
+++ b/plugins/DevicesDetection/Archiver.php
@@ -10,8 +10,9 @@
  */
 
 use Piwik\Metrics;
+use Piwik\PluginsArchiver;
 
-class Piwik_DevicesDetection_Archiver extends Piwik_PluginsArchiver
+class Piwik_DevicesDetection_Archiver extends PluginsArchiver
 {
     const DEVICE_TYPE_RECORD_NAME = 'DevicesDetection_types';
     const DEVICE_BRAND_RECORD_NAME = 'DevicesDetection_brands';
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 2a734b24e4..7129ee581b 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -9,13 +9,15 @@
  * @category Piwik_Plugins
  * @package Piwik_DevicesDetection
  */
+use Piwik\ArchiveProcessor;
 use Piwik\Config;
 use Piwik\Common;
+use Piwik\Plugin;
 
 require_once PIWIK_INCLUDE_PATH . "/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php";
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
 
-class Piwik_DevicesDetection extends Piwik_Plugin
+class Piwik_DevicesDetection extends Plugin
 {
     /**
      * @see Piwik_Plugin::getInformation
@@ -229,7 +231,7 @@ class Piwik_DevicesDetection extends Piwik_Plugin
         Common::printDebug($deviceInfo);
     }
 
-    public function archiveDay(Piwik_ArchiveProcessor_Day $archiveProcessor)
+    public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
     {
         $archiving = new Piwik_DevicesDetection_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {
@@ -237,7 +239,7 @@ class Piwik_DevicesDetection extends Piwik_Plugin
         }
     }
 
-    public function archivePeriod(Piwik_ArchiveProcessor_Period $archiveProcessor)
+    public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
     {
         $archiving = new Piwik_DevicesDetection_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {