diff --git a/lib/api/api-router.js b/lib/api/api-router.js
index 7ad27b9c..c9f1199e 100644
--- a/lib/api/api-router.js
+++ b/lib/api/api-router.js
@@ -12,7 +12,7 @@ const AnalysisBackend = require('../backends/analysis');
 const AnalysisStatusBackend = require('../backends/analysis-status');
 const DataviewBackend = require('../backends/dataview');
 const TemplateMaps = require('../backends/template_maps.js');
-const PgQueryRunner = require('../backends/pg_query_runner');
+const PgQueryRunner = require('../backends/pg-query-runner');
 const StatsBackend = require('../backends/stats');
 const AuthBackend = require('../backends/auth');
 
diff --git a/lib/backends/pg_query_runner.js b/lib/backends/pg-query-runner.js
similarity index 100%
rename from lib/backends/pg_query_runner.js
rename to lib/backends/pg-query-runner.js
diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js
index 24080b52..9a79471f 100644
--- a/test/acceptance/multilayer_server.js
+++ b/test/acceptance/multilayer_server.js
@@ -8,7 +8,7 @@ var _ = require('underscore');
 
 var LayergroupToken = require('../../lib/models/layergroup-token');
 
-var PgQueryRunner = require('../../lib/backends/pg_query_runner');
+var PgQueryRunner = require('../../lib/backends/pg-query-runner');
 var QueryTables = require('cartodb-query-tables').queryTables;
 var CartodbWindshaft = require('../../lib/server');
 var serverOptions = require('../../lib/server_options');
diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js
index b6c7a583..1fe93b47 100644
--- a/test/integration/mapconfig_overviews_adapter.js
+++ b/test/integration/mapconfig_overviews_adapter.js
@@ -6,7 +6,7 @@ var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
 var PgConnection = require('../../lib/backends/pg-connection');
-var PgQueryRunner = require('../../lib/backends/pg_query_runner');
+var PgQueryRunner = require('../../lib/backends/pg-query-runner');
 var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata');
 var FilterStatsBackend = require('../../lib/backends/filter-stats');
 var MapConfigOverviewsAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-overviews-adapter');
diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api.js
index 20f86ff3..f8eb34c2 100644
--- a/test/integration/overviews-metadata-api.js
+++ b/test/integration/overviews-metadata-api.js
@@ -8,7 +8,7 @@ var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
 
 var PgConnection = require('../../lib/backends/pg-connection');
-var PgQueryRunner = require('../../lib/backends/pg_query_runner');
+var PgQueryRunner = require('../../lib/backends/pg-query-runner');
 var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata');
 
 
diff --git a/test/integration/pg-query-runner.js b/test/integration/pg-query-runner.js
index e2288a43..ad6f4443 100644
--- a/test/integration/pg-query-runner.js
+++ b/test/integration/pg-query-runner.js
@@ -8,7 +8,7 @@ var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
 
 var PgConnection = require('../../lib/backends/pg-connection');
-var PgQueryRunner = require('../../lib/backends/pg_query_runner');
+var PgQueryRunner = require('../../lib/backends/pg-query-runner');
 
 
 describe('PgQueryRunner', function() {