diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php
index 1f8bf40ce8ec9b708581b2e41fb16bd4f5e8285f..b2e4474fe9b60e0e064fbe467f6efc0edc4a6b38 100644
--- a/core/DataTable/Renderer.php
+++ b/core/DataTable/Renderer.php
@@ -79,8 +79,11 @@ abstract class Piwik_DataTable_Renderer
 
 	/**
 	 * Output HTTP Content-Type header
+	 * @param Piwik_DataTable_Renderer $instance
+	 * 			can be used to access the configuration of the current instance
+	 * 			(used in subclass Piwik_DataTable_Renderer_Csv)
 	 */
-	protected static function renderHeader()
+	protected static function renderHeader($instance=null)
 	{
 		@header('Content-Type: text/html; charset=utf-8');
 	}
diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php
index 652f4eb2a0ae2944be3714e707c224b6e5d064ed..99504200424a6b6c045ec75ba33fe33296733185 100644
--- a/core/DataTable/Renderer/Csv.php
+++ b/core/DataTable/Renderer/Csv.php
@@ -82,7 +82,7 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 			return 'No data available';
 		}
 
-		self::renderHeader(/*$this*/);
+		self::renderHeader($this);
 
 		if($this->convertToUnicode 
 			&& function_exists('mb_convert_encoding'))
@@ -373,10 +373,8 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 		return $value;
 	}
 	
-	protected static function renderHeader(/*$instance*/)
+	protected static function renderHeader($instance=null)
 	{
-// @todo http://dev.piwik.org/trac/ticket/2809
-/*
 		$fileName = 'Piwik '.Piwik_Translate('General_Export');
 		
 		$period = Piwik_Common::getRequestVar('period', false);
@@ -403,8 +401,6 @@ class Piwik_DataTable_Renderer_Csv extends Piwik_DataTable_Renderer
 			$fileName .= ' _ '.$meta['name']
 					.' _ '.$prettyDate.'.csv';
 		}
-*/
-		$fileName = 'piwik-report-export.csv';
 
 		// silent fail otherwise unit tests fail
 		@header('Content-Type: application/vnd.ms-excel');
diff --git a/core/DataTable/Renderer/Json.php b/core/DataTable/Renderer/Json.php
index ee991b74f5eefe748bc99793f256d0fe2a2f3956..bb0907445d216e307ef91d8b4aee1b5be4b09d4e 100644
--- a/core/DataTable/Renderer/Json.php
+++ b/core/DataTable/Renderer/Json.php
@@ -74,7 +74,7 @@ class Piwik_DataTable_Renderer_Json extends Piwik_DataTable_Renderer
 		return $str;
 	}
 	
-	protected static function renderHeader()
+	protected static function renderHeader($instance=null)
 	{
 		@header('Content-Type: application/json; charset=utf-8');
 		Piwik::overrideCacheControlHeaders();
diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php
index accd5e5376502b783bc345e4360e9239fa0ac480..d0e093b2e66f2aa4129a711e94f27d970a3d1b90 100644
--- a/core/DataTable/Renderer/Rss.php
+++ b/core/DataTable/Renderer/Rss.php
@@ -78,7 +78,7 @@ class Piwik_DataTable_Renderer_Rss extends Piwik_DataTable_Renderer
 		return $header . $out . $footer;
 	}
 
-	protected static function renderHeader()
+	protected static function renderHeader($instance=null)
 	{
 		@header('Content-Type: text/xml; charset=utf-8');
 	}
diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php
index 62ec9c5df9588e1b221742d52f129d7674d04336..ea3a3a626ce2972e8b046e037de8c70be6326a23 100644
--- a/core/DataTable/Renderer/Xml.php
+++ b/core/DataTable/Renderer/Xml.php
@@ -335,7 +335,7 @@ class Piwik_DataTable_Renderer_Xml extends Piwik_DataTable_Renderer
 		return $out;
 	}
 	
-	protected static function renderHeader()
+	protected static function renderHeader($instance=null)
 	{
 		// silent fail because otherwise it throws an exception in the unit tests
 		@header('Content-Type: text/xml; charset=utf-8');