diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
index 07412c39130..36374b6a168 100644
--- a/core/ReportRenderer/Html.php
+++ b/core/ReportRenderer/Html.php
@@ -78,13 +78,13 @@ public function getRenderedReport()
 
     private function epilogue()
     {
-        $view = new Piwik_View('@CoreHome/ReportRenderer/_html_report_footer');
+        $view = new Piwik_View('@CoreHome/ReportRenderer/_htmlReportFooter');
         $this->rendering .= $view->render();
     }
 
     public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata)
     {
-        $frontPageView = new Piwik_View('@CoreHome/ReportRenderer/_html_report_header');
+        $frontPageView = new Piwik_View('@CoreHome/ReportRenderer/_htmlReportHeader');
         $this->assignCommonParameters($frontPageView);
 
         // todo rename 'websiteName' to 'reportTitle' once branch twig is merged
@@ -114,7 +114,7 @@ private function assignCommonParameters(Piwik_View $view)
 
     public function renderReport($processedReport)
     {
-        $reportView = new Piwik_View('@CoreHome/ReportRenderer/_html_report_body');
+        $reportView = new Piwik_View('@CoreHome/ReportRenderer/_htmlReportBody');
         $this->assignCommonParameters($reportView);
 
         $reportMetadata = $processedReport['metadata'];
diff --git a/core/View/ReportsByDimension.php b/core/View/ReportsByDimension.php
index 3cd06b53dcc..39da988de22 100644
--- a/core/View/ReportsByDimension.php
+++ b/core/View/ReportsByDimension.php
@@ -10,7 +10,7 @@
  */
 
 /**
- * A facade that makes it easier to use the 'reports_by_dimension.twig' template.
+ * A facade that makes it easier to use the '_reportsByDimension.twig' template.
  *
  * This view will output HTML that displays a list of report names by category and
  * loads them by AJAX when clicked. The loaded report is displayed to the right
@@ -23,7 +23,7 @@ class Piwik_View_ReportsByDimension extends Piwik_View
      */
     public function __construct()
     {
-        parent::__construct('@CoreHome/ReportsByDimension/reports_by_dimension');
+        parent::__construct('@CoreHome/ReportsByDimension/_reportsByDimension');
         $this->dimensionCategories = array();
     }
 
diff --git a/plugins/CoreHome/templates/ReportRenderer/_html_report_body.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
similarity index 100%
rename from plugins/CoreHome/templates/ReportRenderer/_html_report_body.twig
rename to plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig
diff --git a/plugins/CoreHome/templates/ReportRenderer/_html_report_footer.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
similarity index 100%
rename from plugins/CoreHome/templates/ReportRenderer/_html_report_footer.twig
rename to plugins/CoreHome/templates/ReportRenderer/_htmlReportFooter.twig
diff --git a/plugins/CoreHome/templates/ReportRenderer/_html_report_header.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
similarity index 100%
rename from plugins/CoreHome/templates/ReportRenderer/_html_report_header.twig
rename to plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig
diff --git a/plugins/CoreHome/templates/ReportsByDimension/_reports_by_dimension.twig b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig
similarity index 100%
rename from plugins/CoreHome/templates/ReportsByDimension/_reports_by_dimension.twig
rename to plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig