diff --git a/compiler/include/concretelang-c/Support/CompilerEngine.h b/compiler/include/concretelang-c/Support/CompilerEngine.h
index 33badbce9..1a369e58f 100644
--- a/compiler/include/concretelang-c/Support/CompilerEngine.h
+++ b/compiler/include/concretelang-c/Support/CompilerEngine.h
@@ -118,7 +118,6 @@ enum CompilationTarget {
   FHE,
   TFHE,
   CONCRETE,
-  CONCRETEWITHLOOPS,
   BCONCRETE,
   STD,
   LLVM,
diff --git a/compiler/lib/Bindings/Rust/build.rs b/compiler/lib/Bindings/Rust/build.rs
index 3ba3bebea..4ac724d93 100644
--- a/compiler/lib/Bindings/Rust/build.rs
+++ b/compiler/lib/Bindings/Rust/build.rs
@@ -241,7 +241,7 @@ const LLVM_STATIC_LIBS: [&str; 51] = [
     "LLVMX86Info",
 ];
 
-const CONCRETE_COMPILER_LIBS: [&str; 34] = [
+const CONCRETE_COMPILER_LIBS: [&str; 35] = [
     "RTDialect",
     "RTDialectTransforms",
     "ConcretelangSupport",
@@ -265,7 +265,8 @@ const CONCRETE_COMPILER_LIBS: [&str; 34] = [
     "FHELinalgDialectTransforms",
     "FHEDialect",
     "TFHEToConcrete",
-    "FHEToTFHE",
+    "FHEToTFHECrt",
+    "FHEToTFHEScalar",
     "ConcreteDialectTransforms",
     "BConcreteDialect",
     "concrete_optimizer",
diff --git a/compiler/lib/CAPI/Support/CompilerEngine.cpp b/compiler/lib/CAPI/Support/CompilerEngine.cpp
index 0502aaec1..2adbe6a0b 100644
--- a/compiler/lib/CAPI/Support/CompilerEngine.cpp
+++ b/compiler/lib/CAPI/Support/CompilerEngine.cpp
@@ -128,8 +128,6 @@ llvm::Expected<mlir::concretelang::CompilerEngine::
     return mlir::concretelang::CompilerEngine::Target::TFHE;
   case CONCRETE:
     return mlir::concretelang::CompilerEngine::Target::CONCRETE;
-  case CONCRETEWITHLOOPS:
-    return mlir::concretelang::CompilerEngine::Target::CONCRETEWITHLOOPS;
   case BCONCRETE:
     return mlir::concretelang::CompilerEngine::Target::BCONCRETE;
   case STD: