diff --git a/lib/cartodb/cache/named_map_provider_cache.js b/lib/cartodb/cache/named_map_provider_cache.js
index e5a3f932..dac98b21 100644
--- a/lib/cartodb/cache/named_map_provider_cache.js
+++ b/lib/cartodb/cache/named_map_provider_cache.js
@@ -1,6 +1,6 @@
 var _ = require('underscore');
 var dot = require('dot');
-var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider');
+var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
 var MapConfigNamedLayersAdapter = require('../models/mapconfig/adapter/mapconfig-named-layers-adapter');
 var AnalysisMapConfigAdapter = require('../models/mapconfig/adapter/analysis-mapconfig-adapter');
 var templateName = require('../backends/template_maps').templateName;
diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index 9f8b609f..8e68e9fd 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -17,7 +17,7 @@ var NamedMapsCacheEntry = require('../cache/model/named_maps_entry');
 
 var MapConfigNamedLayersAdapter = require('../models/mapconfig/adapter/mapconfig-named-layers-adapter');
 var AnalysisMapConfigAdapter = require('../models/mapconfig/adapter/analysis-mapconfig-adapter');
-var NamedMapMapConfigProvider = require('../models/mapconfig/named_map_provider');
+var NamedMapMapConfigProvider = require('../models/mapconfig/provider/named-map-provider');
 var CreateLayergroupMapConfigProvider = require('../models/mapconfig/provider/create-layergroup-provider');
 var SqlWrapMapConfigAdapter = require('../models/mapconfig/adapter/sql-wrap-mapconfig-adapter');
 
diff --git a/lib/cartodb/models/mapconfig/named_map_provider.js b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
similarity index 98%
rename from lib/cartodb/models/mapconfig/named_map_provider.js
rename to lib/cartodb/models/mapconfig/provider/named-map-provider.js
index e1ad6fea..e05998e1 100644
--- a/lib/cartodb/models/mapconfig/named_map_provider.js
+++ b/lib/cartodb/models/mapconfig/provider/named-map-provider.js
@@ -4,9 +4,9 @@ var crypto = require('crypto');
 var dot = require('dot');
 var step = require('step');
 var MapConfig = require('windshaft').model.MapConfig;
-var templateName = require('../../backends/template_maps').templateName;
+var templateName = require('../../../backends/template_maps').templateName;
 var QueryTables = require('cartodb-query-tables');
-var SqlWrapMapConfigAdapter = require('./adapter/sql-wrap-mapconfig-adapter');
+var SqlWrapMapConfigAdapter = require('./../adapter/sql-wrap-mapconfig-adapter');
 
 /**
  * @constructor