python: knot_resolver_manager module renamed to knot_resolver

147 files changed, 299 insertions, 301 deletions

diff --git a/build_c_extensions.py b/build_c_extensions.py
index 0e078cfb..77c197a1 100644
--- a/build_c_extensions.py
+++ b/build_c_extensions.py
@@ -8,8 +8,8 @@ def build(setup_kwargs: Dict[Any, Any]) -> None:
         {
             "ext_modules": [
                 Extension(
-                    name="knot_resolver_manager.controller.supervisord.plugin.notify",
-                    sources=["python/knot_resolver_manager/controller/supervisord/plugin/notifymodule.c"],
+                    name="knot_resolver.controller.supervisord.plugin.notify",
+                    sources=["python/knot_resolver/controller/supervisord/plugin/notifymodule.c"],
                 ),
             ]
         }
diff --git a/pyproject.toml b/pyproject.toml
index d4a6063a..da8485c4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "knot-resolver-manager"
+name = "knot-resolver"
 version = "6.0.8"
 description = "Knot Resolver Manager - a Python program that automatically manages the other components of the resolver"
 license = "GPL-3.0-or-later"
@@ -16,7 +16,7 @@ repository = "https://gitlab.nic.cz/knot/knot-resolver"
 documentation = "https://www.knot-resolver.cz/documentation"
 
 packages = [
-    {include = "knot_resolver_manager", from = "python"}
+    {include = "knot_resolver", from = "python"}
 ]
 
 # See currently open issue about building C extensions here:
@@ -65,8 +65,8 @@ breathe = "^4.35.0"
 json-schema-for-humans = "^0.47"
 
 [tool.poetry.scripts]
-kresctl = 'knot_resolver_manager.client.main:main'
-knot-resolver = 'knot_resolver_manager.manager.main:main'
+kresctl = 'knot_resolver.client.main:main'
+knot-resolver = 'knot_resolver.manager.main:main'
 
 [tool.poe.tasks]
 # tasks runed through scripts located in 'scripts/poe-tasks/'
diff --git a/python/knot_resolver_manager/__init__.py b/python/knot_resolver/__init__.py
index 511e8d44..511e8d44 100644
--- a/python/knot_resolver_manager/__init__.py
+++ b/python/knot_resolver/__init__.py
diff --git a/python/knot_resolver/client/__init__.py b/python/knot_resolver/client/__init__.py
new file mode 100644
index 00000000..5b82d3be
--- /dev/null
+++ b/python/knot_resolver/client/__init__.py
@@ -0,0 +1,5 @@
+from pathlib import Path
+
+from knot_resolver.datamodel.globals import Context, set_global_validation_context
+
+set_global_validation_context(Context(Path("."), False))
diff --git a/python/knot_resolver/client/__main__.py b/python/knot_resolver/client/__main__.py
new file mode 100644
index 00000000..56200674
--- /dev/null
+++ b/python/knot_resolver/client/__main__.py
@@ -0,0 +1,4 @@
+from knot_resolver.client.main import main
+
+if __name__ == "__main__":
+    main()
diff --git a/python/knot_resolver_manager/client/client.py b/python/knot_resolver/client/client.py
index d97ca655..4e7d13ea 100644
--- a/python/knot_resolver_manager/client/client.py
+++ b/python/knot_resolver/client/client.py
@@ -1,6 +1,6 @@
 import argparse
 
-from knot_resolver_manager.client.command import CommandArgs
+from knot_resolver.client.command import CommandArgs
 
 KRES_CLIENT_NAME = "kresctl"
 
diff --git a/python/knot_resolver_manager/client/command.py b/python/knot_resolver/client/command.py
index df772858..af59c42e 100644
--- a/python/knot_resolver_manager/client/command.py
+++ b/python/knot_resolver/client/command.py
@@ -5,12 +5,12 @@ from pathlib import Path
 from typing import Dict, List, Optional, Tuple, Type, TypeVar
 from urllib.parse import quote
 
-from knot_resolver_manager.manager.constants import API_SOCK_ENV_VAR, CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE
-from knot_resolver_manager.datamodel.config_schema import DEFAULT_MANAGER_API_SOCK
-from knot_resolver_manager.datamodel.types import IPAddressPort
-from knot_resolver_manager.utils.modeling import parsing
-from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
-from knot_resolver_manager.utils.requests import SocketDesc
+from knot_resolver.manager.constants import API_SOCK_ENV_VAR, CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE
+from knot_resolver.datamodel.config_schema import DEFAULT_MANAGER_API_SOCK
+from knot_resolver.datamodel.types import IPAddressPort
+from knot_resolver.utils.modeling import parsing
+from knot_resolver.utils.modeling.exceptions import DataValidationError
+from knot_resolver.utils.requests import SocketDesc
 
 T = TypeVar("T", bound=Type["Command"])
 
diff --git a/python/knot_resolver_manager/client/commands/cache.py b/python/knot_resolver/client/commands/cache.py
index 493c46d8..60417eec 100644
--- a/python/knot_resolver_manager/client/commands/cache.py
+++ b/python/knot_resolver/client/commands/cache.py
@@ -3,11 +3,11 @@ import sys
 from enum import Enum
 from typing import Any, Dict, List, Optional, Tuple, Type
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.datamodel.cache_schema import CacheClearRPCSchema
-from knot_resolver_manager.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError
-from knot_resolver_manager.utils.modeling.parsing import DataFormat, parse_json
-from knot_resolver_manager.utils.requests import request
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.datamodel.cache_schema import CacheClearRPCSchema
+from knot_resolver.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError
+from knot_resolver.utils.modeling.parsing import DataFormat, parse_json
+from knot_resolver.utils.requests import request
 
 
 class CacheOperations(Enum):
diff --git a/python/knot_resolver_manager/client/commands/completion.py b/python/knot_resolver/client/commands/completion.py
index b79c1d44..05fdded8 100644
--- a/python/knot_resolver_manager/client/commands/completion.py
+++ b/python/knot_resolver/client/commands/completion.py
@@ -2,7 +2,7 @@ import argparse
 from enum import Enum
 from typing import List, Tuple, Type
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
 
 
 class Shells(Enum):
diff --git a/python/knot_resolver_manager/client/commands/config.py b/python/knot_resolver/client/commands/config.py
index 8ef7b545..add17272 100644
--- a/python/knot_resolver_manager/client/commands/config.py
+++ b/python/knot_resolver/client/commands/config.py
@@ -5,9 +5,9 @@ from typing import List, Optional, Tuple, Type
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.utils.modeling.parsing import DataFormat, parse_json, try_to_parse
-from knot_resolver_manager.utils.requests import request
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.utils.modeling.parsing import DataFormat, parse_json, try_to_parse
+from knot_resolver.utils.requests import request
 
 
 class Operations(Enum):
