1 files changed, 8 insertions, 7 deletions

diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php
index 603cce5431..8e2ec1c167 100755
--- a/plugins/Annotations/API.php
+++ b/plugins/Annotations/API.php
@@ -9,8 +9,9 @@
  * @package Piwik_Annotations
  */
 use Piwik\Period;
-use Piwik\Period_Range;
+use Piwik\Period\Range;
 use Piwik\Piwik;
+use Piwik\Date;
 
 /**
  * @see plugins/Annotations/AnnotationList.php
@@ -248,7 +249,7 @@ class Piwik_Annotations_API
                     && $result[$idSite][$strDate]['count'] == 1
                 ) {
                     $annotationsForSite = $annotations->search(
-                        $date, Piwik_Date::factory($nextDate->getTimestamp() - 1), $idSite);
+                        $date, Date::factory($nextDate->getTimestamp() - 1), $idSite);
                     $annotation = reset($annotationsForSite[$idSite]);
 
                     $result[$idSite][$strDate]['note'] = $annotation['note'];
@@ -318,9 +319,9 @@ class Piwik_Annotations_API
             || $period == 'range'
         ) {
             if ($period == 'range') {
-                $oPeriod = new Period_Range('day', $date);
+                $oPeriod = new Range('day', $date);
             } else {
-                $oPeriod = Period::factory($period, Piwik_Date::factory($date));
+                $oPeriod = Period::factory($period, Date::factory($date));
             }
 
             $startDate = $oPeriod->getDateStart();
@@ -331,8 +332,8 @@ class Piwik_Annotations_API
                 Piwik_ViewDataTable_GenerateGraphHTML_ChartEvolution::getDateRangeAndLastN($period, $date, $lastN);
             list($startDate, $endDate) = explode(',', $date);
 
-            $startDate = Piwik_Date::factory($startDate);
-            $endDate = Piwik_Date::factory($endDate);
+            $startDate = Date::factory($startDate);
+            $endDate = Date::factory($endDate);
         }
         return array($startDate, $endDate);
     }
@@ -361,6 +362,6 @@ class Piwik_Annotations_API
             return;
         }
 
-        Piwik_Date::factory($date);
+        Date::factory($date);
     }
 }