diff --git a/.enb/make.js b/.enb/make.js
index 8f1b5e7af..83fde0bf7 100644
--- a/.enb/make.js
+++ b/.enb/make.js
@@ -209,91 +209,103 @@ module.exports = function(config) {
 
             // Base techs
             nodeConfig.addTechs([
-                [techs.bem.bemjsonToBemdecl],
-                [techs.bem.depsOld],
-                [techs.bem.files]
+                [techs.bem.bemjsonToBemdecl, { target : '.tmp.bemdecl.js' }],
+                [techs.bem.depsOld, {
+                    target : '.tmp.deps.js',
+                    bemdeclFile : '.tmp.bemdecl.js'
+                }],
+                [techs.bem.files, {
+                    depsFile : '.tmp.deps.js'
+                }]
             ]);
 
             // Client techs
             nodeConfig.addTechs([
                 [techs.stylus, {
+                    target : '.tmp.css',
                     autoprefixer : {
                         browsers : getBrowsers(platform)
                     }
                 }],
-                [techs.stylus, { target : '?.ie.css', sourceSuffixes : ['styl', 'ie.styl'] }],
+                [techs.stylus, { target : '.tmp.ie.css', sourceSuffixes : ['styl', 'ie.styl'] }],
                 [techs.js, {
-                    target : '?.browser.js',
+                    target : '.tmp.browser.js',
                     sourceSuffixes : ['vanilla.js', 'browser.js', 'js'],
-                    filesTarget : '?.js.files'
+                    filesTarget : '.tmp.js.files'
                 }],
                 [techs.files.merge, {
-                    target : '?.pre.js',
-                    sources : [BEM_TEMPLATE_ENGINE === 'BH'? '?.browser.bh.js' : '?.browser.bemhtml.js', '?.browser.js']
+                    target : '.tmp.pre.js',
+                    sources : [BEM_TEMPLATE_ENGINE === 'BH'? '.tmp.browser.bh.js' : '.tmp.browser.bemhtml.js', '.tmp.browser.js']
                 }],
                 [techs.ym, {
-                    source : '?.pre.js',
-                    target : '?.js'
+                    source : '.tmp.pre.js',
+                    target : '.tmp.js'
                 }]
             ]);
 
             // js techs
             nodeConfig.addTechs([
                 [techs.bem.depsByTechToBemdecl, {
-                    target : '?.js-js.bemdecl.js',
+                    target : '.tmp.js-js.bemdecl.js',
                     sourceTech : 'js',
                     destTech : 'js'
                 }],
                 [techs.bem.mergeBemdecl, {
-                    sources : ['?.bemdecl.js', '?.js-js.bemdecl.js'],
-                    target : '?.js.bemdecl.js'
+                    sources : ['.tmp.bemdecl.js', '.tmp.js-js.bemdecl.js'],
+                    target : '.tmp.js.bemdecl.js'
                 }],
                 [techs.bem.depsOld, {
-                    target : '?.js.deps.js',
-                    bemdeclFile : '?.js.bemdecl.js'
+                    target : '.tmp.js.deps.js',
+                    bemdeclFile : '.tmp.js.bemdecl.js'
                 }],
                 [techs.bem.files, {
-                    depsFile : '?.js.deps.js',
-                    filesTarget : '?.js.files',
-                    dirsTarget : '?.js.dirs'
+                    depsFile : '.tmp.js.deps.js',
+                    filesTarget : '.tmp.js.files',
+                    dirsTarget : '.tmp.js.dirs'
                 }]
             ]);
 
             // Client Template Engine
             nodeConfig.addTechs([
                 [techs.bem.depsByTechToBemdecl, {
-                    target : '?.template.bemdecl.js',
+                    target : '.tmp.template.bemdecl.js',
                     sourceTech : 'js',
                     destTech : 'bemhtml'
                 }],
                 [techs.bem.depsOld, {
-                    target : '?.template.deps.js',
-                    bemdeclFile : '?.template.bemdecl.js'
+                    target : '.tmp.template.deps.js',
+                    bemdeclFile : '.tmp.template.bemdecl.js'
                 }],
                 [techs.bem.files, {
-                    depsFile : '?.template.deps.js',
-                    filesTarget : '?.template.files',
-                    dirsTarget : '?.template.dirs'
+                    depsFile : '.tmp.template.deps.js',
+                    filesTarget : '.tmp.template.files',
+                    dirsTarget : '.tmp.template.dirs'
                 }],
                 BEM_TEMPLATE_ENGINE === 'BH'? [techs.engines.bhBundle, {
-                    target : '?.browser.bh.js',
-                    filesTarget : '?.template.files',
+                    target : '.tmp.browser.bh.js',
+                    filesTarget : '.tmp.template.files',
                     mimic : 'BEMHTML',
                     bhOptions : bhOptions
                 }] : [techs.engines.bemhtml, {
-                    target : '?.browser.bemhtml.js',
-                    filesTarget : '?.template.files',
+                    target : '.tmp.browser.bemhtml.js',
+                    filesTarget : '.tmp.template.files',
                     sourceSuffixes : ['bemhtml.js', 'bemhtml']
                 }]
             ]);
 
             // Build htmls
             nodeConfig.addTechs(BEM_TEMPLATE_ENGINE === 'BH'? [
-                [techs.engines.bhCommonJS, { bhOptions : bhOptions }],
-                [techs.html.bh]
+                [techs.engines.bhCommonJS, {
+                    target : '.tmp.bh.js',
+                    bhOptions : bhOptions
+                }],
+                [techs.html.bh, { bhFile : '.tmp.bh.js' }]
             ] : [
-                [techs.engines.bemhtml, { sourceSuffixes : ['bemhtml.js', 'bemhtml'] }],
-                [techs.html.bemhtml]
+                [techs.engines.bemhtml, {
+                    target : '.tmp.bemhtml.js',
+                    sourceSuffixes : ['bemhtml.js', 'bemhtml']
+                }],
+                [techs.html.bemhtml, { bemhtmlFile : '.tmp.bemhtml.js' }]
             ]);
 
             langs.forEach(function(lang) {
@@ -304,16 +316,16 @@ module.exports = function(config) {
             });
 
             nodeConfig.addTargets([
-                '_?.css', '_?.ie.css', '_?.js', '?.html'
+                '?.css', '?.ie.css', '?.js', '?.html'
             ]);
         });
 
         config.mode('development', function() {
             config.nodes(nodes, function(nodeConfig) {
                 nodeConfig.addTechs([
-                    [techs.borschik, { source : '?.css', target : '_?.css', minify : false }],
-                    [techs.borschik, { source : '?.ie.css', target : '_?.ie.css', minify : false }],
-                    [techs.borschik, { source : '?.js', target : '_?.js', minify : false }]
+                    [techs.borschik, { source : '.tmp.css', target : '?.css', minify : false }],
+                    [techs.borschik, { source : '.tmp.ie.css', target : '?.ie.css', minify : false }],
+                    [techs.borschik, { source : '.tmp.js', target : '?.js', minify : false }]
                 ]);
             });
         });
