diff --git a/odoo-stubs/__init__.pyi b/odoo-stubs/__init__.pyi
index e9c93c7..5ae427d 100644
--- a/odoo-stubs/__init__.pyi
+++ b/odoo-stubs/__init__.pyi
@@ -1,6 +1,6 @@
 from . import addons as addons, api as api, cli as cli, conf as conf, fields as fields, http as http, loglevels as loglevels, models as models, netsvc as netsvc, osv as osv, release as release, service as service, sql_db as sql_db, tools as tools, upgrade as upgrade
-from odoo.fields import Command as Command
-from odoo.tools.translate import _ as _, _lt as _lt
+from .fields import Command as Command
+from .tools.translate import _ as _, _lt as _lt
 from typing import Any
 
 __path__: Any
diff --git a/odoo-stubs/api.pyi b/odoo-stubs/api.pyi
index 92bb8bc..88e5014 100644
--- a/odoo-stubs/api.pyi
+++ b/odoo-stubs/api.pyi
@@ -1,11 +1,11 @@
 from collections import defaultdict
-from weakref import WeakSet
 from collections.abc import Mapping
 from typing import Any
+from weakref import WeakSet
 
-from odoo.modules.registry import Registry
-from odoo.sql_db import Cursor
-from odoo.tools import StackMap
+from .modules.registry import Registry
+from .sql_db import Cursor
+from .tools import StackMap
 
 __all__: Any
 _logger: Any
@@ -66,7 +66,7 @@ class Environment(Mapping):
     def __eq__(self, other) -> bool: ...
     def __ne__(self, other) -> bool: ...
     def __hash__(self) -> int: ...
-    def __call__(self, cr: Any | None = ..., user: Any | None = ..., context: Any | None = ..., su: Any | None = ...) -> Environment: ...
+    def __call__(self, cr: Cursor | None = ..., user: Any | None = ..., context: Any | None = ..., su: Any | None = ...) -> Environment: ...
     def ref(self, xml_id, raise_if_not_found: bool = ...): ...
     def is_superuser(self) -> bool: ...
     def is_admin(self) -> bool: ...
diff --git a/odoo-stubs/fields.pyi b/odoo-stubs/fields.pyi
index 1cdb655..22383e8 100644
--- a/odoo-stubs/fields.pyi
+++ b/odoo-stubs/fields.pyi
@@ -2,7 +2,7 @@ import datetime
 import enum
 from typing import Any
 
-from odoo.tools import date_utils
+from .tools import date_utils
 
 DATE_LENGTH: Any
 DATETIME_LENGTH: Any
diff --git a/odoo-stubs/http.pyi b/odoo-stubs/http.pyi
index eb6d0f5..d2f6232 100644
--- a/odoo-stubs/http.pyi
+++ b/odoo-stubs/http.pyi
@@ -1,11 +1,11 @@
-import werkzeug.wrappers
-from datetime import date as date
 from typing import Any, Union
-from odoo.api import Environment
-from odoo.modules.registry import Registry
-from odoo.sql_db import Cursor
-from odoo.tools import pycompat as pycompat
-from odoo.tools._vendor import sessions
+
+import werkzeug.wrappers
+
+from .api import Environment
+from .modules.registry import Registry
+from .sql_db import Cursor
+from .tools._vendor import sessions
 
 _logger: Any
 rpc_request: Any
diff --git a/odoo-stubs/models.pyi b/odoo-stubs/models.pyi
index c4dab25..c23a4c5 100644
--- a/odoo-stubs/models.pyi
+++ b/odoo-stubs/models.pyi
@@ -1,12 +1,10 @@
 from collections.abc import MutableMapping
-from psycopg2.extensions import AsIs as AsIs
 from typing import Any, Generator, List
 
-from odoo import api, fields
-from odoo.api import Environment
-from odoo.modules.registry import Registry
-from odoo.sql_db import Cursor
-from odoo.tools import Collector as Collector
+from . import api, fields
+from .api import Environment
+from .modules.registry import Registry
+from .sql_db import Cursor
 
 _logger: Any
 _schema: Any
diff --git a/odoo-stubs/sql_db.pyi b/odoo-stubs/sql_db.pyi
index 176df6e..1b39249 100644
--- a/odoo-stubs/sql_db.pyi
+++ b/odoo-stubs/sql_db.pyi
@@ -1,8 +1,9 @@
-import psycopg2.extensions
 from typing import Any
 
-from odoo.api import Transaction
-from odoo.tools import Callbacks
+import psycopg2.extensions
+
+from .api import Transaction
+from .tools import Callbacks
 
 _logger: Any