diff --git a/packages/html-parser/src/index.ts b/packages/html-parser/src/index.ts
index 07b86116..705dfeec 100644
--- a/packages/html-parser/src/index.ts
+++ b/packages/html-parser/src/index.ts
@@ -1,7 +1,7 @@
 import { Parser } from 'htmlparser2'
 import Long from 'long'
 
-import type { InputText, MessageEntity, TextWithEntities, tl } from '@mtcute/client'
+import type { InputText, MessageEntity, TextWithEntities, tl } from '@mtcute/core'
 
 const MENTION_REGEX = /^tg:\/\/user\?id=(\d+)(?:&hash=(-?[0-9a-fA-F]+)(?:&|$)|&|$)/
 
diff --git a/packages/html-parser/tsconfig.json b/packages/html-parser/tsconfig.json
index 554df3b9..6a5497ee 100644
--- a/packages/html-parser/tsconfig.json
+++ b/packages/html-parser/tsconfig.json
@@ -8,6 +8,6 @@
         "./src",
     ],
     "references": [
-        { "path": "../client" }
+        { "path": "../core" }
     ]
 }
diff --git a/packages/i18n/src/types.ts b/packages/i18n/src/types.ts
index b2782a2d..f2f77277 100644
--- a/packages/i18n/src/types.ts
+++ b/packages/i18n/src/types.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import type { tl } from '@mtcute/client'
+import type { tl } from '@mtcute/core'
 
 type Values<T> = T[keyof T]
 type SafeGet<T, K extends string> = T extends Record<K, unknown> ? T[K] : never
diff --git a/packages/markdown-parser/src/index.ts b/packages/markdown-parser/src/index.ts
index e97aa9eb..617d18d9 100644
--- a/packages/markdown-parser/src/index.ts
+++ b/packages/markdown-parser/src/index.ts
@@ -1,6 +1,6 @@
 import Long from 'long'
 
-import type { InputText, MessageEntity, TextWithEntities, tl } from '@mtcute/client'
+import type { InputText, MessageEntity, TextWithEntities, tl } from '@mtcute/core'
 
 const MENTION_REGEX = /^tg:\/\/user\?id=(\d+)(?:&hash=(-?[0-9a-fA-F]+)(?:&|$)|&|$)/
 const EMOJI_REGEX = /^tg:\/\/emoji\?id=(-?\d+)/
diff --git a/packages/markdown-parser/tsconfig.json b/packages/markdown-parser/tsconfig.json
index 554df3b9..6a5497ee 100644
--- a/packages/markdown-parser/tsconfig.json
+++ b/packages/markdown-parser/tsconfig.json
@@ -8,6 +8,6 @@
         "./src",
     ],
     "references": [
-        { "path": "../client" }
+        { "path": "../core" }
     ]
 }
diff --git a/packages/node/index.ts b/packages/node/index.ts
index 6a9a18af..da2c1b3a 100644
--- a/packages/node/index.ts
+++ b/packages/node/index.ts
@@ -1,10 +1,10 @@
 import { createRequire } from 'module'
 import { createInterface, Interface as RlInterface } from 'readline'
 
-import { TelegramClient, TelegramClientOptions, User } from '@mtcute/client'
+import { TelegramClient, TelegramClientOptions, User } from '@mtcute/core'
 import { SqliteStorage } from '@mtcute/sqlite'
 
-export * from '@mtcute/client'
+export * from '@mtcute/core'
 export * from '@mtcute/html-parser'
 export * from '@mtcute/markdown-parser'
 export { SqliteStorage }
@@ -29,6 +29,12 @@ try {
  */
 export class NodeTelegramClient extends TelegramClient {
     constructor(opts: TelegramClientOptions) {
+        if ('client' in opts) {
+            super(opts)
+
+            return
+        }
+
         super({
             // eslint-disable-next-line
             crypto: nativeCrypto ? () => new nativeCrypto() : undefined,
@@ -99,6 +105,6 @@ export class NodeTelegramClient extends TelegramClient {
 
         this.start(params)
             .then(then)
-            .catch((err) => this._emitError(err))
+            .catch((err) => this.emitError(err))
     }
 }
diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json
index 5733f923..a67acb6f 100644
--- a/packages/node/tsconfig.json
+++ b/packages/node/tsconfig.json
@@ -8,7 +8,7 @@
         "./utils.ts",
     ],
     "references": [
-        { "path": "../client" },
+        { "path": "../core" },
         { "path": "../sqlite" },
         { "path": "../dispatcher" },
         { "path": "../html-parser" },
diff --git a/packages/node/typedoc.cjs b/packages/node/typedoc.cjs
index 1ba7965d..cc62716c 100644
--- a/packages/node/typedoc.cjs
+++ b/packages/node/typedoc.cjs
@@ -2,7 +2,6 @@ module.exports = {
     extends: ['../../.config/typedoc/config.base.cjs'],
     entryPoints: ['./index.ts'],
     externalPattern: [
-        '../client/**',
         '../core/**',
         '../html-parser/**',
         '../markdown-parser/**',
diff --git a/packages/node/utils.ts b/packages/node/utils.ts
index 791435e9..3356b98c 100644
--- a/packages/node/utils.ts
+++ b/packages/node/utils.ts
@@ -1 +1 @@
-export * from '@mtcute/client/utils.js'
+export * from '@mtcute/core/utils.js'