diff --git a/client/index.ts b/client/index.ts
index fd2163d0a..0f8011be5 100644
--- a/client/index.ts
+++ b/client/index.ts
@@ -10,14 +10,14 @@ import type {
   ISuperText,
   ISuperStyleSheet,
   ISuperHTMLElement,
-} from 'awaited-dom/base/interfaces/super';
+} from '@ulixee/awaited-dom/base/interfaces/super';
 import {
   IElement,
   IHTMLCollection,
   IHTMLElement,
   INode,
   INodeList,
-} from 'awaited-dom/base/interfaces/official';
+} from '@ulixee/awaited-dom/base/interfaces/official';
 import { BlockedResourceType } from '@ulixee/hero-interfaces/ITabOptions';
 import { KeyboardKey } from '@ulixee/unblocked-specification/agent/interact/IKeyboardLayoutUS';
 import IResourceType, { ResourceType } from '@ulixee/unblocked-specification/agent/net/IResourceType';
diff --git a/client/interfaces/IInteractions.ts b/client/interfaces/IInteractions.ts
index b9609e89c..b0e96233c 100644
--- a/client/interfaces/IInteractions.ts
+++ b/client/interfaces/IInteractions.ts
@@ -4,7 +4,7 @@ import {
   IElementInteractVerification,
   IMousePositionXY,
 } from '@ulixee/unblocked-specification/agent/interact/IInteractions';
-import { ISuperElement } from 'awaited-dom/base/interfaces/super';
+import { ISuperElement } from '@ulixee/awaited-dom/base/interfaces/super';
 
 export type IInteraction = ICommand | ICommandDetailed;
 type IInteractions = IInteraction[];
diff --git a/client/lib/CoreFrameEnvironment.ts b/client/lib/CoreFrameEnvironment.ts
index 874aea224..a795a66a7 100644
--- a/client/lib/CoreFrameEnvironment.ts
+++ b/client/lib/CoreFrameEnvironment.ts
@@ -8,11 +8,11 @@ import {
   ILocationTrigger,
 } from '@ulixee/unblocked-specification/agent/browser/Location';
 import { IJsPath, INodeVisibility, INodePointer } from '@ulixee/js-path';
-import AwaitedPath from 'awaited-dom/base/AwaitedPath';
+import AwaitedPath from '@ulixee/awaited-dom/base/AwaitedPath';
 import { ICookie } from '@ulixee/unblocked-specification/agent/net/ICookie';
 import IWaitForElementOptions from '@ulixee/hero-interfaces/IWaitForElementOptions';
 import IExecJsPathResult from '@ulixee/unblocked-specification/agent/browser/IExecJsPathResult';
