3 files changed, 9 insertions, 5 deletions
diff --git a/plugins/Provider/Archiver.php b/plugins/Provider/Archiver.php
index ce782f9342..bd9a4fa456 100644
--- a/plugins/Provider/Archiver.php
+++ b/plugins/Provider/Archiver.php
@@ -9,8 +9,9 @@
  * @package Piwik_Provider
  */
 use Piwik\Metrics;
+use Piwik\PluginsArchiver;
 
-class Piwik_Provider_Archiver extends Piwik_PluginsArchiver
+class Piwik_Provider_Archiver extends PluginsArchiver
 {
     const PROVIDER_RECORD_NAME = 'Provider_hostnameExt';
     const PROVIDER_FIELD = "location_provider";
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index ca7c05ae8d..fe448e7395 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -9,12 +9,14 @@
  * @package Piwik_Provider
  */
 use Piwik\Common;
+use Piwik\Plugin;
+use Piwik\ArchiveProcessor;
 
 /**
  *
  * @package Piwik_Provider
  */
-class Piwik_Provider extends Piwik_Plugin
+class Piwik_Provider extends Plugin
 {
     /**
      * @see Piwik_Plugin::getListHooksRegistered
@@ -192,7 +194,7 @@ class Piwik_Provider extends Piwik_Plugin
     /**
      * Daily archive: processes the report Visits by Provider
      */
-    public function archiveDay(Piwik_ArchiveProcessor_Day $archiveProcessor)
+    public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
     {
         $archiving = new Piwik_Provider_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {
@@ -200,7 +202,7 @@ class Piwik_Provider extends Piwik_Plugin
         }
     }
 
-    public function archivePeriod(Piwik_ArchiveProcessor_Period $archiveProcessor)
+    public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
     {
         $archiving = new Piwik_Provider_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {
diff --git a/plugins/Provider/functions.php b/plugins/Provider/functions.php
index a09ec1ab36..540060db4b 100644
--- a/plugins/Provider/functions.php
+++ b/plugins/Provider/functions.php
@@ -9,6 +9,7 @@
  * @package Piwik_Provider
  */
 use Piwik\Common;
+use Piwik\DataTable;
 
 /**
  * Return hostname portion of a domain name
@@ -38,7 +39,7 @@ function Piwik_getHostnameName($in)
  */
 function Piwik_getHostnameUrl($in)
 {
-    if ($in == Piwik_DataTable::LABEL_SUMMARY_ROW) {
+    if ($in == DataTable::LABEL_SUMMARY_ROW) {
         return false;
     }
     if (empty($in)