3 files changed, 18 insertions, 12 deletions
diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php
index 800b916886..bfe38b7240 100644
--- a/plugins/CustomVariables/API.php
+++ b/plugins/CustomVariables/API.php
@@ -10,6 +10,8 @@
  */
 use Piwik\Archive;
 use Piwik\Metrics;
+use Piwik\Date;
+use Piwik\DataTable;
 
 /**
  * The Custom Variables API lets you access reports for your <a href='http://piwik.org/docs/custom-variables/' target='_blank'>Custom Variables</a> names and values.
@@ -34,12 +36,12 @@ class Piwik_CustomVariables_API
     /**
      * @param int $idSite
      * @param string $period
-     * @param Piwik_Date $date
+     * @param Date $date
      * @param string $segment
      * @param bool $expanded
      * @param int $idSubtable
      *
-     * @return Piwik_DataTable|Piwik_DataTable_Array
+     * @return DataTable|DataTable\Map
      */
     protected function getDataTable($idSite, $period, $date, $segment, $expanded, $idSubtable)
     {
@@ -53,18 +55,18 @@ class Piwik_CustomVariables_API
     /**
      * @param int $idSite
      * @param string $period
-     * @param Piwik_Date $date
+     * @param Date $date
      * @param string|bool $segment
      * @param bool $expanded
      * @param bool $_leavePiwikCoreVariables
      *
-     * @return Piwik_DataTable|Piwik_DataTable_Array
+     * @return DataTable|DataTable\Map
      */
     public function getCustomVariables($idSite, $period, $date, $segment = false, $expanded = false, $_leavePiwikCoreVariables = false)
     {
         $dataTable = $this->getDataTable($idSite, $period, $date, $segment, $expanded, $idSubtable = null);
 
-        if ($dataTable instanceof Piwik_DataTable
+        if ($dataTable instanceof DataTable
             && !$_leavePiwikCoreVariables
         ) {
             $mapping = self::getReservedCustomVariableKeys();
@@ -90,12 +92,12 @@ class Piwik_CustomVariables_API
     /**
      * @param int $idSite
      * @param string $period
-     * @param Piwik_Date $date
+     * @param Date $date
      * @param int $idSubtable
      * @param string|bool $segment
      * @param bool $_leavePriceViewedColumn
      *
-     * @return Piwik_DataTable|Piwik_DataTable_Array
+     * @return DataTable|DataTable\Map
      */
     public function getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment = false, $_leavePriceViewedColumn = false)
     {
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index 08b15ec865..654cf22835 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -1,7 +1,9 @@
 <?php
 use Piwik\Common;
 use Piwik\Config;
+use Piwik\DataAccess\LogAggregator;
 use Piwik\Metrics;
+use Piwik\PluginsArchiver;
 
 /**
  * Piwik - Open source web analytics
@@ -13,7 +15,7 @@ use Piwik\Metrics;
  * @package Piwik_CustomVariables
  */
 
-class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver
+class Piwik_CustomVariables_Archiver extends PluginsArchiver
 {
     const LABEL_CUSTOM_VALUE_NOT_DEFINED = "Value not defined";
     const CUSTOM_VARIABLE_RECORD_NAME = 'CustomVariables_valueByName';
@@ -78,7 +80,7 @@ class Piwik_CustomVariables_Archiver extends Piwik_PluginsArchiver
 
     protected function getSelectAveragePrice()
     {
-        return Piwik_DataAccess_LogAggregator::getSqlRevenue("AVG(log_link_visit_action.custom_var_v2)")
+        return LogAggregator::getSqlRevenue("AVG(log_link_visit_action.custom_var_v2)")
             . " as `" . Metrics::INDEX_ECOMMERCE_ITEM_PRICE_VIEWED . "`";
     }
 
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index 9a402c192f..971a967b8e 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -8,11 +8,13 @@
  * @category Piwik_Plugins
  * @package Piwik_CustomVariables
  */
+use Piwik\ArchiveProcessor;
+use Piwik\Plugin;
 
 /**
  * @package Piwik_CustomVariables
  */
-class Piwik_CustomVariables extends Piwik_Plugin
+class Piwik_CustomVariables extends Plugin
 {
     public function getInformation()
     {
@@ -130,7 +132,7 @@ class Piwik_CustomVariables extends Piwik_Plugin
     /**
      * Hooks on daily archive to trigger various log processing
      */
-    public function archiveDay(Piwik_ArchiveProcessor_Day $archiveProcessor)
+    public function archiveDay(ArchiveProcessor\Day $archiveProcessor)
     {
         $archiving = new Piwik_CustomVariables_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {
@@ -138,7 +140,7 @@ class Piwik_CustomVariables extends Piwik_Plugin
         }
     }
 
-    public function archivePeriod(Piwik_ArchiveProcessor_Period $archiveProcessor)
+    public function archivePeriod(ArchiveProcessor\Period $archiveProcessor)
     {
         $archiving = new Piwik_CustomVariables_Archiver($archiveProcessor);
         if($archiving->shouldArchive()) {