diff --git a/core/API/DataTableManipulator/ReportTotalsCalculator.php b/core/API/DataTableManipulator/ReportTotalsCalculator.php
index 246b2c6f6dcb16d4a9932c552d0a954bc344feca..988fd41bd5ffa94577f7dfb1c39a5a7d1c618522 100644
--- a/core/API/DataTableManipulator/ReportTotalsCalculator.php
+++ b/core/API/DataTableManipulator/ReportTotalsCalculator.php
@@ -13,7 +13,7 @@ namespace Piwik\API\DataTableManipulator;
 use Piwik\API\DataTableManipulator;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\Period\Range;
 use Piwik\Period;
 use Piwik\Piwik;
diff --git a/core/DataTable.php b/core/DataTable.php
index 7550bc4f254f882ec4b847253e3c936053ab06e1..aa97941971c493138389ffcc40a19f7f48ef77f2 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -14,7 +14,7 @@ namespace Piwik;
 use Closure;
 use Exception;
 use Piwik\DataTable\DataTableInterface;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Html;
 use Piwik\DataTable\Row;
@@ -85,7 +85,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Common.php';
  * applied to DataTable\Map instances. So you can visit every DataTable in a {@link DataTable\Map}
  * without having to write a recursive visiting function.
  * 
- * All predefined filters exist in the **Piwik\DataTable\Filter** namespace.
+ * All predefined filters exist in the **Piwik\DataTable\BaseFilter** namespace.
  * 
  * _Note: For convenience, [anonymous functions](http://www.php.net/manual/en/functions.anonymous.php)
  * can be used as DataTable filters._
@@ -255,7 +255,7 @@ class DataTable implements DataTableInterface
     protected $tableSortedBy = false;
 
     /**
-     * List of Filter queued to this table
+     * List of BaseFilter queued to this table
      *
      * @var array
      */
@@ -399,7 +399,7 @@ class DataTable implements DataTableInterface
      * to all subtables as well.
      *
      * @param string|Closure $className Class name, eg. `"Sort"` or "Piwik\DataTable\Filters\Sort"`. If no
-     *                                  namespace is supplied, `Piwik\DataTable\Filter` is assumed. This parameter
+     *                                  namespace is supplied, `Piwik\DataTable\BaseFilter` is assumed. This parameter
      *                                  can also be a closure that takes a DataTable as its first parameter.
      * @param array $parameters Array of extra parameters to pass to the filter.
      */
diff --git a/core/DataTable/Filter.php b/core/DataTable/BaseFilter.php
similarity index 95%
rename from core/DataTable/Filter.php
rename to core/DataTable/BaseFilter.php
index 99bcd08c85f06b08b33782ed6ebe3b2ea73266a2..29cbd7c3abd60620596d3e397748d1ba8bf27ff2 100644
--- a/core/DataTable/Filter.php
+++ b/core/DataTable/BaseFilter.php
@@ -25,14 +25,14 @@ use Piwik\DataTable\Row;
  * Filters are called with a DataTable instance and extra parameters that are specified
  * in {@link Piwik\DataTable::filter()} and {@link Piwik\DataTable::queueFilter()}.
  * 
- * To see examples of Filters look at the existing ones in the Piwik\DataTable\Filter
+ * To see examples of Filters look at the existing ones in the Piwik\DataTable\BaseFilter
  * namespace.
  * 
  * @package Piwik
  * @subpackage DataTable
  * @api
  */
-abstract class Filter
+abstract class BaseFilter
 {
     /**
      * @var bool
@@ -58,7 +58,7 @@ abstract class Filter
 
     /**
      * Enables/Disables recursive filtering. Whether this property is actually used
-     * is up to the derived Filter class.
+     * is up to the derived BaseFilter class.
      *
      * @param bool $enable
      */
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
index 53f555a274febe1093dcab34801050c027a5111b..39656ecc2df42cddae1f8ae8cdbf0fdf89b9f28a 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -10,7 +10,7 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Row;
 use Piwik\DataTable;
 use Piwik\Metrics;
@@ -39,7 +39,7 @@ use Piwik\Metrics;
  * @subpackage DataTable
  * @api
  */
-class AddColumnsProcessedMetrics extends Filter
+class AddColumnsProcessedMetrics extends BaseFilter
 {
     protected $invalidDivision = 0;
     protected $roundPrecision = 2;
diff --git a/core/DataTable/Filter/AddSummaryRow.php b/core/DataTable/Filter/AddSummaryRow.php
index 80bf0e8a94e90ed50ee435f865e6a594eed1c1a6..26a1a4f3d20edfb86cabf678b34c327d8a75d215 100644
--- a/core/DataTable/Filter/AddSummaryRow.php
+++ b/core/DataTable/Filter/AddSummaryRow.php
@@ -10,7 +10,7 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable;
 use Piwik\DataTable\Row\DataTableSummaryRow;
 
@@ -28,7 +28,7 @@ use Piwik\DataTable\Row\DataTableSummaryRow;
  * @subpackage DataTable
  * @api
  */
-class AddSummaryRow extends Filter
+class AddSummaryRow extends BaseFilter
 {
     /**
      * Constructor.
diff --git a/core/DataTable/Filter/ColumnCallbackAddColumn.php b/core/DataTable/Filter/ColumnCallbackAddColumn.php
index d65d844e9c7329813d6bf47ee1b03559defcd26e..0cbd4a8b069e0e0b579c888ee6f43162248e885c 100755
--- a/core/DataTable/Filter/ColumnCallbackAddColumn.php
+++ b/core/DataTable/Filter/ColumnCallbackAddColumn.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Adds a new column to every row of a {@link DataTable} based on the result of callback.
@@ -28,7 +28,7 @@ use Piwik\DataTable\Filter;
  * @subpackage DataTable
  * @api
  */
-class ColumnCallbackAddColumn extends Filter
+class ColumnCallbackAddColumn extends BaseFilter
 {
     /**
      * The names of the columns to pass to the callback.
diff --git a/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php b/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php
index 47d3825cb5b1f9376ab2b269450a4026fcf684ca..db673db2e4dde28332ef77e515631d61605d6f17 100644
--- a/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php
+++ b/core/DataTable/Filter/ColumnCallbackAddColumnQuotient.php
@@ -10,7 +10,7 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
@@ -29,7 +29,7 @@ use Piwik\DataTable\Row;
  * @subpackage DataTable
  * @api
  */
-class ColumnCallbackAddColumnQuotient extends Filter
+class ColumnCallbackAddColumnQuotient extends BaseFilter
 {
     protected $table;
     protected $columnValueToRead;
diff --git a/core/DataTable/Filter/ColumnCallbackAddMetadata.php b/core/DataTable/Filter/ColumnCallbackAddMetadata.php
index f9a092457f865cda5945f5fe86ce63d377b67069..2e0bf833d4af4f99003f449249b70311a34791ba 100644
--- a/core/DataTable/Filter/ColumnCallbackAddMetadata.php
+++ b/core/DataTable/Filter/ColumnCallbackAddMetadata.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Executes a callback for each row of a {@link DataTable} and adds the result as a new
@@ -25,7 +25,7 @@ use Piwik\DataTable\Filter;
  * @subpackage DataTable
  * @api
  */
-class ColumnCallbackAddMetadata extends Filter
+class ColumnCallbackAddMetadata extends BaseFilter
 {
     private $columnsToRead;
     private $functionToApply;
diff --git a/core/DataTable/Filter/ColumnCallbackDeleteRow.php b/core/DataTable/Filter/ColumnCallbackDeleteRow.php
index cab41a039d18963ec842b8e871a6db9fbad175f3..7a01cbed589831aacc589f6bc16f38db11b751b4 100644
--- a/core/DataTable/Filter/ColumnCallbackDeleteRow.php
+++ b/core/DataTable/Filter/ColumnCallbackDeleteRow.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Deletes all rows for which a callback returns true.
@@ -27,7 +27,7 @@ use Piwik\DataTable\Filter;
  * @subpackage DataTable
  * @api
  */
-class ColumnCallbackDeleteRow extends Filter
+class ColumnCallbackDeleteRow extends BaseFilter
 {
     private $columnToFilter;
     private $function;
diff --git a/core/DataTable/Filter/ColumnCallbackReplace.php b/core/DataTable/Filter/ColumnCallbackReplace.php
index 2b56276d1c0b0aac47d2ed956617ec88b0298855..4bd1619e0c494c3959820974629b66d99ea3a222 100644
--- a/core/DataTable/Filter/ColumnCallbackReplace.php
+++ b/core/DataTable/Filter/ColumnCallbackReplace.php
@@ -10,7 +10,7 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 
@@ -34,7 +34,7 @@ use Piwik\DataTable\Row;
  * @package Piwik
  * @subpackage DataTable
  */
-class ColumnCallbackReplace extends Filter
+class ColumnCallbackReplace extends BaseFilter
 {
     private $columnsToFilter;
     private $functionToApply;
diff --git a/core/DataTable/Filter/ColumnDelete.php b/core/DataTable/Filter/ColumnDelete.php
index 9a63f2b735eae05ade205fe552925d58144ba7d5..17bbe0cb824c2832c23a3202248d8a14b7fa76ac 100644
--- a/core/DataTable/Filter/ColumnDelete.php
+++ b/core/DataTable/Filter/ColumnDelete.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Filter that will remove columns from a {@link DataTable} using either a blacklist,
@@ -31,7 +31,7 @@ use Piwik\DataTable\Filter;
  * @subpackage DataTable
  * @api
  */
-class ColumnDelete extends Filter
+class ColumnDelete extends BaseFilter
 {
     /**
      * The columns that should be removed from DataTable rows.
diff --git a/core/DataTable/Filter/ExcludeLowPopulation.php b/core/DataTable/Filter/ExcludeLowPopulation.php
index e998aa321df7200b2745cf3ceba34183369a35da..168217ae8c5ab5bd6e81209603818b5213606187 100644
--- a/core/DataTable/Filter/ExcludeLowPopulation.php
+++ b/core/DataTable/Filter/ExcludeLowPopulation.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Deletes all rows for which a specific column has a value that is lower than
@@ -35,7 +35,7 @@ use Piwik\DataTable\Filter;
  * @subpackage DataTable
  * @api
  */
-class ExcludeLowPopulation extends Filter
+class ExcludeLowPopulation extends BaseFilter
 {
     const MINIMUM_SIGNIFICANT_PERCENTAGE_THRESHOLD = 0.02;
 
diff --git a/core/DataTable/Filter/GroupBy.php b/core/DataTable/Filter/GroupBy.php
index 0eef76c0d110480cb7b9a7eedd5a9bc2666ff674..28aec21f2ffcb9359d4b21543bf4de658551baf7 100755
--- a/core/DataTable/Filter/GroupBy.php
+++ b/core/DataTable/Filter/GroupBy.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * DataTable filter that will group {@link DataTable} rows together based on the results
@@ -30,7 +30,7 @@ use Piwik\DataTable\Filter;
  * @subpackage DataTable
  * @api
  */
-class GroupBy extends Filter
+class GroupBy extends BaseFilter
 {
     /**
      * The name of the columns to reduce.
diff --git a/core/DataTable/Filter/Limit.php b/core/DataTable/Filter/Limit.php
index dd990223d6ff672c0f7b207c647142d53da9430e..f6ed744653277512a00084a52886ec05daa4a4e4 100644
--- a/core/DataTable/Filter/Limit.php
+++ b/core/DataTable/Filter/Limit.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Delete all rows from the table that are not in the given [offset, offset+limit) range.
@@ -25,7 +25,7 @@ use Piwik\DataTable\Filter;
  * @subpackage DataTable
  * @api
  */
-class Limit extends Filter
+class Limit extends BaseFilter
 {
     /**
      * Constructor.
diff --git a/core/DataTable/Filter/MetadataCallbackAddMetadata.php b/core/DataTable/Filter/MetadataCallbackAddMetadata.php
index b9a88b08b33438d60d249690f896f31539b1a2f3..f7130311133e432a2285802d886dd08f523e93d6 100644
--- a/core/DataTable/Filter/MetadataCallbackAddMetadata.php
+++ b/core/DataTable/Filter/MetadataCallbackAddMetadata.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Executes a callback for each row of a {@link DataTable} and adds the result to the
@@ -26,7 +26,7 @@ use Piwik\DataTable\Filter;
  * @subpackage DataTable
  * @api
  */
-class MetadataCallbackAddMetadata extends Filter
+class MetadataCallbackAddMetadata extends BaseFilter
 {
     private $metadataToRead;
     private $functionToApply;
diff --git a/core/DataTable/Filter/Pattern.php b/core/DataTable/Filter/Pattern.php
index 95875a00460ab136e630de6651b2ebb10c33bde4..6619fe4134c6f8e240933607a0bbf374819897c7 100644
--- a/core/DataTable/Filter/Pattern.php
+++ b/core/DataTable/Filter/Pattern.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Deletes every row for which a specific column does not match a supplied regex pattern.
@@ -25,7 +25,7 @@ use Piwik\DataTable\Filter;
  * @subpackage DataTable
  * @api
  */
-class Pattern extends Filter
+class Pattern extends BaseFilter
 {
     private $columnToFilter;
     private $patternToSearch;
diff --git a/core/DataTable/Filter/PatternRecursive.php b/core/DataTable/Filter/PatternRecursive.php
index 0970a1d29ea520fa56cba2801183de5e7e71b866..1a82384d5e732c5c0732bb1c07d56ee955e15c7f 100644
--- a/core/DataTable/Filter/PatternRecursive.php
+++ b/core/DataTable/Filter/PatternRecursive.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Exception;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 
@@ -28,7 +28,7 @@ use Piwik\DataTable\Manager;
  * @subpackage DataTable
  * @api
  */
-class PatternRecursive extends Filter
+class PatternRecursive extends BaseFilter
 {
     private $columnToFilter;
     private $patternToSearch;
diff --git a/core/DataTable/Filter/RangeCheck.php b/core/DataTable/Filter/RangeCheck.php
index bac24d4acc92a7c11111193358553da7f5283ba4..a5005b2bfd023bfed11ab5a46f8e3193e37b84fd 100644
--- a/core/DataTable/Filter/RangeCheck.php
+++ b/core/DataTable/Filter/RangeCheck.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Check range
@@ -19,7 +19,7 @@ use Piwik\DataTable\Filter;
  * @package Piwik
  * @subpackage DataTable
  */
-class RangeCheck extends Filter
+class RangeCheck extends BaseFilter
 {
     static public $minimumValue = 0.00;
     static public $maximumValue = 100.0;
diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php
index 02c8f9f500cb1f1eb9263a39dc987534beb6bc48..7476616558d1485c2cc63af0d4eae53ff4097c35 100644
--- a/core/DataTable/Filter/ReplaceColumnNames.php
+++ b/core/DataTable/Filter/ReplaceColumnNames.php
@@ -10,7 +10,7 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Simple;
 use Piwik\DataTable;
 use Piwik\Metrics;
@@ -41,7 +41,7 @@ use Piwik\Tracker\GoalManager;
  * @subpackage DataTable
  * @api
  */
-class ReplaceColumnNames extends Filter
+class ReplaceColumnNames extends BaseFilter
 {
     protected $mappingToApply;
 
diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
index bb1d15df46488f53b3f2ceeb630de560f4b1fcaf..9e3c983850fa03e9b45d5b4a95dd854e7408bc6c 100644
--- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php
+++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
@@ -10,7 +10,7 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\Piwik;
@@ -32,7 +32,7 @@ use Piwik\Piwik;
  * @subpackage DataTable
  * @api
  */
-class ReplaceSummaryRowLabel extends Filter
+class ReplaceSummaryRowLabel extends BaseFilter
 {
     /**
      * Constructor.
diff --git a/core/DataTable/Filter/SafeDecodeLabel.php b/core/DataTable/Filter/SafeDecodeLabel.php
index b573fc9a95df4711530c621f59dcc9b2e2d3a593..9b658f9013dabd6b85b0419c4b3356abac23f049 100644
--- a/core/DataTable/Filter/SafeDecodeLabel.php
+++ b/core/DataTable/Filter/SafeDecodeLabel.php
@@ -11,7 +11,7 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * Sanitizes DataTable labels as an extra precaution. Called internally by Piwik.
@@ -19,7 +19,7 @@ use Piwik\DataTable\Filter;
  * @package Piwik
  * @subpackage DataTable
  */
-class SafeDecodeLabel extends Filter
+class SafeDecodeLabel extends BaseFilter
 {
     private $columnToDecode;
 
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
index 16ebd80dc43fd72e4378b85de5829b178b95e820..7a58a877ae4482cb661518cbf628a851ec06e3de 100644
--- a/core/DataTable/Filter/Sort.php
+++ b/core/DataTable/Filter/Sort.php
@@ -10,7 +10,7 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
 use Piwik\DataTable;
@@ -25,7 +25,7 @@ use Piwik\Metrics;
  * @subpackage DataTable
  * @api
  */
-class Sort extends Filter
+class Sort extends BaseFilter
 {
     protected $columnToSort;
     protected $order;
diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index 5896048a6a3e2ad5ca5f353b9e03d5cac6e3a021..bf7d71fe2cd3b89bec148bd372cd582c5398cd75 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -10,7 +10,7 @@
  */
 namespace Piwik\DataTable\Filter;
 
-use Piwik\DataTable\Filter;
+use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Piwik;
@@ -35,7 +35,7 @@ use Piwik\Piwik;
  * @subpackage DataTable
  * @api
  */
-class Truncate extends Filter
+class Truncate extends BaseFilter
 {
     /**
      * Constructor.