Fixing post merge bugs

3 files changed, 9 insertions, 3 deletions

diff --git a/core/View/OneClickDone.php b/core/View/OneClickDone.php
index d87be2dfe0..4e898e1ff7 100644
--- a/core/View/OneClickDone.php
+++ b/core/View/OneClickDone.php
@@ -9,6 +9,8 @@
  * @package Piwik
  */
 
+namespace Piwik\View;
+
 /**
  * Post-update view
  *
@@ -21,7 +23,7 @@
  *
  * @package Piwik
  */
-class Piwik_View_OneClickDone
+class OneClickDone
 {
     /**
      * @var string
diff --git a/core/View/ReportsByDimension.php b/core/View/ReportsByDimension.php
index 69ac869eb8..b394736271 100644
--- a/core/View/ReportsByDimension.php
+++ b/core/View/ReportsByDimension.php
@@ -8,6 +8,8 @@
  * @category Piwik
  * @package SmartyPlugins
  */
+namespace Piwik\View;
+
 use Piwik\FrontController;
 use Piwik\View;
 use Piwik\Url;
@@ -19,7 +21,7 @@ use Piwik\Url;
  * loads them by AJAX when clicked. The loaded report is displayed to the right
  * of the report listing.
  */
-class Piwik_View_ReportsByDimension extends View
+class ReportsByDimension extends View
 {
     /**
      * Constructor.
diff --git a/core/View/Interface.php b/core/View/ViewInterface.php
index a1730cebef..99f3370cad 100644
--- a/core/View/Interface.php
+++ b/core/View/ViewInterface.php
@@ -9,12 +9,14 @@
  * @package Piwik
  */
 
+namespace Piwik\View;
+
 /**
  * Rendering interface for View and Piwik_Visualization
  *
  * @package Piwik
  */
-interface Piwik_View_Interface
+interface ViewInterface
 {
     /**
      * Outputs the data.