diff --git a/lib/api/api-router.js b/lib/api/api-router.js
index 8785a50e..7ad27b9c 100644
--- a/lib/api/api-router.js
+++ b/lib/api/api-router.js
@@ -7,7 +7,7 @@ const cartodbRedis = require('cartodb-redis');
 
 const windshaft = require('windshaft');
 
-const PgConnection = require('../backends/pg_connection');
+const PgConnection = require('../backends/pg-connection');
 const AnalysisBackend = require('../backends/analysis');
 const AnalysisStatusBackend = require('../backends/analysis-status');
 const DataviewBackend = require('../backends/dataview');
diff --git a/lib/backends/pg_connection.js b/lib/backends/pg-connection.js
similarity index 100%
rename from lib/backends/pg_connection.js
rename to lib/backends/pg-connection.js
diff --git a/test/integration/mapconfig_named_layers_datasource.js b/test/integration/mapconfig_named_layers_datasource.js
index 55247105..ff208a3a 100644
--- a/test/integration/mapconfig_named_layers_datasource.js
+++ b/test/integration/mapconfig_named_layers_datasource.js
@@ -5,7 +5,7 @@ require('../support/test_helper');
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../lib/backends/template_maps.js');
-var PgConnection = require(__dirname + '/../../lib/backends/pg_connection');
+var PgConnection = require('../../lib/backends/pg-connection');
 var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter');
 
 // configure redis pool instance to use in tests
diff --git a/test/integration/mapconfig_named_layers_expanded.js b/test/integration/mapconfig_named_layers_expanded.js
index e0f3e71e..558f8852 100644
--- a/test/integration/mapconfig_named_layers_expanded.js
+++ b/test/integration/mapconfig_named_layers_expanded.js
@@ -5,7 +5,7 @@ require('../support/test_helper');
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var TemplateMaps = require('../../lib/backends/template_maps.js');
-var PgConnection = require(__dirname + '/../../lib/backends/pg_connection');
+var PgConnection = require('../../lib/backends/pg-connection');
 var MapConfigNamedLayersAdapter = require('../../lib/models/mapconfig/adapter/mapconfig-named-layers-adapter');
 
 describe('mapconfig-named-layers-adapter', function() {
diff --git a/test/integration/mapconfig_overviews_adapter.js b/test/integration/mapconfig_overviews_adapter.js
index b737c058..b6c7a583 100644
--- a/test/integration/mapconfig_overviews_adapter.js
+++ b/test/integration/mapconfig_overviews_adapter.js
@@ -5,7 +5,7 @@ require('../support/test_helper');
 var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
-var PgConnection = require(__dirname + '/../../lib/backends/pg_connection');
+var PgConnection = require('../../lib/backends/pg-connection');
 var PgQueryRunner = require('../../lib/backends/pg_query_runner');
 var OverviewsMetadataBackend = require('../../lib/backends/overviews-metadata');
 var FilterStatsBackend = require('../../lib/backends/filter-stats');
diff --git a/test/integration/overviews-metadata-api.js b/test/integration/overviews-metadata-api.js
index 761ccad0..20f86ff3 100644
--- a/test/integration/overviews-metadata-api.js
+++ b/test/integration/overviews-metadata-api.js
@@ -7,7 +7,7 @@ var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
 
-var PgConnection = require('../../lib/backends/pg_connection');
+var PgConnection = require('../../lib/backends/pg-connection');
 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 9c6b80b2..e2288a43 100644
--- a/test/integration/pg-query-runner.js
+++ b/test/integration/pg-query-runner.js
@@ -7,7 +7,7 @@ var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
 
-var PgConnection = require('../../lib/backends/pg_connection');
+var PgConnection = require('../../lib/backends/pg-connection');
 var PgQueryRunner = require('../../lib/backends/pg_query_runner');
 
 
diff --git a/test/integration/query-tables.js b/test/integration/query-tables.js
index bf21f34c..341b722b 100644
--- a/test/integration/query-tables.js
+++ b/test/integration/query-tables.js
@@ -7,7 +7,7 @@ var assert = require('assert');
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
 
-var PgConnection = require('../../lib/backends/pg_connection');
+var PgConnection = require('../../lib/backends/pg-connection');
 
 var QueryTables = require('cartodb-query-tables').queryTables;
 
diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context.test.js
index 21046391..5442db90 100644
--- a/test/unit/cartodb/prepare-context.test.js
+++ b/test/unit/cartodb/prepare-context.test.js
@@ -5,7 +5,7 @@ var _ = require('underscore');
 
 var RedisPool = require('redis-mpool');
 var cartodbRedis = require('cartodb-redis');
-var PgConnection = require('../../../lib/backends/pg_connection');
+var PgConnection = require('../../../lib/backends/pg-connection');
 var AuthBackend = require('../../../lib/backends/auth');
 var TemplateMaps = require('../../../lib/backends/template_maps');