-import { IRequestInit } from 'awaited-dom/base/interfaces/official';
+import { IRequestInit } from '@ulixee/awaited-dom/base/interfaces/official';
 import ISetCookieOptions from '@ulixee/hero-interfaces/ISetCookieOptions';
 import {
   getComputedVisibilityFnName,
@@ -21,9 +21,9 @@ import {
 import IWaitForOptions from '@ulixee/hero-interfaces/IWaitForOptions';
 import IFrameMeta from '@ulixee/hero-interfaces/IFrameMeta';
 import IResourceMeta from '@ulixee/unblocked-specification/agent/net/IResourceMeta';
-import StateMachine from 'awaited-dom/base/StateMachine';
-import { IElementIsolate, INodeIsolate } from 'awaited-dom/base/interfaces/isolate';
-import { ISuperElement } from 'awaited-dom/base/interfaces/super';
+import StateMachine from '@ulixee/awaited-dom/base/StateMachine';
+import { IElementIsolate, INodeIsolate } from '@ulixee/awaited-dom/base/interfaces/isolate';
+import { ISuperElement } from '@ulixee/awaited-dom/base/interfaces/super';
 import TimeoutError from '@ulixee/commons/interfaces/TimeoutError';
 import IDetachedElement from '@ulixee/hero-interfaces/IDetachedElement';
 import IAwaitedOptions from '../interfaces/IAwaitedOptions';
diff --git a/client/lib/DomExtender.ts b/client/lib/DomExtender.ts
index 72a4dd461..ec391480f 100644
--- a/client/lib/DomExtender.ts
+++ b/client/lib/DomExtender.ts
@@ -1,24 +1,24 @@
-import StateMachine from 'awaited-dom/base/StateMachine';
-import { ISuperElement, ISuperNode, ISuperHTMLElement, ISuperNodeList, ISuperHTMLCollection } from 'awaited-dom/base/interfaces/super';
-import SuperElement from 'awaited-dom/impl/super-klasses/SuperElement';
-import SuperNode from 'awaited-dom/impl/super-klasses/SuperNode';
-import SuperHTMLElement from 'awaited-dom/impl/super-klasses/SuperHTMLElement';
-import Element from 'awaited-dom/impl/official-klasses/Element';
-import Node from 'awaited-dom/impl/official-klasses/Node';
-import NodeList from 'awaited-dom/impl/official-klasses/NodeList';
-import HTMLCollection from 'awaited-dom/impl/official-klasses/HTMLCollection';
-import HTMLElement from 'awaited-dom/impl/official-klasses/HTMLElement';
-import AwaitedPath from 'awaited-dom/base/AwaitedPath';
+import StateMachine from '@ulixee/awaited-dom/base/StateMachine';
+import { ISuperElement, ISuperNode, ISuperHTMLElement, ISuperNodeList, ISuperHTMLCollection } from '@ulixee/awaited-dom/base/interfaces/super';
+import SuperElement from '@ulixee/awaited-dom/impl/super-klasses/SuperElement';
+import SuperNode from '@ulixee/awaited-dom/impl/super-klasses/SuperNode';
+import SuperHTMLElement from '@ulixee/awaited-dom/impl/super-klasses/SuperHTMLElement';
+import Element from '@ulixee/awaited-dom/impl/official-klasses/Element';
+import Node from '@ulixee/awaited-dom/impl/official-klasses/Node';
+import NodeList from '@ulixee/awaited-dom/impl/official-klasses/NodeList';
+import HTMLCollection from '@ulixee/awaited-dom/impl/official-klasses/HTMLCollection';
+import HTMLElement from '@ulixee/awaited-dom/impl/official-klasses/HTMLElement';
+import AwaitedPath from '@ulixee/awaited-dom/base/AwaitedPath';
 import { INodePointer } from '@ulixee/js-path';
 import { IElementInteractVerification } from '@ulixee/unblocked-specification/agent/interact/IInteractions';
-import SuperNodeList from 'awaited-dom/impl/super-klasses/SuperNodeList';
-import SuperHTMLCollection from 'awaited-dom/impl/super-klasses/SuperHTMLCollection';
+import SuperNodeList from '@ulixee/awaited-dom/impl/super-klasses/SuperNodeList';
+import SuperHTMLCollection from '@ulixee/awaited-dom/impl/super-klasses/SuperHTMLCollection';
 import { KeyboardKey } from '@ulixee/unblocked-specification/agent/interact/IKeyboardLayoutUS';
-import XPathResult from 'awaited-dom/impl/official-klasses/XPathResult';
-import { createSuperDocument, createSuperNode } from 'awaited-dom/impl/create';
+import XPathResult from '@ulixee/awaited-dom/impl/official-klasses/XPathResult';
+import { createSuperDocument, createSuperNode } from '@ulixee/awaited-dom/impl/create';
 import { KeyboardShortcuts } from '@ulixee/unblocked-specification/agent/interact/IKeyboardShortcuts';
-import SuperDocument from 'awaited-dom/impl/super-klasses/SuperDocument';
-import { IElement, IHTMLCollection, IHTMLElement, INode, INodeList } from 'awaited-dom/base/interfaces/official';
+import SuperDocument from '@ulixee/awaited-dom/impl/super-klasses/SuperDocument';
+import { IElement, IHTMLCollection, IHTMLElement, INode, INodeList } from '@ulixee/awaited-dom/base/interfaces/official';
 import { ITypeInteraction } from '../interfaces/IInteractions';
 import CoreFrameEnvironment from './CoreFrameEnvironment';
 import IAwaitedOptions from '../interfaces/IAwaitedOptions';
@@ -60,7 +60,7 @@ interface IBaseExtendNodeList {
   $addToDetachedElements(name?: string): Promise<void>;
 }
 
-declare module 'awaited-dom/base/interfaces/super' {
+declare module '@ulixee/awaited-dom/base/interfaces/super' {
   interface ISuperElement extends IBaseExtendNode {}
   interface ISuperNode extends IBaseExtendNode {}
   interface ISuperHTMLElement extends IBaseExtendNode {}
@@ -68,7 +68,7 @@ declare module 'awaited-dom/base/interfaces/super' {
   interface ISuperHTMLCollection extends IBaseExtendNodeList {}
 }
 
-declare module 'awaited-dom/base/interfaces/official' {
+declare module '@ulixee/awaited-dom/base/interfaces/official' {
   interface IElement extends IBaseExtendNode {}
   interface INode extends IBaseExtendNode {}
   interface IHTMLElement extends IBaseExtendNode {}
diff --git a/client/lib/FileChooser.ts b/client/lib/FileChooser.ts
index 455cc4745..e81e5ec72 100644
--- a/client/lib/FileChooser.ts
+++ b/client/lib/FileChooser.ts
@@ -1,9 +1,9 @@
 import IFileChooserPrompt from '@ulixee/unblocked-specification/agent/browser/IFileChooserPrompt';
 import * as Fs from 'fs';
 import { IJsPath } from '@ulixee/js-path';
-import AwaitedPath  from 'awaited-dom/base/AwaitedPath';
-import { createHTMLInputElement } from 'awaited-dom/impl/create';
-import { IHTMLInputElement } from 'awaited-dom/base/interfaces/official';
+import AwaitedPath  from '@ulixee/awaited-dom/base/AwaitedPath';
+import { createHTMLInputElement } from '@ulixee/awaited-dom/impl/create';
+import { IHTMLInputElement } from '@ulixee/awaited-dom/base/interfaces/official';
 import * as Path from 'path';
 import CoreFrameEnvironment from './CoreFrameEnvironment';
 
diff --git a/client/lib/FrameEnvironment.ts b/client/lib/FrameEnvironment.ts
index 6b233e9cd..22993bada 100644
--- a/client/lib/FrameEnvironment.ts
+++ b/client/lib/FrameEnvironment.ts
@@ -1,11 +1,11 @@
-import StateMachine from 'awaited-dom/base/StateMachine';
-import { ISuperElement, ISuperNode, ISuperNodeList } from 'awaited-dom/base/interfaces/super';
-import AwaitedPath from 'awaited-dom/base/AwaitedPath';
-import { IRequestInit } from 'awaited-dom/base/interfaces/official';
-import SuperDocument from 'awaited-dom/impl/super-klasses/SuperDocument';
-import XPathResult from 'awaited-dom/impl/official-klasses/XPathResult';
-import Storage from 'awaited-dom/impl/official-klasses/Storage';
-import CSSStyleDeclaration from 'awaited-dom/impl/official-klasses/CSSStyleDeclaration';
+import StateMachine from '@ulixee/awaited-dom/base/StateMachine';
+import { ISuperElement, ISuperNode, ISuperNodeList } from '@ulixee/awaited-dom/base/interfaces/super';
+import AwaitedPath from '@ulixee/awaited-dom/base/AwaitedPath';
+import { IRequestInit } from '@ulixee/awaited-dom/base/interfaces/official';
+import SuperDocument from '@ulixee/awaited-dom/impl/super-klasses/SuperDocument';
+import XPathResult from '@ulixee/awaited-dom/impl/official-klasses/XPathResult';
+import Storage from '@ulixee/awaited-dom/impl/official-klasses/Storage';
+import CSSStyleDeclaration from '@ulixee/awaited-dom/impl/official-klasses/CSSStyleDeclaration';
 import {
   createCSSStyleDeclaration,
   createResponse,
@@ -13,15 +13,15 @@ import {
   createSuperDocument,
   createSuperNode,
   createSuperNodeList,
-} from 'awaited-dom/impl/create';
-import Request from 'awaited-dom/impl/official-klasses/Request';
+} from '@ulixee/awaited-dom/impl/create';
+import Request from '@ulixee/awaited-dom/impl/official-klasses/Request';
 import {
   ILoadStatus,
   ILocationTrigger,
   LocationStatus,
 } from '@ulixee/unblocked-specification/agent/browser/Location';
 import IWaitForElementOptions from '@ulixee/hero-interfaces/IWaitForElementOptions';
-import Response from 'awaited-dom/impl/official-klasses/Response';
+import Response from '@ulixee/awaited-dom/impl/official-klasses/Response';
 import IWaitForOptions from '@ulixee/hero-interfaces/IWaitForOptions';
 import {
   IElementIsolate,
@@ -29,7 +29,7 @@ import {
   IHTMLIFrameElementIsolate,
   IHTMLObjectElementIsolate,
   INodeIsolate,
-} from 'awaited-dom/base/interfaces/isolate';
+} from '@ulixee/awaited-dom/base/interfaces/isolate';
 import { INodeVisibility } from '@ulixee/js-path';
 import { INodePointer } from '@ulixee/hero-interfaces/AwaitedDom';
 import { IMousePositionXY } from '@ulixee/unblocked-specification/agent/interact/IInteractions';
diff --git a/client/lib/Hero.ts b/client/lib/Hero.ts
index f9ae33060..ebf7a6922 100644
--- a/client/lib/Hero.ts
+++ b/client/lib/Hero.ts
@@ -1,19 +1,19 @@
 import { BlockedResourceType } from '@ulixee/hero-interfaces/ITabOptions';
 import { bindFunctions } from '@ulixee/commons/lib/utils';
 import ISessionCreateOptions from '@ulixee/hero-interfaces/ISessionCreateOptions';
-import SuperDocument from 'awaited-dom/impl/super-klasses/SuperDocument';
+import SuperDocument from '@ulixee/awaited-dom/impl/super-klasses/SuperDocument';
 import IDomStorage from '@ulixee/unblocked-specification/agent/browser/IDomStorage';
 import IUserProfile from '@ulixee/hero-interfaces/IUserProfile';
-import { IRequestInit } from 'awaited-dom/base/interfaces/official';
-import Response from 'awaited-dom/impl/official-klasses/Response';
-import { ISuperElement, ISuperNode, ISuperNodeList } from 'awaited-dom/base/interfaces/super';
+import { IRequestInit } from '@ulixee/awaited-dom/base/interfaces/official';
+import Response from '@ulixee/awaited-dom/impl/official-klasses/Response';
+import { ISuperElement, ISuperNode, ISuperNodeList } from '@ulixee/awaited-dom/base/interfaces/super';
 import IWaitForResourceOptions from '@ulixee/hero-interfaces/IWaitForResourceOptions';
 import IWaitForElementOptions from '@ulixee/hero-interfaces/IWaitForElementOptions';
 import {
   ILoadStatus,
   ILocationTrigger,
 } from '@ulixee/unblocked-specification/agent/browser/Location';
-import Request from 'awaited-dom/impl/official-klasses/Request';
+import Request from '@ulixee/awaited-dom/impl/official-klasses/Request';
 import IWaitForOptions from '@ulixee/hero-interfaces/IWaitForOptions';
 import {
   IElementIsolate,
@@ -21,8 +21,8 @@ import {
   IHTMLIFrameElementIsolate,
   IHTMLObjectElementIsolate,
   INodeIsolate,
-} from 'awaited-dom/base/interfaces/isolate';
-import CSSStyleDeclaration from 'awaited-dom/impl/official-klasses/CSSStyleDeclaration';
+} from '@ulixee/awaited-dom/base/interfaces/isolate';
+import CSSStyleDeclaration from '@ulixee/awaited-dom/impl/official-klasses/CSSStyleDeclaration';
 import IHeroMeta from '@ulixee/hero-interfaces/IHeroMeta';
 import IScreenshotOptions from '@ulixee/unblocked-specification/agent/browser/IScreenshotOptions';
 import { INodeVisibility } from '@ulixee/js-path';
diff --git a/client/lib/Interactor.ts b/client/lib/Interactor.ts
index fc0152c40..5052327af 100644
--- a/client/lib/Interactor.ts
+++ b/client/lib/Interactor.ts
@@ -10,9 +10,9 @@ import {
   isMousePositionXY,
   MouseButton,
 } from '@ulixee/unblocked-specification/agent/interact/IInteractions';
-import StateMachine from 'awaited-dom/base/StateMachine';
-import { ISuperElement, ISuperNode } from 'awaited-dom/base/interfaces/super';
-import AwaitedPath from 'awaited-dom/base/AwaitedPath';
+import StateMachine from '@ulixee/awaited-dom/base/StateMachine';
+import { ISuperElement, ISuperNode } from '@ulixee/awaited-dom/base/interfaces/super';
+import AwaitedPath from '@ulixee/awaited-dom/base/AwaitedPath';
 import { IKeyboardKeyCode } from '@ulixee/unblocked-specification/agent/interact/IKeyboardLayoutUS';
 import { IKeyboardShortcut } from '@ulixee/unblocked-specification/agent/interact/IKeyboardShortcuts';
 import IInteractions, {
diff --git a/client/lib/Request.ts b/client/lib/Request.ts
index 4f1e51000..8a61e03aa 100644
--- a/client/lib/Request.ts
+++ b/client/lib/Request.ts
@@ -1,7 +1,7 @@
-import FetchRequest from 'awaited-dom/impl/official-klasses/Request';
-import AwaitedPath from 'awaited-dom/base/AwaitedPath';
-import StateMachine from 'awaited-dom/base/StateMachine';
-import { IRequestInfo, IRequestInit } from 'awaited-dom/base/interfaces/official';
+import FetchRequest from '@ulixee/awaited-dom/impl/official-klasses/Request';
+import AwaitedPath from '@ulixee/awaited-dom/base/AwaitedPath';
+import StateMachine from '@ulixee/awaited-dom/base/StateMachine';
+import { IRequestInfo, IRequestInit } from '@ulixee/awaited-dom/base/interfaces/official';
 import { INodePointer } from '@ulixee/js-path';
 import CoreFrameEnvironment from './CoreFrameEnvironment';
 import IAwaitedOptions from '../interfaces/IAwaitedOptions';
diff --git a/client/lib/ScriptInstance.ts b/client/lib/ScriptInstance.ts
index 1b705d68b..746532118 100644
--- a/client/lib/ScriptInstance.ts
+++ b/client/lib/ScriptInstance.ts
@@ -4,7 +4,7 @@ import { getCallSite } from '@ulixee/commons/lib/utils';
 import ISessionCreateOptions from '@ulixee/hero-interfaces/ISessionCreateOptions';
 import ISourceCodeLocation from '@ulixee/commons/interfaces/ISourceCodeLocation';
 
-const AwaitedDomPath = require.resolve('awaited-dom/package.json').replace('package.json', '');
+const AwaitedDomPath = require.resolve('@ulixee/awaited-dom/package.json').replace('package.json', '');
 const HeroLibPath = require.resolve('./Hero').replace(/\/Hero\.(?:ts|js)/, '');
 
 export default class ScriptInstance {
diff --git a/client/lib/SetupAwaitedHandler.ts b/client/lib/SetupAwaitedHandler.ts
index 4667794f8..ae1770329 100644
--- a/client/lib/SetupAwaitedHandler.ts
+++ b/client/lib/SetupAwaitedHandler.ts
@@ -1,11 +1,11 @@
-import AwaitedHandler, { NotImplementedError } from 'awaited-dom/base/AwaitedHandler';
+import AwaitedHandler, { NotImplementedError } from '@ulixee/awaited-dom/base/AwaitedHandler';
 import { IJsPath , INodePointer } from '@ulixee/js-path';
-import AwaitedPath from 'awaited-dom/base/AwaitedPath';
-import Constructable from 'awaited-dom/base/Constructable';
+import AwaitedPath from '@ulixee/awaited-dom/base/AwaitedPath';
+import Constructable from '@ulixee/awaited-dom/base/Constructable';
 import IExecJsPathResult from '@ulixee/unblocked-specification/agent/browser/IExecJsPathResult';
 import { getNodePointerFnName } from '@ulixee/unblocked-specification/agent/browser/IJsPathFunctions';
-import StateMachine from 'awaited-dom/base/StateMachine';
-import NodeFactory from 'awaited-dom/base/NodeFactory';
+import StateMachine from '@ulixee/awaited-dom/base/StateMachine';
+import NodeFactory from '@ulixee/awaited-dom/base/NodeFactory';
 import IAwaitedOptions from '../interfaces/IAwaitedOptions';
 import CoreFrameEnvironment from './CoreFrameEnvironment';
 
diff --git a/client/lib/Tab.ts b/client/lib/Tab.ts
index 1ce47bcb0..19a1d6ec5 100644
--- a/client/lib/Tab.ts
+++ b/client/lib/Tab.ts
@@ -1,17 +1,17 @@
-import StateMachine from 'awaited-dom/base/StateMachine';
-import { ISuperElement, ISuperNode, ISuperNodeList } from 'awaited-dom/base/interfaces/super';
-import { IRequestInit } from 'awaited-dom/base/interfaces/official';
-import SuperDocument from 'awaited-dom/impl/super-klasses/SuperDocument';
-import Storage from 'awaited-dom/impl/official-klasses/Storage';
-import CSSStyleDeclaration from 'awaited-dom/impl/official-klasses/CSSStyleDeclaration';
-import Request from 'awaited-dom/impl/official-klasses/Request';
+import StateMachine from '@ulixee/awaited-dom/base/StateMachine';
+import { ISuperElement, ISuperNode, ISuperNodeList } from '@ulixee/awaited-dom/base/interfaces/super';
+import { IRequestInit } from '@ulixee/awaited-dom/base/interfaces/official';
+import SuperDocument from '@ulixee/awaited-dom/impl/super-klasses/SuperDocument';
+import Storage from '@ulixee/awaited-dom/impl/official-klasses/Storage';
+import CSSStyleDeclaration from '@ulixee/awaited-dom/impl/official-klasses/CSSStyleDeclaration';
+import Request from '@ulixee/awaited-dom/impl/official-klasses/Request';
 import {
   ILoadStatus,
   ILocationTrigger,
 } from '@ulixee/unblocked-specification/agent/browser/Location';
 import IWaitForResourceOptions from '@ulixee/hero-interfaces/IWaitForResourceOptions';
 import IWaitForElementOptions from '@ulixee/hero-interfaces/IWaitForElementOptions';
-import Response from 'awaited-dom/impl/official-klasses/Response';
+import Response from '@ulixee/awaited-dom/impl/official-klasses/Response';
 import IWaitForOptions from '@ulixee/hero-interfaces/IWaitForOptions';
 import {
   IElementIsolate,
@@ -19,9 +19,9 @@ import {
   IHTMLIFrameElementIsolate,
   IHTMLObjectElementIsolate,
   INodeIsolate,
-} from 'awaited-dom/base/interfaces/isolate';
+} from '@ulixee/awaited-dom/base/interfaces/isolate';
 import IScreenshotOptions from '@ulixee/unblocked-specification/agent/browser/IScreenshotOptions';
-import AwaitedPath from 'awaited-dom/base/AwaitedPath';
+import AwaitedPath from '@ulixee/awaited-dom/base/AwaitedPath';
 import { INodeVisibility } from '@ulixee/js-path';
 import IResourceFilterProperties from '@ulixee/hero-interfaces/IResourceFilterProperties';
 import IDomState, { IDomStateAllFn } from '@ulixee/hero-interfaces/IDomState';
diff --git a/client/lib/WebsocketResource.ts b/client/lib/WebsocketResource.ts
index a0a874dda..815ed0c07 100644
--- a/client/lib/WebsocketResource.ts
+++ b/client/lib/WebsocketResource.ts
@@ -1,4 +1,4 @@
-import AwaitedPath from 'awaited-dom/base/AwaitedPath';
+import AwaitedPath from '@ulixee/awaited-dom/base/AwaitedPath';
 import IResourceMeta from '@ulixee/unblocked-specification/agent/net/IResourceMeta';
 import IResourceType from '@ulixee/unblocked-specification/agent/net/IResourceType';
 import IWebsocketMessage from '@ulixee/hero-interfaces/IWebsocketMessage';
diff --git a/client/package.json b/client/package.json
index be4c9464e..647dd7d81 100644
--- a/client/package.json
+++ b/client/package.json
@@ -17,7 +17,7 @@
     "@ulixee/js-path": "2.0.0-alpha.13",
     "@ulixee/net": "2.0.0-alpha.14",
     "@ulixee/unblocked-specification": "2.0.0-alpha.13",
-    "awaited-dom": "1.4.0",
+    "@ulixee/awaited-dom": "1.4.1",
     "linkedom": "^0.14.11",
     "nanoid": "^3.1.30",
     "ws": "^7.4.6"
diff --git a/client/test/document.test.ts b/client/test/document.test.ts
index df5cab0c2..a1f022776 100644
--- a/client/test/document.test.ts
+++ b/client/test/document.test.ts
@@ -1,7 +1,7 @@
 // need to import this before the awaited stuff gets imported
 import '../lib/SetupAwaitedHandler';
 
-import { getState as getElementState } from 'awaited-dom/base/official-klasses/Element';
+import { getState as getElementState } from '@ulixee/awaited-dom/base/official-klasses/Element';
 import IExecJsPathResult from '@ulixee/unblocked-specification/agent/browser/IExecJsPathResult';
 import { getNodePointerFnName } from '@ulixee/unblocked-specification/agent/browser/IJsPathFunctions';
 import { Helpers } from '@ulixee/hero-testing';
diff --git a/core/lib/FrameEnvironment.ts b/core/lib/FrameEnvironment.ts
index f3c38ee35..9e764e3ad 100644
--- a/core/lib/FrameEnvironment.ts
+++ b/core/lib/FrameEnvironment.ts
@@ -14,7 +14,7 @@ import {
 import { URL } from 'url';
 import * as Fs from 'fs';
 import IExecJsPathResult from '@ulixee/unblocked-specification/agent/browser/IExecJsPathResult';
-import { IRequestInit } from 'awaited-dom/base/interfaces/official';
+import { IRequestInit } from '@ulixee/awaited-dom/base/interfaces/official';
 import { IFrameEvents } from '@ulixee/unblocked-specification/agent/browser/IFrame';
 import { CanceledPromiseError } from '@ulixee/commons/interfaces/IPendingWaitEvent';
 import ISetCookieOptions from '@ulixee/hero-interfaces/ISetCookieOptions';
diff --git a/core/package.json b/core/package.json
index 8083aaf84..a67f12c0c 100644
--- a/core/package.json
+++ b/core/package.json
@@ -15,7 +15,6 @@
     "./connections/*": "./connections/*.js"
   },
   "dependencies": {
-    "@types/ua-parser-js": "^0.7.35",
     "@ulixee/commons": "2.0.0-alpha.14",
     "@ulixee/default-browser-emulator": "2.0.0-alpha.13",
     "@ulixee/default-human-emulator": "2.0.0-alpha.13",
@@ -27,13 +26,14 @@
     "@ulixee/unblocked-agent": "2.0.0-alpha.13",
     "@ulixee/unblocked-agent-mitm": "2.0.0-alpha.13",
     "@ulixee/unblocked-specification": "2.0.0-alpha.13",
-    "awaited-dom": "1.4.0",
+    "@ulixee/awaited-dom": "1.4.1",
     "better-sqlite3": "^7.5.1",
     "moment": "^2.29.4",
     "nanoid": "^3.1.30",
     "ws": "^7.4.6"
   },
   "devDependencies": {
+    "@types/ua-parser-js": "^0.7.35",
     "@types/better-sqlite3": "^7.5.0",
     "@types/json-socket": "^0.1.17",
     "@ulixee/chrome-app": "1.0.2",
diff --git a/docs/scripts/generateAwaitedDOM.ts b/docs/scripts/generateAwaitedDOM.ts
index e39607a3d..4f4c0ffef 100755
--- a/docs/scripts/generateAwaitedDOM.ts
+++ b/docs/scripts/generateAwaitedDOM.ts
@@ -2,7 +2,7 @@ import * as Fs from 'fs';
 import * as Path from 'path';
 import * as json2md from 'json2md';
 import decamelize = require('decamelize');
-import rawDocs = require('awaited-dom/docs.json');
+import rawDocs = require('@ulixee/awaited-dom/docs.json');
 import { DOMParser } from 'noderdom-detached';
 import { IElement, IHTMLLinkElement } from 'noderdom-detached/base/interfaces';
 
diff --git a/end-to-end/package.json b/end-to-end/package.json
index 3c4e05ed8..01ee27297 100644
--- a/end-to-end/package.json
+++ b/end-to-end/package.json
@@ -19,7 +19,7 @@
     "@ulixee/hero-timetravel": "2.0.0-alpha.14",
     "@ulixee/unblocked-agent-mitm": "2.0.0-alpha.13",
     "@ulixee/unblocked-specification": "2.0.0-alpha.13",
-    "awaited-dom": "1.4.0",
+    "@ulixee/awaited-dom": "1.4.1",
     "ws": "^7.4.6"
   }
 }
diff --git a/end-to-end/test/document.test.ts b/end-to-end/test/document.test.ts
index a6dd803d3..4e2aed688 100644
--- a/end-to-end/test/document.test.ts
+++ b/end-to-end/test/document.test.ts
@@ -3,8 +3,8 @@ import { XPathResult } from '@ulixee/hero-interfaces/AwaitedDom';
 import { ITestKoaServer } from '@ulixee/hero-testing/helpers';
 import { FrameEnvironment, LocationStatus } from '@ulixee/hero';
 import Dialog from '@ulixee/hero/lib/Dialog';
-import HTMLIFrameElement from 'awaited-dom/impl/official-klasses/HTMLIFrameElement';
-import HTMLHeadingElement from 'awaited-dom/impl/official-klasses/HTMLHeadingElement';
+import HTMLIFrameElement from '@ulixee/awaited-dom/impl/official-klasses/HTMLIFrameElement';
+import HTMLHeadingElement from '@ulixee/awaited-dom/impl/official-klasses/HTMLHeadingElement';
 
 let koaServer: ITestKoaServer;
 beforeAll(async () => {
diff --git a/interfaces/AwaitedDom.ts b/interfaces/AwaitedDom.ts
index 6a5b7476a..38597d2c2 100644
--- a/interfaces/AwaitedDom.ts
+++ b/interfaces/AwaitedDom.ts
@@ -1,5 +1,5 @@
-import XPathResult from 'awaited-dom/impl/official-klasses/XPathResult';
-import Node from 'awaited-dom/impl/official-klasses/Node';
+import XPathResult from '@ulixee/awaited-dom/impl/official-klasses/XPathResult';
+import Node from '@ulixee/awaited-dom/impl/official-klasses/Node';
 import { INodePointer } from '@ulixee/js-path';
 
 // export these 2 so you can access the static readonly properties (e.g., XPathResult.ANY_RESULT)
diff --git a/interfaces/IDomState.ts b/interfaces/IDomState.ts
index 0485e300a..b37aca68a 100644
--- a/interfaces/IDomState.ts
+++ b/interfaces/IDomState.ts
@@ -1,4 +1,4 @@
-import { ISuperElement, ISuperHTMLElement, ISuperNode } from 'awaited-dom/base/interfaces/super';
+import { ISuperElement, ISuperHTMLElement, ISuperNode } from '@ulixee/awaited-dom/base/interfaces/super';
 
 export default interface IDomState {
   url?: string | RegExp;
diff --git a/interfaces/package.json b/interfaces/package.json
index 8c5e7f24e..c22346ae6 100644
--- a/interfaces/package.json
+++ b/interfaces/package.json
@@ -6,7 +6,7 @@
     "@ulixee/commons": "2.0.0-alpha.14",
     "@ulixee/js-path": "2.0.0-alpha.13",
     "@ulixee/unblocked-specification": "2.0.0-alpha.13",
-    "awaited-dom": "1.4.0",
+    "@ulixee/awaited-dom": "1.4.1",
     "devtools-protocol": "^0.0.981744"
   }
 }
diff --git a/package.json b/package.json
index 60f914855..b6ddddaf4 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,8 @@
     "@commitlint/config-conventional": "^12.0.1",
     "@types/jest": "^28.1.0",
     "@types/node": "^14.18.18",
-    "@ulixee/repo-tools": "^1.0.21",
-    "awaited-dom": "1.4.0",
+    "@ulixee/repo-tools": "^1.0.22",
+    "@ulixee/awaited-dom": "1.4.1",
     "cross-env": "^7.0.3",
     "decamelize": "^4.0.0",
     "husky": "^7.0.1",
diff --git a/yarn.lock b/yarn.lock
index b781d1f96..b0e9b39e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2047,6 +2047,13 @@
     "@typescript-eslint/types" "5.39.0"
     eslint-visitor-keys "^3.3.0"
 
+"@ulixee/awaited-dom@1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@ulixee/awaited-dom/-/awaited-dom-1.4.1.tgz#faa43fcc25710caa0bb7558f106768c60ba3622a"
+  integrity sha512-lj5TqBm4thn6+8PcMesgWwPUP9HRf8jKO3+Pc3cst7nDqKKedfBnDvUhDS9outiI1U5dmFvxoYmiNwL1Pi3oXg==
+  dependencies:
+    "@ulixee/js-path" "^2.0.0-alpha.13"
+
 "@ulixee/chrome-105-0@^5195.127.6":
   version "5195.127.6"
   resolved "https://registry.yarnpkg.com/@ulixee/chrome-105-0/-/chrome-105-0-5195.127.6.tgz#b1a3d2e91d5f982c0a2b3b6e7aa5a514cd265a0a"
@@ -2079,10 +2086,10 @@
     progress "^2.0.3"
     tar "^6.1.11"
 
-"@ulixee/repo-tools@^1.0.21":
-  version "1.0.21"
-  resolved "https://registry.yarnpkg.com/@ulixee/repo-tools/-/repo-tools-1.0.21.tgz#357808c570872494fdf9c8255b23038b36d3992e"
-  integrity sha512-Oflv3YtPAYnZWA291PZ7X1AP1HbqHR4HSm+yrOIfUqQ2r97Un5eYdU7f/ZRqd0SGkj9/A/9i+Ad09XKXOHeBBg==
+"@ulixee/repo-tools@^1.0.22":
+  version "1.0.22"
+  resolved "https://registry.yarnpkg.com/@ulixee/repo-tools/-/repo-tools-1.0.22.tgz#b906737cf464b5fc3ea0be5b2c958e0fedb76921"
+  integrity sha512-Qgocpy/bOCFfr5rIjAY+AHOonif/FgGcOuXUWpe8ucB402ujnIs/woyVzmj3INbu0K0fAop+sJcNvNkx4QhZew==
   dependencies:
     "@typescript-eslint/eslint-plugin" "^5.27.1"
     "@typescript-eslint/parser" "^5.27.1"
@@ -2103,11 +2110,6 @@
     pretty-quick "^3.1.0"
     typescript "^4.7.2"
 
-"@unblocked-web/js-path@2.0.0-alpha.1":
-  version "2.0.0-alpha.1"
-  resolved "https://registry.yarnpkg.com/@unblocked-web/js-path/-/js-path-2.0.0-alpha.1.tgz#39482400d582a1cb88197724f2b1efa339d9483f"
-  integrity sha512-59FWvS1XRD862CLm2/9ZPiJlylolwkhe3HRH+aIes7dRXHSlpdwOLQG1V6NN1W//TXh9ars3f3TJqr4XLSaAcg==
-
 "@vue/compiler-sfc@2.7.10":
   version "2.7.10"
   resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz#3fe08e780053a3bbf41328c65ae5dfdee0385206"
@@ -2390,13 +2392,6 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-awaited-dom@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/awaited-dom/-/awaited-dom-1.4.0.tgz#d74ed6bf7012aa8588f2189bee1dd2f7661870d4"
-  integrity sha512-0Am2L51ByCfKkHXUs8Cv2qCoukJtXq+iLrBwoPgNPB5OmfmdnPefibb6jJ1SN9pNMx7pxMakScYY2aO2gikoww==
-  dependencies:
-    "@unblocked-web/js-path" "2.0.0-alpha.1"
-
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"