diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
index c929c9a4497109ac1469c0d9bc5a6620c8c07c1d..d8ff678bc817b8c3dd5304410116fb11fbf1e6a9 100644
--- a/core/ReportRenderer/Html.php
+++ b/core/ReportRenderer/Html.php
@@ -189,10 +189,9 @@ class Html extends ReportRenderer
 
         $additionalFile['filename'] =
             sprintf(
-                '%s - %s - %s %d - %s %d%s.png',
+                '%s - %s - %d - %s %d%s.png',
                 $processedReportMetadata['name'],
                 $prettyDate,
-                Piwik::translate('General_Website'),
                 $report['idsite'],
                 Piwik::translate('General_Report'),
                 $report['idreport'],
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index a42b5bb209ad90fb0593051079757546d9859ebd..9e91defd0626dc578feebcf6b9b41d7dd5d172e8 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -560,7 +560,7 @@ class API extends \Piwik\Plugin\API
     private static function getReportSubjectAndReportTitle($websiteName, $reports)
     {
         // if the only report is "All websites", we don't display the site name
-        $reportTitle = Piwik::translate('General_Website') . " " . $websiteName;
+        $reportTitle = $websiteName;
         $reportSubject = $websiteName;
         if (count($reports) == 1
             && $reports[0] == 'MultiSites_getAll'
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 9ce8430f42f0a8cce9eadd68cf5241a304e6f770..676f8f9cf19f9dac5e91fd631aead51c71448ea6 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -24,6 +24,7 @@ require_once 'ScheduledReports/ScheduledReports.php';
  * Class Plugins_ScheduledReportsTest
  *
  * @group Plugins
+ * @group ScheduledReportsTest
  */
 class Plugins_ScheduledReportsTest extends DatabaseTestCase
 {
@@ -399,8 +400,8 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
     public function getGetReportSubjectAndReportTitleTestCases()
     {
         return array(
-            array('Piwik.org', 'General_Website Piwik.org', 'Piwik.org', array('UserSettings_getBrowserType')),
-            array('Piwik.org', 'General_Website Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'UserSettings_getBrowserType')),
+            array('<Piwik.org>', '<Piwik.org>', '<Piwik.org>', array('UserSettings_getBrowserType')),
+            array('Piwik.org', 'Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'UserSettings_getBrowserType')),
             array('General_MultiSitesSummary', 'General_MultiSitesSummary', 'Piwik.org', array('MultiSites_getAll')),
         );
     }