diff --git a/td/generate/scheme/mtproto_api.tl b/td/generate/scheme/mtproto_api.tl
index de2e94bd6..b2508b478 100644
--- a/td/generate/scheme/mtproto_api.tl
+++ b/td/generate/scheme/mtproto_api.tl
@@ -25,8 +25,7 @@ dh_gen_ok#3bcbf734 nonce:int128 server_nonce:int128 new_nonce_hash1:int128 = Set
 dh_gen_retry#46dc1fb9 nonce:int128 server_nonce:int128 new_nonce_hash2:int128 = Set_client_DH_params_answer;
 dh_gen_fail#a69dae02 nonce:int128 server_nonce:int128 new_nonce_hash3:int128 = Set_client_DH_params_answer;
 
-bind_auth_key_inner#75a3f765 nonce:long temp_auth_key_id:long perm_auth_key_id:long temp_session_id:long expires_at:int
-= BindAuthKeyInner;
+bind_auth_key_inner#75a3f765 nonce:long temp_auth_key_id:long perm_auth_key_id:long temp_session_id:long expires_at:int = BindAuthKeyInner;
 
 //rpc_result#f35c6d01 req_msg_id:long result:string = RpcResult;
 rpc_error#2144ca19 error_code:int error_message:string = RpcError;
diff --git a/tdtl/td/tl/tl_generate.cpp b/tdtl/td/tl/tl_generate.cpp
index 6d3fe7698..0dea24e87 100644
--- a/tdtl/td/tl/tl_generate.cpp
+++ b/tdtl/td/tl/tl_generate.cpp
@@ -69,11 +69,11 @@ static void get_children_types(const tl_tree *tree, const TL_writer &w, std::map
   assert(t->flags == 0);
 
   if (t->simple_constructors != 1) {
-    children_types.emplace(t->name, true);
+    children_types.emplace(w.gen_main_class_name(t), true);
   } else {
     for (std::size_t i = 0; i < t->constructors_num; i++) {
       if (w.is_combinator_supported(t->constructors[i])) {
-        children_types.emplace(t->constructors[i]->name, false);
+        children_types.emplace(w.gen_class_name(t->constructors[i]->name), false);
       }
     }
   }
@@ -103,7 +103,7 @@ static std::map<std::string, bool> get_children_types(const tl_type *t, const TL
 static void write_forward_declarations(tl_outputer &out, const std::map<std::string, bool> &children_types,
                                        const TL_writer &w) {
   for (std::map<std::string, bool>::const_iterator it = children_types.begin(); it != children_types.end(); ++it) {
-    out.append(w.gen_forward_class_declaration(w.gen_class_name(it->first), it->second));
+    out.append(w.gen_forward_class_declaration(it->first, it->second));
   }
 }
 
@@ -906,7 +906,7 @@ static std::string get_additional_imports(const std::map<std::string, bool> &typ
       w.gen_import_declaration(file_name_prefix + "_" + base_class_name + w.gen_package_suffix(), false);
   if (w.gen_package_suffix() != file_name_suffix) {
     for (std::map<std::string, bool>::const_iterator it = types.begin(); it != types.end(); ++it) {
-      std::string package_name = file_name_prefix + "_" + w.gen_class_name(it->first) + w.gen_package_suffix();
+      std::string package_name = file_name_prefix + "_" + it->first + w.gen_package_suffix();
       result += w.gen_import_declaration(package_name, false);
     }
   }
@@ -946,7 +946,7 @@ bool write_tl_to_multiple_files(const tl_config &config, const std::string &file
       continue;
     }
 
-    object_types[t->name] = (t->simple_constructors != 1);
+    object_types[w.gen_main_class_name(t)] = (t->simple_constructors != 1);
     out = &outs[w.gen_main_class_name(t)];
     auto additional_imports =
         get_additional_imports(get_children_types(t, w), "Object", file_name_prefix, file_name_suffix, w);
@@ -963,7 +963,7 @@ bool write_tl_to_multiple_files(const tl_config &config, const std::string &file
       continue;
     }
 
-    function_types[t->name] = false;
+    function_types[w.gen_class_name(t->name)] = false;
     out = &outs[w.gen_class_name(t->name)];
     auto additional_imports =
         get_additional_imports(get_children_types(t, w), "Function", file_name_prefix, file_name_suffix, w);