diff --git a/python/knot_resolver_manager/client/commands/convert.py b/python/knot_resolver/client/commands/convert.py
index a468bf56..a25c5cd9 100644
--- a/python/knot_resolver_manager/client/commands/convert.py
+++ b/python/knot_resolver/client/commands/convert.py
@@ -3,15 +3,15 @@ import sys
 from pathlib import Path
 from typing import List, Optional, Tuple, Type
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.datamodel import KresConfig
-from knot_resolver_manager.datamodel.globals import (
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.datamodel import KresConfig
+from knot_resolver.datamodel.globals import (
     Context,
     reset_global_validation_context,
     set_global_validation_context,
 )
-from knot_resolver_manager.utils.modeling import try_to_parse
-from knot_resolver_manager.utils.modeling.exceptions import DataParsingError, DataValidationError
+from knot_resolver.utils.modeling import try_to_parse
+from knot_resolver.utils.modeling.exceptions import DataParsingError, DataValidationError
 
 
 @register_command
diff --git a/python/knot_resolver_manager/client/commands/help.py b/python/knot_resolver/client/commands/help.py
index 93b45855..87306c2a 100644
--- a/python/knot_resolver_manager/client/commands/help.py
+++ b/python/knot_resolver/client/commands/help.py
@@ -1,7 +1,7 @@
 import argparse
 from typing import List, Tuple, Type
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
 
 
 @register_command
diff --git a/python/knot_resolver_manager/client/commands/metrics.py b/python/knot_resolver/client/commands/metrics.py
index 2d3378d0..058cad8b 100644
--- a/python/knot_resolver_manager/client/commands/metrics.py
+++ b/python/knot_resolver/client/commands/metrics.py
@@ -2,9 +2,9 @@ import argparse
 import sys
 from typing import List, Optional, Tuple, Type
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.utils.modeling.parsing import DataFormat, parse_json
-from knot_resolver_manager.utils.requests import request
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.utils.modeling.parsing import DataFormat, parse_json
+from knot_resolver.utils.requests import request
 
 
 @register_command
diff --git a/python/knot_resolver_manager/client/commands/reload.py b/python/knot_resolver/client/commands/reload.py
index c800ca2f..c1350fc5 100644
--- a/python/knot_resolver_manager/client/commands/reload.py
+++ b/python/knot_resolver/client/commands/reload.py
@@ -2,8 +2,8 @@ import argparse
 import sys
 from typing import List, Tuple, Type
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.utils.requests import request
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.utils.requests import request
 
 
 @register_command
diff --git a/python/knot_resolver_manager/client/commands/schema.py b/python/knot_resolver/client/commands/schema.py
index af7ad618..f5538424 100644
--- a/python/knot_resolver_manager/client/commands/schema.py
+++ b/python/knot_resolver/client/commands/schema.py
@@ -3,9 +3,9 @@ import json
 import sys
 from typing import List, Optional, Tuple, Type
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.datamodel.config_schema import KresConfig
-from knot_resolver_manager.utils.requests import request
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.utils.requests import request
 
 
 @register_command
diff --git a/python/knot_resolver_manager/client/commands/stop.py b/python/knot_resolver/client/commands/stop.py
index 7bd6d21c..35baf36c 100644
--- a/python/knot_resolver_manager/client/commands/stop.py
+++ b/python/knot_resolver/client/commands/stop.py
@@ -2,8 +2,8 @@ import argparse
 import sys
 from typing import List, Tuple, Type
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.utils.requests import request
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.utils.requests import request
 
 
 @register_command
diff --git a/python/knot_resolver_manager/client/commands/validate.py b/python/knot_resolver/client/commands/validate.py
index 924244bd..267bf562 100644
--- a/python/knot_resolver_manager/client/commands/validate.py
+++ b/python/knot_resolver/client/commands/validate.py
@@ -3,15 +3,15 @@ import sys
 from pathlib import Path
 from typing import List, Tuple, Type
 
-from knot_resolver_manager.client.command import Command, CommandArgs, CompWords, register_command
-from knot_resolver_manager.datamodel import KresConfig
-from knot_resolver_manager.datamodel.globals import (
+from knot_resolver.client.command import Command, CommandArgs, CompWords, register_command
+from knot_resolver.datamodel import KresConfig
+from knot_resolver.datamodel.globals import (
     Context,
     reset_global_validation_context,
     set_global_validation_context,
 )
-from knot_resolver_manager.utils.modeling import try_to_parse
-from knot_resolver_manager.utils.modeling.exceptions import DataParsingError, DataValidationError
+from knot_resolver.utils.modeling import try_to_parse
+from knot_resolver.utils.modeling.exceptions import DataParsingError, DataValidationError
 
 
 @register_command
diff --git a/python/knot_resolver_manager/client/main.py b/python/knot_resolver/client/main.py
index 933da54d..933da54d 100644
--- a/python/knot_resolver_manager/client/main.py
+++ b/python/knot_resolver/client/main.py
diff --git a/python/knot_resolver_manager/compat/__init__.py b/python/knot_resolver/compat/__init__.py
index 53993f6c..53993f6c 100644
--- a/python/knot_resolver_manager/compat/__init__.py
+++ b/python/knot_resolver/compat/__init__.py
diff --git a/python/knot_resolver_manager/compat/asyncio.py b/python/knot_resolver/compat/asyncio.py
index 9e10e6c6..9e10e6c6 100644
--- a/python/knot_resolver_manager/compat/asyncio.py
+++ b/python/knot_resolver/compat/asyncio.py
diff --git a/python/knot_resolver_manager/controller/__init__.py b/python/knot_resolver/controller/__init__.py
index cfefa48f..2398347e 100644
--- a/python/knot_resolver_manager/controller/__init__.py
+++ b/python/knot_resolver/controller/__init__.py
@@ -12,8 +12,8 @@ import asyncio
 import logging
 from typing import List, Optional
 
-from knot_resolver_manager.datamodel.config_schema import KresConfig
-from knot_resolver_manager.controller.interface import SubprocessController
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.controller.interface import SubprocessController
 
 logger = logging.getLogger(__name__)
 
@@ -29,7 +29,7 @@ def try_supervisord():
     Attempt to load supervisord controllers.
     """
     try:
-        from knot_resolver_manager.controller.supervisord import SupervisordSubprocessController
+        from knot_resolver.controller.supervisord import SupervisordSubprocessController
 
         _registered_controllers.append(SupervisordSubprocessController())
     except ImportError:
diff --git a/python/knot_resolver_manager/controller/interface.py b/python/knot_resolver/controller/interface.py
index dfedb4b2..02bbaa50 100644
--- a/python/knot_resolver_manager/controller/interface.py
+++ b/python/knot_resolver/controller/interface.py
@@ -10,11 +10,11 @@ from pathlib import Path
 from typing import Dict, Iterable, Optional, Type, TypeVar
 from weakref import WeakValueDictionary
 
-from knot_resolver_manager.manager.constants import kresd_config_file, policy_loader_config_file
-from knot_resolver_manager.datamodel.config_schema import KresConfig
-from knot_resolver_manager.manager.exceptions import SubprocessControllerException
-from knot_resolver_manager.controller.registered_workers import register_worker, unregister_worker
-from knot_resolver_manager.utils.async_utils import writefile
+from knot_resolver.manager.constants import kresd_config_file, policy_loader_config_file
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.manager.exceptions import SubprocessControllerException
+from knot_resolver.controller.registered_workers import register_worker, unregister_worker
+from knot_resolver.utils.async_utils import writefile
 
 logger = logging.getLogger(__name__)
 
diff --git a/python/knot_resolver_manager/controller/registered_workers.py b/python/knot_resolver/controller/registered_workers.py
index 87066dcf..2d3176c3 100644
--- a/python/knot_resolver_manager/controller/registered_workers.py
+++ b/python/knot_resolver/controller/registered_workers.py
@@ -2,10 +2,10 @@ import asyncio
 import logging
 from typing import TYPE_CHECKING, Dict, List, Tuple
 
-from knot_resolver_manager.manager.exceptions import SubprocessControllerException
+from knot_resolver.manager.exceptions import SubprocessControllerException
 
 if TYPE_CHECKING:
-    from knot_resolver_manager.controller.interface import KresID, Subprocess
+    from knot_resolver.controller.interface import KresID, Subprocess
 
 
 logger = logging.getLogger(__name__)
diff --git a/python/knot_resolver_manager/controller/supervisord/__init__.py b/python/knot_resolver/controller/supervisord/__init__.py
index bf1429e3..592b76be 100644
--- a/python/knot_resolver_manager/controller/supervisord/__init__.py
+++ b/python/knot_resolver/controller/supervisord/__init__.py
@@ -6,20 +6,20 @@ from xmlrpc.client import Fault, ServerProxy
 
 import supervisor.xmlrpc  # type: ignore[import]
 
-from knot_resolver_manager.compat.asyncio import async_in_a_thread
-from knot_resolver_manager.manager.constants import supervisord_config_file, supervisord_pid_file, supervisord_sock_file
-from knot_resolver_manager.datamodel.config_schema import KresConfig
-from knot_resolver_manager.manager.exceptions import CancelStartupExecInsteadException, SubprocessControllerException
-from knot_resolver_manager.controller.interface import (
+from knot_resolver.compat.asyncio import async_in_a_thread
+from knot_resolver.manager.constants import supervisord_config_file, supervisord_pid_file, supervisord_sock_file
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.manager.exceptions import CancelStartupExecInsteadException, SubprocessControllerException
+from knot_resolver.controller.interface import (
     KresID,
     Subprocess,
     SubprocessController,
     SubprocessStatus,
     SubprocessType,
 )
-from knot_resolver_manager.controller.supervisord.config_file import SupervisordKresID, write_config_file
-from knot_resolver_manager.utils import which
-from knot_resolver_manager.utils.async_utils import call, readfile
+from knot_resolver.controller.supervisord.config_file import SupervisordKresID, write_config_file
+from knot_resolver.utils import which
+from knot_resolver.utils.async_utils import call, readfile
 
 logger = logging.getLogger(__name__)
 
diff --git a/python/knot_resolver_manager/controller/supervisord/config_file.py b/python/knot_resolver/controller/supervisord/config_file.py
index 27da636c..d9a79f9e 100644
--- a/python/knot_resolver_manager/controller/supervisord/config_file.py
+++ b/python/knot_resolver/controller/supervisord/config_file.py
@@ -6,7 +6,7 @@ from pathlib import Path
 from jinja2 import Template
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.constants import (
+from knot_resolver.manager.constants import (
     kres_gc_executable,
     kresd_cache_dir,
     kresd_config_file_supervisord_pattern,
@@ -19,10 +19,10 @@ from knot_resolver_manager.manager.constants import (
     supervisord_subprocess_log_dir,
     user_constants,
 )
-from knot_resolver_manager.datamodel.config_schema import KresConfig
-from knot_resolver_manager.datamodel.logging_schema import LogTargetEnum
-from knot_resolver_manager.controller.interface import KresID, SubprocessType
-from knot_resolver_manager.utils.async_utils import read_resource, writefile
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.datamodel.logging_schema import LogTargetEnum
+from knot_resolver.controller.interface import KresID, SubprocessType
+from knot_resolver.utils.async_utils import read_resource, writefile
 
 logger = logging.getLogger(__name__)
 
@@ -131,7 +131,7 @@ class ProcessTypeConfig:
         if os.environ.get("KRES_DEBUG_MANAGER"):
             logger.warning("Injecting debugger into the supervisord config")
             # the args array looks like this:
-            # [PYTHON_PATH, "-m", "knot_resolver_manager", ...]
+            # [PYTHON_PATH, "-m", "knot_resolver", ...]
             args = args[:1] + ["-m", "debugpy", "--listen", "0.0.0.0:5678", "--wait-for-client"] + args[2:]
 
         cmd = '"' + '" "'.join(args) + '"'
diff --git a/python/knot_resolver_manager/controller/supervisord/plugin/fast_rpcinterface.py b/python/knot_resolver/controller/supervisord/plugin/fast_rpcinterface.py
index c3834784..c3834784 100644
--- a/python/knot_resolver_manager/controller/supervisord/plugin/fast_rpcinterface.py
+++ b/python/knot_resolver/controller/supervisord/plugin/fast_rpcinterface.py
diff --git a/python/knot_resolver_manager/controller/supervisord/plugin/manager_integration.py b/python/knot_resolver/controller/supervisord/plugin/manager_integration.py
index 81115617..2fc8cf94 100644
--- a/python/knot_resolver_manager/controller/supervisord/plugin/manager_integration.py
+++ b/python/knot_resolver/controller/supervisord/plugin/manager_integration.py
@@ -12,7 +12,7 @@ from supervisor.process import Subprocess
 from supervisor.states import SupervisorStates
 from supervisor.supervisord import Supervisor
 
-from knot_resolver_manager.utils.systemd_notify import systemd_notify
+from knot_resolver.utils.systemd_notify import systemd_notify
 
 superd: Optional[Supervisor] = None
 
diff --git a/python/knot_resolver_manager/controller/supervisord/plugin/notifymodule.c b/python/knot_resolver/controller/supervisord/plugin/notifymodule.c
index d56ee7d2..d56ee7d2 100644
--- a/python/knot_resolver_manager/controller/supervisord/plugin/notifymodule.c
+++ b/python/knot_resolver/controller/supervisord/plugin/notifymodule.c
diff --git a/python/knot_resolver_manager/controller/supervisord/plugin/patch_logger.py b/python/knot_resolver/controller/supervisord/plugin/patch_logger.py
index 411f232e..411f232e 100644
--- a/python/knot_resolver_manager/controller/supervisord/plugin/patch_logger.py
+++ b/python/knot_resolver/controller/supervisord/plugin/patch_logger.py
diff --git a/python/knot_resolver_manager/controller/supervisord/plugin/sd_notify.py b/python/knot_resolver/controller/supervisord/plugin/sd_notify.py
index a3fb3180..ff32828b 100644
--- a/python/knot_resolver_manager/controller/supervisord/plugin/sd_notify.py
+++ b/python/knot_resolver/controller/supervisord/plugin/sd_notify.py
@@ -13,7 +13,7 @@ from supervisor.process import Subprocess
 from supervisor.states import ProcessStates
 from supervisor.supervisord import Supervisor
 
-from knot_resolver_manager.controller.supervisord.plugin import notify
+from knot_resolver.controller.supervisord.plugin import notify
 
 starting_processes: List[Subprocess] = []
 
diff --git a/python/knot_resolver_manager/controller/supervisord/supervisord.conf.j2 b/python/knot_resolver/controller/supervisord/supervisord.conf.j2
index d187fc64..4179d522 100644
--- a/python/knot_resolver_manager/controller/supervisord/supervisord.conf.j2
+++ b/python/knot_resolver/controller/supervisord/supervisord.conf.j2
@@ -20,21 +20,21 @@ serverurl = unix://{{ config.unix_http_server }}
 
 {# Extensions to changing the supervisord behavior #}
 [rpcinterface:patch_logger]
-supervisor.rpcinterface_factory = knot_resolver_manager.controller.supervisord.plugin.patch_logger:inject
+supervisor.rpcinterface_factory = knot_resolver.controller.supervisord.plugin.patch_logger:inject
 target = {{ config.target }}
 
 [rpcinterface:manager_integration]
-supervisor.rpcinterface_factory = knot_resolver_manager.controller.supervisord.plugin.manager_integration:inject
+supervisor.rpcinterface_factory = knot_resolver.controller.supervisord.plugin.manager_integration:inject
 
 [rpcinterface:sd_notify]
-supervisor.rpcinterface_factory = knot_resolver_manager.controller.supervisord.plugin.sd_notify:inject
+supervisor.rpcinterface_factory = knot_resolver.controller.supervisord.plugin.sd_notify:inject
 
 {# Extensions for actual API control #}
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [rpcinterface:fast]
-supervisor.rpcinterface_factory = knot_resolver_manager.controller.supervisord.plugin.fast_rpcinterface:make_main_rpcinterface
+supervisor.rpcinterface_factory = knot_resolver.controller.supervisord.plugin.fast_rpcinterface:make_main_rpcinterface
 
 [program:manager]
 redirect_stderr=false
diff --git a/python/knot_resolver_manager/datamodel/__init__.py b/python/knot_resolver/datamodel/__init__.py
index a0174acc..a0174acc 100644
--- a/python/knot_resolver_manager/datamodel/__init__.py
+++ b/python/knot_resolver/datamodel/__init__.py
diff --git a/python/knot_resolver_manager/datamodel/cache_schema.py b/python/knot_resolver/datamodel/cache_schema.py
index 4ed9fc3a..eca36bf2 100644
--- a/python/knot_resolver_manager/datamodel/cache_schema.py
+++ b/python/knot_resolver/datamodel/cache_schema.py
@@ -2,8 +2,8 @@ from typing import List, Optional, Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.datamodel.templates import template_from_str
-from knot_resolver_manager.datamodel.types import (
+from knot_resolver.datamodel.templates import template_from_str
+from knot_resolver.datamodel.types import (
     DNSRecordTypeEnum,
     DomainName,
     EscapedStr,
@@ -15,8 +15,8 @@ from knot_resolver_manager.datamodel.types import (
     TimeUnit,
     WritableDir,
 )
-from knot_resolver_manager.utils.modeling import ConfigSchema
-from knot_resolver_manager.utils.modeling.base_schema import lazy_default
+from knot_resolver.utils.modeling import ConfigSchema
+from knot_resolver.utils.modeling.base_schema import lazy_default
 
 _CACHE_CLEAR_TEMPLATE = template_from_str(
     "{% from 'macros/cache_macros.lua.j2' import cache_clear %} {{ cache_clear(params) }}"
diff --git a/python/knot_resolver_manager/datamodel/config_schema.py b/python/knot_resolver/datamodel/config_schema.py
index 2f633d72..1ee300d8 100644
--- a/python/knot_resolver_manager/datamodel/config_schema.py
+++ b/python/knot_resolver/datamodel/config_schema.py
@@ -5,25 +5,25 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.manager.constants import MAX_WORKERS
-from knot_resolver_manager.datamodel.cache_schema import CacheSchema
-from knot_resolver_manager.datamodel.dns64_schema import Dns64Schema
-from knot_resolver_manager.datamodel.dnssec_schema import DnssecSchema
-from knot_resolver_manager.datamodel.forward_schema import ForwardSchema
-from knot_resolver_manager.datamodel.local_data_schema import LocalDataSchema, RPZSchema, RuleSchema
-from knot_resolver_manager.datamodel.logging_schema import LoggingSchema
-from knot_resolver_manager.datamodel.lua_schema import LuaSchema
-from knot_resolver_manager.datamodel.management_schema import ManagementSchema
-from knot_resolver_manager.datamodel.monitoring_schema import MonitoringSchema
-from knot_resolver_manager.datamodel.network_schema import NetworkSchema
-from knot_resolver_manager.datamodel.options_schema import OptionsSchema
-from knot_resolver_manager.datamodel.templates import POLICY_CONFIG_TEMPLATE, WORKER_CONFIG_TEMPLATE
-from knot_resolver_manager.datamodel.types import EscapedStr, IntPositive, WritableDir
-from knot_resolver_manager.datamodel.view_schema import ViewSchema
-from knot_resolver_manager.datamodel.webmgmt_schema import WebmgmtSchema
-from knot_resolver_manager.utils.modeling import ConfigSchema
-from knot_resolver_manager.utils.modeling.base_schema import lazy_default
-from knot_resolver_manager.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError
+from knot_resolver.manager.constants import MAX_WORKERS
+from knot_resolver.datamodel.cache_schema import CacheSchema
+from knot_resolver.datamodel.dns64_schema import Dns64Schema
+from knot_resolver.datamodel.dnssec_schema import DnssecSchema
+from knot_resolver.datamodel.forward_schema import ForwardSchema
+from knot_resolver.datamodel.local_data_schema import LocalDataSchema, RPZSchema, RuleSchema
+from knot_resolver.datamodel.logging_schema import LoggingSchema
+from knot_resolver.datamodel.lua_schema import LuaSchema
+from knot_resolver.datamodel.management_schema import ManagementSchema
+from knot_resolver.datamodel.monitoring_schema import MonitoringSchema
+from knot_resolver.datamodel.network_schema import NetworkSchema
+from knot_resolver.datamodel.options_schema import OptionsSchema
+from knot_resolver.datamodel.templates import POLICY_CONFIG_TEMPLATE, WORKER_CONFIG_TEMPLATE
+from knot_resolver.datamodel.types import EscapedStr, IntPositive, WritableDir
+from knot_resolver.datamodel.view_schema import ViewSchema
+from knot_resolver.datamodel.webmgmt_schema import WebmgmtSchema
+from knot_resolver.utils.modeling import ConfigSchema
+from knot_resolver.utils.modeling.base_schema import lazy_default
+from knot_resolver.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError
 
 _DEFAULT_RUNDIR = "/var/run/knot-resolver"
 
diff --git a/python/knot_resolver_manager/datamodel/design-notes.yml b/python/knot_resolver/datamodel/design-notes.yml
index e4424bc8..e4424bc8 100644
--- a/python/knot_resolver_manager/datamodel/design-notes.yml
+++ b/python/knot_resolver/datamodel/design-notes.yml
diff --git a/python/knot_resolver_manager/datamodel/dns64_schema.py b/python/knot_resolver/datamodel/dns64_schema.py
index 60b92f2b..cc0fa06a 100644
--- a/python/knot_resolver_manager/datamodel/dns64_schema.py
+++ b/python/knot_resolver/datamodel/dns64_schema.py
@@ -1,7 +1,7 @@
 from typing import List, Optional
 
-from knot_resolver_manager.datamodel.types import IPv6Network, IPv6Network96, TimeUnit
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import IPv6Network, IPv6Network96, TimeUnit
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class Dns64Schema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/dnssec_schema.py b/python/knot_resolver/datamodel/dnssec_schema.py
index e51500e1..6f51d5eb 100644
--- a/python/knot_resolver_manager/datamodel/dnssec_schema.py
+++ b/python/knot_resolver/datamodel/dnssec_schema.py
@@ -1,7 +1,7 @@
 from typing import List, Optional
 
-from knot_resolver_manager.datamodel.types import DomainName, EscapedStr, IntNonNegative, ReadableFile, TimeUnit
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import DomainName, EscapedStr, IntNonNegative, ReadableFile, TimeUnit
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class TrustAnchorFileSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/forward_schema.py b/python/knot_resolver/datamodel/forward_schema.py
index 0804ef25..96c0f048 100644
--- a/python/knot_resolver_manager/datamodel/forward_schema.py
+++ b/python/knot_resolver/datamodel/forward_schema.py
@@ -2,14 +2,14 @@ from typing import Any, List, Optional, Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.datamodel.types import (
+from knot_resolver.datamodel.types import (
     DomainName,
     IPAddressOptionalPort,
     ListOrItem,
     PinSha256,
     ReadableFile,
 )
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class ForwardServerSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/globals.py b/python/knot_resolver/datamodel/globals.py
index 610323fa..610323fa 100644
--- a/python/knot_resolver_manager/datamodel/globals.py
+++ b/python/knot_resolver/datamodel/globals.py
diff --git a/python/knot_resolver_manager/datamodel/local_data_schema.py b/python/knot_resolver/datamodel/local_data_schema.py
index fafa7ebe..2fe5a03a 100644
--- a/python/knot_resolver_manager/datamodel/local_data_schema.py
+++ b/python/knot_resolver/datamodel/local_data_schema.py
@@ -2,7 +2,7 @@ from typing import Dict, List, Optional
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.datamodel.types import (
+from knot_resolver.datamodel.types import (
     DomainName,
     EscapedStr,
     IDPattern,
@@ -11,7 +11,7 @@ from knot_resolver_manager.datamodel.types import (
     ReadableFile,
     TimeUnit,
 )
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class RuleSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/logging_schema.py b/python/knot_resolver/datamodel/logging_schema.py
index 601cd4a5..e2985dd1 100644
--- a/python/knot_resolver_manager/datamodel/logging_schema.py
+++ b/python/knot_resolver/datamodel/logging_schema.py
@@ -3,9 +3,9 @@ from typing import Any, List, Optional, Set, Type, Union, cast
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.datamodel.types import TimeUnit, WritableFilePath
-from knot_resolver_manager.utils.modeling import ConfigSchema
-from knot_resolver_manager.utils.modeling.base_schema import is_obj_type_valid
+from knot_resolver.datamodel.types import TimeUnit, WritableFilePath
+from knot_resolver.utils.modeling import ConfigSchema
+from knot_resolver.utils.modeling.base_schema import is_obj_type_valid
 
 try:
     # On Debian 10, the typing_extensions library does not contain TypeAlias.
diff --git a/python/knot_resolver_manager/datamodel/lua_schema.py b/python/knot_resolver/datamodel/lua_schema.py
index 079333ae..56e8ee09 100644
--- a/python/knot_resolver_manager/datamodel/lua_schema.py
+++ b/python/knot_resolver/datamodel/lua_schema.py
@@ -1,7 +1,7 @@
 from typing import Optional
 
-from knot_resolver_manager.datamodel.types import ReadableFile
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import ReadableFile
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class LuaSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/management_schema.py b/python/knot_resolver/datamodel/management_schema.py
index 44f8f3e8..b338c32a 100644
--- a/python/knot_resolver_manager/datamodel/management_schema.py
+++ b/python/knot_resolver/datamodel/management_schema.py
@@ -1,7 +1,7 @@
 from typing import Optional
 
-from knot_resolver_manager.datamodel.types import WritableFilePath, IPAddressPort
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import WritableFilePath, IPAddressPort
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class ManagementSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/monitoring_schema.py b/python/knot_resolver/datamodel/monitoring_schema.py
index dfc4a116..3b3ad6d9 100644
--- a/python/knot_resolver_manager/datamodel/monitoring_schema.py
+++ b/python/knot_resolver/datamodel/monitoring_schema.py
@@ -2,8 +2,8 @@ from typing import Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.datamodel.types import DomainName, EscapedStr, IPAddress, PortNumber, TimeUnit
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import DomainName, EscapedStr, IPAddress, PortNumber, TimeUnit
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class GraphiteSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/network_schema.py b/python/knot_resolver/datamodel/network_schema.py
index b9a35090..e766d499 100644
--- a/python/knot_resolver_manager/datamodel/network_schema.py
+++ b/python/knot_resolver/datamodel/network_schema.py
@@ -2,7 +2,7 @@ from typing import List, Optional, Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.datamodel.types import (
+from knot_resolver.datamodel.types import (
     EscapedStr32B,
     WritableFilePath,
     Int0_512,
@@ -18,7 +18,7 @@ from knot_resolver_manager.datamodel.types import (
     ReadableFile,
     SizeUnit,
 )
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.utils.modeling import ConfigSchema
 
 KindEnum = Literal["dns", "xdp", "dot", "doh-legacy", "doh2"]
 
diff --git a/python/knot_resolver_manager/datamodel/options_schema.py b/python/knot_resolver/datamodel/options_schema.py
index d0bb0399..9230c7f0 100644
--- a/python/knot_resolver_manager/datamodel/options_schema.py
+++ b/python/knot_resolver/datamodel/options_schema.py
@@ -1,6 +1,6 @@
 from typing_extensions import Literal
 
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.utils.modeling import ConfigSchema
 
 GlueCheckingEnum = Literal["normal", "strict", "permissive"]
 
diff --git a/python/knot_resolver_manager/datamodel/policy_schema.py b/python/knot_resolver/datamodel/policy_schema.py
index bbc61cd1..8f9d8b26 100644
--- a/python/knot_resolver_manager/datamodel/policy_schema.py
+++ b/python/knot_resolver/datamodel/policy_schema.py
@@ -1,15 +1,15 @@
 from typing import List, Optional, Union
 
-from knot_resolver_manager.datamodel.forward_schema import ForwardServerSchema
-from knot_resolver_manager.datamodel.network_schema import AddressRenumberingSchema
-from knot_resolver_manager.datamodel.types import (
+from knot_resolver.datamodel.forward_schema import ForwardServerSchema
+from knot_resolver.datamodel.network_schema import AddressRenumberingSchema
+from knot_resolver.datamodel.types import (
     DNSRecordTypeEnum,
     IPAddressOptionalPort,
     PolicyActionEnum,
     PolicyFlagEnum,
     TimeUnit,
 )
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class FilterSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/rpz_schema.py b/python/knot_resolver/datamodel/rpz_schema.py
index bf98bd0c..96d79293 100644
--- a/python/knot_resolver_manager/datamodel/rpz_schema.py
+++ b/python/knot_resolver/datamodel/rpz_schema.py
@@ -1,7 +1,7 @@
 from typing import List, Optional
 
-from knot_resolver_manager.datamodel.types import PolicyActionEnum, PolicyFlagEnum, ReadableFile
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import PolicyActionEnum, PolicyFlagEnum, ReadableFile
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class RPZSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/slice_schema.py b/python/knot_resolver/datamodel/slice_schema.py
index 0c7cdea1..1586cab7 100644
--- a/python/knot_resolver_manager/datamodel/slice_schema.py
+++ b/python/knot_resolver/datamodel/slice_schema.py
@@ -2,8 +2,8 @@ from typing import List, Optional
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.datamodel.policy_schema import ActionSchema
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.policy_schema import ActionSchema
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class SliceSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/static_hints_schema.py b/python/knot_resolver/datamodel/static_hints_schema.py
index 89db49bb..ac64c311 100644
--- a/python/knot_resolver_manager/datamodel/static_hints_schema.py
+++ b/python/knot_resolver/datamodel/static_hints_schema.py
@@ -1,7 +1,7 @@
 from typing import Dict, List, Optional
 
-from knot_resolver_manager.datamodel.types import DomainName, IPAddress, ReadableFile, TimeUnit
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import DomainName, IPAddress, ReadableFile, TimeUnit
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class StaticHintsSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/stub_zone_schema.py b/python/knot_resolver/datamodel/stub_zone_schema.py
index b9945ecc..afd1cc79 100644
--- a/python/knot_resolver_manager/datamodel/stub_zone_schema.py
+++ b/python/knot_resolver/datamodel/stub_zone_schema.py
@@ -1,7 +1,7 @@
 from typing import List, Optional, Union
 
-from knot_resolver_manager.datamodel.types import DomainName, IPAddressOptionalPort, PolicyFlagEnum
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import DomainName, IPAddressOptionalPort, PolicyFlagEnum
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class StubServerSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/templates/__init__.py b/python/knot_resolver/datamodel/templates/__init__.py
index 832503b7..fdb91dd2 100644
--- a/python/knot_resolver_manager/datamodel/templates/__init__.py
+++ b/python/knot_resolver/datamodel/templates/__init__.py
@@ -5,13 +5,13 @@ from jinja2 import Environment, FileSystemLoader, Template
 
 
 def _get_templates_dir() -> str:
-    module = sys.modules["knot_resolver_manager.datamodel"].__file__
+    module = sys.modules["knot_resolver.datamodel"].__file__
     if module:
         templates_dir = os.path.join(os.path.dirname(module), "templates")
         if os.path.isdir(templates_dir):
             return templates_dir
         raise NotADirectoryError(f"the templates dir '{templates_dir}' is not a directory or does not exist")
-    raise OSError("package 'knot_resolver_manager.datamodel' cannot be located or loaded")
+    raise OSError("package 'knot_resolver.datamodel' cannot be located or loaded")
 
 
 _TEMPLATES_DIR = _get_templates_dir()
diff --git a/python/knot_resolver_manager/datamodel/templates/cache.lua.j2 b/python/knot_resolver/datamodel/templates/cache.lua.j2
index f0176a59..f0176a59 100644
--- a/python/knot_resolver_manager/datamodel/templates/cache.lua.j2
+++ b/python/knot_resolver/datamodel/templates/cache.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/dns64.lua.j2 b/python/knot_resolver/datamodel/templates/dns64.lua.j2
index c5239f00..c5239f00 100644
--- a/python/knot_resolver_manager/datamodel/templates/dns64.lua.j2
+++ b/python/knot_resolver/datamodel/templates/dns64.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2 b/python/knot_resolver/datamodel/templates/dnssec.lua.j2
index 05d1fa68..05d1fa68 100644
--- a/python/knot_resolver_manager/datamodel/templates/dnssec.lua.j2
+++ b/python/knot_resolver/datamodel/templates/dnssec.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/forward.lua.j2 b/python/knot_resolver/datamodel/templates/forward.lua.j2
index 24311da1..24311da1 100644
--- a/python/knot_resolver_manager/datamodel/templates/forward.lua.j2
+++ b/python/knot_resolver/datamodel/templates/forward.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/local_data.lua.j2 b/python/knot_resolver/datamodel/templates/local_data.lua.j2
index 8882471f..8882471f 100644
--- a/python/knot_resolver_manager/datamodel/templates/local_data.lua.j2
+++ b/python/knot_resolver/datamodel/templates/local_data.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/logging.lua.j2 b/python/knot_resolver/datamodel/templates/logging.lua.j2
index 2d5937a8..2d5937a8 100644
--- a/python/knot_resolver_manager/datamodel/templates/logging.lua.j2
+++ b/python/knot_resolver/datamodel/templates/logging.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2 b/python/knot_resolver/datamodel/templates/macros/cache_macros.lua.j2
index 51df48da..51df48da 100644
--- a/python/knot_resolver_manager/datamodel/templates/macros/cache_macros.lua.j2
+++ b/python/knot_resolver/datamodel/templates/macros/cache_macros.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2 b/python/knot_resolver/datamodel/templates/macros/common_macros.lua.j2
index 4c2ba11a..4c2ba11a 100644
--- a/python/knot_resolver_manager/datamodel/templates/macros/common_macros.lua.j2
+++ b/python/knot_resolver/datamodel/templates/macros/common_macros.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2 b/python/knot_resolver/datamodel/templates/macros/forward_macros.lua.j2
index b7723fb0..b7723fb0 100644
--- a/python/knot_resolver_manager/datamodel/templates/macros/forward_macros.lua.j2
+++ b/python/knot_resolver/datamodel/templates/macros/forward_macros.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2 b/python/knot_resolver/datamodel/templates/macros/local_data_macros.lua.j2
index 0898571c..0898571c 100644
--- a/python/knot_resolver_manager/datamodel/templates/macros/local_data_macros.lua.j2
+++ b/python/knot_resolver/datamodel/templates/macros/local_data_macros.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2 b/python/knot_resolver/datamodel/templates/macros/network_macros.lua.j2
index 79800f7d..79800f7d 100644
--- a/python/knot_resolver_manager/datamodel/templates/macros/network_macros.lua.j2
+++ b/python/knot_resolver/datamodel/templates/macros/network_macros.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2 b/python/knot_resolver/datamodel/templates/macros/policy_macros.lua.j2
index 347532e6..347532e6 100644
--- a/python/knot_resolver_manager/datamodel/templates/macros/policy_macros.lua.j2
+++ b/python/knot_resolver/datamodel/templates/macros/policy_macros.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2 b/python/knot_resolver/datamodel/templates/macros/view_macros.lua.j2
index 2f1a7964..2f1a7964 100644
--- a/python/knot_resolver_manager/datamodel/templates/macros/view_macros.lua.j2
+++ b/python/knot_resolver/datamodel/templates/macros/view_macros.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2 b/python/knot_resolver/datamodel/templates/monitoring.lua.j2
index 624b59ab..624b59ab 100644
--- a/python/knot_resolver_manager/datamodel/templates/monitoring.lua.j2
+++ b/python/knot_resolver/datamodel/templates/monitoring.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/network.lua.j2 b/python/knot_resolver/datamodel/templates/network.lua.j2
index 665ee454..665ee454 100644
--- a/python/knot_resolver_manager/datamodel/templates/network.lua.j2
+++ b/python/knot_resolver/datamodel/templates/network.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/options.lua.j2 b/python/knot_resolver/datamodel/templates/options.lua.j2
index 8210fb6d..8210fb6d 100644
--- a/python/knot_resolver_manager/datamodel/templates/options.lua.j2
+++ b/python/knot_resolver/datamodel/templates/options.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2 b/python/knot_resolver/datamodel/templates/policy-config.lua.j2
index 4c5c9048..4c5c9048 100644
--- a/python/knot_resolver_manager/datamodel/templates/policy-config.lua.j2
+++ b/python/knot_resolver/datamodel/templates/policy-config.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2 b/python/knot_resolver/datamodel/templates/static_hints.lua.j2
index 130facf9..130facf9 100644
--- a/python/knot_resolver_manager/datamodel/templates/static_hints.lua.j2
+++ b/python/knot_resolver/datamodel/templates/static_hints.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/views.lua.j2 b/python/knot_resolver/datamodel/templates/views.lua.j2
index 81de8c7b..81de8c7b 100644
--- a/python/knot_resolver_manager/datamodel/templates/views.lua.j2
+++ b/python/knot_resolver/datamodel/templates/views.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2 b/python/knot_resolver/datamodel/templates/webmgmt.lua.j2
index 938ea8da..938ea8da 100644
--- a/python/knot_resolver_manager/datamodel/templates/webmgmt.lua.j2
+++ b/python/knot_resolver/datamodel/templates/webmgmt.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2 b/python/knot_resolver/datamodel/templates/worker-config.lua.j2
index 17c49fb0..17c49fb0 100644
--- a/python/knot_resolver_manager/datamodel/templates/worker-config.lua.j2
+++ b/python/knot_resolver/datamodel/templates/worker-config.lua.j2
diff --git a/python/knot_resolver_manager/datamodel/types/__init__.py b/python/knot_resolver/datamodel/types/__init__.py
index a3d7db3e..a3d7db3e 100644
--- a/python/knot_resolver_manager/datamodel/types/__init__.py
+++ b/python/knot_resolver/datamodel/types/__init__.py
diff --git a/python/knot_resolver_manager/datamodel/types/base_types.py b/python/knot_resolver/datamodel/types/base_types.py
index 91f53406..c2d60312 100644
--- a/python/knot_resolver_manager/datamodel/types/base_types.py
+++ b/python/knot_resolver/datamodel/types/base_types.py
@@ -1,7 +1,7 @@
 import re
 from typing import Any, Dict, Pattern, Type
 
-from knot_resolver_manager.utils.modeling import BaseValueType
+from knot_resolver.utils.modeling import BaseValueType
 
 
 class IntBase(BaseValueType):
diff --git a/python/knot_resolver_manager/datamodel/types/enums.py b/python/knot_resolver/datamodel/types/enums.py
index bc93ae2f..bc93ae2f 100644
--- a/python/knot_resolver_manager/datamodel/types/enums.py
+++ b/python/knot_resolver/datamodel/types/enums.py
diff --git a/python/knot_resolver_manager/datamodel/types/files.py b/python/knot_resolver/datamodel/types/files.py
index db496d20..920d90b1 100644
--- a/python/knot_resolver_manager/datamodel/types/files.py
+++ b/python/knot_resolver/datamodel/types/files.py
@@ -6,9 +6,9 @@ from pathlib import Path
 from pwd import getpwnam
 from typing import Any, Dict, Tuple, Type, TypeVar
 
-from knot_resolver_manager.manager.constants import kresd_group, kresd_user
-from knot_resolver_manager.datamodel.globals import get_resolve_root, get_strict_validation
-from knot_resolver_manager.utils.modeling.base_value_type import BaseValueType
+from knot_resolver.manager.constants import kresd_group, kresd_user
+from knot_resolver.datamodel.globals import get_resolve_root, get_strict_validation
+from knot_resolver.utils.modeling.base_value_type import BaseValueType
 
 
 class UncheckedPath(BaseValueType):
diff --git a/python/knot_resolver_manager/datamodel/types/generic_types.py b/python/knot_resolver/datamodel/types/generic_types.py
index 549b11a8..8649a0f0 100644
--- a/python/knot_resolver_manager/datamodel/types/generic_types.py
+++ b/python/knot_resolver/datamodel/types/generic_types.py
@@ -1,6 +1,6 @@
 from typing import Any, List, TypeVar, Union
 
-from knot_resolver_manager.utils.modeling import BaseGenericTypeWrapper
+from knot_resolver.utils.modeling import BaseGenericTypeWrapper
 
 T = TypeVar("T")
 
diff --git a/python/knot_resolver_manager/datamodel/types/types.py b/python/knot_resolver/datamodel/types/types.py
index d9a0b910..ca8706d2 100644
--- a/python/knot_resolver_manager/datamodel/types/types.py
+++ b/python/knot_resolver/datamodel/types/types.py
@@ -2,14 +2,14 @@ import ipaddress
 import re
 from typing import Any, Dict, Optional, Type, Union
 
-from knot_resolver_manager.datamodel.types.base_types import (
+from knot_resolver.datamodel.types.base_types import (
     IntRangeBase,
     PatternBase,
     StrBase,
     StringLengthBase,
     UnitBase,
 )
-from knot_resolver_manager.utils.modeling import BaseValueType
+from knot_resolver.utils.modeling import BaseValueType
 
 
 class IntNonNegative(IntRangeBase):
diff --git a/python/knot_resolver_manager/datamodel/view_schema.py b/python/knot_resolver/datamodel/view_schema.py
index ad44eb3b..b1d3adbe 100644
--- a/python/knot_resolver_manager/datamodel/view_schema.py
+++ b/python/knot_resolver/datamodel/view_schema.py
@@ -2,8 +2,8 @@ from typing import List, Optional
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.datamodel.types import IDPattern, IPNetwork
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import IDPattern, IPNetwork
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class ViewOptionsSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/datamodel/webmgmt_schema.py b/python/knot_resolver/datamodel/webmgmt_schema.py
index 2e75c3b7..ce18376b 100644
--- a/python/knot_resolver_manager/datamodel/webmgmt_schema.py
+++ b/python/knot_resolver/datamodel/webmgmt_schema.py
@@ -1,7 +1,7 @@
 from typing import Optional
 
-from knot_resolver_manager.datamodel.types import WritableFilePath, InterfacePort, ReadableFile
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import WritableFilePath, InterfacePort, ReadableFile
+from knot_resolver.utils.modeling import ConfigSchema
 
 
 class WebmgmtSchema(ConfigSchema):
diff --git a/python/knot_resolver_manager/manager/__init__.py b/python/knot_resolver/manager/__init__.py
index e69de29b..e69de29b 100644
--- a/python/knot_resolver_manager/manager/__init__.py
+++ b/python/knot_resolver/manager/__init__.py
diff --git a/python/knot_resolver/manager/__main__.py b/python/knot_resolver/manager/__main__.py
new file mode 100644
index 00000000..26aae1d6
--- /dev/null
+++ b/python/knot_resolver/manager/__main__.py
@@ -0,0 +1,5 @@
+from knot_resolver.manager.main import main
+
+
+if __name__ == "__main__":
+    main()
diff --git a/python/knot_resolver_manager/manager/config_store.py b/python/knot_resolver/manager/config_store.py
index 0491bf46..1c0174f2 100644
--- a/python/knot_resolver_manager/manager/config_store.py
+++ b/python/knot_resolver/manager/config_store.py
@@ -2,11 +2,11 @@ import asyncio
 from asyncio import Lock
 from typing import Any, Awaitable, Callable, List, Tuple
 
-from knot_resolver_manager.datamodel import KresConfig
-from knot_resolver_manager.manager.exceptions import KresManagerException
-from knot_resolver_manager.utils.functional import Result
-from knot_resolver_manager.utils.modeling.exceptions import DataParsingError
-from knot_resolver_manager.utils.modeling.types import NoneType
+from knot_resolver.datamodel import KresConfig
+from knot_resolver.manager.exceptions import KresManagerException
+from knot_resolver.utils.functional import Result
+from knot_resolver.utils.modeling.exceptions import DataParsingError
+from knot_resolver.utils.modeling.types import NoneType
 
 VerifyCallback = Callable[[KresConfig, KresConfig], Awaitable[Result[None, str]]]
 UpdateCallback = Callable[[KresConfig], Awaitable[None]]
diff --git a/python/knot_resolver_manager/manager/constants.py b/python/knot_resolver/manager/constants.py
index 4d63a736..832d3fa9 100644
--- a/python/knot_resolver_manager/manager/constants.py
+++ b/python/knot_resolver/manager/constants.py
@@ -11,9 +11,9 @@ else:
     knot_resolver = None
 
 if TYPE_CHECKING:
-    from knot_resolver_manager.manager.config_store import ConfigStore
-    from knot_resolver_manager.datamodel.config_schema import KresConfig
-    from knot_resolver_manager.controller.interface import KresID
+    from knot_resolver.manager.config_store import ConfigStore
+    from knot_resolver.datamodel.config_schema import KresConfig
+    from knot_resolver.controller.interface import KresID
 
 STARTUP_LOG_LEVEL = logging.DEBUG
 DEFAULT_MANAGER_CONFIG_FILE = Path("/etc/knot-resolver/config.yaml")
diff --git a/python/knot_resolver_manager/manager/exceptions.py b/python/knot_resolver/manager/exceptions.py
index 5b05d98e..5b05d98e 100644
--- a/python/knot_resolver_manager/manager/exceptions.py
+++ b/python/knot_resolver/manager/exceptions.py
diff --git a/python/knot_resolver_manager/manager/kres_manager.py b/python/knot_resolver/manager/kres_manager.py
index e3d91513..3dbc1079 100644
--- a/python/knot_resolver_manager/manager/kres_manager.py
+++ b/python/knot_resolver/manager/kres_manager.py
@@ -6,32 +6,32 @@ from secrets import token_hex
 from subprocess import SubprocessError
 from typing import Any, Callable, List, Optional
 
-from knot_resolver_manager.compat.asyncio import create_task
-from knot_resolver_manager.manager.config_store import (
+from knot_resolver.compat.asyncio import create_task
+from knot_resolver.manager.config_store import (
     ConfigStore,
     only_on_real_changes_update,
     only_on_real_changes_verifier,
 )
-from knot_resolver_manager.manager.constants import (
+from knot_resolver.manager.constants import (
     FIX_COUNTER_DECREASE_INTERVAL_SEC,
     MANAGER_FIX_ATTEMPT_MAX_COUNTER,
     WATCHDOG_INTERVAL,
 )
-from knot_resolver_manager.manager.exceptions import SubprocessControllerException
-from knot_resolver_manager.controller.interface import (
+from knot_resolver.manager.exceptions import SubprocessControllerException
+from knot_resolver.controller.interface import (
     Subprocess,
     SubprocessController,
     SubprocessStatus,
     SubprocessType,
 )
-from knot_resolver_manager.controller.registered_workers import (
+from knot_resolver.controller.registered_workers import (
     command_registered_workers,
     get_registered_workers_kresids,
 )
-from knot_resolver_manager.utils.functional import Result
-from knot_resolver_manager.utils.modeling.types import NoneType
+from knot_resolver.utils.functional import Result
+from knot_resolver.utils.modeling.types import NoneType
 
-from knot_resolver_manager import KresConfig
+from knot_resolver import KresConfig
 
 logger = logging.getLogger(__name__)
 
diff --git a/python/knot_resolver_manager/manager/log.py b/python/knot_resolver/manager/log.py
index cd432e15..a22898a5 100644
--- a/python/knot_resolver_manager/manager/log.py
+++ b/python/knot_resolver/manager/log.py
@@ -4,10 +4,10 @@ import os
 import sys
 from typing import Optional
 
-from knot_resolver_manager.manager.config_store import ConfigStore, only_on_real_changes_update
-from knot_resolver_manager.manager.constants import STARTUP_LOG_LEVEL
-from knot_resolver_manager.datamodel.config_schema import KresConfig
-from knot_resolver_manager.datamodel.logging_schema import LogTargetEnum
+from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update
+from knot_resolver.manager.constants import STARTUP_LOG_LEVEL
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.datamodel.logging_schema import LogTargetEnum
 
 logger = logging.getLogger(__name__)
 
diff --git a/python/knot_resolver_manager/manager/main.py b/python/knot_resolver/manager/main.py
index 2240c1aa..5facc470 100644
--- a/python/knot_resolver_manager/manager/main.py
+++ b/python/knot_resolver/manager/main.py
@@ -9,10 +9,10 @@ import sys
 from pathlib import Path
 from typing import NoReturn
 
-from knot_resolver_manager import compat
-from knot_resolver_manager.manager.constants import CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE
-from knot_resolver_manager.manager.log import logger_startup
-from knot_resolver_manager.manager.server import start_server
+from knot_resolver import compat
+from knot_resolver.manager.constants import CONFIG_FILE_ENV_VAR, DEFAULT_MANAGER_CONFIG_FILE
+from knot_resolver.manager.log import logger_startup
+from knot_resolver.manager.server import start_server
 
 
 def parse_args() -> argparse.Namespace:
diff --git a/python/knot_resolver_manager/manager/server.py b/python/knot_resolver/manager/server.py
index 92569eeb..cf31a3fc 100644
--- a/python/knot_resolver_manager/manager/server.py
+++ b/python/knot_resolver/manager/server.py
@@ -18,31 +18,31 @@ from aiohttp.web_response import json_response
 from aiohttp.web_runner import AppRunner, TCPSite, UnixSite
 from typing_extensions import Literal
 
-import knot_resolver_manager.utils.custom_atexit as atexit
-from knot_resolver_manager.manager import log, statistics
-from knot_resolver_manager.compat import asyncio as asyncio_compat
-from knot_resolver_manager.manager.config_store import ConfigStore
-from knot_resolver_manager.manager.constants import DEFAULT_MANAGER_CONFIG_FILE, PID_FILE_NAME, init_user_constants
-from knot_resolver_manager.datamodel.cache_schema import CacheClearRPCSchema
-from knot_resolver_manager.datamodel.config_schema import KresConfig, get_rundir_without_validation
-from knot_resolver_manager.datamodel.globals import Context, set_global_validation_context
-from knot_resolver_manager.datamodel.management_schema import ManagementSchema
-from knot_resolver_manager.manager.exceptions import CancelStartupExecInsteadException, KresManagerException
-from knot_resolver_manager.controller import get_best_controller_implementation
-from knot_resolver_manager.controller.registered_workers import command_single_registered_worker
-from knot_resolver_manager.utils import ignore_exceptions_optional
-from knot_resolver_manager.utils.async_utils import readfile
-from knot_resolver_manager.utils.etag import structural_etag
-from knot_resolver_manager.utils.functional import Result
-from knot_resolver_manager.utils.modeling.exceptions import (
+import knot_resolver.utils.custom_atexit as atexit
+from knot_resolver.manager import log, statistics
+from knot_resolver.compat import asyncio as asyncio_compat
+from knot_resolver.manager.config_store import ConfigStore
+from knot_resolver.manager.constants import DEFAULT_MANAGER_CONFIG_FILE, PID_FILE_NAME, init_user_constants
+from knot_resolver.datamodel.cache_schema import CacheClearRPCSchema
+from knot_resolver.datamodel.config_schema import KresConfig, get_rundir_without_validation
+from knot_resolver.datamodel.globals import Context, set_global_validation_context
+from knot_resolver.datamodel.management_schema import ManagementSchema
+from knot_resolver.manager.exceptions import CancelStartupExecInsteadException, KresManagerException
+from knot_resolver.controller import get_best_controller_implementation
+from knot_resolver.controller.registered_workers import command_single_registered_worker
+from knot_resolver.utils import ignore_exceptions_optional
+from knot_resolver.utils.async_utils import readfile
+from knot_resolver.utils.etag import structural_etag
+from knot_resolver.utils.functional import Result
+from knot_resolver.utils.modeling.exceptions import (
     AggregateDataValidationError,
     DataParsingError,
     DataValidationError,
 )
-from knot_resolver_manager.utils.modeling.parsing import DataFormat, try_to_parse
-from knot_resolver_manager.utils.modeling.query import query
-from knot_resolver_manager.utils.modeling.types import NoneType
-from knot_resolver_manager.utils.systemd_notify import systemd_notify
+from knot_resolver.utils.modeling.parsing import DataFormat, try_to_parse
+from knot_resolver.utils.modeling.query import query
+from knot_resolver.utils.modeling.types import NoneType
+from knot_resolver.utils.systemd_notify import systemd_notify
 
 from .kres_manager import KresManager
 
diff --git a/python/knot_resolver_manager/manager/statistics.py b/python/knot_resolver/manager/statistics.py
index f3e9e425..292a480d 100644
--- a/python/knot_resolver_manager/manager/statistics.py
+++ b/python/knot_resolver/manager/statistics.py
@@ -4,18 +4,18 @@ import json
 import logging
 from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Tuple
 
-from knot_resolver_manager import compat
-from knot_resolver_manager.manager.config_store import ConfigStore, only_on_real_changes_update
-from knot_resolver_manager.datamodel.config_schema import KresConfig
-from knot_resolver_manager.controller.registered_workers import (
+from knot_resolver import compat
+from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update
+from knot_resolver.datamodel.config_schema import KresConfig
+from knot_resolver.controller.registered_workers import (
     command_registered_workers,
     get_registered_workers_kresids,
 )
-from knot_resolver_manager.utils.functional import Result
-from knot_resolver_manager.utils.modeling.parsing import DataFormat
+from knot_resolver.utils.functional import Result
+from knot_resolver.utils.modeling.parsing import DataFormat
 
 if TYPE_CHECKING:
-    from knot_resolver_manager.controller.interface import KresID
+    from knot_resolver.controller.interface import KresID
 
 logger = logging.getLogger(__name__)
 
diff --git a/python/knot_resolver_manager/utils/__init__.py b/python/knot_resolver/utils/__init__.py
index edc36fca..edc36fca 100644
--- a/python/knot_resolver_manager/utils/__init__.py
+++ b/python/knot_resolver/utils/__init__.py
diff --git a/python/knot_resolver_manager/utils/async_utils.py b/python/knot_resolver/utils/async_utils.py
index 1cd7303e..a5acdbd5 100644
--- a/python/knot_resolver_manager/utils/async_utils.py
+++ b/python/knot_resolver/utils/async_utils.py
@@ -9,7 +9,7 @@ from pathlib import PurePath
 from threading import Thread
 from typing import Any, Dict, Generic, List, Optional, TypeVar, Union
 
-from knot_resolver_manager.compat.asyncio import to_thread
+from knot_resolver.compat.asyncio import to_thread
 
 
 def unblock_signals():
diff --git a/python/knot_resolver_manager/utils/custom_atexit.py b/python/knot_resolver/utils/custom_atexit.py
index 2fe55433..2fe55433 100644
--- a/python/knot_resolver_manager/utils/custom_atexit.py
+++ b/python/knot_resolver/utils/custom_atexit.py
diff --git a/python/knot_resolver_manager/utils/etag.py b/python/knot_resolver/utils/etag.py
index bb80700b..bb80700b 100644
--- a/python/knot_resolver_manager/utils/etag.py
+++ b/python/knot_resolver/utils/etag.py
diff --git a/python/knot_resolver_manager/utils/functional.py b/python/knot_resolver/utils/functional.py
index 43abd705..43abd705 100644
--- a/python/knot_resolver_manager/utils/functional.py
+++ b/python/knot_resolver/utils/functional.py
diff --git a/python/knot_resolver_manager/utils/modeling/README.md b/python/knot_resolver/utils/modeling/README.md
index 97c68b54..97c68b54 100644
--- a/python/knot_resolver_manager/utils/modeling/README.md
+++ b/python/knot_resolver/utils/modeling/README.md
diff --git a/python/knot_resolver_manager/utils/modeling/__init__.py b/python/knot_resolver/utils/modeling/__init__.py
index d16f6c12..d16f6c12 100644
--- a/python/knot_resolver_manager/utils/modeling/__init__.py
+++ b/python/knot_resolver/utils/modeling/__init__.py
diff --git a/python/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py b/python/knot_resolver/utils/modeling/base_generic_type_wrapper.py
index 1f2c1767..1f2c1767 100644
--- a/python/knot_resolver_manager/utils/modeling/base_generic_type_wrapper.py
+++ b/python/knot_resolver/utils/modeling/base_generic_type_wrapper.py
diff --git a/python/knot_resolver_manager/utils/modeling/base_schema.py b/python/knot_resolver/utils/modeling/base_schema.py
index 477a6a69..aca3be05 100644
--- a/python/knot_resolver_manager/utils/modeling/base_schema.py
+++ b/python/knot_resolver/utils/modeling/base_schema.py
@@ -5,7 +5,7 @@ from typing import Any, Callable, Dict, Generic, List, Optional, Set, Tuple, Typ
 
 import yaml
 
-from knot_resolver_manager.utils.functional import all_matches
+from knot_resolver.utils.functional import all_matches
 
 from .base_generic_type_wrapper import BaseGenericTypeWrapper
 from .base_value_type import BaseValueType
diff --git a/python/knot_resolver_manager/utils/modeling/base_value_type.py b/python/knot_resolver/utils/modeling/base_value_type.py
index dff4a3fe..dff4a3fe 100644
--- a/python/knot_resolver_manager/utils/modeling/base_value_type.py
+++ b/python/knot_resolver/utils/modeling/base_value_type.py
diff --git a/python/knot_resolver_manager/utils/modeling/exceptions.py b/python/knot_resolver/utils/modeling/exceptions.py
index b3cc415d..ea057339 100644
--- a/python/knot_resolver_manager/utils/modeling/exceptions.py
+++ b/python/knot_resolver/utils/modeling/exceptions.py
@@ -1,6 +1,6 @@
 from typing import Iterable, List
 
-from knot_resolver_manager.manager.exceptions import KresManagerException
+from knot_resolver.manager.exceptions import KresManagerException
 
 
 class DataModelingBaseException(KresManagerException):
diff --git a/python/knot_resolver_manager/utils/modeling/json_pointer.py b/python/knot_resolver/utils/modeling/json_pointer.py
index a60ba5d1..a60ba5d1 100644
--- a/python/knot_resolver_manager/utils/modeling/json_pointer.py
+++ b/python/knot_resolver/utils/modeling/json_pointer.py
diff --git a/python/knot_resolver_manager/utils/modeling/parsing.py b/python/knot_resolver/utils/modeling/parsing.py
index 185a53a1..185a53a1 100644
--- a/python/knot_resolver_manager/utils/modeling/parsing.py
+++ b/python/knot_resolver/utils/modeling/parsing.py
diff --git a/python/knot_resolver_manager/utils/modeling/query.py b/python/knot_resolver/utils/modeling/query.py
index cfea82f6..aab0be0e 100644
--- a/python/knot_resolver_manager/utils/modeling/query.py
+++ b/python/knot_resolver/utils/modeling/query.py
@@ -4,8 +4,8 @@ from typing import Any, List, Optional, Tuple, Union
 
 from typing_extensions import Literal
 
-from knot_resolver_manager.utils.modeling.base_schema import BaseSchema, map_object
-from knot_resolver_manager.utils.modeling.json_pointer import json_ptr_resolve
+from knot_resolver.utils.modeling.base_schema import BaseSchema, map_object
+from knot_resolver.utils.modeling.json_pointer import json_ptr_resolve
 
 
 class PatchError(Exception):
diff --git a/python/knot_resolver_manager/utils/modeling/renaming.py b/python/knot_resolver/utils/modeling/renaming.py
index 2420ed04..2420ed04 100644
--- a/python/knot_resolver_manager/utils/modeling/renaming.py
+++ b/python/knot_resolver/utils/modeling/renaming.py
diff --git a/python/knot_resolver_manager/utils/modeling/types.py b/python/knot_resolver/utils/modeling/types.py
index 4ce9aecc..4ce9aecc 100644
--- a/python/knot_resolver_manager/utils/modeling/types.py
+++ b/python/knot_resolver/utils/modeling/types.py
diff --git a/python/knot_resolver_manager/utils/requests.py b/python/knot_resolver/utils/requests.py
index e52e54a3..e52e54a3 100644
--- a/python/knot_resolver_manager/utils/requests.py
+++ b/python/knot_resolver/utils/requests.py
diff --git a/python/knot_resolver_manager/utils/systemd_notify.py b/python/knot_resolver/utils/systemd_notify.py
index 44e8dee1..44e8dee1 100644
--- a/python/knot_resolver_manager/utils/systemd_notify.py
+++ b/python/knot_resolver/utils/systemd_notify.py
diff --git a/python/knot_resolver_manager/utils/which.py b/python/knot_resolver/utils/which.py
index 450102f3..450102f3 100644
--- a/python/knot_resolver_manager/utils/which.py
+++ b/python/knot_resolver/utils/which.py
diff --git a/python/knot_resolver_manager/client/__init__.py b/python/knot_resolver_manager/client/__init__.py
deleted file mode 100644
index d3c6280d..00000000
--- a/python/knot_resolver_manager/client/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from pathlib import Path
-
-from knot_resolver_manager.datamodel.globals import Context, set_global_validation_context
-
-set_global_validation_context(Context(Path("."), False))
diff --git a/python/knot_resolver_manager/client/__main__.py b/python/knot_resolver_manager/client/__main__.py
deleted file mode 100644
index e26a454e..00000000
--- a/python/knot_resolver_manager/client/__main__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from knot_resolver_manager.client.main import main
-
-if __name__ == "__main__":
-    main()
diff --git a/python/knot_resolver_manager/manager/__main__.py b/python/knot_resolver_manager/manager/__main__.py
deleted file mode 100644
index ca5fef3b..00000000
--- a/python/knot_resolver_manager/manager/__main__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from knot_resolver_manager.manager.main import main
-
-
-if __name__ == "__main__":
-    main()
diff --git a/scripts/meson/make-doc.sh b/scripts/meson/make-doc.sh
index 0e14da4b..787b8a37 100755
--- a/scripts/meson/make-doc.sh
+++ b/scripts/meson/make-doc.sh
@@ -4,12 +4,10 @@ set -o errexit -o nounset
 cd "$(dirname "${0}")/../.."
 
 # generate JSON schema for the manager's declarative config
-pushd python
 ## the following python command should hopefully run without any dependencies except for standard python
-mkdir -p ../doc/_static/
-python3 -m knot_resolver_manager.client schema > ../doc/_static/config.schema.json
-generate-schema-doc --config expand_buttons=true ../doc/_static/config.schema.json ../doc/_static/schema_doc.html
-popd
+mkdir -p doc/_static/
+python3 -m python.knot_resolver.client schema > doc/_static/config.schema.json
+generate-schema-doc --config expand_buttons=true doc/_static/config.schema.json doc/_static/schema_doc.html
 
 # generating the user documentation
 SPHINX=$(type -P sphinx-build-3 sphinx-build | head -n1)
diff --git a/scripts/poe-tasks/check b/scripts/poe-tasks/check
index 49491c11..8aa33b36 100755
--- a/scripts/poe-tasks/check
+++ b/scripts/poe-tasks/check
@@ -32,25 +32,25 @@ fi
 
 # check formatting using black
 echo -e "${yellow}Checking formatting using black...${reset}"
-black python/knot_resolver_manager tests/manager scripts/poe-tasks/utils/create_setup.py --check --diff
+black python/knot_resolver tests/manager scripts/poe-tasks/utils/create_setup.py --check --diff
 check_rv $?
 echo
 
 # check code with pylint
 echo -e "${yellow}Linting using pylint...${reset}"
-pylint python/knot_resolver_manager
+pylint python/knot_resolver
 check_rv $?
 echo
 
 # check code with flake8
 echo -e "${yellow}Linting using flake8...${reset}"
-flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 python/knot_resolver_manager
+flake8 --max-line-length=200 --ignore=E266,W503 --extend-ignore=E203 python/knot_resolver
 check_rv $?
 echo
 
 # check types with mypy
 echo -e "${yellow}Type checking using mypy...${reset}"
-mypy python/knot_resolver_manager
+mypy python/knot_resolver
 check_rv $?
 echo
 
diff --git a/scripts/poe-tasks/kresctl b/scripts/poe-tasks/kresctl
index 922d0624..50e028fc 100755
--- a/scripts/poe-tasks/kresctl
+++ b/scripts/poe-tasks/kresctl
@@ -5,4 +5,4 @@ src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/utils/_env.sh
 
 # run knot-resolver client
-python3 -m knot_resolver_manager.client $@
+python3 -m knot_resolver.client $@
diff --git a/scripts/poe-tasks/run b/scripts/poe-tasks/run
index 77b2d131..90f02632 100755
--- a/scripts/poe-tasks/run
+++ b/scripts/poe-tasks/run
@@ -26,4 +26,4 @@ echo The Knot Resolver management API is accessible on http://localhost:5000
 echo -----------------------------------------------------------------------
 
 # run the knot-resolver manager
-python3 -m knot_resolver_manager.manager $@
+python3 -m knot_resolver.manager $@
diff --git a/scripts/poe-tasks/test b/scripts/poe-tasks/test
index 6b37dff7..85fd6089 100755
--- a/scripts/poe-tasks/test
+++ b/scripts/poe-tasks/test
@@ -5,4 +5,4 @@ src_dir="$(dirname "$(realpath "$0")")"
 source $src_dir/utils/_env.sh
 
 # run pytest
-env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=python/knot_resolver_manager --show-capture=all tests/manager
+env PYTHONPATH=. pytest --junitxml=unit.junit.xml --cov=python/knot_resolver --show-capture=all tests/manager
diff --git a/setup.py b/setup.py
index c2c4dfe6..b17ebe88 100644
--- a/setup.py
+++ b/setup.py
@@ -5,22 +5,22 @@ package_dir = \
 {'': 'python'}
 
 packages = \
-['knot_resolver_manager',
- 'knot_resolver_manager.client',
- 'knot_resolver_manager.client.commands',
- 'knot_resolver_manager.compat',
- 'knot_resolver_manager.controller',
- 'knot_resolver_manager.controller.supervisord',
- 'knot_resolver_manager.controller.supervisord.plugin',
- 'knot_resolver_manager.datamodel',
- 'knot_resolver_manager.datamodel.templates',
- 'knot_resolver_manager.datamodel.types',
- 'knot_resolver_manager.manager',
- 'knot_resolver_manager.utils',
- 'knot_resolver_manager.utils.modeling']
+['knot_resolver',
+ 'knot_resolver.client',
+ 'knot_resolver.client.commands',
+ 'knot_resolver.compat',
+ 'knot_resolver.controller',
+ 'knot_resolver.controller.supervisord',
+ 'knot_resolver.controller.supervisord.plugin',
+ 'knot_resolver.datamodel',
+ 'knot_resolver.datamodel.templates',
+ 'knot_resolver.datamodel.types',
+ 'knot_resolver.manager',
+ 'knot_resolver.utils',
+ 'knot_resolver.utils.modeling']
 
 package_data = \
-{'': ['*'], 'knot_resolver_manager.datamodel.templates': ['macros/*']}
+{'': ['*'], 'knot_resolver.datamodel.templates': ['macros/*']}
 
 install_requires = \
 ['aiohttp', 'jinja2', 'pyyaml', 'supervisor', 'typing-extensions']
@@ -29,11 +29,11 @@ extras_require = \
 {'prometheus': ['prometheus-client']}
 
 entry_points = \
-{'console_scripts': ['knot-resolver = knot_resolver_manager.manager.main:main',
-                     'kresctl = knot_resolver_manager.client.main:main']}
+{'console_scripts': ['knot-resolver = knot_resolver.manager.main:main',
+                     'kresctl = knot_resolver.client.main:main']}
 
 setup_kwargs = {
-    'name': 'knot-resolver-manager',
+    'name': 'knot-resolver',
     'version': '6.0.8',
     'description': 'Knot Resolver Manager - a Python program that automatically manages the other components of the resolver',
     'long_description': "# Knot Resolver\n\n[![Build Status](https://gitlab.nic.cz/knot/knot-resolver/badges/nightly/pipeline.svg?x)](https://gitlab.nic.cz/knot/knot-resolver/commits/nightly)\n[![Coverage Status](https://gitlab.nic.cz/knot/knot-resolver/badges/nightly/coverage.svg?x)](https://www.knot-resolver.cz/documentation/latest)\n[![Packaging status](https://repology.org/badge/tiny-repos/knot-resolver.svg)](https://repology.org/project/knot-resolver/versions)\n\nKnot Resolver is a full caching DNS resolver implementation. The core architecture is tiny and efficient, written in C and [LuaJIT][luajit], providing a foundation and a state-machine-like API for extension modules. There are three built-in modules - *iterator*, *validator* and *cache* - which provide the main functionality of the resolver. A few other modules are automatically loaded by default to extend the resolver's functionality.\n\nSince Knot Resolver version 6, it also includes a so-called [manager][manager]. It is a new component written in [Python][python] that hides the complexity of older versions and makes it more user friendly. For example, new features include declarative configuration in YAML format and HTTP API for dynamic changes in the resolver and more.\n\nKnot Resolver uses a [different scaling strategy][scaling] than the rest of the DNS resolvers - no threading, shared-nothing architecture (except MVCC cache which can be shared), which allows you to pin workers to available CPU cores and grow by self-replication. You can start and stop additional workers based on the contention without downtime, which is automated by the [manager][manager] by default.\n\nThe LuaJIT modules, support for DNS privacy and DNSSEC, and persistent cache with low memory footprint make it a great personal DNS resolver or a research tool to tap into DNS data. Strong filtering rules, and auto-configuration with etcd make it a great large-scale resolver solution. It also has strong support for DNS over TCP, in particular TCP Fast-Open, query pipelining and deduplication, and response reordering.\n\nFor more on using the resolver, see the [User Documentation][doc]. See the [Developer Documentation][doc-dev] for detailed architecture and development.\n\n## Packages\n\nThe latest stable packages for various distributions are available in our\n[upstream repository](https://pkg.labs.nic.cz/doc/?project=knot-resolver).\nFollow the installation instructions to add this repository to your system.\n\nKnot Resolver is also available from the following distributions' repositories:\n\n* [Fedora and Fedora EPEL](https://src.fedoraproject.org/rpms/knot-resolver)\n* [Debian stable](https://packages.debian.org/stable/knot-resolver),\n  [Debian testing](https://packages.debian.org/testing/knot-resolver),\n  [Debian unstable](https://packages.debian.org/sid/knot-resolver)\n* [Ubuntu](https://packages.ubuntu.com/jammy/knot-resolver)\n* [Arch Linux](https://archlinux.org/packages/extra/x86_64/knot-resolver/)\n* [Alpine Linux](https://pkgs.alpinelinux.org/packages?name=knot-resolver)\n\n### Packaging\n\nThe project uses [`apkg`](https://gitlab.nic.cz/packaging/apkg) for packaging.\nSee [`distro/README.md`](distro/README.md) for packaging specific instructions.\n\n## Building from sources\n\nKnot Resolver mainly depends on [KnotDNS][knot-dns] libraries, [LuaJIT][luajit], [libuv][libuv] and [Python][python].\n\nSee the [Building project][build] documentation page for more information.\n\n## Running\n\nBy default, Knot Resolver comes with [systemd][systemd] integration and you just need to start its service. It requires no configuration changes to run a server on localhost.\n\n```\n# systemctl start knot-resolver\n```\n\nSee the documentation at [knot-resolver.cz/documentation/latest][doc] for more information.\n\n## Running the Docker image\n\nRunning the Docker image is simple and doesn't require any dependencies or system modifications, just run:\n\n```\n$ docker run -Pit cznic/knot-resolver\n```\n\nThe images are meant as an easy way to try the resolver, and they're not designed for production use.\n\n## Contacting us\n\n- [GitLab issues](https://gitlab.nic.cz/knot/knot-resolver/issues) (you may authenticate via GitHub)\n- [mailing list](https://lists.nic.cz/postorius/lists/knot-resolver-announce.lists.nic.cz/)\n- [![Join the chat at https://gitter.im/CZ-NIC/knot-resolver](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CZ-NIC/knot-resolver?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)\n\n[build]: https://www.knot-resolver.cz/documentation/latest/dev/build.html\n[doc]: https://www.knot-resolver.cz/documentation/latest/\n[doc-dev]: https://www.knot-resolver.cz/documentation/latest/dev\n[knot-dns]: https://www.knot-dns.cz/\n[luajit]: https://luajit.org/\n[libuv]: http://libuv.org\n[python]: https://www.python.org/\n[systemd]: https://systemd.io/\n[scaling]: https://www.knot-resolver.cz/documentation/latest/config-multiple-workers.html\n[manager]: https://www.knot-resolver.cz/documentation/latest/dev/architecture.html\n",
diff --git a/tests/manager/__init__.py b/tests/manager/__init__.py
index d3c6280d..5b82d3be 100644
--- a/tests/manager/__init__.py
+++ b/tests/manager/__init__.py
@@ -1,5 +1,5 @@
 from pathlib import Path
 
-from knot_resolver_manager.datamodel.globals import Context, set_global_validation_context
+from knot_resolver.datamodel.globals import Context, set_global_validation_context
 
 set_global_validation_context(Context(Path("."), False))
diff --git a/tests/manager/datamodel/templates/test_cache_macros.py b/tests/manager/datamodel/templates/test_cache_macros.py
index 155905c6..b90bc417 100644
--- a/tests/manager/datamodel/templates/test_cache_macros.py
+++ b/tests/manager/datamodel/templates/test_cache_macros.py
@@ -2,8 +2,8 @@ from typing import Any
 
 import pytest
 
-from knot_resolver_manager.datamodel.cache_schema import CacheClearRPCSchema
-from knot_resolver_manager.datamodel.templates import template_from_str
+from knot_resolver.datamodel.cache_schema import CacheClearRPCSchema
+from knot_resolver.datamodel.templates import template_from_str
 
 
 @pytest.mark.parametrize(
diff --git a/tests/manager/datamodel/templates/test_common_macros.py b/tests/manager/datamodel/templates/test_common_macros.py
index e64b278f..9d442ee4 100644
--- a/tests/manager/datamodel/templates/test_common_macros.py
+++ b/tests/manager/datamodel/templates/test_common_macros.py
@@ -1,5 +1,5 @@
-from knot_resolver_manager.datamodel.forward_schema import ForwardServerSchema
-from knot_resolver_manager.datamodel.templates import template_from_str
+from knot_resolver.datamodel.forward_schema import ForwardServerSchema
+from knot_resolver.datamodel.templates import template_from_str
 
 
 def test_boolean():
diff --git a/tests/manager/datamodel/templates/test_forward_macros.py b/tests/manager/datamodel/templates/test_forward_macros.py
index 534c6007..0ed2ec9b 100644
--- a/tests/manager/datamodel/templates/test_forward_macros.py
+++ b/tests/manager/datamodel/templates/test_forward_macros.py
@@ -1,6 +1,6 @@
-from knot_resolver_manager.datamodel.forward_schema import ForwardSchema
-from knot_resolver_manager.datamodel.templates import template_from_str
-from knot_resolver_manager.datamodel.types import IPAddressOptionalPort
+from knot_resolver.datamodel.forward_schema import ForwardSchema
+from knot_resolver.datamodel.templates import template_from_str
+from knot_resolver.datamodel.types import IPAddressOptionalPort
 
 
 def test_policy_rule_forward_add():
diff --git a/tests/manager/datamodel/templates/test_network_macros.py b/tests/manager/datamodel/templates/test_network_macros.py
index 066463df..7ff856fe 100644
--- a/tests/manager/datamodel/templates/test_network_macros.py
+++ b/tests/manager/datamodel/templates/test_network_macros.py
@@ -1,5 +1,5 @@
-from knot_resolver_manager.datamodel.network_schema import ListenSchema
-from knot_resolver_manager.datamodel.templates import template_from_str
+from knot_resolver.datamodel.network_schema import ListenSchema
+from knot_resolver.datamodel.templates import template_from_str
 
 
 def test_network_listen():
diff --git a/tests/manager/datamodel/templates/test_policy_macros.py b/tests/manager/datamodel/templates/test_policy_macros.py
index a9804cd3..09aac85d 100644
--- a/tests/manager/datamodel/templates/test_policy_macros.py
+++ b/tests/manager/datamodel/templates/test_policy_macros.py
@@ -1,9 +1,9 @@
 from typing import List
 
-from knot_resolver_manager.datamodel.network_schema import AddressRenumberingSchema
-from knot_resolver_manager.datamodel.policy_schema import AnswerSchema
-from knot_resolver_manager.datamodel.templates import template_from_str
-from knot_resolver_manager.datamodel.types import PolicyFlagEnum
+from knot_resolver.datamodel.network_schema import AddressRenumberingSchema
+from knot_resolver.datamodel.policy_schema import AnswerSchema
+from knot_resolver.datamodel.templates import template_from_str
+from knot_resolver.datamodel.types import PolicyFlagEnum
 
 
 def test_policy_add():
diff --git a/tests/manager/datamodel/templates/test_types_render.py b/tests/manager/datamodel/templates/test_types_render.py
index f83b41e3..c67d72b2 100644
--- a/tests/manager/datamodel/templates/test_types_render.py
+++ b/tests/manager/datamodel/templates/test_types_render.py
@@ -3,8 +3,8 @@ from typing import Any
 import pytest
 from jinja2 import Template
 
-from knot_resolver_manager.datamodel.types import EscapedStr
-from knot_resolver_manager.utils.modeling import ConfigSchema
+from knot_resolver.datamodel.types import EscapedStr
+from knot_resolver.utils.modeling import ConfigSchema
 
 str_template = Template("'{{ string }}'")
 
diff --git a/tests/manager/datamodel/templates/test_view_macros.py b/tests/manager/datamodel/templates/test_view_macros.py
index 5f4956f8..f814827d 100644
--- a/tests/manager/datamodel/templates/test_view_macros.py
+++ b/tests/manager/datamodel/templates/test_view_macros.py
@@ -2,8 +2,8 @@ from typing import Any
 
 import pytest
 
-from knot_resolver_manager.datamodel.templates import template_from_str
-from knot_resolver_manager.datamodel.view_schema import ViewOptionsSchema, ViewSchema
+from knot_resolver.datamodel.templates import template_from_str
+from knot_resolver.datamodel.view_schema import ViewOptionsSchema, ViewSchema
 
 
 def test_view_flags():
diff --git a/tests/manager/datamodel/test_config_schema.py b/tests/manager/datamodel/test_config_schema.py
index 13a20f33..9ec2b31b 100644
--- a/tests/manager/datamodel/test_config_schema.py
+++ b/tests/manager/datamodel/test_config_schema.py
@@ -2,10 +2,10 @@ import inspect
 import json
 from typing import Any, Dict, Type, cast
 
-from knot_resolver_manager.datamodel import KresConfig
-from knot_resolver_manager.datamodel.lua_schema import LuaSchema
-from knot_resolver_manager.utils.modeling import BaseSchema
-from knot_resolver_manager.utils.modeling.types import (
+from knot_resolver.datamodel import KresConfig
+from knot_resolver.datamodel.lua_schema import LuaSchema
+from knot_resolver.utils.modeling import BaseSchema
+from knot_resolver.utils.modeling.types import (
     get_generic_type_argument,
     get_generic_type_arguments,
     get_optional_inner_type,
diff --git a/tests/manager/datamodel/test_forward_schema.py b/tests/manager/datamodel/test_forward_schema.py
index 9ae77fe8..58ad4667 100644
--- a/tests/manager/datamodel/test_forward_schema.py
+++ b/tests/manager/datamodel/test_forward_schema.py
@@ -1,8 +1,8 @@
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.datamodel.forward_schema import ForwardSchema
-from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
+from knot_resolver.datamodel.forward_schema import ForwardSchema
+from knot_resolver.utils.modeling.exceptions import DataValidationError
 
 
 @pytest.mark.parametrize("port,auth", [(5353, False), (53, True)])
diff --git a/tests/manager/datamodel/test_local_data.py b/tests/manager/datamodel/test_local_data.py
index 9842b0b2..9edc5fba 100644
--- a/tests/manager/datamodel/test_local_data.py
+++ b/tests/manager/datamodel/test_local_data.py
@@ -3,8 +3,8 @@ from typing import Any
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.datamodel.local_data_schema import RuleSchema
-from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
+from knot_resolver.datamodel.local_data_schema import RuleSchema
+from knot_resolver.utils.modeling.exceptions import DataValidationError
 
 
 @pytest.mark.parametrize(
diff --git a/tests/manager/datamodel/test_lua_schema.py b/tests/manager/datamodel/test_lua_schema.py
index 30d69bd9..2021298a 100644
--- a/tests/manager/datamodel/test_lua_schema.py
+++ b/tests/manager/datamodel/test_lua_schema.py
@@ -1,7 +1,7 @@
 from pytest import raises
 
-from knot_resolver_manager.datamodel.lua_schema import LuaSchema
-from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
+from knot_resolver.datamodel.lua_schema import LuaSchema
+from knot_resolver.utils.modeling.exceptions import DataValidationError
 
 
 def test_invalid():
diff --git a/tests/manager/datamodel/test_management_schema.py b/tests/manager/datamodel/test_management_schema.py
index 870e7208..b310a2e2 100644
--- a/tests/manager/datamodel/test_management_schema.py
+++ b/tests/manager/datamodel/test_management_schema.py
@@ -2,8 +2,8 @@ from typing import Any, Dict, Optional
 
 import pytest
 
-from knot_resolver_manager.datamodel.management_schema import ManagementSchema
-from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
+from knot_resolver.datamodel.management_schema import ManagementSchema
+from knot_resolver.utils.modeling.exceptions import DataValidationError
 
 
 @pytest.mark.parametrize("val", [{"interface": "::1@53"}, {"unix-socket": "/tmp/socket"}])
diff --git a/tests/manager/datamodel/test_network_schema.py b/tests/manager/datamodel/test_network_schema.py
index 7b616f34..aed09310 100644
--- a/tests/manager/datamodel/test_network_schema.py
+++ b/tests/manager/datamodel/test_network_schema.py
@@ -3,9 +3,9 @@ from typing import Any, Dict, Optional
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.datamodel.network_schema import ListenSchema, NetworkSchema
-from knot_resolver_manager.datamodel.types import InterfaceOptionalPort, PortNumber
-from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
+from knot_resolver.datamodel.network_schema import ListenSchema, NetworkSchema
+from knot_resolver.datamodel.types import InterfaceOptionalPort, PortNumber
+from knot_resolver.utils.modeling.exceptions import DataValidationError
 
 
 def test_listen_defaults():
diff --git a/tests/manager/datamodel/test_policy_schema.py b/tests/manager/datamodel/test_policy_schema.py
index aeb98a71..8b18e42c 100644
--- a/tests/manager/datamodel/test_policy_schema.py
+++ b/tests/manager/datamodel/test_policy_schema.py
@@ -3,10 +3,10 @@ from typing import Any, Dict
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.datamodel.policy_schema import ActionSchema, PolicySchema
-from knot_resolver_manager.datamodel.types import PolicyActionEnum
-from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
-from knot_resolver_manager.utils.modeling.types import get_generic_type_arguments
+from knot_resolver.datamodel.policy_schema import ActionSchema, PolicySchema
+from knot_resolver.datamodel.types import PolicyActionEnum
+from knot_resolver.utils.modeling.exceptions import DataValidationError
+from knot_resolver.utils.modeling.types import get_generic_type_arguments
 
 noconfig_actions = [
     "pass",
diff --git a/tests/manager/datamodel/test_rpz_schema.py b/tests/manager/datamodel/test_rpz_schema.py
index 6603deed..b656b2a3 100644
--- a/tests/manager/datamodel/test_rpz_schema.py
+++ b/tests/manager/datamodel/test_rpz_schema.py
@@ -1,8 +1,8 @@
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.datamodel.rpz_schema import RPZSchema
-from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
+from knot_resolver.datamodel.rpz_schema import RPZSchema
+from knot_resolver.utils.modeling.exceptions import DataValidationError
 
 
 @pytest.mark.parametrize(
diff --git a/tests/manager/datamodel/types/test_base_types.py b/tests/manager/datamodel/types/test_base_types.py
index bee030c6..c74fe945 100644
--- a/tests/manager/datamodel/types/test_base_types.py
+++ b/tests/manager/datamodel/types/test_base_types.py
@@ -5,8 +5,8 @@ from typing import List, Optional
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.datamodel.types.base_types import IntRangeBase, StringLengthBase
-from knot_resolver_manager.manager.exceptions import KresManagerException
+from knot_resolver.datamodel.types.base_types import IntRangeBase, StringLengthBase
+from knot_resolver.manager.exceptions import KresManagerException
 
 
 @pytest.mark.parametrize("min,max", [(0, None), (None, 0), (1, 65535), (-65535, -1)])
diff --git a/tests/manager/datamodel/types/test_custom_types.py b/tests/manager/datamodel/types/test_custom_types.py
index c82779c8..e381e918 100644
--- a/tests/manager/datamodel/types/test_custom_types.py
+++ b/tests/manager/datamodel/types/test_custom_types.py
@@ -6,7 +6,7 @@ from typing import Any
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.datamodel.types import (
+from knot_resolver.datamodel.types import (
     Dir,
     DomainName,
     EscapedStr,
@@ -25,7 +25,7 @@ from knot_resolver_manager.datamodel.types import (
     SizeUnit,
     TimeUnit,
 )
-from knot_resolver_manager.utils.modeling import BaseSchema
+from knot_resolver.utils.modeling import BaseSchema
 
 
 def _rand_domain(label_chars: int, levels: int = 1) -> str:
diff --git a/tests/manager/datamodel/types/test_generic_types.py b/tests/manager/datamodel/types/test_generic_types.py
index 40b40189..e0b40664 100644
--- a/tests/manager/datamodel/types/test_generic_types.py
+++ b/tests/manager/datamodel/types/test_generic_types.py
@@ -3,10 +3,10 @@ from typing import Any, List, Optional, Union
 import pytest
 from pytest import raises
 
-from knot_resolver_manager.datamodel.types import ListOrItem
-from knot_resolver_manager.utils.modeling import BaseSchema
-from knot_resolver_manager.utils.modeling.exceptions import DataValidationError
-from knot_resolver_manager.utils.modeling.types import get_generic_type_wrapper_argument
+from knot_resolver.datamodel.types import ListOrItem
+from knot_resolver.utils.modeling import BaseSchema
+from knot_resolver.utils.modeling.exceptions import DataValidationError
+from knot_resolver.utils.modeling.types import get_generic_type_wrapper_argument
 
 
 @pytest.mark.parametrize("val", [str, int])
diff --git a/tests/manager/test_config_store.py b/tests/manager/test_config_store.py
index 28a1a4c8..06bdda6c 100644
--- a/tests/manager/test_config_store.py
+++ b/tests/manager/test_config_store.py
@@ -1,7 +1,7 @@
 import pytest
 
-from knot_resolver_manager.manager.config_store import ConfigStore, only_on_real_changes_update
-from knot_resolver_manager.datamodel.config_schema import KresConfig
+from knot_resolver.manager.config_store import ConfigStore, only_on_real_changes_update
+from knot_resolver.datamodel.config_schema import KresConfig
 
 
 @pytest.mark.asyncio  # type: ignore
diff --git a/tests/manager/test_knot_resolver_manager.py b/tests/manager/test_knot_resolver_manager.py
index ed67e354..c1d9b933 100644
--- a/tests/manager/test_knot_resolver_manager.py
+++ b/tests/manager/test_knot_resolver_manager.py
@@ -1,4 +1,4 @@
-from knot_resolver_manager import __version__
+from knot_resolver import __version__
 
 
 def test_version():
diff --git a/tests/manager/utils/modeling/test_base_schema.py b/tests/manager/utils/modeling/test_base_schema.py
index 07e278bb..c4f94b7c 100644
--- a/tests/manager/utils/modeling/test_base_schema.py
+++ b/tests/manager/utils/modeling/test_base_schema.py
@@ -4,8 +4,8 @@ import pytest
 from pytest import raises
 from typing_extensions import Literal
 
-from knot_resolver_manager.utils.modeling import ConfigSchema, parse_json, parse_yaml
-from knot_resolver_manager.utils.modeling.exceptions import DataDescriptionError, DataValidationError
+from knot_resolver.utils.modeling import ConfigSchema, parse_json, parse_yaml
+from knot_resolver.utils.modeling.exceptions import DataDescriptionError, DataValidationError
 
 
 class _TestBool(ConfigSchema):
diff --git a/tests/manager/utils/modeling/test_etag.py b/tests/manager/utils/modeling/test_etag.py
index 25a52369..8a9e2af3 100644
--- a/tests/manager/utils/modeling/test_etag.py
+++ b/tests/manager/utils/modeling/test_etag.py
@@ -1,6 +1,6 @@
 from pyparsing import empty
 
-from knot_resolver_manager.utils.etag import structural_etag
+from knot_resolver.utils.etag import structural_etag
 
 
 def test_etag():
diff --git a/tests/manager/utils/modeling/test_json_pointer.py b/tests/manager/utils/modeling/test_json_pointer.py
index 532e6d5e..1566c715 100644
--- a/tests/manager/utils/modeling/test_json_pointer.py
+++ b/tests/manager/utils/modeling/test_json_pointer.py
@@ -1,6 +1,6 @@
 from pytest import raises
 
-from knot_resolver_manager.utils.modeling.json_pointer import json_ptr_resolve
+from knot_resolver.utils.modeling.json_pointer import json_ptr_resolve
 
 # example adopted from https://www.sitepoint.com/json-server-example/
 TEST = {
diff --git a/tests/manager/utils/modeling/test_query.py b/tests/manager/utils/modeling/test_query.py
index 1a552b87..0e9200d1 100644
--- a/tests/manager/utils/modeling/test_query.py
+++ b/tests/manager/utils/modeling/test_query.py
@@ -1,6 +1,6 @@
 from pytest import raises
 
-from knot_resolver_manager.utils.modeling.query import query
+from knot_resolver.utils.modeling.query import query
 
 
 def test_example_from_spec():
diff --git a/tests/manager/utils/modeling/test_renaming.py b/tests/manager/utils/modeling/test_renaming.py
index 1a4ce89e..219e58d5 100644
--- a/tests/manager/utils/modeling/test_renaming.py
+++ b/tests/manager/utils/modeling/test_renaming.py
@@ -1,4 +1,4 @@
-from knot_resolver_manager.utils.modeling.renaming import renamed
+from knot_resolver.utils.modeling.renaming import renamed
 
 
 def test_all():
diff --git a/tests/manager/utils/modeling/test_types.py b/tests/manager/utils/modeling/test_types.py
index 281f03a8..184eee45 100644
--- a/tests/manager/utils/modeling/test_types.py
+++ b/tests/manager/utils/modeling/test_types.py
@@ -3,8 +3,8 @@ from typing import Any, Dict, List, Tuple, Union
 import pytest
 from typing_extensions import Literal
 
-from knot_resolver_manager.utils.modeling import BaseSchema
-from knot_resolver_manager.utils.modeling.types import is_list, is_literal
+from knot_resolver.utils.modeling import BaseSchema
+from knot_resolver.utils.modeling.types import is_list, is_literal
 
 types = [
     bool,
diff --git a/tests/manager/utils/test_functional.py b/tests/manager/utils/test_functional.py
index 041748e4..31bd19fc 100644
--- a/tests/manager/utils/test_functional.py
+++ b/tests/manager/utils/test_functional.py
@@ -1,4 +1,4 @@
-from knot_resolver_manager.utils.functional import all_matches, contains_element_matching, foldl
+from knot_resolver.utils.functional import all_matches, contains_element_matching, foldl
 
 
 def test_foldl():