diff --git a/ts2panda/src/base/lreference.ts b/ts2panda/src/base/lreference.ts
index e27363aee3be3827527764c52f8feb4640fce0c0..b079b70bb89e2d0538d4bdff16aa07780845c735 100644
--- a/ts2panda/src/base/lreference.ts
+++ b/ts2panda/src/base/lreference.ts
@@ -139,7 +139,12 @@ export class LReference {
             let name = jshelpers.getTextOfIdentifierOrLiteral(<ts.Identifier>realNode);
             let variable = compiler.getCurrentScope().find(name);
             if (!variable.v) {
-                variable.v = compiler.getCurrentScope().add(name, VarDeclarationKind.NONE);
+                // @ts-ignore
+                if (ts.isGeneratedIdentifier(realNode)) {
+                    variable.v = compiler.getCurrentScope().add(name, VarDeclarationKind.VAR);
+                } else {
+                    variable.v = compiler.getCurrentScope().add(name, VarDeclarationKind.NONE);
+                }
             }
 
             return new LReference(realNode, compiler, isDeclaration, ReferenceKind.LocalOrGlobal, variable);
diff --git a/ts2panda/src/index.ts b/ts2panda/src/index.ts
index bc87b8b9ce0beb85cd9602828bf3177c83fce4fc..f5ceefb93c435b5923d1f2ac0d8fb31abad91f3d 100644
--- a/ts2panda/src/index.ts
+++ b/ts2panda/src/index.ts
@@ -100,6 +100,8 @@ function main(fileNames: string[], options: ts.CompilerOptions) {
                 // @ts-ignore
                 (ctx: ts.TransformationContext) => {
                     return (node: ts.SourceFile) => {
+                        makeAutoGeneratedNodeName(node);
+
                         if (ts.getEmitHelpers(node)) {
                             let newStatements = [];
                             ts.getEmitHelpers(node)?.forEach(
@@ -142,6 +144,29 @@ function main(fileNames: string[], options: ts.CompilerOptions) {
     });
 }
 
+function makeAutoGeneratedNodeName(node: ts.Node) {
+    node.forEachChild(childNode => {
+        switch (childNode.kind) {
+            case ts.SyntaxKind.Identifier: {
+                // @ts-ignore
+                if (ts.isGeneratedIdentifier(childNode)) {
+                    // @ts-ignore
+                    let generatedVarId = (<ts.Identifier>childNode).autoGenerateId;
+                    if (generatedVarId < 26) {  // _a ~ _z
+                        // @ts-ignore
+                        (<ts.Identifier>childNode).escapedText = "#" + String.fromCharCode(97 /* a */ + generatedVarId);
+                    } else {
+                        // @ts-ignore
+                        (<ts.Identifier>childNode).escapedText = "#" + (generatedVarId - 26);
+                    }
+                }
+                break;
+            }
+        }
+        makeAutoGeneratedNodeName(childNode);
+    });
+}
+
 function getOutputBinName(node: ts.SourceFile) {
     let outputBinName = CmdOptions.getOutputBinName();
     let fileName = node.fileName.substring(0, node.fileName.lastIndexOf('.'));