diff --git a/compiler/Makefile b/compiler/Makefile
index 1cce35d42..f076b8708 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -152,7 +152,7 @@ release_tarballs:
 	docker container run --rm -v ${PWD}/../tarballs:/tarballs_volume concretefhe-compiler-manylinux:linux_x86_64_tarball cp -r /tarballs/. /tarballs_volume/.
 
 update_python_version:
-	echo "__version__ = \"`git describe --tags --abbrev=0 | grep -e '[0-9].*' -o`\"" > lib/Bindings/Python/concretelang/version.py
+	echo "__version__ = \"`git describe --tags --abbrev=0 | grep -e '[0-9].*' -o`\"" > lib/Bindings/Python/concrete/version.py
 
 .PHONY: build-initialized \
 	build-end-to-end-jit \
diff --git a/compiler/lib/Bindings/Python/CMakeLists.txt b/compiler/lib/Bindings/Python/CMakeLists.txt
index 4152aaf74..fd3d323b1 100644
--- a/compiler/lib/Bindings/Python/CMakeLists.txt
+++ b/compiler/lib/Bindings/Python/CMakeLists.txt
@@ -26,11 +26,11 @@ declare_mlir_python_extension(ConcretelangBindingsPythonExtension.Core
 declare_mlir_python_sources(ConcretelangBindingsPythonSources
   ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
   SOURCES
-    concretelang/__init__.py
-    concretelang/compiler.py
-    concretelang/version.py
-    concretelang/dialects/__init__.py
-    concretelang/dialects/_ods_common.py)
+    concrete/compiler.py
+    concrete/version.py
+    concrete/lang/__init__.py
+    concrete/lang/dialects/__init__.py
+    concrete/lang/dialects/_ods_common.py)
 
 ################################################################################
 # Declare dialect-specific bindings.
@@ -43,18 +43,18 @@ declare_mlir_dialect_python_bindings(
   ADD_TO_PARENT ConcretelangBindingsPythonSources.Dialects
   ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
   CONCRETELANGBindingsPythonHLFHEOps
-	TD_FILE concretelang/dialects/HLFHEOps.td
+	TD_FILE concrete/lang/dialects/HLFHEOps.td
   SOURCES
-    concretelang/dialects/hlfhe.py
+    concrete/lang/dialects/hlfhe.py
 	DIALECT_NAME HLFHE)
 
 declare_mlir_dialect_python_bindings(
   ADD_TO_PARENT ConcretelangBindingsPythonSources.Dialects
   ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
   CONCRETELANGBindingsPythonHLFHELinalgOps
-  TD_FILE concretelang/dialects/HLFHELinalgOps.td
+  TD_FILE concrete/lang/dialects/HLFHELinalgOps.td
   SOURCES
-    concretelang/dialects/hlfhelinalg.py
+    concrete/lang/dialects/hlfhelinalg.py
   DIALECT_NAME HLFHELinalg)
 
 
diff --git a/compiler/lib/Bindings/Python/concretelang/compiler.py b/compiler/lib/Bindings/Python/concrete/compiler.py
similarity index 100%
rename from compiler/lib/Bindings/Python/concretelang/compiler.py
rename to compiler/lib/Bindings/Python/concrete/compiler.py
diff --git a/compiler/lib/Bindings/Python/concretelang/__init__.py b/compiler/lib/Bindings/Python/concrete/lang/__init__.py
similarity index 85%
rename from compiler/lib/Bindings/Python/concretelang/__init__.py
rename to compiler/lib/Bindings/Python/concrete/lang/__init__.py
index 99d2a59b0..c59b32668 100644
--- a/compiler/lib/Bindings/Python/concretelang/__init__.py
+++ b/compiler/lib/Bindings/Python/concrete/lang/__init__.py
@@ -3,4 +3,3 @@
 
 """Concretelang python module"""
 from mlir._mlir_libs._concretelang import *
