Rename template file names

177 files changed, 205 insertions, 213 deletions

diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
index a5baeb26ce..07412c3913 100644
--- a/core/ReportRenderer/Html.php
+++ b/core/ReportRenderer/Html.php
@@ -78,13 +78,13 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer
 
     private function epilogue()
     {
-        $view = new Piwik_View('@CoreHome/html_report_footer');
+        $view = new Piwik_View('@CoreHome/ReportRenderer/_html_report_footer');
         $this->rendering .= $view->render();
     }
 
     public function renderFrontPage($reportTitle, $prettyDate, $description, $reportMetadata)
     {
-        $frontPageView = new Piwik_View('@CoreHome/html_report_header');
+        $frontPageView = new Piwik_View('@CoreHome/ReportRenderer/_html_report_header');
         $this->assignCommonParameters($frontPageView);
 
         // todo rename 'websiteName' to 'reportTitle' once branch twig is merged
@@ -114,7 +114,7 @@ class Piwik_ReportRenderer_Html extends Piwik_ReportRenderer
 
     public function renderReport($processedReport)
     {
-        $reportView = new Piwik_View('@CoreHome/html_report_body');
+        $reportView = new Piwik_View('@CoreHome/ReportRenderer/_html_report_body');
         $this->assignCommonParameters($reportView);
 
         $reportMetadata = $processedReport['metadata'];
diff --git a/core/View.php b/core/View.php
index 3e45fb6400..6c88b66370 100644
--- a/core/View.php
+++ b/core/View.php
@@ -210,7 +210,7 @@ class Piwik_View implements Piwik_View_Interface
      */
     static public function singleReport($title, $reportHtml, $fetch = false)
     {
-        $view = new Piwik_View('@CoreHome/single_report');
+        $view = new Piwik_View('@CoreHome/_singleReport');
         $view->title = $title;
         $view->report = $reportHtml;
 
diff --git a/core/View/ReportsByDimension.php b/core/View/ReportsByDimension.php
index a13ee95bb7..3cd06b53dc 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.tpl' template.
+ * A facade that makes it easier to use the 'reports_by_dimension.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/reports_by_dimension');
+        parent::__construct('@CoreHome/ReportsByDimension/reports_by_dimension');
         $this->dimensionCategories = array();
     }
 
diff --git a/core/ViewDataTable/Cloud.php b/core/ViewDataTable/Cloud.php
index be44984756..517a326a09 100644
--- a/core/ViewDataTable/Cloud.php
+++ b/core/ViewDataTable/Cloud.php
@@ -46,7 +46,7 @@ class Piwik_ViewDataTable_Cloud extends Piwik_ViewDataTable
             $currentControllerAction,
             $apiMethodToRequestDataTable,
             $controllerActionCalledWhenRequestSubTable);
-        $this->dataTableTemplate = '@CoreHome/cloud';
+        $this->dataTableTemplate = '@CoreHome/_dataTableCloud';
         $this->disableOffsetInformation();
         $this->disableExcludeLowPopulation();
     }
diff --git a/core/ViewDataTable/GenerateGraphHTML.php b/core/ViewDataTable/GenerateGraphHTML.php
index 7db2a78fdc..39dd0bf167 100644
--- a/core/ViewDataTable/GenerateGraphHTML.php
+++ b/core/ViewDataTable/GenerateGraphHTML.php
@@ -48,7 +48,7 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable
             $apiMethodToRequestDataTable,
             $controllerActionCalledWhenRequestSubTable);
 
-        $this->dataTableTemplate = '@CoreHome/graph';
+        $this->dataTableTemplate = '@CoreHome/_dataTableGraph';
 
         $this->disableOffsetInformationAndPaginationControls();
         $this->disableExcludeLowPopulation();
diff --git a/core/ViewDataTable/HtmlTable.php b/core/ViewDataTable/HtmlTable.php
index 44cbbfcdca..f1b2cca44c 100644
--- a/core/ViewDataTable/HtmlTable.php
+++ b/core/ViewDataTable/HtmlTable.php
@@ -50,7 +50,7 @@ class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable
             $currentControllerAction,
             $apiMethodToRequestDataTable,
             $controllerActionCalledWhenRequestSubTable);
-        $this->dataTableTemplate = '@CoreHome/datatable';
+        $this->dataTableTemplate = '@CoreHome/_dataTable';
         $this->variablesDefault['enable_sort'] = '1';
         $this->setSortedColumn('nb_visits', 'desc');
         $this->setLimit(Piwik_Config::getInstance()->General['datatable_default_limit']);
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 97cdeea7af..210fea76a8 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -77,8 +77,8 @@ if (!function_exists('Piwik_ExitWithMessage')) {
                             <li><a target="_blank" href="http://demo.piwik.org">Piwik Online Demo</a></li>
                             </ul>';
         }
-        $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_header.tpl');
-        $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simple_structure_footer.tpl');
+        $headerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl');
+        $footerPage = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl');
 
         $headerPage = str_replace('{$HTML_TITLE}', 'Piwik &rsaquo; Error', $headerPage);
         $content = '<p>' . $message . '</p>
diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig
index 9863e00ceb..0b1b76000f 100644
--- a/plugins/API/templates/listAllAPI.twig
+++ b/plugins/API/templates/listAllAPI.twig
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="page_api">
     <div class="top_controls_inner">
-        {% include "@CoreHome/period_select.twig" %}
+        {% include "@CoreHome/_periodSelect.twig" %}
     </div>
 
     <h2>{{ 'API_QuickDocumentationTitle'|translate }}</h2>
diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php
index 3e01c54bb1..69e1f5c6e4 100644
--- a/plugins/Actions/Controller.php
+++ b/plugins/Actions/Controller.php
@@ -452,13 +452,13 @@ class Piwik_Actions_Controller extends Piwik_Controller
      */
     protected function configureGenericViewActions($view)
     {
-        $view->setTemplate('@CoreHome/datatable_actions');
+        $view->setTemplate('@CoreHome/_dataTableActions');
         if (Piwik_Common::getRequestVar('idSubtable', -1) != -1) {
-            $view->setTemplate('@CoreHome/datatable_actions_subdatable');
+            $view->setTemplate('@CoreHome/_dataTableActions_subDataTable');
         }
         $currentlySearching = $view->setSearchRecursive();
         if ($currentlySearching) {
-            $view->setTemplate('@CoreHome/datatable_actions_recursive');
+            $view->setTemplate('@CoreHome/_dataTableActions_recursive');
         }
         // disable Footer icons
         $view->disableShowAllViewsIcons();
diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php
index 295f2fb949..3b88fadb9d 100755
--- a/plugins/Annotations/Controller.php
+++ b/plugins/Annotations/Controller.php
@@ -55,7 +55,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller
         }
 
         // create & render the view
-        $view = new Piwik_View('@Annotations/annotationManager');
+        $view = new Piwik_View('@Annotations/getAnnotationManager');
 
         $allAnnotations = Piwik_API_Request::processRequest(
             'Annotations.getAll', array('date' => $date, 'period' => $period, 'lastN' => $lastN));
@@ -103,7 +103,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller
         if ($_SERVER["REQUEST_METHOD"] == "POST") {
             $this->checkTokenInUrl();
 
-            $view = new Piwik_View('@Annotations//annotation');
+            $view = new Piwik_View('@Annotations/saveAnnotation');
 
             // NOTE: permissions checked in API method
             // save the annotation
@@ -208,7 +208,7 @@ class Piwik_Annotations_Controller extends Piwik_Controller
             "Annotations.getAnnotationCountForDates", array('getAnnotationText' => 1));
 
         // create & render the view
-        $view = new Piwik_View('@Annotations/evolutionAnnotations');
+        $view = new Piwik_View('@Annotations/getEvolutionIcons');
         $view->annotationCounts = reset($annotationCounts); // only one idSite allowed for this action
 
         echo $view->render();
diff --git a/plugins/Annotations/templates/annotation.twig b/plugins/Annotations/templates/_annotation.twig
index e3e879c403..e3e879c403 100755
--- a/plugins/Annotations/templates/annotation.twig
+++ b/plugins/Annotations/templates/_annotation.twig
diff --git a/plugins/Annotations/templates/annotations.twig b/plugins/Annotations/templates/_annotationList.twig
index 72f5c93ca5..f3820ab833 100755
--- a/plugins/Annotations/templates/annotations.twig
+++ b/plugins/Annotations/templates/_annotationList.twig
@@ -6,7 +6,7 @@
 
     <table>
         {% for annotation in annotations %}
-            {% include "@Annotations/annotation.twig" %}
+            {% include "@Annotations/_annotation.twig" %}
         {% endfor %}
         <tr class="new-annotation-row" style="display:none" data-date="{{ startDate }}">
             <td class="annotation-meta">
diff --git a/plugins/Annotations/templates/annotationManager.twig b/plugins/Annotations/templates/getAnnotationManager.twig
index 8cd93e2b10..cea1d7e2ac 100755
--- a/plugins/Annotations/templates/annotationManager.twig
+++ b/plugins/Annotations/templates/getAnnotationManager.twig
@@ -10,7 +10,7 @@
     <div class="annotation-list-range">{{ startDatePretty }}{% if startDate != endDate %} &mdash; {{ endDatePretty }}{% endif %}</div>
 
     <div class="annotation-list">
-        {% include "@Annotations/annotations.twig" %}
+        {% include "@Annotations/_annotationList.twig" %}
 
         <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span>
 
