diff --git a/lib/cartodb/api/filter_stats_api.js b/lib/cartodb/api/filter_stats_api.js
index d872ad8c..31e90a25 100644
--- a/lib/cartodb/api/filter_stats_api.js
+++ b/lib/cartodb/api/filter_stats_api.js
@@ -1,6 +1,6 @@
 var _ = require('underscore');
 var step = require('step');
-var CamshaftFilter = require('../models/filter/camshaft');
+var AnalysisFilter = require('../models/filter/analysis');
 
 function FilterStatsApi(pgQueryRunner) {
     this.pgQueryRunner = pgQueryRunner;
@@ -40,8 +40,8 @@ FilterStatsApi.prototype.getFilterStats = function (username, unfiltered_query,
       },
       function getFilteredRows() {
           if ( filters && !_.isEmpty(filters)) {
-              var camshaftFilter = new CamshaftFilter(filters);
-              var query = camshaftFilter.sql(unfiltered_query);
+              var analysisFilter = new AnalysisFilter(filters);
+              var query = analysisFilter.sql(unfiltered_query);
               getEstimatedRows(self.pgQueryRunner, username, query, this);
           } else {
               this(null, null);
diff --git a/lib/cartodb/models/filter/camshaft.js b/lib/cartodb/models/filter/analysis.js
similarity index 80%
rename from lib/cartodb/models/filter/camshaft.js
rename to lib/cartodb/models/filter/analysis.js
index 97cb25b6..a0975662 100644
--- a/lib/cartodb/models/filter/camshaft.js
+++ b/lib/cartodb/models/filter/analysis.js
@@ -1,6 +1,6 @@
 var filters = {
-    category: require('./camshaft/category'),
-    range: require('./camshaft/range')
+    category: require('./analysis/category'),
+    range: require('./analysis/range')
 };
 
 function createFilter(filterDefinition) {
@@ -11,11 +11,11 @@ function createFilter(filterDefinition) {
     return new filters[filterType](filterDefinition.column, filterDefinition.params);
 }
 
-function CamshaftFilters(filters) {
+function AnalysisFilters(filters) {
     this.filters = filters;
 }
 
-CamshaftFilters.prototype.sql = function(rawSql) {
+AnalysisFilters.prototype.sql = function(rawSql) {
   var filters = this.filters || {};
   var applyFilters = {};
 
@@ -32,4 +32,4 @@ CamshaftFilters.prototype.sql = function(rawSql) {
       }, rawSql);
 };
 
-module.exports = CamshaftFilters;
+module.exports = AnalysisFilters;
diff --git a/lib/cartodb/models/filter/camshaft/category.js b/lib/cartodb/models/filter/analysis/category.js
similarity index 97%
rename from lib/cartodb/models/filter/camshaft/category.js
rename to lib/cartodb/models/filter/analysis/category.js
index 6181de7f..0b91655c 100644
--- a/lib/cartodb/models/filter/camshaft/category.js
+++ b/lib/cartodb/models/filter/analysis/category.js
@@ -6,7 +6,7 @@ dot.templateSettings.strip = false;
 
 var filterQueryTpl = dot.template([
     'SELECT *',
-    'FROM ({{=it._sql}}) _camshaft_category_filter',
+    'FROM ({{=it._sql}}) _analysis_category_filter',
     'WHERE {{=it._filters}}'
 ].join('\n'));
 var escapeStringTpl = dot.template('$escape_{{=it._i}}${{=it._value}}$escape_{{=it._i}}$');
diff --git a/lib/cartodb/models/filter/camshaft/range.js b/lib/cartodb/models/filter/analysis/range.js
similarity index 96%
rename from lib/cartodb/models/filter/camshaft/range.js
rename to lib/cartodb/models/filter/analysis/range.js
index f894ca32..4a1ccfa7 100644
--- a/lib/cartodb/models/filter/camshaft/range.js
+++ b/lib/cartodb/models/filter/analysis/range.js
@@ -6,7 +6,7 @@ dot.templateSettings.strip = false;
 var betweenFilterTpl = dot.template('{{=it._column}} BETWEEN {{=it._min}} AND {{=it._max}}');
 var minFilterTpl = dot.template('{{=it._column}} >= {{=it._min}}');
 var maxFilterTpl = dot.template('{{=it._column}} <= {{=it._max}}');
-var filterQueryTpl = dot.template('SELECT * FROM ({{=it._sql}}) _camshaft_range_filter WHERE {{=it._filter}}');
+var filterQueryTpl = dot.template('SELECT * FROM ({{=it._sql}}) _analysis_range_filter WHERE {{=it._filter}}');
 
 function Range(column, filterParams) {
     this.column = column;
diff --git a/lib/cartodb/utils/overviews_query_rewriter.js b/lib/cartodb/utils/overviews_query_rewriter.js
index ebb91fb0..8dcc2f08 100644
--- a/lib/cartodb/utils/overviews_query_rewriter.js
+++ b/lib/cartodb/utils/overviews_query_rewriter.js
@@ -2,7 +2,7 @@ var _ = require('underscore');
 var TableNameParser = require('./table_name_parser');
 
 var BBoxFilter = require('../models/filter/bbox');
-var CamshaftFilter = require('../models/filter/camshaft');
+var AnalysisFilter = require('../models/filter/analysis');
 
 // Minimim number of filtered rows to use overviews
 var FILTER_MIN_ROWS = 65536;
@@ -11,8 +11,8 @@ var FILTER_MAX_FRACTION = 0.2;
 
 function apply_filters_to_query(query, filters, bbox_filter) {
     if ( filters && !_.isEmpty(filters)) {
-        var camshaftFilter = new CamshaftFilter(filters);
-        query = camshaftFilter.sql(query);
+        var analysisFilter = new AnalysisFilter(filters);
+        query = analysisFilter.sql(query);
     }
     if ( bbox_filter ) {
         var bboxFilter = new BBoxFilter(bbox_filter.options, bbox_filter.params);
diff --git a/test/unit/cartodb/overviews_query_rewriter.js b/test/unit/cartodb/overviews_query_rewriter.js
index dd6b0798..c224fed8 100644
--- a/test/unit/cartodb/overviews_query_rewriter.js
+++ b/test/unit/cartodb/overviews_query_rewriter.js
@@ -527,7 +527,7 @@ describe('Overviews query rewriter', function() {
     it('generates query with filters', function(){
         var sql = "SELECT ST_Transform(the_geom, 3857) the_geom_webmercator, cartodb_id, name\
                    FROM (SELECT *\
-                   FROM (select * from table1) _camshaft_category_filter\
+                   FROM (select * from table1) _analysis_category_filter\
                    WHERE name IN ($escape_0$X$escape_0$)) _cdb_analysis_query";
         var data = {
             overviews: {
@@ -555,7 +555,7 @@ describe('Overviews query rewriter', function() {
                   SELECT * FROM table1_ov3, _vovw_scale WHERE _vovw_z = 3\
                   UNION ALL\
                   SELECT * FROM table1, _vovw_scale WHERE _vovw_z > 3\
-                ) AS _vovw_table1) _camshaft_category_filter\
+                ) AS _vovw_table1) _analysis_category_filter\
              WHERE name IN ($escape_0$X$escape_0$)\
         ";
         assertSameSql(overviews_sql, expected_sql);
@@ -564,7 +564,7 @@ describe('Overviews query rewriter', function() {
     it('generates query with filters for specific zoom level', function(){
         var sql = "SELECT ST_Transform(the_geom, 3857) the_geom_webmercator, cartodb_id, name\
                    FROM (SELECT *\
-                   FROM (select * from table1) _camshaft_category_filter\
+                   FROM (select * from table1) _analysis_category_filter\
                    WHERE name IN ($escape_0$X$escape_0$)) _cdb_analysis_query";
         var data = {
             overviews: {
@@ -581,7 +581,7 @@ describe('Overviews query rewriter', function() {
         };
         var overviews_sql = overviewsQueryRewriter.query(sql, data, { zoom_level: 2 });
         var expected_sql = "\
-            SELECT * FROM (SELECT * FROM table1_ov2) _camshaft_category_filter\
+            SELECT * FROM (SELECT * FROM table1_ov2) _analysis_category_filter\
             WHERE name IN ($escape_0$X$escape_0$)\
         ";
         assertSameSql(overviews_sql, expected_sql);
@@ -590,7 +590,7 @@ describe('Overviews query rewriter', function() {
     it('does not generates query with aggressive filtering', function(){
         var sql = "SELECT ST_Transform(the_geom, 3857) the_geom_webmercator, cartodb_id, name\
                    FROM (SELECT *\
-                   FROM (select * from table1) _camshaft_category_filter\
+                   FROM (select * from table1) _analysis_category_filter\
                    WHERE name IN ($escape_0$X$escape_0$)) _cdb_analysis_query";
         var data = {
             overviews: {