diff --git a/src/serena/agent.py b/src/serena/agent.py
index 97bf63e..1ac3ffb 100644
--- a/src/serena/agent.py
+++ b/src/serena/agent.py
@@ -33,7 +33,7 @@ from sensai.util import logging
 from sensai.util.logging import LOG_DEFAULT_FORMAT, FallbackHandler
 from sensai.util.string import ToStringMixin, dict_string
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from serena import serena_version
 from serena.config import SerenaAgentContext, SerenaAgentMode
 from serena.constants import (
diff --git a/src/serena/symbol.py b/src/serena/symbol.py
index 334671d..ec94db2 100644
--- a/src/serena/symbol.py
+++ b/src/serena/symbol.py
@@ -9,8 +9,8 @@ from typing import TYPE_CHECKING, Any, Literal, NamedTuple, Self, Union
 
 from sensai.util.string import ToStringMixin
 
-from multilspy import SyncLanguageServer
-from multilspy.language_server import ReferenceInSymbol as LSPReferenceInSymbol
+from solidlsp import SolidLanguageServer as SyncLanguageServer
+from solidlsp.ls import ReferenceInSymbol as LSPReferenceInSymbol
 from solidlsp.multilspy_types import Position, SymbolKind, UnifiedSymbolInformation
 
 if TYPE_CHECKING:
diff --git a/src/solidlsp/__init__.py b/src/solidlsp/__init__.py
new file mode 100644
index 0000000..fbd65b1
--- /dev/null
+++ b/src/solidlsp/__init__.py
@@ -0,0 +1 @@
+from .ls import SolidLanguageServer
diff --git a/test/conftest.py b/test/conftest.py
index 0eeda4a..8e086cf 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -5,7 +5,7 @@ from typing import cast
 import pytest
 from sensai.util.logging import configure
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from serena.constants import USE_SOLID_LSP
 from serena.util.file_system import GitignoreParser
 from solidlsp.ls import SolidLanguageServer
diff --git a/test/multilspy/go/test_go_basic.py b/test/multilspy/go/test_go_basic.py
index 535b3ad..e5d82de 100644
--- a/test/multilspy/go/test_go_basic.py
+++ b/test/multilspy/go/test_go_basic.py
@@ -2,7 +2,7 @@ import os
 
 import pytest
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_utils import SymbolUtils
 
diff --git a/test/multilspy/java/test_java_basic.py b/test/multilspy/java/test_java_basic.py
index 2403d12..679a7a8 100644
--- a/test/multilspy/java/test_java_basic.py
+++ b/test/multilspy/java/test_java_basic.py
@@ -2,7 +2,7 @@ import os
 
 import pytest
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_utils import SymbolUtils
 
diff --git a/test/multilspy/php/test_php_basic.py b/test/multilspy/php/test_php_basic.py
index 2bfed7b..ff4bf32 100644
--- a/test/multilspy/php/test_php_basic.py
+++ b/test/multilspy/php/test_php_basic.py
@@ -2,7 +2,7 @@ from pathlib import Path
 
 import pytest
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 
 
diff --git a/test/multilspy/python/test_python_basic.py b/test/multilspy/python/test_python_basic.py
index a3edbea..c5522e5 100644
--- a/test/multilspy/python/test_python_basic.py
+++ b/test/multilspy/python/test_python_basic.py
@@ -9,7 +9,7 @@ import os
 
 import pytest
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from serena.text_utils import LineType
 from solidlsp.multilspy_config import Language
 
diff --git a/test/multilspy/python/test_retrieval_with_ignored_dirs.py b/test/multilspy/python/test_retrieval_with_ignored_dirs.py
index f6b25c9..d0446f9 100644
--- a/test/multilspy/python/test_retrieval_with_ignored_dirs.py
+++ b/test/multilspy/python/test_retrieval_with_ignored_dirs.py
@@ -3,7 +3,7 @@ from pathlib import Path
 
 import pytest
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from test.conftest import create_ls
 
diff --git a/test/multilspy/python/test_symbol_retrieval.py b/test/multilspy/python/test_symbol_retrieval.py
index 80229ef..5bca8f6 100644
--- a/test/multilspy/python/test_symbol_retrieval.py
+++ b/test/multilspy/python/test_symbol_retrieval.py
@@ -10,7 +10,7 @@ import os
 
 import pytest
 
-from multilspy.language_server import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_types import SymbolKind
 
diff --git a/test/multilspy/rust/test_rust_basic.py b/test/multilspy/rust/test_rust_basic.py
index 20aa6e0..ffe1245 100644
--- a/test/multilspy/rust/test_rust_basic.py
+++ b/test/multilspy/rust/test_rust_basic.py
@@ -2,7 +2,7 @@ import os
 
 import pytest
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_utils import SymbolUtils
 
diff --git a/test/multilspy/typescript/test_typescript_basic.py b/test/multilspy/typescript/test_typescript_basic.py
index fca1e54..e135f88 100644
--- a/test/multilspy/typescript/test_typescript_basic.py
+++ b/test/multilspy/typescript/test_typescript_basic.py
@@ -2,7 +2,7 @@ import os
 
 import pytest
 
-from multilspy import SyncLanguageServer
+from solidlsp import SolidLanguageServer as SyncLanguageServer
 from solidlsp.multilspy_config import Language
 from solidlsp.multilspy_utils import SymbolUtils