@@ -321,9 +333,9 @@ module.exports = function(config) {
         config.mode('production', function() {
             config.nodes(nodes, function(nodeConfig) {
                 nodeConfig.addTechs([
-                    [techs.borschik, { source : '?.css', target : '_?.css', tech : 'cleancss', minify : true }],
-                    [techs.borschik, { source : '?.ie.css', target : '_?.ie.css', tech : 'cleancss', minify : true }],
-                    [techs.borschik, { source : '?.js', target : '_?.js', minify : true }]
+                    [techs.borschik, { source : '.tmp.css', target : '?.css', tech : 'cleancss', minify : true }],
+                    [techs.borschik, { source : '.tmp.ie.css', target : '?.ie.css', tech : 'cleancss', minify : true }],
+                    [techs.borschik, { source : '.tmp.js', target : '?.js', minify : true }]
                 ]);
             });
         });
@@ -492,7 +504,7 @@ function getBrowsers(platform) {
 }
 
 function wrapInPage(bemjson, meta) {
-    var basename = '_' + path.basename(meta.filename, '.bemjson.js');
+    var basename = path.basename(meta.filename, '.bemjson.js');
     return {
         block : 'page',
         title : naming.stringify(meta.notation),
diff --git a/common.blocks/attach/attach.tests/gemini.bemjson.js b/common.blocks/attach/attach.tests/gemini.bemjson.js
index 9b17ec2a3..285b13b41 100644
--- a/common.blocks/attach/attach.tests/gemini.bemjson.js
+++ b/common.blocks/attach/attach.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: attach',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : ['s', 'm', 'l', 'xl'].map(function(size) {
         var cls = 'islands-size' + size.toUpperCase();
diff --git a/common.blocks/attach/attach.tests/simple.bemjson.js b/common.blocks/attach/attach.tests/simple.bemjson.js
index 32b3b283f..c4c9050a9 100644
--- a/common.blocks/attach/attach.tests/simple.bemjson.js
+++ b/common.blocks/attach/attach.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
 
         { tag : 'h2', content : 'default' },
diff --git a/common.blocks/button/button.tests/gemini.bemjson.js b/common.blocks/button/button.tests/gemini.bemjson.js
index 5e1ce0dff..ee6769393 100644
--- a/common.blocks/button/button.tests/gemini.bemjson.js
+++ b/common.blocks/button/button.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: button',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         { tag : 'h2', content : 'islands' },
diff --git a/common.blocks/button/button.tests/simple.bemjson.js b/common.blocks/button/button.tests/simple.bemjson.js
index 3fa41b579..126aeaac2 100644
--- a/common.blocks/button/button.tests/simple.bemjson.js
+++ b/common.blocks/button/button.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
 
         { tag : 'h2', content : 'default' },
diff --git a/common.blocks/checkbox-group/checkbox-group.tests/gemini.bemjson.js b/common.blocks/checkbox-group/checkbox-group.tests/gemini.bemjson.js
index c80bef471..8ae32cadc 100644
--- a/common.blocks/checkbox-group/checkbox-group.tests/gemini.bemjson.js
+++ b/common.blocks/checkbox-group/checkbox-group.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: checkbox-group',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         { tag : 'h2', content : 'islands' },
diff --git a/common.blocks/checkbox-group/checkbox-group.tests/simple.bemjson.js b/common.blocks/checkbox-group/checkbox-group.tests/simple.bemjson.js
index f49da8f88..9fdf67e89 100644
--- a/common.blocks/checkbox-group/checkbox-group.tests/simple.bemjson.js
+++ b/common.blocks/checkbox-group/checkbox-group.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
 
         { tag : 'h2', content : 'default' },
diff --git a/common.blocks/checkbox/checkbox.tests/gemini.bemjson.js b/common.blocks/checkbox/checkbox.tests/gemini.bemjson.js
index 53504d023..febad328a 100644
--- a/common.blocks/checkbox/checkbox.tests/gemini.bemjson.js
+++ b/common.blocks/checkbox/checkbox.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: checkbox',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         { tag : 'h2', content : 'islands' },
diff --git a/common.blocks/checkbox/checkbox.tests/simple.bemjson.js b/common.blocks/checkbox/checkbox.tests/simple.bemjson.js
index 96bcfeae0..d3fc78af0 100644
--- a/common.blocks/checkbox/checkbox.tests/simple.bemjson.js
+++ b/common.blocks/checkbox/checkbox.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
 
         { tag : 'h2', content : 'default' },
diff --git a/common.blocks/control-group/control-group.tests/gemini.bemjson.js b/common.blocks/control-group/control-group.tests/gemini.bemjson.js
index 013a82a7c..c875ee906 100644
--- a/common.blocks/control-group/control-group.tests/gemini.bemjson.js
+++ b/common.blocks/control-group/control-group.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: control-group',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         { tag : 'h3', content : 'search form' },
diff --git a/common.blocks/control-group/control-group.tests/simple.bemjson.js b/common.blocks/control-group/control-group.tests/simple.bemjson.js
index ed6c6a7ce..a2a49f922 100644
--- a/common.blocks/control-group/control-group.tests/simple.bemjson.js
+++ b/common.blocks/control-group/control-group.tests/simple.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: control-group',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_simple.css' },
-        { elem : 'js', url : '_simple.js' }
+        { elem : 'css', url : 'simple.css' },
+        { elem : 'js', url : 'simple.js' }
     ],
     content : [
         { tag : 'h2', content : 'islands' },
diff --git a/common.blocks/dropdown/dropdown.tests/gemini.bemjson.js b/common.blocks/dropdown/dropdown.tests/gemini.bemjson.js
index c55bcabd1..49cac7e13 100644
--- a/common.blocks/dropdown/dropdown.tests/gemini.bemjson.js
+++ b/common.blocks/dropdown/dropdown.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: dropdown',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         { tag : 'h2', content : 'islands' },
diff --git a/common.blocks/dropdown/dropdown.tests/simple.bemjson.js b/common.blocks/dropdown/dropdown.tests/simple.bemjson.js
index 394b751ce..c71dcce12 100644
--- a/common.blocks/dropdown/dropdown.tests/simple.bemjson.js
+++ b/common.blocks/dropdown/dropdown.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
 
         { tag : 'h2', content : 'default' },
diff --git a/common.blocks/icon/icon.tests/gemini.bemjson.js b/common.blocks/icon/icon.tests/gemini.bemjson.js
index 9b3106824..d0669dc6c 100644
--- a/common.blocks/icon/icon.tests/gemini.bemjson.js
+++ b/common.blocks/icon/icon.tests/gemini.bemjson.js
@@ -3,7 +3,7 @@
     title : 'bem-components: icon',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' }
+        { elem : 'css', url : 'gemini.css' }
     ],
     content : [
         { tag : 'h2', content : 'icon' },
diff --git a/common.blocks/icon/icon.tests/simple.bemjson.js b/common.blocks/icon/icon.tests/simple.bemjson.js
index 074c2fe76..d4b2bdf80 100644
--- a/common.blocks/icon/icon.tests/simple.bemjson.js
+++ b/common.blocks/icon/icon.tests/simple.bemjson.js
@@ -3,7 +3,7 @@
     title : 'bem-components: icon',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_simple.css' }
+        { elem : 'css', url : 'simple.css' }
     ],
     content : [
         { tag : 'h2', content : 'icon' },
diff --git a/common.blocks/image/image.tests/gemini.bemjson.js b/common.blocks/image/image.tests/gemini.bemjson.js
index 6fbe63d85..1b2c6e917 100644
--- a/common.blocks/image/image.tests/gemini.bemjson.js
+++ b/common.blocks/image/image.tests/gemini.bemjson.js
@@ -3,7 +3,7 @@
     title : 'bem-components: image',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' }
+        { elem : 'css', url : 'gemini.css' }
     ],
     content : [
         {
diff --git a/common.blocks/image/image.tests/simple.bemjson.js b/common.blocks/image/image.tests/simple.bemjson.js
index d58c5a1d0..aad9d3be0 100644
--- a/common.blocks/image/image.tests/simple.bemjson.js
+++ b/common.blocks/image/image.tests/simple.bemjson.js
@@ -3,7 +3,7 @@
     title : 'bem-components: image',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_simple.css' }
+        { elem : 'css', url : 'simple.css' }
     ],
     content : [
         { tag : 'h2', content : 'image' },
diff --git a/common.blocks/input/input.tests/gemini.bemjson.js b/common.blocks/input/input.tests/gemini.bemjson.js
index a6c92f614..42f4842f5 100644
--- a/common.blocks/input/input.tests/gemini.bemjson.js
+++ b/common.blocks/input/input.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: input',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         { tag : 'h2', content : 'islands' },
diff --git a/common.blocks/input/input.tests/simple.bemjson.js b/common.blocks/input/input.tests/simple.bemjson.js
index 267db210f..26883510a 100644
--- a/common.blocks/input/input.tests/simple.bemjson.js
+++ b/common.blocks/input/input.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
 
         { tag : 'h2', content : 'default' },
diff --git a/common.blocks/link/link.tests/gemini.bemjson.js b/common.blocks/link/link.tests/gemini.bemjson.js
index 6ed2eee9c..85036e72b 100644
--- a/common.blocks/link/link.tests/gemini.bemjson.js
+++ b/common.blocks/link/link.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: link',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : ['islands'].map(function(theme, i) {
         var content = [
diff --git a/common.blocks/link/link.tests/simple.bemjson.js b/common.blocks/link/link.tests/simple.bemjson.js
index 0358d5f33..a988e43bf 100644
--- a/common.blocks/link/link.tests/simple.bemjson.js
+++ b/common.blocks/link/link.tests/simple.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: link',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_simple.css' },
-        { elem : 'js', url : '_simple.js' }
+        { elem : 'css', url : 'simple.css' },
+        { elem : 'js', url : 'simple.js' }
     ],
     content : ['default', 'simple', 'islands'].map(function(theme, i) {
         var content = [
diff --git a/common.blocks/menu/menu.tests/gemini.bemjson.js b/common.blocks/menu/menu.tests/gemini.bemjson.js
index 87329a6e5..0c0feafdf 100644
--- a/common.blocks/menu/menu.tests/gemini.bemjson.js
+++ b/common.blocks/menu/menu.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: menu',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         ['s', 'm', 'l', 'xl'].map(function(size) {
diff --git a/common.blocks/menu/menu.tests/simple.bemjson.js b/common.blocks/menu/menu.tests/simple.bemjson.js
index 6f95e5116..86d763f14 100644
--- a/common.blocks/menu/menu.tests/simple.bemjson.js
+++ b/common.blocks/menu/menu.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : ['simple', 'islands'].map(function(theme) {
         var size = theme == 'islands'? 'm' : undefined;
 
diff --git a/common.blocks/modal/modal.examples/10-modal.bemjson.js b/common.blocks/modal/modal.examples/10-modal.bemjson.js
index 47ff54aad..2e7ecb07f 100644
--- a/common.blocks/modal/modal.examples/10-modal.bemjson.js
+++ b/common.blocks/modal/modal.examples/10-modal.bemjson.js
@@ -6,16 +6,16 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_10-modal.css' }
+            content : { elem : 'css', url : '10-modal.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_10-modal.ie.css' }
+            content : { elem : 'css', url : '10-modal.ie.css' }
         }
     ],
     scripts : [
-        { elem : 'js', url : '_10-modal.js' }
+        { elem : 'js', url : '10-modal.js' }
     ],
     mods : { theme : 'islands' },
     content : {
diff --git a/common.blocks/modal/modal.tests/gemini.bemjson.js b/common.blocks/modal/modal.tests/gemini.bemjson.js
index 65d38c5e8..f19e93dd1 100644
--- a/common.blocks/modal/modal.tests/gemini.bemjson.js
+++ b/common.blocks/modal/modal.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components : modal',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         { block : 'test', js : true, content : [
diff --git a/common.blocks/modal/modal.tests/simple.bemjson.js b/common.blocks/modal/modal.tests/simple.bemjson.js
index 623231792..20ee9691e 100644
--- a/common.blocks/modal/modal.tests/simple.bemjson.js
+++ b/common.blocks/modal/modal.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
         // simple
         { block : 'test', js : true, content : [
diff --git a/common.blocks/popup/popup.examples/10-popup.bemjson.js b/common.blocks/popup/popup.examples/10-popup.bemjson.js
index a4b8b162d..30b4320fe 100644
--- a/common.blocks/popup/popup.examples/10-popup.bemjson.js
+++ b/common.blocks/popup/popup.examples/10-popup.bemjson.js
@@ -6,16 +6,16 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_10-popup.css' }
+            content : { elem : 'css', url : '10-popup.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_10-popup.ie.css' }
+            content : { elem : 'css', url : '10-popup.ie.css' }
         }
     ],
     scripts : [
-        { elem : 'js', url : '_10-popup.js' }
+        { elem : 'js', url : '10-popup.js' }
     ],
     mods : { theme : 'islands' },
     content : {
diff --git a/common.blocks/popup/popup.examples/20-popup.bemjson.js b/common.blocks/popup/popup.examples/20-popup.bemjson.js
index 873a624d4..1ab9952a5 100644
--- a/common.blocks/popup/popup.examples/20-popup.bemjson.js
+++ b/common.blocks/popup/popup.examples/20-popup.bemjson.js
@@ -6,16 +6,16 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_20-popup.css' }
+            content : { elem : 'css', url : '20-popup.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_20-popup.ie.css' }
+            content : { elem : 'css', url : '20-popup.ie.css' }
         }
     ],
     scripts : [
-        { elem : 'js', url : '_20-popup.js' }
+        { elem : 'js', url : '20-popup.js' }
     ],
     mods : { theme : 'islands' },
     content : [
diff --git a/common.blocks/popup/popup.tests/controls.bemjson.js b/common.blocks/popup/popup.tests/controls.bemjson.js
index c9dab8217..cd1980bf8 100644
--- a/common.blocks/popup/popup.tests/controls.bemjson.js
+++ b/common.blocks/popup/popup.tests/controls.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: popup',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_controls.css' },
-        { elem : 'js', url : '_controls.js' }
+        { elem : 'css', url : 'controls.css' },
+        { elem : 'js', url : 'controls.js' }
     ],
     content : [
         {
diff --git a/common.blocks/popup/popup.tests/destruct.bemjson.js b/common.blocks/popup/popup.tests/destruct.bemjson.js
index abe018c2e..c6b6175d5 100644
--- a/common.blocks/popup/popup.tests/destruct.bemjson.js
+++ b/common.blocks/popup/popup.tests/destruct.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: destruct popup',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_destruct.css' },
-        { elem : 'js', url : '_destruct.js' }
+        { elem : 'css', url : 'destruct.css' },
+        { elem : 'js', url : 'destruct.js' }
     ],
     content : [
         {
diff --git a/common.blocks/popup/popup.tests/gemini.bemjson.js b/common.blocks/popup/popup.tests/gemini.bemjson.js
index 908f22f47..ee57b1af5 100644
--- a/common.blocks/popup/popup.tests/gemini.bemjson.js
+++ b/common.blocks/popup/popup.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: popup',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         {
diff --git a/common.blocks/popup/popup.tests/horiz-scroll.bemjson.js b/common.blocks/popup/popup.tests/horiz-scroll.bemjson.js
index e665d129f..c89288443 100644
--- a/common.blocks/popup/popup.tests/horiz-scroll.bemjson.js
+++ b/common.blocks/popup/popup.tests/horiz-scroll.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: popup within scrolling',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_horiz-scroll.css' },
-        { elem : 'js', url : '_horiz-scroll.js' }
+        { elem : 'css', url : 'horiz-scroll.css' },
+        { elem : 'js', url : 'horiz-scroll.js' }
     ],
     content : [
         {
diff --git a/common.blocks/popup/popup.tests/nested.bemjson.js b/common.blocks/popup/popup.tests/nested.bemjson.js
index 84e51462d..684e8fa32 100644
--- a/common.blocks/popup/popup.tests/nested.bemjson.js
+++ b/common.blocks/popup/popup.tests/nested.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: nested popups',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_nested.css' },
-        { elem : 'js', url : '_nested.js' }
+        { elem : 'css', url : 'nested.css' },
+        { elem : 'js', url : 'nested.js' }
     ],
     content : [
         {
diff --git a/common.blocks/popup/popup.tests/simple.bemjson.js b/common.blocks/popup/popup.tests/simple.bemjson.js
index 0d73e337f..c846f5b58 100644
--- a/common.blocks/popup/popup.tests/simple.bemjson.js
+++ b/common.blocks/popup/popup.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
 
         { tag : 'h2', content : 'simple' },
diff --git a/common.blocks/popup/popup.tests/vert-scroll.bemjson.js b/common.blocks/popup/popup.tests/vert-scroll.bemjson.js
index f6cacc5fd..fa44aeae7 100644
--- a/common.blocks/popup/popup.tests/vert-scroll.bemjson.js
+++ b/common.blocks/popup/popup.tests/vert-scroll.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: popup within scrolling',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_vert-scroll.css' },
-        { elem : 'js', url : '_vert-scroll.js' }
+        { elem : 'css', url : 'vert-scroll.css' },
+        { elem : 'js', url : 'vert-scroll.js' }
     ],
     content : [
         {
diff --git a/common.blocks/popup/popup.tests/z-index-group.bemjson.js b/common.blocks/popup/popup.tests/z-index-group.bemjson.js
index c600252b2..0b4b44a99 100644
--- a/common.blocks/popup/popup.tests/z-index-group.bemjson.js
+++ b/common.blocks/popup/popup.tests/z-index-group.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: popup',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_z-index-group.css' },
-        { elem : 'js', url : '_z-index-group.js' }
+        { elem : 'css', url : 'z-index-group.css' },
+        { elem : 'js', url : 'z-index-group.js' }
     ],
     content : { block : 'test-wrapper', js : true, content : [
         {
diff --git a/common.blocks/progressbar/progressbar.tests/gemini.bemjson.js b/common.blocks/progressbar/progressbar.tests/gemini.bemjson.js
index 0bce739f8..c123e6495 100644
--- a/common.blocks/progressbar/progressbar.tests/gemini.bemjson.js
+++ b/common.blocks/progressbar/progressbar.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'progressbar',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         { tag : 'h2', content : 'theme-islands' },
diff --git a/common.blocks/progressbar/progressbar.tests/simple.bemjson.js b/common.blocks/progressbar/progressbar.tests/simple.bemjson.js
index 8ff45928d..aef946ad1 100644
--- a/common.blocks/progressbar/progressbar.tests/simple.bemjson.js
+++ b/common.blocks/progressbar/progressbar.tests/simple.bemjson.js
@@ -3,8 +3,8 @@
     title : 'progressbar',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_simple.css' },
-        { elem : 'js', url : '_simple.js' }
+        { elem : 'css', url : 'simple.css' },
+        { elem : 'js', url : 'simple.js' }
     ],
     content : [
 
diff --git a/common.blocks/radio-group/radio-group.tests/gemini.bemjson.js b/common.blocks/radio-group/radio-group.tests/gemini.bemjson.js
index ce67263d5..b2a561042 100644
--- a/common.blocks/radio-group/radio-group.tests/gemini.bemjson.js
+++ b/common.blocks/radio-group/radio-group.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: radio-group',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
 
diff --git a/common.blocks/radio-group/radio-group.tests/simple.bemjson.js b/common.blocks/radio-group/radio-group.tests/simple.bemjson.js
index 7957d7d3d..edf542e98 100644
--- a/common.blocks/radio-group/radio-group.tests/simple.bemjson.js
+++ b/common.blocks/radio-group/radio-group.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
 
         { tag : 'h2', content : 'default' },
diff --git a/common.blocks/select/select.tests/gemini.bemjson.js b/common.blocks/select/select.tests/gemini.bemjson.js
index 9e68a1762..78911ece6 100644
--- a/common.blocks/select/select.tests/gemini.bemjson.js
+++ b/common.blocks/select/select.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: select',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         {
diff --git a/common.blocks/select/select.tests/simple.bemjson.js b/common.blocks/select/select.tests/simple.bemjson.js
index acf70e325..dff1a2ffd 100644
--- a/common.blocks/select/select.tests/simple.bemjson.js
+++ b/common.blocks/select/select.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
         {
             block : 'select',
diff --git a/common.blocks/spin/spin.tests/gemini.bemjson.js b/common.blocks/spin/spin.tests/gemini.bemjson.js
index 177d812dc..014eb05c7 100644
--- a/common.blocks/spin/spin.tests/gemini.bemjson.js
+++ b/common.blocks/spin/spin.tests/gemini.bemjson.js
@@ -3,7 +3,7 @@
     title : 'bem-components: spin',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' }
+        { elem : 'css', url : 'gemini.css' }
     ],
     content : [
         { tag : 'h2', content : 'islands' },
diff --git a/common.blocks/spin/spin.tests/simple.bemjson.js b/common.blocks/spin/spin.tests/simple.bemjson.js
index 5e485eb3a..346454f05 100644
--- a/common.blocks/spin/spin.tests/simple.bemjson.js
+++ b/common.blocks/spin/spin.tests/simple.bemjson.js
@@ -3,7 +3,7 @@
     title : 'bem-components: spin',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_simple.css' }
+        { elem : 'css', url : 'simple.css' }
     ],
     content : [
         { tag : 'h2', content : 'simple' },
diff --git a/common.blocks/textarea/textarea.tests/gemini.bemjson.js b/common.blocks/textarea/textarea.tests/gemini.bemjson.js
index 25f7896a7..81c9d86fc 100644
--- a/common.blocks/textarea/textarea.tests/gemini.bemjson.js
+++ b/common.blocks/textarea/textarea.tests/gemini.bemjson.js
@@ -3,8 +3,8 @@
     title : 'bem-components: textarea',
     mods : { theme : 'islands' },
     head : [
-        { elem : 'css', url : '_gemini.css' },
-        { elem : 'js', url : '_gemini.js' }
+        { elem : 'css', url : 'gemini.css' },
+        { elem : 'js', url : 'gemini.js' }
     ],
     content : [
         { tag : 'h2', content : 'islands' },
diff --git a/common.blocks/textarea/textarea.tests/simple.bemjson.js b/common.blocks/textarea/textarea.tests/simple.bemjson.js
index 595716634..dfee50072 100644
--- a/common.blocks/textarea/textarea.tests/simple.bemjson.js
+++ b/common.blocks/textarea/textarea.tests/simple.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_simple.css' }
+            content : { elem : 'css', url : 'simple.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_simple.ie.css' }
+            content : { elem : 'css', url : 'simple.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_simple.js' }],
+    scripts : [{ elem : 'js', url : 'simple.js' }],
     content : [
 
         { tag : 'h2', content : 'default' },
diff --git a/common.blocks/z-index-group/z-index-group.examples/10-z-index-group.bemjson.js b/common.blocks/z-index-group/z-index-group.examples/10-z-index-group.bemjson.js
index d64b2ab8b..bd1654ab1 100644
--- a/common.blocks/z-index-group/z-index-group.examples/10-z-index-group.bemjson.js
+++ b/common.blocks/z-index-group/z-index-group.examples/10-z-index-group.bemjson.js
@@ -2,10 +2,10 @@
     block : 'page',
     title : 'z-index-group',
     head : [
-        { elem : 'css', url : '_10-z-index-group.css' }
+        { elem : 'css', url : '10-z-index-group.css' }
     ],
     scripts : [
-        { elem : 'js', url : '_10-z-index-group.js' }
+        { elem : 'js', url : '10-z-index-group.js' }
     ],
     mods : { theme : 'islands' },
     content : [
diff --git a/desktop.pages/index/index.bemjson.js b/desktop.pages/index/index.bemjson.js
index ddf46c2a6..c2d7b856a 100644
--- a/desktop.pages/index/index.bemjson.js
+++ b/desktop.pages/index/index.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_index.css' }
+            content : { elem : 'css', url : 'index.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_index.ie.css' }
+            content : { elem : 'css', url : 'index.ie.css' }
         }
     ],
-    scripts : [ { elem : 'js', url : '_index.js' } ],
+    scripts : [ { elem : 'js', url : 'index.js' } ],
     content : [
         { tag : 'h2', content : 'Library variety' },
         {
diff --git a/desktop.pages/islands/islands.bemjson.js b/desktop.pages/islands/islands.bemjson.js
index b853a98c5..25869eec3 100644
--- a/desktop.pages/islands/islands.bemjson.js
+++ b/desktop.pages/islands/islands.bemjson.js
@@ -7,15 +7,15 @@
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_islands.css' }
+            content : { elem : 'css', url : 'islands.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_islands.ie.css' }
+            content : { elem : 'css', url : 'islands.ie.css' }
         }
     ],
-    scripts : [ { elem : 'js', url : '_islands.js' } ],
+    scripts : [ { elem : 'js', url : 'islands.js' } ],
     content : [
         { tag : 'h2', content : 'islands theme' },
 
diff --git a/desktop.pages/showcase/showcase.bemjson.js b/desktop.pages/showcase/showcase.bemjson.js
index 0497e5040..b5a91d311 100644
--- a/desktop.pages/showcase/showcase.bemjson.js
+++ b/desktop.pages/showcase/showcase.bemjson.js
@@ -5,7 +5,7 @@ var addLinkToDoc = function(blockName, hash, text) {
         {
             block : 'link',
             mods : { theme : 'islands', size : 'l', type : 'docs' },
-            url : 'https://github.com/bem/bem-components/blob/v2/common.blocks/' +
+            url : 'https://github.com/bem/bem-components/blob/v3/common.blocks/' +
                 blockName + '/' + blockName + '.ru.md' + (hash? hash : ''),
             content : text || blockName
         },
@@ -22,15 +22,15 @@ module.exports = {
             elem : 'conditional-comment',
             condition : '> IE 8',
             msieOnly : false,
-            content : { elem : 'css', url : '_showcase.css' }
+            content : { elem : 'css', url : 'showcase.css' }
         },
         {
             elem : 'conditional-comment',
             condition : '<= IE 8',
-            content : { elem : 'css', url : '_showcase.ie.css' }
+            content : { elem : 'css', url : 'showcase.ie.css' }
         }
     ],
-    scripts : [{ elem : 'js', url : '_showcase.js' }],
+    scripts : [{ elem : 'js', url : 'showcase.js' }],
     content : [
         {
             block : 'layout',