-from .compiler import CompilerEngine, library
diff --git a/compiler/lib/Bindings/Python/concretelang/dialects/HLFHELinalgOps.td b/compiler/lib/Bindings/Python/concrete/lang/dialects/HLFHELinalgOps.td
similarity index 100%
rename from compiler/lib/Bindings/Python/concretelang/dialects/HLFHELinalgOps.td
rename to compiler/lib/Bindings/Python/concrete/lang/dialects/HLFHELinalgOps.td
diff --git a/compiler/lib/Bindings/Python/concretelang/dialects/HLFHEOps.td b/compiler/lib/Bindings/Python/concrete/lang/dialects/HLFHEOps.td
similarity index 100%
rename from compiler/lib/Bindings/Python/concretelang/dialects/HLFHEOps.td
rename to compiler/lib/Bindings/Python/concrete/lang/dialects/HLFHEOps.td
diff --git a/compiler/lib/Bindings/Python/concretelang/dialects/__init__.py b/compiler/lib/Bindings/Python/concrete/lang/dialects/__init__.py
similarity index 100%
rename from compiler/lib/Bindings/Python/concretelang/dialects/__init__.py
rename to compiler/lib/Bindings/Python/concrete/lang/dialects/__init__.py
diff --git a/compiler/lib/Bindings/Python/concretelang/dialects/_ods_common.py b/compiler/lib/Bindings/Python/concrete/lang/dialects/_ods_common.py
similarity index 100%
rename from compiler/lib/Bindings/Python/concretelang/dialects/_ods_common.py
rename to compiler/lib/Bindings/Python/concrete/lang/dialects/_ods_common.py
diff --git a/compiler/lib/Bindings/Python/concretelang/dialects/hlfhe.py b/compiler/lib/Bindings/Python/concrete/lang/dialects/hlfhe.py
similarity index 100%
rename from compiler/lib/Bindings/Python/concretelang/dialects/hlfhe.py
rename to compiler/lib/Bindings/Python/concrete/lang/dialects/hlfhe.py
diff --git a/compiler/lib/Bindings/Python/concretelang/dialects/hlfhelinalg.py b/compiler/lib/Bindings/Python/concrete/lang/dialects/hlfhelinalg.py
similarity index 100%
rename from compiler/lib/Bindings/Python/concretelang/dialects/hlfhelinalg.py
rename to compiler/lib/Bindings/Python/concrete/lang/dialects/hlfhelinalg.py
diff --git a/compiler/lib/Bindings/Python/concretelang/version.py b/compiler/lib/Bindings/Python/concrete/version.py
similarity index 100%
rename from compiler/lib/Bindings/Python/concretelang/version.py
rename to compiler/lib/Bindings/Python/concrete/version.py
diff --git a/compiler/setup.py b/compiler/setup.py
index 00ff59adc..c4946b37b 100644
--- a/compiler/setup.py
+++ b/compiler/setup.py
@@ -14,7 +14,7 @@ def read(fname):
 def find_version():
     return re.match(
         r"__version__ = \"(?P<version>.+)\"",
-        read("lib/Bindings/Python/concretelang/version.py"),
+        read("lib/Bindings/Python/concrete/version.py"),
     ).group("version")
 
 
@@ -56,9 +56,9 @@ setuptools.setup(
     long_description=read("README.md"),
     long_description_content_type="text/markdown",
     url="https://github.com/zama-ai/homomorphizer",
-    packages=setuptools.find_packages(
+    packages=setuptools.find_namespace_packages(
         where=build_dir() + "tools/concretelang/python_packages/concretelang_core",
-        include=["concretelang", "concretelang.*"],
+        include=["concrete", "concrete.*"],
     )
     + setuptools.find_namespace_packages(
         where=build_dir() + "tools/concretelang/python_packages/concretelang_core",
diff --git a/compiler/tests/python/test_compiler_engine.py b/compiler/tests/python/test_compiler_engine.py
index 6473f514a..869579619 100644
--- a/compiler/tests/python/test_compiler_engine.py
+++ b/compiler/tests/python/test_compiler_engine.py
@@ -3,7 +3,7 @@ import tempfile
 
 import pytest
 import numpy as np
-from concretelang import CompilerEngine, library
+from concrete.compiler import CompilerEngine, library
 
 KEY_SET_CACHE_PATH =  os.path.join(tempfile.gettempdir(), 'KeySetCache')
 
diff --git a/compiler/tests/python/test_hlfhe_dialect.py b/compiler/tests/python/test_hlfhe_dialect.py
index e5e24880a..86bdc5bfa 100644
--- a/compiler/tests/python/test_hlfhe_dialect.py
+++ b/compiler/tests/python/test_hlfhe_dialect.py
@@ -1,7 +1,7 @@
 import pytest
 from mlir.ir import Context, RankedTensorType, Location
-from concretelang import register_dialects
-from concretelang.dialects import hlfhe
+from concrete.lang import register_dialects
+from concrete.lang.dialects import hlfhe
 
 
 @pytest.mark.parametrize("width", list(range(1, 8)))
diff --git a/compiler/tests/python/test_round_trip.py b/compiler/tests/python/test_round_trip.py
index 4fd1cbc59..761b7b8ff 100644
--- a/compiler/tests/python/test_round_trip.py
+++ b/compiler/tests/python/test_round_trip.py
@@ -1,5 +1,5 @@
 import pytest
-from concretelang import compiler
+from concrete import compiler
 
 
 VALID_INPUTS = [