diff --git a/.bemy.json b/.bemy.json
index 689721d..b7bf0d7 100644
--- a/.bemy.json
+++ b/.bemy.json
@@ -19,7 +19,7 @@
     },
     "deps_dom": {
       "suffix": ".deps.js",
-      "shortcuts": [ "ddom", "deps_dom" ],
+      "shortcuts": [ "dd", "ddom", "deps_dom" ],
       "template": "stub/depend/_dom/depend_dom.deps.js"
     },
     "bh": {
@@ -43,13 +43,13 @@
     "js": {
       "suffix": ".js",
       "shortcuts": [ "j", "js" ],
-      "rename": "decl('{{bemNode}}",
+      "rename": [ "modules.define('{{bemNode}}", "@module {{bemNode}}", "@exports {{bemNode}}" ],
       "template": [ "stub/script/script.js" ]
     },
     "js_dom": {
       "suffix": ".js",
       "shortcuts": [ "jdom", "js_dom" ],
-      "rename": "decl('{{bemNode}}",
+      "rename": [ "@module {{bemNode}}", "@class {{bemNode}}", "@lends {{bemNode}}", "@exports {{bemNode}}" ],
       "template": [ "stub/script/_dom/script_dom.js" ]
     }
   },
diff --git a/package.json b/package.json
index c733166..303cebf 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/f0rmat1k/bemy.git"
   },
-  "version": "3.3.2",
+  "version": "3.4.0",
   "keywords": [
     "bem",
     "BEM Tools"
diff --git a/stub/template/template.bh.js b/stub/template/template.bh.js
index 2d2c459..242e40c 100644
--- a/stub/template/template.bh.js
+++ b/stub/template/template.bh.js
@@ -1,5 +1,5 @@
 module.exports = function (bh) {
     bh.match('{{blockName}}{{elemName}}{{modName}}{{modVal}}', function (ctx) {
-        {{cursor}}ctx.tag('div');
+        ctx.tag({{cursor}});
     });
 };
diff --git a/stub/template/template.priv.js b/stub/template/template.priv.js
index 825e761..a6e3e31 100644
--- a/stub/template/template.priv.js
+++ b/stub/template/template.priv.js
@@ -2,7 +2,7 @@ module.exports = function (blocks) {
     blocks.declare('{{blockName}}{{elemName}}{{modName}}{{modVal}}', function (data) {
         return {
             block: '{{blockName}}',
-            content: ''{{cursor}}
+            content: '{{cursor}}'
         };
     });
 };