diff --git a/plugins/Annotations/templates/evolutionAnnotations.twig b/plugins/Annotations/templates/getEvolutionIcons.twig
index f2475c2416..f2475c2416 100755
--- a/plugins/Annotations/templates/evolutionAnnotations.twig
+++ b/plugins/Annotations/templates/getEvolutionIcons.twig
diff --git a/plugins/Annotations/templates/saveAnnotation.twig b/plugins/Annotations/templates/saveAnnotation.twig
new file mode 100644
index 0000000000..e5cd120205
--- /dev/null
+++ b/plugins/Annotations/templates/saveAnnotation.twig
@@ -0,0 +1 @@
+{% include "@Annotations/_annotation.twig" %}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 880745f68b..f9f5301347 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -129,7 +129,7 @@ class Piwik_CoreAdminHome_Controller extends Piwik_Controller_Admin
      */
     public function trackingCodeGenerator()
     {
-        $view = new Piwik_View('@CoreAdminHome/jsTrackingGenerator');
+        $view = new Piwik_View('@CoreAdminHome/trackingCodeGenerator');
         $this->setBasicVariablesView($view);
         $view->topMenu = Piwik_GetTopMenu();
         $view->menu = Piwik_GetAdminMenu();
diff --git a/plugins/CoreAdminHome/templates/menu.twig b/plugins/CoreAdminHome/templates/_menu.twig
index 1a4bc9a33c..1a4bc9a33c 100644
--- a/plugins/CoreAdminHome/templates/menu.twig
+++ b/plugins/CoreAdminHome/templates/_menu.twig
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index e50bc5c30b..f18a2cf8c9 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -26,7 +26,7 @@
     <div>
         {# website #}
         <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
-        {% include "@CoreHome/sites_selection.twig" with {'siteName':defaultReportSiteName, 'idSite':idSite, 'showAllSitesItem':false, 'switchSiteOnSelect':false,
+        {% include "@CoreHome/_siteSelect.twig" with {'siteName':defaultReportSiteName, 'idSite':idSite, 'showAllSitesItem':false, 'switchSiteOnSelect':false,
         'siteSelectorId':"js-tracker-website", 'showSelectedSite':true} %}
 
         <br/><br/><br/>
@@ -193,7 +193,7 @@
     <div>
         {# website #}
         <label class="website-label"><strong>{{ 'General_Website'|translate }}</strong></label>
-        {% include "@CoreHome/sites_selection.twig" with {
+        {% include "@CoreHome/_siteSelect.twig" with {
             'siteName': defaultReportSiteName, 'idSite': idSite, 'showAllSitesItem': false,
             'switchSiteOnSelect': false, 'showSelectedSite': true, 'siteSelectorId':"image-tracker-website"
         } %}
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
index 9e0ace143d..cd949995fe 100644
--- a/plugins/CoreHome/Controller.php
+++ b/plugins/CoreHome/Controller.php
@@ -54,7 +54,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
 
     protected function getDefaultIndexView()
     {
-        $view = new Piwik_View('@CoreHome/index');
+        $view = new Piwik_View('@CoreHome/getDefaultIndexView');
         $this->setGeneralVariablesView($view);
         $view->menu = Piwik_GetMenu();
         $view->content = '';
@@ -136,7 +136,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
     {
         $rowEvolution = $this->makeRowEvolution($isMulti = false);
         self::$rowEvolutionCache = $rowEvolution;
-        $view = new Piwik_View('popover_rowevolution');
+        $view = new Piwik_View('@CoreHome/getRowEvolutionPopover');
         echo $rowEvolution->renderPopover($this, $view);
     }
 
@@ -145,7 +145,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
     {
         $rowEvolution = $this->makeRowEvolution($isMulti = true);
         self::$rowEvolutionCache = $rowEvolution;
-        $view = new Piwik_View('@CoreHome/popover_multirowevolution');
+        $view = new Piwik_View('@CoreHome/getMultiRowEvolutionPopover');
         echo $rowEvolution->renderPopover($this, $view);
     }
 
@@ -189,7 +189,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
         // perform check (but only once every 10s)
         Piwik_UpdateCheck::check($force = false, Piwik_UpdateCheck::UI_CLICK_CHECK_INTERVAL);
 
-        $view = new Piwik_View('@CoreHome/header_message');
+        $view = new Piwik_View('@CoreHome/checkForUpdates');
         $this->setGeneralVariablesView($view);
         echo $view->render();
     }
@@ -199,7 +199,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
      */
     public function getDonateForm()
     {
-        $view = new Piwik_View('@CoreHome/donate');
+        $view = new Piwik_View('@CoreHome/getDonateForm');
         if (Piwik_Common::getRequestVar('widget', false)
             && Piwik::isUserIsSuperUser()
         ) {
@@ -213,7 +213,7 @@ class Piwik_CoreHome_Controller extends Piwik_Controller
      */
     public function getPromoVideo()
     {
-        $view = new Piwik_View('@CoreHome/promo_video');
+        $view = new Piwik_View('@CoreHome/getPromoVideo');
         $view->shareText = Piwik_Translate('CoreHome_SharePiwikShort');
         $view->shareTextLong = Piwik_Translate('CoreHome_SharePiwikLong');
         $view->promoVideoUrl = 'http://www.youtube.com/watch?v=OslfF_EH81g';
diff --git a/plugins/CoreHome/templates/html_report_body.twig b/plugins/CoreHome/templates/ReportRenderer/_html_report_body.twig
index 85d6a492d2..85d6a492d2 100644
--- a/plugins/CoreHome/templates/html_report_body.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_html_report_body.twig
diff --git a/plugins/CoreHome/templates/html_report_footer.twig b/plugins/CoreHome/templates/ReportRenderer/_html_report_footer.twig
index 691287b6e3..691287b6e3 100644
--- a/plugins/CoreHome/templates/html_report_footer.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_html_report_footer.twig
diff --git a/plugins/CoreHome/templates/html_report_header.twig b/plugins/CoreHome/templates/ReportRenderer/_html_report_header.twig
index 2e74bcc038..2e74bcc038 100644
--- a/plugins/CoreHome/templates/html_report_header.twig
+++ b/plugins/CoreHome/templates/ReportRenderer/_html_report_header.twig
diff --git a/plugins/CoreHome/templates/reports_by_dimension.twig b/plugins/CoreHome/templates/ReportsByDimension/_reports_by_dimension.twig
index de23fe1053..de23fe1053 100644
--- a/plugins/CoreHome/templates/reports_by_dimension.twig
+++ b/plugins/CoreHome/templates/ReportsByDimension/_reports_by_dimension.twig
diff --git a/plugins/CoreHome/templates/datatable.twig b/plugins/CoreHome/templates/_dataTable.twig
index 2f45a36dad..0411e7dd85 100644
--- a/plugins/CoreHome/templates/datatable.twig
+++ b/plugins/CoreHome/templates/_dataTable.twig
@@ -19,7 +19,7 @@
             {% else %}
                 <a name="{{ properties.uniqueId }}"></a>
                 <table cellspacing="0" class="dataTable">
-                    {% include "@CoreHome/datatable_head.twig" %}
+                    {% include "@CoreHome/_dataTableHead.twig" %}
 
                     <tbody>
                     {% for row in arrayDataTable %}
@@ -27,7 +27,7 @@
                             id="{{ row.idsubdatatable }}"{% endif %}{% if row.issummaryrow is defined and row.issummaryrow and properties.highlight_summary_row %} class="highlight"{% endif %}>
                             {% for column in dataTableColumns %}
                                 <td>
-                                    {% include "@CoreHome/datatable_cell.twig" %}
+                                    {% include "@CoreHome/_dataTableCell.twig" %}
                                 </td>
                             {% endfor %}
                         </tr>
@@ -37,9 +37,9 @@
             {% endif %}
 
             {% if properties.show_footer %}
-                {% include "@CoreHome/datatable_footer.twig" %}
+                {% include "@CoreHome/_dataTableFooter.twig" %}
             {% endif %}
-            {% include "@CoreHome/datatable_js.twig" %}
+            {% include "@CoreHome/_dataTableJS.twig" %}
         {% endif %}
     </div>
 </div>
diff --git a/plugins/CoreHome/templates/datatable_actions.twig b/plugins/CoreHome/templates/_dataTableActions.twig
index fcc8b06f80..cc5988e06a 100644
--- a/plugins/CoreHome/templates/datatable_actions.twig
+++ b/plugins/CoreHome/templates/_dataTableActions.twig
@@ -11,7 +11,7 @@
                 <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div>
             {% else %}
                 <table cellspacing="0" class="dataTable dataTableActions">
-                    {% include "@CoreHome/datatable_head.twig" %}
+                    {% include "@CoreHome/_dataTableHead.twig" %}
 
                     <tbody>
                     {% for row in arrayDataTable %}
@@ -19,7 +19,7 @@
                             {% else %}class="actionsDataTable rowToProcess"{% endif %}>
                             {% for column in dataTableColumns %}
                                 <td>
-                                    {% include "@CoreHome/datatable_cell.twig" with {'column': column, 'row': row} only %}
+                                    {% include "@CoreHome/_dataTableCell.twig" with {'column': column, 'row': row} only %}
                                 </td>
                             {% endfor %}
                         </tr>
@@ -29,9 +29,9 @@
             {% endif %}
 
             {% if properties.show_footer %}
-                {% include "@CoreHome/datatable_footer.twig" %}
+                {% include "@CoreHome/_dataTableFooter.twig" %}
             {% endif %}
-            {% include "@CoreHome/datatable_js.twig" %}
+            {% include "@CoreHome/_dataTableJS.twig" %}
         {% endif %}
     </div>
 </div>
diff --git a/plugins/CoreHome/templates/datatable_actions_recursive.twig b/plugins/CoreHome/templates/_dataTableActions_recursive.twig
index 41a26a5c16..c5935e696d 100644
--- a/plugins/CoreHome/templates/datatable_actions_recursive.twig
+++ b/plugins/CoreHome/templates/_dataTableActions_recursive.twig
@@ -8,7 +8,7 @@
             {% else %}
                 <table cellspacing="0" class="dataTable dataTableActions">
                     
-                    {% include "@CoreHome/datatable_head.twig" %}
+                    {% include "@CoreHome/_dataTableHead.twig" %}
                     
                     <tbody>
                     {% for row in arrayDataTable %}
@@ -16,7 +16,7 @@
                             {% else %}class="actionsDataTable rowToProcess level{$row.level}"{% endif %}>
                             {% for column in dataTableColumns %}
                                 <td>
-                                    {% include "@CoreHome/datatable_cell.twig" %}
+                                    {% include "@CoreHome/_dataTableCell.twig" %}
                                 </td>
                             {% endfor %}
                         </tr>
@@ -26,9 +26,9 @@
             {% endif %}
 
             {% if properties.show_footer %}
-                {% include "@CoreHome/datatable_footer.twig" %}
+                {% include "@CoreHome/_dataTableFooter.twig" %}
             {% endif %}
-            {% include "@CoreHome/datatable_js.twig" %}
+            {% include "@CoreHome/_dataTableJS.twig" %}
         {% endif %}
     </div>
 </div>
diff --git a/plugins/CoreHome/templates/datatable_actions_subdatable.twig b/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig
index a0216893b4..71d7fe7a4d 100644
--- a/plugins/CoreHome/templates/datatable_actions_subdatable.twig
+++ b/plugins/CoreHome/templates/_dataTableActions_subDataTable.twig
@@ -11,7 +11,7 @@
             <tr {% if row.idsubdatatable %}class="subActionsDataTable" id="{{ row.idsubdatatable }}" {% else %}class="actionsDataTable"{% endif %}>
                 {% for column in dataTableColumns %}
                     <td>
-                        {% include "@CoreHome/datatable_cell.twig" with {'column': column} %}
+                        {% include "@CoreHome/_dataTableCell.twig" with {'column': column} %}
                     </td>
                 {% endfor %}
             </tr>
diff --git a/plugins/CoreHome/templates/datatable_cell.twig b/plugins/CoreHome/templates/_dataTableCell.twig
index dab9a6401d..dab9a6401d 100644
--- a/plugins/CoreHome/templates/datatable_cell.twig
+++ b/plugins/CoreHome/templates/_dataTableCell.twig
diff --git a/plugins/CoreHome/templates/cloud.twig b/plugins/CoreHome/templates/_dataTableCloud.twig
index f53bc3ec16..1007628587 100644
--- a/plugins/CoreHome/templates/cloud.twig
+++ b/plugins/CoreHome/templates/_dataTableCloud.twig
@@ -28,7 +28,7 @@
         {% endif %}
     </div>
     {% if properties.show_footer %}
-        {% include "@CoreHome/datatable_footer.twig" %}
+        {% include "@CoreHome/_dataTableFooter.twig" %}
     {% endif %}
-    {% include "@CoreHome/datatable_js.twig" %}
+    {% include "@CoreHome/_dataTableJS.twig" %}
 </div>
diff --git a/plugins/CoreHome/templates/datatable_footer.twig b/plugins/CoreHome/templates/_dataTableFooter.twig
index bf4e932068..bf4e932068 100644
--- a/plugins/CoreHome/templates/datatable_footer.twig
+++ b/plugins/CoreHome/templates/_dataTableFooter.twig
diff --git a/plugins/CoreHome/templates/graph.twig b/plugins/CoreHome/templates/_dataTableGraph.twig
index 87a136a28c..d0012fdca4 100644
--- a/plugins/CoreHome/templates/graph.twig
+++ b/plugins/CoreHome/templates/_dataTableGraph.twig
@@ -32,8 +32,8 @@
         {% endif %}
 
         {% if properties.show_footer %}
-            {% include "@CoreHome/datatable_footer.twig" %}
-            {% include "@CoreHome/datatable_js.twig" %}
+            {% include "@CoreHome/_dataTableFooter.twig" %}
+            {% include "@CoreHome/_dataTableJS.twig" %}
         {% endif %}
     </div>
 </div>
diff --git a/plugins/CoreHome/templates/datatable_head.twig b/plugins/CoreHome/templates/_dataTableHead.twig
index aab08b50aa..aab08b50aa 100644
--- a/plugins/CoreHome/templates/datatable_head.twig
+++ b/plugins/CoreHome/templates/_dataTableHead.twig
diff --git a/plugins/CoreHome/templates/datatable_js.twig b/plugins/CoreHome/templates/_dataTableJS.twig
index 244ee8a17b..244ee8a17b 100644
--- a/plugins/CoreHome/templates/datatable_js.twig
+++ b/plugins/CoreHome/templates/_dataTableJS.twig
diff --git a/plugins/CoreHome/templates/donate.twig b/plugins/CoreHome/templates/_donate.twig
index c33dfffe9e..c33dfffe9e 100755
--- a/plugins/CoreHome/templates/donate.twig
+++ b/plugins/CoreHome/templates/_donate.twig
diff --git a/plugins/CoreHome/templates/header_message.twig b/plugins/CoreHome/templates/_headerMessage.twig
index c929db3c03..c929db3c03 100644
--- a/plugins/CoreHome/templates/header_message.twig
+++ b/plugins/CoreHome/templates/_headerMessage.twig
diff --git a/plugins/CoreHome/templates/index_content.twig b/plugins/CoreHome/templates/_indexContent.twig
index 9aea411789..ec4c7cd663 100644
--- a/plugins/CoreHome/templates/index_content.twig
+++ b/plugins/CoreHome/templates/_indexContent.twig
@@ -3,9 +3,9 @@
     <div class="pageWrap">
         <div class="nav_sep"></div>
         <div class="top_controls">
-            {% include "@CoreHome/period_select.twig" %}
+            {% include "@CoreHome/_periodSelect.twig" %}
             {{ postEvent("template_nextToCalendar") }}
-            {% include "@CoreHome/header_message.twig" %}
+            {% include "@CoreHome/_headerMessage.twig" %}
             {{ ajax.requestErrorDiv }}
         </div>
 
diff --git a/plugins/CoreHome/templates/js_disabled_notice.twig b/plugins/CoreHome/templates/_javaScriptDisabled.twig
index fb50e92d56..fb50e92d56 100644
--- a/plugins/CoreHome/templates/js_disabled_notice.twig
+++ b/plugins/CoreHome/templates/_javaScriptDisabled.twig
diff --git a/plugins/CoreHome/templates/logo.twig b/plugins/CoreHome/templates/_logo.twig
index 26ac468aee..26ac468aee 100644
--- a/plugins/CoreHome/templates/logo.twig
+++ b/plugins/CoreHome/templates/_logo.twig
diff --git a/plugins/CoreHome/templates/menu.twig b/plugins/CoreHome/templates/_menu.twig
index 9b7ae232c2..9b7ae232c2 100644
--- a/plugins/CoreHome/templates/menu.twig
+++ b/plugins/CoreHome/templates/_menu.twig
diff --git a/plugins/CoreHome/templates/period_select.twig b/plugins/CoreHome/templates/_periodSelect.twig
index bf63a6d752..bf63a6d752 100644
--- a/plugins/CoreHome/templates/period_select.twig
+++ b/plugins/CoreHome/templates/_periodSelect.twig
diff --git a/plugins/CoreHome/templates/single_report.twig b/plugins/CoreHome/templates/_singleReport.twig
index f6ad622f21..f6ad622f21 100644
--- a/plugins/CoreHome/templates/single_report.twig
+++ b/plugins/CoreHome/templates/_singleReport.twig
diff --git a/plugins/CoreHome/templates/sites_selection.twig b/plugins/CoreHome/templates/_siteSelect.twig
index d7c904a6c6..d7c904a6c6 100644
--- a/plugins/CoreHome/templates/sites_selection.twig
+++ b/plugins/CoreHome/templates/_siteSelect.twig
diff --git a/plugins/CoreHome/templates/top_bar.twig b/plugins/CoreHome/templates/_topBar.twig
index 5133f0b96f..1a8e94d1ca 100644
--- a/plugins/CoreHome/templates/top_bar.twig
+++ b/plugins/CoreHome/templates/_topBar.twig
@@ -1,13 +1,13 @@
 <div id="topBars">
 
-    {% include "@CoreHome/top_bar_top_menu.twig" %}
-    {% include "@CoreHome/top_bar_hello_menu.twig" %}
+    {% include "@CoreHome/_topBarTopMenu.twig" %}
+    {% include "@CoreHome/_topBarHelloMenu.twig" %}
 
 </div>
 
 {% if showSitesSelection %}
     <div class="top_bar_sites_selector">
         <label>{{ 'General_Website'|translate }}</label>
-        {% include "@CoreHome/sites_selection.twig" %}
+        {% include "@CoreHome/_siteSelect.twig" %}
     </div>
 {% endif %}
diff --git a/plugins/CoreHome/templates/top_bar_hello_menu.twig b/plugins/CoreHome/templates/_topBarHelloMenu.twig
index 5d3fb16a12..5d3fb16a12 100644
--- a/plugins/CoreHome/templates/top_bar_hello_menu.twig
+++ b/plugins/CoreHome/templates/_topBarHelloMenu.twig
diff --git a/plugins/CoreHome/templates/top_bar_top_menu.twig b/plugins/CoreHome/templates/_topBarTopMenu.twig
index 29330720a0..29330720a0 100644
--- a/plugins/CoreHome/templates/top_bar_top_menu.twig
+++ b/plugins/CoreHome/templates/_topBarTopMenu.twig
diff --git a/plugins/CoreHome/templates/_topScreen.twig b/plugins/CoreHome/templates/_topScreen.twig
new file mode 100644
index 0000000000..cdb2b93020
--- /dev/null
+++ b/plugins/CoreHome/templates/_topScreen.twig
@@ -0,0 +1,4 @@
+<div id="header">
+    {% include "@CoreHome/_logo.twig" %}
+    {% include "@CoreHome/_javaScriptDisabled.twig" %}
+</div>
diff --git a/plugins/CoreHome/templates/warning_invalid_host.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig
index 58ec1b397f..58ec1b397f 100644
--- a/plugins/CoreHome/templates/warning_invalid_host.twig
+++ b/plugins/CoreHome/templates/_warningInvalidHost.twig
diff --git a/plugins/CoreHome/templates/checkForUpdates.twig b/plugins/CoreHome/templates/checkForUpdates.twig
new file mode 100644
index 0000000000..c611ae0587
--- /dev/null
+++ b/plugins/CoreHome/templates/checkForUpdates.twig
@@ -0,0 +1 @@
+{% include "@CoreHome/_headerMessage.twig" %}
\ No newline at end of file
diff --git a/plugins/CoreHome/templates/index.twig b/plugins/CoreHome/templates/getDefaultIndexView.twig
index bd0c471200..76725b9ef7 100644
--- a/plugins/CoreHome/templates/index.twig
+++ b/plugins/CoreHome/templates/getDefaultIndexView.twig
@@ -5,10 +5,10 @@
 {% block content %}
 
 {% if (menu is defined and menu) %}
-  {% include "@CoreHome/menu.twig" %}
+  {% include "@CoreHome/_menu.twig" %}
 {% endif %}
 
-{% include "@CoreHome/index_content.twig" %}
+{% include "@CoreHome/_indexContent.twig" %}
 
 {% endblock %}
 
diff --git a/plugins/CoreHome/templates/getDonateForm.twig b/plugins/CoreHome/templates/getDonateForm.twig
new file mode 100644
index 0000000000..1b89eabbea
--- /dev/null
+++ b/plugins/CoreHome/templates/getDonateForm.twig
@@ -0,0 +1 @@
+{% include "@CoreHome/_donate.tpl" %}
\ No newline at end of file
diff --git a/plugins/CoreHome/templates/popover_multirowevolution.twig b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
index a4a2a6c704..a4a2a6c704 100644
--- a/plugins/CoreHome/templates/popover_multirowevolution.twig
+++ b/plugins/CoreHome/templates/getMultiRowEvolutionPopover.twig
diff --git a/plugins/CoreHome/templates/promo_video.twig b/plugins/CoreHome/templates/getPromoVideo.twig
index e7decbb2bc..e7decbb2bc 100755
--- a/plugins/CoreHome/templates/promo_video.twig
+++ b/plugins/CoreHome/templates/getPromoVideo.twig
diff --git a/plugins/CoreHome/templates/popover_rowevolution.twig b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
index f93089a687..f93089a687 100644
--- a/plugins/CoreHome/templates/popover_rowevolution.twig
+++ b/plugins/CoreHome/templates/getRowEvolutionPopover.twig
diff --git a/plugins/CoreHome/templates/top_screen.twig b/plugins/CoreHome/templates/top_screen.twig
deleted file mode 100644
index f257720525..0000000000
--- a/plugins/CoreHome/templates/top_screen.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id="header">
-    {% include "@CoreHome/logo.twig" %}
-    {% include "@CoreHome/js_disabled_notice.twig" %}
-</div>
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index db3fe68bac..f4c4898332 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -51,7 +51,7 @@ class Piwik_CorePluginsAdmin_Controller extends Piwik_Controller_Admin
             }
         }
 
-        $view = Piwik_View::factory('@CorePluginsAdmin/manage');
+        $view = new Piwik_View('@CorePluginsAdmin/index');
         $view->pluginsName = $plugins;
         $this->setBasicVariablesView($view);
         $view->menu = Piwik_GetAdminMenu();
diff --git a/plugins/CorePluginsAdmin/templates/manage.twig b/plugins/CorePluginsAdmin/templates/index.twig
index 214a764dc9..214a764dc9 100644
--- a/plugins/CorePluginsAdmin/templates/manage.twig
+++ b/plugins/CorePluginsAdmin/templates/index.twig
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index ef57443698..aab7177dc4 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -37,7 +37,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 
         $newVersion = $this->checkNewVersionIsAvailableOrDie();
 
-        $view = new Piwik_View('@CoreUpdater/update_new_version_available');
+        $view = new Piwik_View('@CoreUpdater/newVersionAvailable');
         $view->piwik_version = Piwik_Version::VERSION;
         $view->piwik_new_version = $newVersion;
         $view->piwik_latest_version_url = self::getLatestZipUrl($newVersion);
@@ -89,7 +89,7 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
         Piwik_API_Request::reloadAuthUsingTokenAuth($_POST);
         Piwik::checkUserIsSuperUser();
 
-        $view = new Piwik_View('@CoreUpdater/update_one_click_results');
+        $view = new Piwik_View('@CoreUpdater/oneClickResults');
         $view->coreError = Piwik_Common::getRequestVar('error', '', 'string', $_POST);
         $view->feedbackMessages = safe_unserialize(Piwik_Common::unsanitizeInputValue(Piwik_Common::getRequestVar('messages', '', 'string', $_POST)));
         echo $view->render();
@@ -236,47 +236,33 @@ class Piwik_CoreUpdater_Controller extends Piwik_Controller
 
         $sqlQueries = $updater->getSqlQueriesToExecute();
         if (Piwik_Common::isPhpCliMode()) {
-            if (Piwik_Common::isPhpCliMode()) {
-                $view = new Piwik_View('@CoreUpdater/cli_update_welcome', array(), false);
-            } else {
-                $view = new Piwik_View('@CoreUpdater/update_welcome');
-            }
+            $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_cli_welcome', array(), false);
             $this->doWelcomeUpdates($view, $componentsWithUpdateFile);
             echo $view->render();
 
             if (!$this->coreError && Piwik::getModule() == 'CoreUpdater') {
-                if (Piwik_Common::isPhpCliMode()) {
-                    $view = new Piwik_View('@CoreUpdater/cli_update_database_done', array(), false);
-                } else {
-                    $view = new Piwik_View('@CoreUpdater/update_database_done');
-                }
+                $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_cli_done', array(), false);
                 $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile);
                 echo $view->render();
             }
-        } else if (Piwik_Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) {
-            $this->warningMessages = array();
-            if (Piwik_Common::isPhpCliMode()) {
-                $view = new Piwik_View('@CoreUpdater/cli_update_database_done', array(), false);
-            } else {
-                $view = new Piwik_View('@CoreUpdater/update_database_done');
-            }
-            $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile);
+        } else {
+            if (Piwik_Common::getRequestVar('updateCorePlugins', 0, 'integer') == 1) {
+                $this->warningMessages = array();
+                $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_done');
+                $this->doExecuteUpdates($view, $updater, $componentsWithUpdateFile);
 
-            if (count($sqlQueries) == 1 && !$this->coreError) {
-                Piwik::redirectToModule('CoreHome');
-            }
+                if (count($sqlQueries) == 1 && !$this->coreError) {
+                    Piwik::redirectToModule('CoreHome');
+                }
 
-            echo $view->render();
-        } else {
-            if (Piwik_Common::isPhpCliMode()) {
-                $view = new Piwik_View('@CoreUpdater/cli_update_welcome', array(), false);
+                echo $view->render();
             } else {
-                $view = new Piwik_View('@CoreUpdater/update_welcome');
+                $view = new Piwik_View('@CoreUpdater/runUpdaterAndExit_welcome');
+                $view->queries = $sqlQueries;
+                $view->isMajor = $updater->hasMajorDbUpdate();
+                $this->doWelcomeUpdates($view, $componentsWithUpdateFile);
+                echo $view->render();
             }
-            $view->queries = $sqlQueries;
-            $view->isMajor = $updater->hasMajorDbUpdate();
-            $this->doWelcomeUpdates($view, $componentsWithUpdateFile);
-            echo $view->render();
         }
         exit;
     }
diff --git a/plugins/CoreUpdater/templates/update_new_version_available.twig b/plugins/CoreUpdater/templates/newVersionAvailable.twig
index e87362fe07..e87362fe07 100644
--- a/plugins/CoreUpdater/templates/update_new_version_available.twig
+++ b/plugins/CoreUpdater/templates/newVersionAvailable.twig
diff --git a/plugins/CoreUpdater/templates/update_one_click_results.twig b/plugins/CoreUpdater/templates/oneClickResults.twig
index 3795153608..3795153608 100644
--- a/plugins/CoreUpdater/templates/update_one_click_results.twig
+++ b/plugins/CoreUpdater/templates/oneClickResults.twig
diff --git a/plugins/CoreUpdater/templates/cli_update_database_done.tpl b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_done.tpl
index 099960be4d..099960be4d 100644
--- a/plugins/CoreUpdater/templates/cli_update_database_done.tpl
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_done.tpl
diff --git a/plugins/CoreUpdater/templates/cli_update_welcome.tpl b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_welcome.tpl
index b3802e024a..b3802e024a 100644
--- a/plugins/CoreUpdater/templates/cli_update_welcome.tpl
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_cli_welcome.tpl
diff --git a/plugins/CoreUpdater/templates/update_database_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
index 99ae48b124..917ddaaeba 100644
--- a/plugins/CoreUpdater/templates/update_database_done.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
@@ -68,7 +68,7 @@
     {% else %}
         <p class="success">{{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}</p>
         <div id="donate-form-container">
-            {% include "@CoreHome/donate.tpl" %}
+            {% include "@CoreHome/_donate.tpl" %}
         </div>
     {% endif %}
     <form action="index.php">
diff --git a/plugins/CoreUpdater/templates/update_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
index b527778939..39f1f00920 100644
--- a/plugins/CoreUpdater/templates/update_welcome.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
@@ -96,7 +96,7 @@
     {% endif %}
 {% endif %}
 
-{% include "@Installation/integrityDetails.twig" %}
+{% include "@Installation/_integrityDetails.twig" %}
 
 <style type="text/css">
     code {
diff --git a/plugins/Dashboard/templates/_header.twig b/plugins/Dashboard/templates/_header.twig
index efe4da510a..f9dfba3f4b 100644
--- a/plugins/Dashboard/templates/_header.twig
+++ b/plugins/Dashboard/templates/_header.twig
@@ -9,8 +9,8 @@
     <!--[if lt IE 9]>
     <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
     <![endif]-->
-    {% include "@CoreHome/js_global_variables.twig" %}
-    {% include "@CoreHome/js_css_includes.twig" %}
+    {% include "_jsGlobalVariables.twig" %}
+    {% include "_jsCssIncludes.twig" %}
 
     <style type="text/css">
         body {
diff --git a/plugins/Dashboard/templates/index.twig b/plugins/Dashboard/templates/index.twig
index e2db5d5f50..cc86a56715 100644
--- a/plugins/Dashboard/templates/index.twig
+++ b/plugins/Dashboard/templates/index.twig
@@ -1,6 +1,6 @@
 {% include "@Dashboard/_header.twig" %}
 <div id="menuHead">
-    {% include "@CoreHome/period_select.twig" %}
+    {% include "@CoreHome/_periodSelect.twig" %}
     <div id="Dashboard">
         <ul>
             {% for dashboard in dashboards %}
diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php
index bd61bd4045..7a30d38302 100644
--- a/plugins/Feedback/Controller.php
+++ b/plugins/Feedback/Controller.php
@@ -33,7 +33,7 @@ class Piwik_Feedback_Controller extends Piwik_Controller
         $category = Piwik_Common::getRequestVar('category', '', 'string');
         $nonce = Piwik_Common::getRequestVar('nonce', '', 'string');
 
-        $view = new Piwik_View('@Feedback/sent');
+        $view = new Piwik_View('@Feedback/sendFeedback');
         $view->feedbackEmailAddress = Piwik_Config::getInstance()->General['feedback_email_address'];
         try {
             $minimumBodyLength = 40;
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index 7bd23e21b5..c3287be5cd 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -46,7 +46,7 @@
 
     <p><strong>{{ 'Feedback_WantToThankConsiderDonating'|translate }}</strong></p>
     <br/>
-    {% include "@CoreHome/donate.twig" with { 'msg':""} %}
+    {% include "@CoreHome/_donate.twig" with { 'msg':""} %}
 </div>
 <div id="feedback-form" style="display:none;">
     <form method="post" action="index.php?module=Feedback&action=sendFeedback">
diff --git a/plugins/Feedback/templates/sent.twig b/plugins/Feedback/templates/sendFeedback.twig
index 38dc79663c..38dc79663c 100644
--- a/plugins/Feedback/templates/sent.twig
+++ b/plugins/Feedback/templates/sendFeedback.twig
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 47752a7a4d..69fd31d032 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -156,7 +156,7 @@ class Piwik_Goals_Controller extends Piwik_Controller
 
     protected function getGoalReportView($idGoal = false)
     {
-        $view = new Piwik_View('@Goals/single_goal');
+        $view = new Piwik_View('@Goals/getGoalReportView');
         if ($idGoal == Piwik_Archive::LABEL_ECOMMERCE_ORDER) {
             $goalDefinition['name'] = Piwik_Translate('Goals_Ecommerce');
             $goalDefinition['allow_multiple'] = true;
@@ -217,7 +217,7 @@ class Piwik_Goals_Controller extends Piwik_Controller
 
     protected function getOverviewView()
     {
-        $view = new Piwik_View('@Goals/overview');
+        $view = new Piwik_View('@Goals/getOverviewView');
         $this->setGeneralVariablesView($view);
 
         $view->graphEvolution = $this->getEvolutionGraph(true, array('nb_conversions'));
@@ -271,7 +271,7 @@ class Piwik_Goals_Controller extends Piwik_Controller
 
     public function addNewGoal()
     {
-        $view = new Piwik_View('@Goals/add_new_goal');
+        $view = new Piwik_View('@Goals/addNewGoal');
         $this->setGeneralVariablesView($view);
         $view->userCanEditGoals = Piwik::isUserHasAdminAccess($this->idSite);
         $view->onlyShowAddNewGoal = true;
diff --git a/plugins/Goals/templates/add_edit_goal.twig b/plugins/Goals/templates/_addEditGoal.twig
index a45b85148a..354076ed0e 100644
--- a/plugins/Goals/templates/add_edit_goal.twig
+++ b/plugins/Goals/templates/_addEditGoal.twig
@@ -39,9 +39,9 @@
 
 <div class="entityContainer">
     {% if onlyShowAddNewGoal is not defined %}
-        {% include "@Goals/list_goal_edit.twig" %}
+        {% include "@Goals/_listGoalEdit.twig" %}
     {% endif %}
-    {% include "@Goals/form_add_goal.twig" %}
+    {% include "@Goals/_formAddGoal.twig" %}
     {% if onlyShowAddNewGoal is not defined %}
         <div class='entityCancel' style='display:none'>
             {{ 'General_OrCancel'|translate("<a class='entityCancelLink'>","</a>") }}
diff --git a/plugins/Goals/templates/form_add_goal.twig b/plugins/Goals/templates/_formAddGoal.twig
index a8ac48b6aa..a8ac48b6aa 100644
--- a/plugins/Goals/templates/form_add_goal.twig
+++ b/plugins/Goals/templates/_formAddGoal.twig
diff --git a/plugins/Goals/templates/list_goal_edit.twig b/plugins/Goals/templates/_listGoalEdit.twig
index af4057483f..af4057483f 100644
--- a/plugins/Goals/templates/list_goal_edit.twig
+++ b/plugins/Goals/templates/_listGoalEdit.twig
diff --git a/plugins/Goals/templates/list_top_dimension.twig b/plugins/Goals/templates/_listTopDimension.twig
index 27e66d3e1e..27e66d3e1e 100644
--- a/plugins/Goals/templates/list_top_dimension.twig
+++ b/plugins/Goals/templates/_listTopDimension.twig
diff --git a/plugins/Goals/templates/title_and_evolution_graph.twig b/plugins/Goals/templates/_titleAndEvolutionGraph.twig
index 3e0d8d8cbd..7fff7829ed 100644
--- a/plugins/Goals/templates/title_and_evolution_graph.twig
+++ b/plugins/Goals/templates/_titleAndEvolutionGraph.twig
@@ -77,5 +77,5 @@
         </div>
     </div>
 {% endif %}
-{% include "@CoreHome/sparkline_footer.twig" %}
+{% include "_sparklineFooter.twig" %}
 
diff --git a/plugins/Goals/templates/add_new_goal.twig b/plugins/Goals/templates/addNewGoal.twig
index f93e1a8077..cb4021c645 100644
--- a/plugins/Goals/templates/add_new_goal.twig
+++ b/plugins/Goals/templates/addNewGoal.twig
@@ -1,5 +1,5 @@
 {% if userCanEditGoals %}
-    {% include "@Goals/add_edit_goal.twig" %}
+    {% include "@Goals/_addEditGoal.twig" %}
 {% else %}
     <h2>{{ 'Goals_CreateNewGOal'|translate }}</h2>
     <p>
diff --git a/plugins/Goals/templates/single_goal.twig b/plugins/Goals/templates/getGoalReportView.twig
index 5b241fcbe0..2f707a3d91 100644
--- a/plugins/Goals/templates/single_goal.twig
+++ b/plugins/Goals/templates/getGoalReportView.twig
@@ -1,5 +1,5 @@
 <link rel="stylesheet" type="text/css" href="plugins/Goals/stylesheets/goals.css"/>
-{% include "@Goals/title_and_evolution_graph.twig" %}
+{% include "@Goals/_titleAndEvolutionGraph.twig" %}
 
 <div class="clear"></div>
 {% if nb_conversions > 0 %}
@@ -7,13 +7,13 @@
     <ul class="ulGoalTopElements">
         {% if ecommerce is not defined}
             {% if topDimensions.country is defined %}
-                <li>{{ 'Goals_BestCountries'|translate }} {% include '@Goals/list_top_dimension.twig' with {'topDimension':topDimensions.country} %}</li>
+                <li>{{ 'Goals_BestCountries'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.country} %}</li>
             {% endif %}
             {% if topDimensions.keyword is defined and topDimensions.keyword|length > 0 %}
-                <li>{{ 'Goals_BestKeywords'|translate }} {% include '@Goals/list_top_dimension.twig' with {'topDimension':topDimensions.keyword} %}</li>
+                <li>{{ 'Goals_BestKeywords'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.keyword} %}</li>
             {% endif %}
             {% if topDimensions.website is defined and topDimensions.website|length > 0 %}
-                <li>{{ 'Goals_BestReferers'|translate }} {% include '@Goals/list_top_dimension.twig' with {'topDimension':topDimensions.website} %}</li>
+                <li>{{ 'Goals_BestReferers'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.website} %}</li>
             {% endif %}
             <li>
                 {{ 'Goals_ReturningVisitorsConversionRateIs'|translate("<strong>"+conversion_rate_returning+"</strong>")|raw }}
diff --git a/plugins/Goals/templates/overview.twig b/plugins/Goals/templates/getOverviewView.twig
index 54f3219721..923a4d1af2 100644
--- a/plugins/Goals/templates/overview.twig
+++ b/plugins/Goals/templates/getOverviewView.twig
@@ -1,6 +1,6 @@
 <link rel="stylesheet" type="text/css" href="plugins/Goals/stylesheets/goals.css"/>
 
-{% include "@Goals/title_and_evolution_graph.twig" %}
+{% include "@Goals/_titleAndEvolutionGraph.twig" %}
 {% set sum_nb_conversions=nb_conversions %}
 
 {% for goal in goalMetrics %}
@@ -43,6 +43,6 @@
     {{ goalReportsByDimension }}
 
     {% if userCanEditGoals %}
-        {% include "@Goals/add_edit_goal.twig" %}
+        {% include "@Goals/_addEditGoal.twig" %}
     {% endif %}
 {% endif %}
diff --git a/plugins/ImageGraph/Controller.php b/plugins/ImageGraph/Controller.php
index 430e372955..f6b08bf4fd 100644
--- a/plugins/ImageGraph/Controller.php
+++ b/plugins/ImageGraph/Controller.php
@@ -41,7 +41,7 @@ class Piwik_ImageGraph_Controller extends Piwik_Controller
     {
         Piwik::checkUserIsSuperUser();
 
-        $view = new Piwik_View('@ImageGraph/debug_graphs_all_sizes');
+        $view = new Piwik_View('@ImageGraph/testAllSizes');
         $this->setGeneralVariablesView($view);
 
         $period = Piwik_Common::getRequestVar('period', 'day', 'string');
diff --git a/plugins/ImageGraph/templates/debug_graphs_all_sizes.twig b/plugins/ImageGraph/templates/testAllSizes.twig
index 85af6b4f32..99ff2dede4 100644
--- a/plugins/ImageGraph/templates/debug_graphs_all_sizes.twig
+++ b/plugins/ImageGraph/templates/testAllSizes.twig
@@ -7,7 +7,7 @@
     <h2>{{ 'ImageGraph_ImageGraph'|translate }} ::: {{ siteName }}</h2>
 
     <div class="top_controls_inner">
-        {% include '@CoreHome/period_select.twig' %}
+        {% include '@CoreHome/_periodSelect.twig' %}
     </div>
 
     <div class="entityContainer" style="width:100%;">
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index cc45c10b18..e302bee14a 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -419,7 +419,7 @@ class Piwik_Installation_Controller extends Piwik_Controller_Admin
         $idSite = $this->session->site_idSite;
 
         // Load the Tracking code and help text from the SitesManager
-        $viewTrackingHelp = new Piwik_View('SitesManager/templates/DisplayJavascriptCode.tpl');
+        $viewTrackingHelp = new Piwik_View('@SitesManager/_displayJavascriptCode');
         $viewTrackingHelp->displaySiteName = $siteName;
         $viewTrackingHelp->jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName());
         $viewTrackingHelp->idSite = $idSite;
diff --git a/plugins/Installation/templates/allSteps.twig b/plugins/Installation/templates/_allSteps.twig
index 7f5f8ba54b..7f5f8ba54b 100644
--- a/plugins/Installation/templates/allSteps.twig
+++ b/plugins/Installation/templates/_allSteps.twig
diff --git a/plugins/Installation/templates/integrityDetails.twig b/plugins/Installation/templates/_integrityDetails.twig
index b285bb46f9..b285bb46f9 100644
--- a/plugins/Installation/templates/integrityDetails.twig
+++ b/plugins/Installation/templates/_integrityDetails.twig
diff --git a/plugins/Installation/templates/systemCheck_legend.twig b/plugins/Installation/templates/_systemCheckLegend.twig
index 04e1c20edf..04e1c20edf 100644
--- a/plugins/Installation/templates/systemCheck_legend.twig
+++ b/plugins/Installation/templates/_systemCheckLegend.twig
diff --git a/plugins/Installation/templates/systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig
index 9c0de17d00..7ff8da3666 100755
--- a/plugins/Installation/templates/systemCheckSection.twig
+++ b/plugins/Installation/templates/_systemCheckSection.twig
@@ -327,4 +327,4 @@
     </tr>
 </table>
 
-{% include "@Installation/integrityDetails.twig" %}
\ No newline at end of file
+{% include "@Installation/_integrityDetails.twig" %}
\ No newline at end of file
diff --git a/plugins/Installation/templates/databaseCheck.twig b/plugins/Installation/templates/databaseCheck.twig
index 005f5e6198..a65be33046 100644
--- a/plugins/Installation/templates/databaseCheck.twig
+++ b/plugins/Installation/templates/databaseCheck.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 {% set ok %}<img src='plugins/Zeitgeist/images/ok.png' />{% endset %}
diff --git a/plugins/Installation/templates/databaseSetup.twig b/plugins/Installation/templates/databaseSetup.twig
index 8afdbb707a..1a4a243693 100644
--- a/plugins/Installation/templates/databaseSetup.twig
+++ b/plugins/Installation/templates/databaseSetup.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_DatabaseSetup'|translate }}</h2>
diff --git a/plugins/Installation/templates/displayJavascriptCode.twig b/plugins/Installation/templates/displayJavascriptCode.twig
index 64fa19be1e..dede2e5a3e 100644
--- a/plugins/Installation/templates/displayJavascriptCode.twig
+++ b/plugins/Installation/templates/displayJavascriptCode.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 {% if displayfirstWebsiteSetupSuccess is defined %}
diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig
index 18e869244a..db04747a21 100644
--- a/plugins/Installation/templates/finished.twig
+++ b/plugins/Installation/templates/finished.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_Congratulations'|translate|raw }}</h2>
diff --git a/plugins/Installation/templates/firstWebsiteSetup.twig b/plugins/Installation/templates/firstWebsiteSetup.twig
index f4a0b1449b..feffadd1d2 100644
--- a/plugins/Installation/templates/firstWebsiteSetup.twig
+++ b/plugins/Installation/templates/firstWebsiteSetup.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 {% if displayGeneralSetupSuccess is defined %}
diff --git a/plugins/Installation/templates/generalSetup.twig b/plugins/Installation/templates/generalSetup.twig
index ae96f4b5a4..c22d83d48c 100644
--- a/plugins/Installation/templates/generalSetup.twig
+++ b/plugins/Installation/templates/generalSetup.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_SuperUser'|translate }}</h2>
diff --git a/plugins/Installation/templates/structure.twig b/plugins/Installation/templates/layout.twig
index 897c5f2986..2a61063f1e 100644
--- a/plugins/Installation/templates/structure.twig
+++ b/plugins/Installation/templates/layout.twig
@@ -41,7 +41,7 @@
         <div class="both"></div>
 
         <div id="generalInstall">
-            {% include "@Installation/allSteps.twig" %}
+            {% include "@Installation/_allSteps.twig" %}
         </div>
 
         <div id="detailInstall">
diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig
index fd798a0558..51dbc46167 100644
--- a/plugins/Installation/templates/systemCheck.twig
+++ b/plugins/Installation/templates/systemCheck.twig
@@ -1,14 +1,14 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 {% if not showNextStep %}
-    {% include "@Installation/systemCheck_legend.twig" %}
+    {% include "@Installation/_systemCheckLegend.twig" %}
     <br style="clear:both">
 {% endif %}
 
 <h3>{{ 'Installation_SystemCheck'|translate }}</h3>
 <br/>
-{% include "@Installation/systemCheckSection.twig" %}
+{% include "@Installation/_systemCheckSection.twig" %}
 
 {% if not showNextStep %}
     <br/>
@@ -16,6 +16,6 @@
         <img src='plugins/Zeitgeist/images/link.gif'/> &nbsp;
         <a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
     </p>
-    {% include "@Installation/systemCheck_legend.twig" %}
+    {% include "@Installation/_systemCheckLegend.twig" %}
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/plugins/Installation/templates/systemCheckPage.twig b/plugins/Installation/templates/systemCheckPage.twig
index 219e120394..7739f7c72e 100755
--- a/plugins/Installation/templates/systemCheckPage.twig
+++ b/plugins/Installation/templates/systemCheckPage.twig
@@ -15,6 +15,6 @@
             {{ 'Installation_SystemCheckSummaryNoProblems'|translate }}
         {% endif %}
     </p>
-    {% include "@Installation/systemCheckSection.twig" %}
+    {% include "@Installation/_systemCheckSection.twig" %}
 {% endif %}
 {% endblock %}
diff --git a/plugins/Installation/templates/tablesCreation.twig b/plugins/Installation/templates/tablesCreation.twig
index e5f48fc017..f51db570b3 100644
--- a/plugins/Installation/templates/tablesCreation.twig
+++ b/plugins/Installation/templates/tablesCreation.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_Tables'|translate }}</h2>
diff --git a/plugins/Installation/templates/welcome.twig b/plugins/Installation/templates/welcome.twig
index 7eafe56e91..5ded3aa8e6 100644
--- a/plugins/Installation/templates/welcome.twig
+++ b/plugins/Installation/templates/welcome.twig
@@ -1,4 +1,4 @@
-{% extends '@Installation/structure.twig' %}
+{% extends '@Installation/layout.twig' %}
 
 {% block content %}
 <h2>{{ 'Installation_Welcome'|translate }}</h2>
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index 8d54ccf1b4..a0cf7d0039 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -89,8 +89,7 @@ class Piwik_LanguagesManager extends Piwik_Plugin
      */
     private function getLanguagesSelector()
     {
-        // don't use Piwik_View::factory() here
-        $view = new Piwik_View("@LanguagesManager/languages");
+        $view = new Piwik_View("@LanguagesManager/getLanguagesSelector");
         $view->languages = Piwik_LanguagesManager_API::getInstance()->getAvailableLanguageNames();
         $view->currentLanguageCode = self::getLanguageCodeForCurrentUser();
         $view->currentLanguageName = self::getLanguageNameForCurrentUser();
diff --git a/plugins/LanguagesManager/templates/languages.twig b/plugins/LanguagesManager/templates/getLanguagesSelector.twig
index 96b5b5144c..96b5b5144c 100644
--- a/plugins/LanguagesManager/templates/languages.twig
+++ b/plugins/LanguagesManager/templates/getLanguagesSelector.twig
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index b049bbf80c..e683ee1c1d 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -38,7 +38,7 @@ class Piwik_Live_Controller extends Piwik_Controller
 
         $lastNData = Piwik_API_Request::processRequest('Live.getCounters', array('lastMinutes' => $lastMinutes));
 
-        $view = new Piwik_View('@Live/simpleLastVisitCount');
+        $view = new Piwik_View('@Live/getSimpleLastVisitCount');
         $view->lastMinutes = $lastMinutes;
         $view->visitors = Piwik::getPrettyNumber($lastNData[0]['visitors']);
         $view->visits = Piwik::getPrettyNumber($lastNData[0]['visits']);
@@ -59,7 +59,7 @@ class Piwik_Live_Controller extends Piwik_Controller
 
     public function ajaxTotalVisitors($fetch = false)
     {
-        $view = new Piwik_View('@Live/totalVisits');
+        $view = new Piwik_View('@Live/ajaxTotalVisitors');
         $view = $this->setCounters($view);
         $view->idSite = $this->idSite;
         return $this->render($view, $fetch);
@@ -83,7 +83,7 @@ class Piwik_Live_Controller extends Piwik_Controller
         );
         $view->disableGenericFilters();
         $view->disableSort();
-        $view->setTemplate("@Live/visitorLog.twig");
+        $view->setTemplate("@Live/getVisitorLog.twig");
         $view->setSortedColumn('idVisit', 'ASC');
         $view->disableSearchBox();
         $view->setLimit(20);
@@ -118,7 +118,7 @@ class Piwik_Live_Controller extends Piwik_Controller
         // hack, ensure we load today's visits by default
         $_GET['date'] = 'today';
         $_GET['period'] = 'day';
-        $view = new Piwik_View('@Live/lastVisits');
+        $view = new Piwik_View('@Live/getLastVisitsStart');
         $view->idSite = $this->idSite;
 
         $api = new Piwik_API_Request("method=Live.getLastVisitsDetails&idSite={$this->idSite}&filter_limit=10&format=php&serialize=0&disable_generic_filters=1");
diff --git a/plugins/Live/templates/totalVisits.twig b/plugins/Live/templates/_totalVisitors.twig
index 40d2d1eed0..40d2d1eed0 100644
--- a/plugins/Live/templates/totalVisits.twig
+++ b/plugins/Live/templates/_totalVisitors.twig
diff --git a/plugins/Live/templates/ajaxTotalVisitors.twig b/plugins/Live/templates/ajaxTotalVisitors.twig
new file mode 100644
index 0000000000..e3f9121941
--- /dev/null
+++ b/plugins/Live/templates/ajaxTotalVisitors.twig
@@ -0,0 +1 @@
+{% include "@Live/_totalVisitors.twig" %}
\ No newline at end of file
diff --git a/plugins/Live/templates/lastVisits.twig b/plugins/Live/templates/getLastVisitsStart.twig
index f8cc9a9703..f8cc9a9703 100644
--- a/plugins/Live/templates/lastVisits.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
diff --git a/plugins/Live/templates/simpleLastVisitCount.twig b/plugins/Live/templates/getSimpleLastVisitCount.twig
index 787128922c..787128922c 100644
--- a/plugins/Live/templates/simpleLastVisitCount.twig
+++ b/plugins/Live/templates/getSimpleLastVisitCount.twig
diff --git a/plugins/Live/templates/visitorLog.twig b/plugins/Live/templates/getVisitorLog.twig
index de4147e43e..52184460ee 100644
--- a/plugins/Live/templates/visitorLog.twig
+++ b/plugins/Live/templates/getVisitorLog.twig
@@ -310,10 +310,10 @@
 {% endif %}
 
     {% if properties.show_footer %}
-        {% include "@CoreHome/datatable_footer.twig" %}
+        {% include "@CoreHome/_dataTableFooter.twig" %}
     {% endif %}
 
-    {% include "@CoreHome/datatable_js.twig"}
+    {% include "@CoreHome/_dataTableJS.twig"}
     <script type="text/javascript" defer="defer">
 
         var visitorLogTitle = '{{ 'Live_VisitorLog'|translate|e('js') }}';
diff --git a/plugins/Live/templates/index.twig b/plugins/Live/templates/index.twig
index 98382fa253..ea6028db27 100644
--- a/plugins/Live/templates/index.twig
+++ b/plugins/Live/templates/index.twig
@@ -25,7 +25,7 @@
     });
 </script>
 
-{% include "@Live/totalVisits.twig" %}
+{% include "@Live/_totalVisitors.twig" %}
 
 {{ visitors|raw }}
 
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 83e6f374b1..ba3e3cf355 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -75,7 +75,7 @@ class Piwik_Login_Controller extends Piwik_Controller
             }
         }
 
-        $view = Piwik_View::factory('@Login/login');
+        $view = new Piwik_View('@Login/login');
         $view->AccessErrorString = $messageNoAccess;
         $view->infoMessage = nl2br($infoMessage);
         $view->addForm($form);
@@ -191,7 +191,7 @@ class Piwik_Login_Controller extends Piwik_Controller
             $formErrors = $formData['errors'];
         }
 
-        $view = Piwik_View::factory('message');
+        $view = new Piwik_View('@Login/resetPassword');
         $view->infoMessage = $infoMessage;
         $view->formErrors = $formErrors;
         echo $view->render();
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index a346ce4650..d699e17a6c 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -33,10 +33,10 @@
     {% if 'General_LayoutDirection'|translate =='rtl' %}
     <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/>
     {% endif %}
-    {% include "@CoreHome/iframe_buster_header.twig" %}
+    {% include "_iframeBusterHeader.twig" %}
 </head>
 <body class="login">
-{% include "@CoreHome/iframe_buster_body.twig" %}
+{% include "_iframeBusterBody.twig" %}
 <div id="logo">
     {% if isCustomLogo == false %}<a href="http://piwik.org" title="{{ linkTitle }}">{% endif %}
     {% if hasSVGLogo %}
diff --git a/plugins/Login/templates/message.twig b/plugins/Login/templates/resetPassword.twig
index eaa5be0a8d..eaa5be0a8d 100755
--- a/plugins/Login/templates/message.twig
+++ b/plugins/Login/templates/resetPassword.twig
diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php
index b4e99c3242..01c3d731e0 100644
--- a/plugins/MobileMessaging/Controller.php
+++ b/plugins/MobileMessaging/Controller.php
@@ -28,7 +28,7 @@ class Piwik_MobileMessaging_Controller extends Piwik_Controller_Admin
     {
         Piwik::checkUserIsNotAnonymous();
 
-        $view = new Piwik_View('@MobileMessaging/Settings');
+        $view = new Piwik_View('@MobileMessaging/index');
 
         $view->isSuperUser = Piwik::isUserIsSuperUser();
 
diff --git a/plugins/MobileMessaging/MobileMessaging.php b/plugins/MobileMessaging/MobileMessaging.php
index 7d56fe14f2..1235be46c3 100644
--- a/plugins/MobileMessaging/MobileMessaging.php
+++ b/plugins/MobileMessaging/MobileMessaging.php
@@ -273,7 +273,7 @@ class Piwik_MobileMessaging extends Piwik_Plugin
         }
 
         $out =& $notification->getNotificationObject();
-        $view = Piwik_View::factory('ReportParameters');
+        $view = new Piwik_View('@MobileMessaging/reportParametersPDFReports');
         $view->reportType = self::MOBILE_TYPE;
         $view->phoneNumbers = Piwik_MobileMessaging_API::getInstance()->getActivatedPhoneNumbers();
         $out .= $view->render();
diff --git a/plugins/MobileMessaging/templates/Settings.twig b/plugins/MobileMessaging/templates/index.twig
index adbd93d2bf..adbd93d2bf 100644
--- a/plugins/MobileMessaging/templates/Settings.twig
+++ b/plugins/MobileMessaging/templates/index.twig
diff --git a/plugins/MobileMessaging/templates/ReportParameters.twig b/plugins/MobileMessaging/templates/reportParametersPDFReports.twig
index 13f89c752a..13f89c752a 100644
--- a/plugins/MobileMessaging/templates/ReportParameters.twig
+++ b/plugins/MobileMessaging/templates/reportParametersPDFReports.twig
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index 151b080ac3..8c26e75f6c 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -116,7 +116,7 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
 
         $this->applyPrettyMoney($digestableData);
 
-        $view = new Piwik_View("@MultiSites/index");
+        $view = new Piwik_View("@MultiSites/getSitesInfo");
         $view->isWidgetized = $isWidgetized;
         $view->sitesData = array_values($digestableData);
         $view->evolutionBy = $this->evolutionBy;
diff --git a/plugins/MultiSites/templates/row.twig b/plugins/MultiSites/templates/_siteRow.twig
index 23169836e2..437db12226 100644
--- a/plugins/MultiSites/templates/row.twig
+++ b/plugins/MultiSites/templates/_siteRow.twig
@@ -1,7 +1,7 @@
 <td class="multisites-label label">
     <a title="View reports" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%">%name%</a>
-    
-    <span style="width: 10px; margin-left:3px"> 
+
+    <span style="width: 10px; margin-left:3px">
 	<a target="_blank" title="{{ 'General_GoTo'|translate("%main_url%") }}" href="%main_url%"><img src="plugins/MultiSites/images/link.gif"/></a>
     </span>
 </td>
@@ -23,8 +23,8 @@
     {% if displayRevenueColumn %}
         <div class="revenue" style="display:none">%revenueSummary%</div>
     {% endif %}
-{% endif %}
-{% if show_sparklines %}
+    {% endif %}
+    {% if show_sparklines %}
     <td style="width:180px">
         <div id="sparkline_%idsite%" style="width: 100px; margin: auto">
             <a target="_blank" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%"
diff --git a/plugins/MultiSites/templates/index.twig b/plugins/MultiSites/templates/getSitesInfo.twig
index c520c34cff..ebc75894fc 100644
--- a/plugins/MultiSites/templates/index.twig
+++ b/plugins/MultiSites/templates/getSitesInfo.twig
@@ -5,7 +5,7 @@
 {% block content %}
 <div id="multisites">
     <div id="main">
-        {% include "@MultiSites/row.twig" with row %}
+        {% include "@MultiSites/_siteRow.twig" %}
         <script type="text/javascript">
             var allSites = [];
             var params = [];
@@ -36,8 +36,8 @@
 
         {% if not isWidgetized %}
             <div class="top_controls_inner">
-                {% include "@CoreHome/period_select.twig" %}
-                {% include "@CoreHome/header_message.twig" %}
+                {% include "@CoreHome/_periodSelect.twig" %}
+                {% include "@CoreHome/_headerMessage.twig" %}
             </div>
         {% endif %}
 
diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php
index 550422c214..3975e837b0 100644
--- a/plugins/Overlay/Controller.php
+++ b/plugins/Overlay/Controller.php
@@ -17,12 +17,12 @@ class Piwik_Overlay_Controller extends Piwik_Controller
     {
         Piwik::checkUserHasViewAccess($this->idSite);
 
-        $template = 'index';
+        $template = '@Overlay/index';
         if (Piwik_Config::getInstance()->General['overlay_disable_framed_mode']) {
-            $template = 'index_noframe';
+            $template = '@Overlay/index_noframe';
         }
 
-        $view = Piwik_View::factory($template);
+        $view = new Piwik_View($template);
 
         $this->setGeneralVariablesView($view);
         $view->showTopMenu = false;
@@ -100,7 +100,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller
         }
 
         // render template
-        $view = Piwik_View::factory('sidebar');
+        $view = new Piwik_View('@Overlay/renderSidebar');
         $view->data = $data;
         $view->location = $page;
         $view->normalizedUrl = $normalizedCurrentUrl;
@@ -194,7 +194,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller
         $message = Piwik_Translate('Overlay_RedirectUrlError', array($url, "\n"));
         $message = nl2br(htmlentities($message));
 
-        $view = Piwik_View::factory('error_wrong_domain');
+        $view = new Piwik_View('@Overlay/showErrorWrongDomain');
         $view->message = $message;
 
         if (Piwik::isUserHasAdminAccess($idSite)) {
@@ -221,7 +221,7 @@ class Piwik_Overlay_Controller extends Piwik_Controller
      */
     public function notifyParentIframe()
     {
-        $view = Piwik_View::factory('notify_parent_iframe');
+        $view = new Piwik_View('@Overlay/notifyParentIframe');
         echo $view->render();
     }
 
diff --git a/plugins/Overlay/templates/notify_parent_iframe.twig b/plugins/Overlay/templates/notifyParentIframe.twig
index 19327445a1..19327445a1 100644
--- a/plugins/Overlay/templates/notify_parent_iframe.twig
+++ b/plugins/Overlay/templates/notifyParentIframe.twig
diff --git a/plugins/Overlay/templates/sidebar.twig b/plugins/Overlay/templates/renderSidebar.twig
index 3ff6ee50a8..3ff6ee50a8 100644
--- a/plugins/Overlay/templates/sidebar.twig
+++ b/plugins/Overlay/templates/renderSidebar.twig
diff --git a/plugins/Overlay/templates/error_wrong_domain.twig b/plugins/Overlay/templates/showErrorWrongDomain.twig
index 0a39680a12..0a39680a12 100644
--- a/plugins/Overlay/templates/error_wrong_domain.twig
+++ b/plugins/Overlay/templates/showErrorWrongDomain.twig
diff --git a/plugins/PDFReports/PDFReports.php b/plugins/PDFReports/PDFReports.php
index 15d0f534a8..c1ec102756 100644
--- a/plugins/PDFReports/PDFReports.php
+++ b/plugins/PDFReports/PDFReports.php
@@ -437,7 +437,7 @@ class Piwik_PDFReports extends Piwik_Plugin
     {
         $out =& $notification->getNotificationObject();
 
-        $view = Piwik_View::factory('report_parameters');
+        $view = new Piwik_View('@PDFReports/reportParametersPDFReports');
         $view->currentUserEmail = Piwik::getCurrentUserEmail();
         $view->displayFormats = self::getDisplayFormats();
         $view->reportType = self::EMAIL_TYPE;
diff --git a/plugins/PDFReports/templates/add.twig b/plugins/PDFReports/templates/_addReport.twig
index b41d901efc..b41d901efc 100644
--- a/plugins/PDFReports/templates/add.twig
+++ b/plugins/PDFReports/templates/_addReport.twig
diff --git a/plugins/PDFReports/templates/list.twig b/plugins/PDFReports/templates/_listReports.twig
index 96ba0f64d5..96ba0f64d5 100644
--- a/plugins/PDFReports/templates/list.twig
+++ b/plugins/PDFReports/templates/_listReports.twig
diff --git a/plugins/PDFReports/templates/index.twig b/plugins/PDFReports/templates/index.twig
index 076936cb40..92f647fb77 100644
--- a/plugins/PDFReports/templates/index.twig
+++ b/plugins/PDFReports/templates/index.twig
@@ -4,7 +4,7 @@
 {% set showSitesSelection=true %}
 
 <div class="top_controls_inner">
-    {% include "@CoreHome/period_select.twig" %}
+    {% include "@CoreHome/_periodSelect.twig" %}
 </div>
 
 <div class="centerLargeDiv">
@@ -14,8 +14,8 @@
         {% import 'ajaxMacros.twig' as ajax %}
         {{ ajax.errorDiv() }}
         {{ ajax.loadingDiv() }}
-        {% include "@PDFReports/list.twig" %}
-        {% include "@PDFReports/add.twig" %}
+        {% include "@PDFReports/_listReports.twig" %}
+        {% include "@PDFReports/_addReport.twig" %}
         <a id='bottom'></a>
     </div>
 </div>
diff --git a/plugins/PDFReports/templates/report_parameters.twig b/plugins/PDFReports/templates/reportParametersPDFReports.twig
index 0bf2e2bd14..0bf2e2bd14 100644
--- a/plugins/PDFReports/templates/report_parameters.twig
+++ b/plugins/PDFReports/templates/reportParametersPDFReports.twig
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index a51addf23d..336587eca0 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -86,7 +86,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin
     public function getDatabaseSize()
     {
         Piwik::checkUserIsSuperUser();
-        $view = new Piwik_View('@PrivacyManager/databaseSize');
+        $view = new Piwik_View('@PrivacyManager/getDatabaseSize');
 
         $forceEstimate = Piwik_Common::getRequestVar('forceEstimate', 0);
         $view->dbStats = $this->getDeleteDBSizeEstimate($getSettingsFromQuery = true, $forceEstimate);
diff --git a/plugins/PrivacyManager/templates/databaseSize.twig b/plugins/PrivacyManager/templates/getDatabaseSize.twig
index 2828a245db..2828a245db 100755
--- a/plugins/PrivacyManager/templates/databaseSize.twig
+++ b/plugins/PrivacyManager/templates/getDatabaseSize.twig
diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php
index 12e8435703..1d714e3570 100644
--- a/plugins/Proxy/Controller.php
+++ b/plugins/Proxy/Controller.php
@@ -29,7 +29,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller
     {
         Piwik::checkUserHasSomeViewAccess();
 
-        $view = Piwik_View::factory('exportImage');
+        $view = new Piwik_View('@Proxy/exportImageWindow');
         $view->imageData = 'data:image/png;base64,' . Piwik_Common::getRequestVar('imageData', self::TRANSPARENT_PNG_PIXEL, 'string', $_POST);
         echo $view->render();
     }
diff --git a/plugins/Proxy/templates/exportImage.twig b/plugins/Proxy/templates/exportImageWindow.twig
index 85bc749a0f..85bc749a0f 100644
--- a/plugins/Proxy/templates/exportImage.twig
+++ b/plugins/Proxy/templates/exportImageWindow.twig
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 6aee58ed5c..ecdf97aedb 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -120,7 +120,7 @@ class Piwik_Referers_Controller extends Piwik_Controller
 
     function getSearchEnginesAndKeywords()
     {
-        $view = new Piwik_View('@Referers/searchEngines_Keywords');
+        $view = new Piwik_View('@Referers/getSearchEnginesAndKeywords');
         $view->searchEngines = $this->getSearchEngines(true);
         $view->keywords = $this->getKeywords(true);
         echo $view->render();
@@ -295,7 +295,7 @@ class Piwik_Referers_Controller extends Piwik_Controller
 
     function indexWebsites($fetch = false)
     {
-        $view = new Piwik_View('@Referers/Websites_SocialNetworks');
+        $view = new Piwik_View('@Referers/indexWebsites');
         $view->websites = $this->getWebsites(true);
         $view->socials = $this->getSocials(true);
         if ($fetch) {
diff --git a/plugins/Referers/templates/searchEngines_Keywords.twig b/plugins/Referers/templates/getSearchEnginesAndKeywords.twig
index d930921631..d930921631 100644
--- a/plugins/Referers/templates/searchEngines_Keywords.twig
+++ b/plugins/Referers/templates/getSearchEnginesAndKeywords.twig
diff --git a/plugins/Referers/templates/index.twig b/plugins/Referers/templates/index.twig
index 23de4ab3ec..d08bb4cbf9 100644
--- a/plugins/Referers/templates/index.twig
+++ b/plugins/Referers/templates/index.twig
@@ -115,5 +115,5 @@
     {{ referrersReportsByDimension|raw }}
 {% endif %}
 
-{% include "@CoreHome/sparkline_footer.twig" %}
+{% include "_sparklineFooter.twig" %}
 
diff --git a/plugins/Referers/templates/Websites_SocialNetworks.twig b/plugins/Referers/templates/indexWebsites.twig
index 44596c307c..44596c307c 100755
--- a/plugins/Referers/templates/Websites_SocialNetworks.twig
+++ b/plugins/Referers/templates/indexWebsites.twig
diff --git a/plugins/SEO/Controller.php b/plugins/SEO/Controller.php
index dad2b1630c..68ae5caa12 100644
--- a/plugins/SEO/Controller.php
+++ b/plugins/SEO/Controller.php
@@ -31,7 +31,7 @@ class Piwik_SEO_Controller extends Piwik_Controller
 
         $dataTable = Piwik_SEO_API::getInstance()->getRank($url);
 
-        $view = new Piwik_View('@SEO/index');
+        $view = new Piwik_View('@SEO/getRank');
         $view->urlToRank = Piwik_SEO_RankChecker::extractDomainFromUrl($url);
 
         $renderer = Piwik_DataTable_Renderer::factory('php');
diff --git a/plugins/SEO/templates/index.twig b/plugins/SEO/templates/getRank.twig
index 1d6e9deb22..1d6e9deb22 100644
--- a/plugins/SEO/templates/index.twig
+++ b/plugins/SEO/templates/getRank.twig
diff --git a/plugins/SegmentEditor/Controller.php b/plugins/SegmentEditor/Controller.php
index aeb69978f8..519504e1d1 100644
--- a/plugins/SegmentEditor/Controller.php
+++ b/plugins/SegmentEditor/Controller.php
@@ -17,7 +17,7 @@ class Piwik_SegmentEditor_Controller extends Piwik_Controller
 
     public function getSelector()
     {
-        $view = Piwik_View::factory('@SegmentEditor/selector');
+        $view = new Piwik_View('@SegmentEditor/getSelector');
         $idSite = Piwik_Common::getRequestVar('idSite');
         $this->setGeneralVariablesView($view);
         $segments = Piwik_API_API::getInstance()->getSegmentsMetadata($idSite);
diff --git a/plugins/SegmentEditor/templates/selector.twig b/plugins/SegmentEditor/templates/getSelector.twig
index 0cabb467e5..0cabb467e5 100644
--- a/plugins/SegmentEditor/templates/selector.twig
+++ b/plugins/SegmentEditor/templates/getSelector.twig
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index 2d399f88eb..235037a1b1 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -119,7 +119,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
         $idSite = Piwik_Common::getRequestVar('idSite');
         Piwik::checkUserHasViewAccess($idSite);
         $jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName());
-        $view = new Piwik_View('@SitesManager/Tracking');
+        $view = new Piwik_View('@SitesManager/displayJavascriptCode');
         $this->setBasicVariablesView($view);
         $view->menu = Piwik_GetAdminMenu();
         $view->idSite = $idSite;
@@ -146,7 +146,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller_Admin
      */
     function displayAlternativeTagsHelp()
     {
-        $view = new Piwik_View('@SitesManager/DisplayAlternativeTags');
+        $view = new Piwik_View('@SitesManager/displayAlternativeTagsHelp');
         $view->idSite = Piwik_Common::getRequestVar('idSite');
         $url = Piwik_Common::getRequestVar('piwikUrl', '', 'string');
         if (empty($url)
diff --git a/plugins/SitesManager/templates/DisplayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig
index 950ce47705..950ce47705 100644
--- a/plugins/SitesManager/templates/DisplayJavascriptCode.twig
+++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig
diff --git a/plugins/SitesManager/templates/DisplayAlternativeTags.twig b/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig
index 115b9863e2..115b9863e2 100644
--- a/plugins/SitesManager/templates/DisplayAlternativeTags.twig
+++ b/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig
diff --git a/plugins/SitesManager/templates/Tracking.twig b/plugins/SitesManager/templates/displayJavascriptCode.twig
index 6733214fbe..1d19de45f1 100644
--- a/plugins/SitesManager/templates/Tracking.twig
+++ b/plugins/SitesManager/templates/displayJavascriptCode.twig
@@ -3,5 +3,5 @@
 {% block content %}
 {{ loadJavascriptTranslations(['SitesManager']) }}
 
-{% include "@SitesManager/DisplayJavascriptCode.twig" %}
+{% include "@SitesManager/_displayJavascriptCode.twig" %}
 {% endblock %}
\ No newline at end of file
diff --git a/plugins/Transitions/Controller.php b/plugins/Transitions/Controller.php
index e84e4fc9a3..01b72bb7ff 100644
--- a/plugins/Transitions/Controller.php
+++ b/plugins/Transitions/Controller.php
@@ -74,7 +74,7 @@ class Piwik_Transitions_Controller extends Piwik_Controller
      */
     public function renderPopover()
     {
-        $view = new Piwik_View('@Transitions/transitions');
+        $view = new Piwik_View('@Transitions/renderPopover');
         $view->translations = $this->getTranslations();
         echo $view->render();
     }
diff --git a/plugins/Transitions/templates/transitions.twig b/plugins/Transitions/templates/renderPopover.twig
index 0a0163d49a..0a0163d49a 100644
--- a/plugins/Transitions/templates/transitions.twig
+++ b/plugins/Transitions/templates/renderPopover.twig
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index bd4f32075f..404d6fb0be 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -134,7 +134,7 @@ class Piwik_UserCountry_Controller extends Piwik_Controller_Admin
      */
     private function getGeoIpUpdaterManageScreen()
     {
-        $view = new Piwik_View('@UserCountry/updaterSetup');
+        $view = new Piwik_View('@UserCountry/getGeoIpUpdaterManageScreen');
         $view->geoIPDatabasesInstalled = true;
         $this->setUpdaterManageVars($view);
         return $view->render();
diff --git a/plugins/UserCountry/templates/updaterSetup.twig b/plugins/UserCountry/templates/_updaterManage.twig
index 810fefe146..810fefe146 100755
--- a/plugins/UserCountry/templates/updaterSetup.twig
+++ b/plugins/UserCountry/templates/_updaterManage.twig
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index 2ba90d02e7..1af38efa54 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -124,7 +124,7 @@
 	        <div id="geoip-download-progress"></div>
         </div>
     {% endif %}
-    {% include "@UserCountry/updaterSetup.twig" %}
+    {% include "@UserCountry/_updaterManage.twig" %}
 {% else %}
 <p style="width:900px" class="form-description">{{ 'UserCountry_CannotSetupGeoIPAutoUpdating'|translate }}</p>
 {% endif %}
diff --git a/plugins/UserCountry/templates/getGeoIpUpdaterManageScreen.twig b/plugins/UserCountry/templates/getGeoIpUpdaterManageScreen.twig
new file mode 100755
index 0000000000..750e395b44
--- /dev/null
+++ b/plugins/UserCountry/templates/getGeoIpUpdaterManageScreen.twig
@@ -0,0 +1 @@
+{% include "@UserCountry/_updaterManage.twig" %}
\ No newline at end of file
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php
index d6ef194faa..b09f6fdb0b 100644
--- a/plugins/UserCountryMap/Controller.php
+++ b/plugins/UserCountryMap/Controller.php
@@ -30,7 +30,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
         $date = Piwik_Common::getRequestVar('date');
         $token_auth = Piwik::getCurrentUserTokenAuth();
 
-        $view = new Piwik_View('@UserCountryMap/visitor-map');
+        $view = new Piwik_View('@UserCountryMap/visitorMap');
 
         // request visits summary
         $request = new Piwik_API_Request(
@@ -106,7 +106,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
         Piwik::checkUserHasViewAccess($idSite);
 
         $token_auth = Piwik::getCurrentUserTokenAuth();
-        $view = new Piwik_View('@UserCountryMap/realtime-map');
+        $view = new Piwik_View('@UserCountryMap/realtimeMap');
 
         $view->mapIsStandaloneNotWidget = $standalone;
 
diff --git a/plugins/UserCountryMap/templates/realtime-map.twig b/plugins/UserCountryMap/templates/realtimeMap.twig
index 17933eca58..17933eca58 100644
--- a/plugins/UserCountryMap/templates/realtime-map.twig
+++ b/plugins/UserCountryMap/templates/realtimeMap.twig
diff --git a/plugins/UserCountryMap/templates/visitor-map.twig b/plugins/UserCountryMap/templates/visitorMap.twig
index 0a95b574bd..0a95b574bd 100644
--- a/plugins/UserCountryMap/templates/visitor-map.twig
+++ b/plugins/UserCountryMap/templates/visitorMap.twig
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 730e756c27..adef52eaaa 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -27,7 +27,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
     {
         Piwik::checkUserIsNotAnonymous();
 
-        $view = new Piwik_View('@UsersManager/UsersManager');
+        $view = new Piwik_View('@UsersManager/index');
 
         $IdSitesAdmin = Piwik_SitesManager_API::getInstance()->getSitesIdWithAdminAccess();
         $idSiteSelected = 1;
diff --git a/plugins/UsersManager/templates/UsersManager.twig b/plugins/UsersManager/templates/index.twig
index 883952079d..d2ad1d02e1 100644
--- a/plugins/UsersManager/templates/UsersManager.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -42,7 +42,7 @@
         {% set applyAllSitesText %}
             <strong>{{ 'UsersManager_ApplyToAllWebsites'|translate }}</strong>
         {% endset %}
-        {% include "@CoreHome/sites_selection.twig" with {
+        {% include "@CoreHome/_siteSelect.twig" with {
             'siteName': defaultReportSiteName,
             'idSite':idSiteSelected,
             'allSitesItemText': applyAllSitesText,
diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig
index fb94dfb538..d52c2ea6eb 100644
--- a/plugins/UsersManager/templates/userSettings.twig
+++ b/plugins/UsersManager/templates/userSettings.twig
@@ -49,7 +49,7 @@
                 {% else %}
                     {% set defaultReportIdSite=defaultReport %}
                 {% endif %}
-                {% include "@CoreHome/sites_selection.twig" with {
+                {% include "@CoreHome/_siteSelect.twig" with {
                     'siteName':defaultReportSiteName,
                     'idSite':defaultReportIdSite,
                     'switchSiteOnSelect':false,
diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php
index 45254b67fe..982756148e 100644
--- a/plugins/VisitFrequency/Controller.php
+++ b/plugins/VisitFrequency/Controller.php
@@ -25,7 +25,7 @@ class Piwik_VisitFrequency_Controller extends Piwik_Controller
 
     public function getSparklines()
     {
-        $view = new Piwik_View('@VisitFrequency/sparklines');
+        $view = new Piwik_View('@VisitFrequency/getSparklines');
         $this->setSparklinesAndNumbers($view);
         echo $view->render();
     }
diff --git a/plugins/VisitFrequency/templates/sparklines.twig b/plugins/VisitFrequency/templates/_sparklines.twig
index 085a44c170..75f21e669e 100644
--- a/plugins/VisitFrequency/templates/sparklines.twig
+++ b/plugins/VisitFrequency/templates/_sparklines.twig
@@ -19,4 +19,4 @@
     {{ sparkline(urlSparklineBounceRateReturning) }}
     {{ 'VisitFrequency_ReturnBounceRate'|translate("<strong>"+bounceRateReturning+"%</strong>")|raw }}
 </div>
-{% include "@CoreHome/sparkline_footer.twig" %}
+{% include "_sparklineFooter.twig" %}
diff --git a/plugins/VisitFrequency/templates/getSparklines.twig b/plugins/VisitFrequency/templates/getSparklines.twig
new file mode 100644
index 0000000000..fd158c8329
--- /dev/null
+++ b/plugins/VisitFrequency/templates/getSparklines.twig
@@ -0,0 +1 @@
+{% include "@VisitFrequency/_sparklines.twig" %}
\ No newline at end of file
diff --git a/plugins/VisitFrequency/templates/index.twig b/plugins/VisitFrequency/templates/index.twig
index 237f922c20..82053d00f6 100644
--- a/plugins/VisitFrequency/templates/index.twig
+++ b/plugins/VisitFrequency/templates/index.twig
@@ -5,6 +5,6 @@
 {{ graphEvolutionVisitFrequency|raw }}
 <br/>
 
-{% include "@VisitFrequency/sparklines.twig" %}
+{% include "@VisitFrequency/_sparklines.twig" %}
 
 {{ postEvent("template_footerVisitsFrequency") }}
diff --git a/plugins/VisitorGenerator/templates/index.twig b/plugins/VisitorGenerator/templates/index.twig
index 0edfd18296..9489f2e9d0 100644
--- a/plugins/VisitorGenerator/templates/index.twig
+++ b/plugins/VisitorGenerator/templates/index.twig
@@ -10,7 +10,7 @@
         <tr>
             <td><label for="idSite">{{ 'General_ChooseWebsite'|translate }}</label></td>
             <td>
-                {% include file="@CoreHome/sites_selection.twig" with {
+                {% include file="@CoreHome/_siteSelect.twig" with {
                 'showAllSitesItem':false,'showSelectedSite':true,'switchSiteOnSelect':false,'inputName':idSite} %}
             </td>
         </tr>
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index dcd1313da3..e23680fc10 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -26,7 +26,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller
 
     public function getSparklines()
     {
-        $view = new Piwik_View('@VisitsSummary/sparklines');
+        $view = new Piwik_View('@VisitsSummary/getSparklines');
         $this->setPeriodVariablesView($view);
         $this->setSparklinesAndNumbers($view);
         echo $view->render();
diff --git a/plugins/VisitsSummary/templates/sparklines.twig b/plugins/VisitsSummary/templates/_sparklines.twig
index ca405b5799..c3a22290b0 100644
--- a/plugins/VisitsSummary/templates/sparklines.twig
+++ b/plugins/VisitsSummary/templates/_sparklines.twig
@@ -61,5 +61,5 @@
 </div>
 <div style="clear:both;"></div>
 
-{% include "@CoreHome/sparkline_footer.twig" %}
+{% include "_sparklineFooter.twig" %}
 
diff --git a/plugins/VisitsSummary/templates/getSparklines.twig b/plugins/VisitsSummary/templates/getSparklines.twig
new file mode 100644
index 0000000000..7e35981828
--- /dev/null
+++ b/plugins/VisitsSummary/templates/getSparklines.twig
@@ -0,0 +1 @@
+{% include "@VisitsSummary/_sparklines.twig" %}
\ No newline at end of file
diff --git a/plugins/VisitsSummary/templates/index.twig b/plugins/VisitsSummary/templates/index.twig
index 1dd7a49689..6769b9e876 100644
--- a/plugins/VisitsSummary/templates/index.twig
+++ b/plugins/VisitsSummary/templates/index.twig
@@ -6,7 +6,7 @@
 {{ graphEvolutionVisitsSummary|raw }}
 
 <h2>{{ 'General_Report'|translate }}</h2>
-{% include "@VisitsSummary/sparklines.twig" %}
+{% include "@VisitsSummary/_sparklines.twig" %}
 {#
 Time page generation
 	<p style='color:lightgrey; size:0.8em;'>
diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php
index e478d992c8..1f326563b8 100644
--- a/plugins/Widgetize/Controller.php
+++ b/plugins/Widgetize/Controller.php
@@ -25,7 +25,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
 
     public function testJsInclude1()
     {
-        $view = new Piwik_View('@Widgetize/test_jsinclude');
+        $view = new Piwik_View('@Widgetize/testJsInclude1');
         $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
         $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=API&actionToWidgetize=index&method=ExamplePlugin.getGoldenRatio&format=original';
         echo $view->render();
@@ -33,7 +33,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
 
     public function testJsInclude2()
     {
-        $view = new Piwik_View('@Widgetize/test_jsinclude2');
+        $view = new Piwik_View('@Widgetize/testJsInclude2');
         $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday';
         $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0';
         $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0';
@@ -49,7 +49,7 @@ class Piwik_Widgetize_Controller extends Piwik_Controller
         $parameters = array($fetch = true);
         $outputDataTable = Piwik_FrontController::getInstance()->fetchDispatch($controllerName, $actionName, $parameters);
         if ($controllerName == 'Dashboard' && $actionName == 'index') {
-            $view = new Piwik_View('@Widgetize/empty');
+            $view = new Piwik_View('@Widgetize/iframe_empty');
         } else {
             $view = new Piwik_View('@Widgetize/iframe');
         }
diff --git a/plugins/Widgetize/templates/iframe.twig b/plugins/Widgetize/templates/iframe.twig
index 5413450d9c..ea34ef8936 100644
--- a/plugins/Widgetize/templates/iframe.twig
+++ b/plugins/Widgetize/templates/iframe.twig
@@ -4,11 +4,11 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
         {{ loadJavascriptTranslations(['CoreHome']) }}
-        {% include "@CoreHome/js_global_variables.twig" %}
+        {% include "_jsGlobalVariables.twig" %}
         <!--[if lt IE 9]>
         <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
         <![endif]-->
-        {% include "@CoreHome/js_css_includes.twig" %}
+        {% include "_jsCssIncludes.twig" %}
         <!--[if IE]>
         <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
         <![endif]-->
diff --git a/plugins/Widgetize/templates/empty.twig b/plugins/Widgetize/templates/iframe_empty.twig
index b40340ba39..b40340ba39 100644
--- a/plugins/Widgetize/templates/empty.twig
+++ b/plugins/Widgetize/templates/iframe_empty.twig
diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig
index 558bc2ec37..359551f968 100644
--- a/plugins/Widgetize/templates/index.twig
+++ b/plugins/Widgetize/templates/index.twig
@@ -75,7 +75,7 @@
 </script>
 
 <div class="top_controls_inner">
-    {% include "@CoreHome/period_select.twig" %}
+    {% include "@CoreHome/_periodSelect.twig" %}
 </div>
 
 <div class="widgetize">
diff --git a/plugins/Widgetize/templates/test_jsinclude.twig b/plugins/Widgetize/templates/testJsInclude1.twig
index 95c4a3945c..95c4a3945c 100644
--- a/plugins/Widgetize/templates/test_jsinclude.twig
+++ b/plugins/Widgetize/templates/testJsInclude1.twig
diff --git a/plugins/Widgetize/templates/test_jsinclude2.twig b/plugins/Widgetize/templates/testJsInclude2.twig
index 92dba2b47b..92dba2b47b 100644
--- a/plugins/Widgetize/templates/test_jsinclude2.twig
+++ b/plugins/Widgetize/templates/testJsInclude2.twig
diff --git a/plugins/CoreHome/templates/iframe_buster_body.twig b/plugins/Zeitgeist/templates/_iframeBusterBody.twig
index 8322f4e483..8322f4e483 100644
--- a/plugins/CoreHome/templates/iframe_buster_body.twig
+++ b/plugins/Zeitgeist/templates/_iframeBusterBody.twig
diff --git a/plugins/CoreHome/templates/iframe_buster_header.twig b/plugins/Zeitgeist/templates/_iframeBusterHeader.twig
index b3c070d91c..b3c070d91c 100644
--- a/plugins/CoreHome/templates/iframe_buster_header.twig
+++ b/plugins/Zeitgeist/templates/_iframeBusterHeader.twig
diff --git a/plugins/CoreHome/templates/index_before_menu.twig b/plugins/Zeitgeist/templates/_indexBeforeMenu.twig
index 70c2854b61..6293d6f930 100644
--- a/plugins/CoreHome/templates/index_before_menu.twig
+++ b/plugins/Zeitgeist/templates/_indexBeforeMenu.twig
@@ -1,9 +1,9 @@
-{% include "@CoreHome/warning_invalid_host.twig" %}
+{% include "@CoreHome/_warningInvalidHost.twig" %}
 
 {% if (showTopMenu == false or showTopMenu) %}
-    {% include "@CoreHome/top_bar.twig" %}
+    {% include "@CoreHome/_topBar.twig" %}
 {% endif %}
-{% include "@CoreHome/top_screen.twig" %}
+{% include "@CoreHome/_topScreen.twig" %}
 
 <div class="ui-confirm" id="alert">
     <h2></h2>
diff --git a/plugins/CoreHome/templates/js_css_includes.twig b/plugins/Zeitgeist/templates/_jsCssIncludes.twig
index eb9a3cdbb1..eb9a3cdbb1 100644
--- a/plugins/CoreHome/templates/js_css_includes.twig
+++ b/plugins/Zeitgeist/templates/_jsCssIncludes.twig
diff --git a/plugins/CoreHome/templates/js_global_variables.twig b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
index d00ea372e5..d00ea372e5 100644
--- a/plugins/CoreHome/templates/js_global_variables.twig
+++ b/plugins/Zeitgeist/templates/_jsGlobalVariables.twig
diff --git a/plugins/CoreHome/templates/piwik_tag.twig b/plugins/Zeitgeist/templates/_piwikTag.twig
index ec37b774f9..ec37b774f9 100644
--- a/plugins/CoreHome/templates/piwik_tag.twig
+++ b/plugins/Zeitgeist/templates/_piwikTag.twig
diff --git a/plugins/CoreHome/templates/sparkline_footer.twig b/plugins/Zeitgeist/templates/_sparklineFooter.twig
index b8b864d75c..b8b864d75c 100644
--- a/plugins/CoreHome/templates/sparkline_footer.twig
+++ b/plugins/Zeitgeist/templates/_sparklineFooter.twig
diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig
index de3969a148..a5746c5847 100644
--- a/plugins/Zeitgeist/templates/admin.twig
+++ b/plugins/Zeitgeist/templates/admin.twig
@@ -12,40 +12,40 @@
 
             {{ loadJavascriptTranslations(['CoreAdminHome','CoreHome'])|raw }}
 
-            {% include "@CoreHome/js_global_variables.twig" %}
-            {% include "@CoreHome/js_css_includes.twig" %}
+            {% include "_jsGlobalVariables.twig" %}
+            {% include "_jsCssIncludes.twig" %}
             <!--[if IE]>
             <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
             <![endif]-->
-            {% include "@CoreHome/iframe_buster_header.twig" %}
+            {% include "_iframeBusterHeader.twig" %}
         {% endblock %}
     </head>
     <body>
-    {% include "@CoreHome/iframe_buster_body.twig" %}
+    {% include "_iframeBusterBody.twig" %}
 
         <div id="root">
             {% if showTopMenu is not defined or showTopMenu %}
                 {% set showSitesSelection = false %}
                 {% set showPeriodSelection = false %}
-                {% include "@CoreHome/top_bar.twig" %}
+                {% include "@CoreHome/_topBar.twig" %}
             {% endif %}
 
             <div id="header">
-                {% include "@CoreHome/logo.twig" %}
-                {% if showPeriodSelection %}{% include "@CoreHome/period_select.twig"%}{% endif %}
-                {% include "@CoreHome/js_disabled_notice.twig" %}
+                {% include "@CoreHome/_logo.twig" %}
+                {% if showPeriodSelection %}{% include "@CoreHome/_periodSelect.twig"%}{% endif %}
+                {% include "@CoreHome/_javaScriptDisabled.twig" %}
             </div>
 
             {% import 'ajaxMacros.twig' as ajax %}
             {{ ajax.requestErrorDiv }}
             <div id="container">
                 {% if showMenu is not defined or showMenu %}
-                    {% include "@CoreAdminHome/menu.twig" %}
+                    {% include "@CoreAdminHome/_menu.twig" %}
                 {% endif %}
 
                 <div id="content" class="admin">
 
-                    {% include "@CoreHome/header_message.twig" %}
+                    {% include "@CoreHome/_headerMessage.twig" %}
 
                     {% if configFileNotWritable is not empty %}
                     <div class="ajaxSuccess" style="display:inline-block">
@@ -68,7 +68,7 @@
                         <input role="no" type="button" value="{{ 'General_Ok'|translate }}"/>
                     </div>
 
-                    {% include "@CoreHome/warning_invalid_host.twig" %}
+                    {% include "@CoreHome/_warningInvalidHost.twig" %}
 
                     {# missing plugins warning #}
                     {% if isSuperUser and missingPluginsWarning is not empty %}
@@ -90,7 +90,7 @@
 
                 </div>
             </div>
-            {% include "@CoreHome/piwik_tag.twig" %}
+            {% include "_piwikTag.twig" %}
         </div>
     </body>
 </html>
diff --git a/plugins/Zeitgeist/templates/dashboard.twig b/plugins/Zeitgeist/templates/dashboard.twig
index f476227885..fb6c675dbb 100644
--- a/plugins/Zeitgeist/templates/dashboard.twig
+++ b/plugins/Zeitgeist/templates/dashboard.twig
@@ -11,28 +11,28 @@
             <meta name="description" content="Web Analytics report for '{{ siteName }}' - Piwik"/>
             <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
             {{ loadJavascriptTranslations(['CoreHome','Annotations'])|raw }}
-            {% include "@CoreHome/js_global_variables.twig" %}
+            {% include "_jsGlobalVariables.twig" %}
             <!--[if lt IE 9]>
             <script language="javascript" type="text/javascript" src="libs/jqplot/excanvas.min.js"></script>
             <![endif]-->
-            {% include "@CoreHome/js_css_includes.twig" %}
+            {% include "_jsCssIncludes.twig" %}
             <!--[if IE]>
             <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/ieonly.css"/>
             <![endif]-->
-            {% include "@CoreHome/iframe_buster_header.twig" %}
+            {% include "_iframeBusterHeader.twig" %}
         {% endblock %}
     </head>
     <body>
-    {% include "@CoreHome/iframe_buster_body.twig" %}
+    {% include "_iframeBusterBody.twig" %}
 
     <div id="root">
-        {% include "@CoreHome/index_before_menu.twig" %}
+        {% include "_indexBeforeMenu.twig" %}
 
         {% block content %}
         {% endblock %}
     </div>
 
-    {% include "@CoreHome/piwik_tag.twig" %}
+    {% include "_piwikTag.twig" %}
 
     </body>
 </html>
diff --git a/plugins/Zeitgeist/templates/simple_structure_footer.tpl b/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl
index 9943ff0f85..9943ff0f85 100644
--- a/plugins/Zeitgeist/templates/simple_structure_footer.tpl
+++ b/plugins/Zeitgeist/templates/simpleLayoutFooter.tpl
diff --git a/plugins/Zeitgeist/templates/simple_structure_header.tpl b/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl
index 364ab16fb3..364ab16fb3 100644
--- a/plugins/Zeitgeist/templates/simple_structure_header.tpl
+++ b/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl