diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index b8bb43bfcd4caaedb05dd3cddf9684e5dccd446c..514379ed3c5e67869216d844d1233579e3ebb90a 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -28,7 +28,7 @@ walberla_codegen_venv_install(
 add_executable ( HeatEquationWithMaterial )
 target_sources( HeatEquationWithMaterial PRIVATE CodegenHeatEquationWithMaterial.cpp )
 target_link_libraries( HeatEquationWithMaterial PRIVATE walberla::blockforest walberla::core walberla::field walberla::stencil walberla::timeloop walberla::vtk walberla::pde )
-target_link_libraries( HeatEquationWithMaterial PRIVATE interpolation_template )
+target_link_libraries( HeatEquationWithMaterial PRIVATE pymatlib_interpolators )
 
 pystencilssfg_generate_target_sources( HeatEquationWithMaterial
         SCRIPTS HeatEquationKernelWithMaterial.py
diff --git a/src/pymatlib/core/cpp/CMakeLists.txt b/src/pymatlib/core/cpp/CMakeLists.txt
index b50fa6ad8da25c64f7c5386042c895124d11ef3e..8edbf89b580b6a83d80dc30844e4a15f32b0268d 100644
--- a/src/pymatlib/core/cpp/CMakeLists.txt
+++ b/src/pymatlib/core/cpp/CMakeLists.txt
@@ -1,38 +1,36 @@
 cmake_minimum_required(VERSION 3.10)
-project(fast_interpolation)
+project(pymatlib_interpolators)
 
 # Find required packages
 find_package(Python COMPONENTS Interpreter Development NumPy REQUIRED)
-execute_process(
-        COMMAND ${Python_EXECUTABLE} -m pybind11 --cmakedir
-        OUTPUT_VARIABLE PYBIND11_CMAKE_DIR
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-find_package(pybind11 PATHS ${PYBIND11_CMAKE_DIR} NO_DEFAULT_PATH REQUIRED)
+# execute_process(
+#         COMMAND ${Python_EXECUTABLE} -m pybind11 --cmakedir
+#         OUTPUT_VARIABLE PYBIND11_CMAKE_DIR
+#         OUTPUT_STRIP_TRAILING_WHITESPACE
+# )
+# find_package(pybind11 PATHS ${PYBIND11_CMAKE_DIR} NO_DEFAULT_PATH REQUIRED)
 
 # Create interface library for header-only template implementation
-add_library(interpolation_template INTERFACE)
-target_include_directories(interpolation_template INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+add_library(pymatlib_interpolators INTERFACE)
+target_include_directories(pymatlib_interpolators INTERFACE
+        # ${CMAKE_CURRENT_SOURCE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
 # Add the Pybind11 module
-pybind11_add_module(fast_interpolation
-        module.cpp
-        binary_search_interpolation.cpp
-        double_lookup_interpolation.cpp
-)
-target_include_directories(fast_interpolation PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-target_compile_features(fast_interpolation PRIVATE cxx_std_11)
-target_compile_options(fast_interpolation PRIVATE -O3)
-target_link_libraries(fast_interpolation PRIVATE
-        interpolation_template
-        pybind11::module
-        Python::NumPy
-)
+# pybind11_add_module(fast_interpolation
+#         module.cpp
+# )
+# target_include_directories(fast_interpolation PRIVATE
+#         ${CMAKE_CURRENT_SOURCE_DIR}/include
+# )
+# target_compile_features(fast_interpolation PRIVATE cxx_std_11)
+# target_compile_options(fast_interpolation PRIVATE -O3)
+# target_link_libraries(fast_interpolation PRIVATE
+#         interpolation_template
+#         pybind11::module
+#         Python::NumPy
+# )
 
 # Remove or update this if test_interpolation.py has been moved
 # add_custom_target(fast_interpolation_test_py