diff --git a/Makefile b/Makefile
index cc4d079bc19710aecb8b2e4e268150daef1fa326..34d3760279b08c7d625c220a7503eeb404f98d07 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,9 @@ sinclude ${FRAMAC_SHARE}/Makefile.common
 ##########################################################################
 # Build
 
-all:: build frama-c-clang.opam
+all:: build frama-clang.opam
 
-frama-c-clang.opam: frama-c-clang.opam.template dune-project
+frama-clang.opam: frama-clang.opam.template dune-project
 	rm -f $@
 	dune build $@
 
diff --git a/dune b/dune
index 8b69bcd2c773a28db9e8937ce5c622afe72f2d0f..95d11a57f0b4be293ca55fa0bc06acbb9d275d84 100644
--- a/dune
+++ b/dune
@@ -24,7 +24,7 @@
  (alias frama-c-configure)
  (deps (universe))
  (action (progn
-          (echo "Clang:" %{lib-available:frama-c-clang.core} "\n")
+          (echo "Clang:" %{lib-available:frama-clang.core} "\n")
           (echo "  - zarith:" %{lib-available:zarith} "\n")
           (echo "  - camlp5:" %{lib-available:camlp5} "\n") ; for gen_ast
           (echo "  - camlp-streams:" %{lib-available:camlp-streams} "\n")
@@ -59,7 +59,7 @@
 (library
  (name clang)
   (optional)
-  (public_name frama-c-clang.core)
+  (public_name frama-clang.core)
   (flags (-open Frama_c_kernel :standard -w -9))
   (libraries frama-c.kernel frama-c-wp.core camlp-streams zarith)
 )
@@ -73,7 +73,7 @@
    (action (run %{exe:gen_ast_src/gen_ast.exe} %{deps}))
 )
 
-(plugin (optional) (name clang) (libraries frama-c-clang.core) (site (frama-c plugins)))
+(plugin (optional) (name clang) (libraries frama-clang.core) (site (frama-c plugins)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
diff --git a/dune-project b/dune-project
index cc926b7e5ddf2d8d1a88f84fd300d8c7e8673b6a..110cc9dfc806f1374b503afe41e612093d4ce595 100644
--- a/dune-project
+++ b/dune-project
@@ -24,10 +24,10 @@
 (using dune_site 0.1)
 (generate_opam_files true)
 
-(name frama-c-clang)
+(name frama-clang)
 (maintainers "https://git.frama-c.com/pub/frama-c")
 
-(package (name frama-c-clang)
+(package (name frama-clang)
  (depends
   ("frama-c" (and (>= 25.0) (< 26.0)))
   ("zarith" (>= 1.5))
diff --git a/frama-c-clang.opam b/frama-clang.opam
similarity index 97%
rename from frama-c-clang.opam
rename to frama-clang.opam
index b48ddefc8421f7c5a6dea0b39ddd9276fb89538b..0907aa0d7eaec2914a5c7be65e517405e47db6f8 100644
--- a/frama-c-clang.opam
+++ b/frama-clang.opam
@@ -28,7 +28,7 @@ build: [
   ]
   ["dune" "install" "-p" name "--create-install-files" name]
 ]
-name: "frama-c-clang"
+name: "frama-clang"
 version: "0.0.11"
 synopsis: "Frama-C plug-in based on Clang for parsing C++ files"
 description: """
diff --git a/frama-c-clang.opam.template b/frama-clang.opam.template
similarity index 94%
rename from frama-c-clang.opam.template
rename to frama-clang.opam.template
index cf7a895fab006453cb882480ca9ab0dd877cd962..b559bc80372681bbf3bb6720aae52562899fd076 100644
--- a/frama-c-clang.opam.template
+++ b/frama-clang.opam.template
@@ -1,4 +1,4 @@
-name: "frama-c-clang"
+name: "frama-clang"
 version: "0.0.11"
 synopsis: "Frama-C plug-in based on Clang for parsing C++ files"
 description: """
diff --git a/share/dune b/share/dune
index 9dc87725a60acf2688f769cfd5df3e447f196834..a7c8d45a56d12c56ff84783be090d8216152e2af 100644
--- a/share/dune
+++ b/share/dune
@@ -21,7 +21,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (install
- (package frama-c-clang)
+ (package frama-clang)
  (section (site (frama-c share)))
  (files
   (libc++/algorithm as libc++/algorithm)
diff --git a/tests/test_config b/tests/test_config
index c3d4e232642647daf0cf022bb3631199ce32325a..ed5cf13b9b17966869134878b102e6bbadb8f103 100644
--- a/tests/test_config
+++ b/tests/test_config
@@ -12,7 +12,7 @@ MACRO: WP -wp -wp-par 1 -wp-session=%{read:@WP_CACHE@} -wp-cache update -wp-msg-
 MACRO: EVA_PLUGINS eva,scope inout,from variadic
 MACRO: WP_PLUGINS wp,rtegen
 
-PLUGIN: clang @WP_PLUGINS@ @EVA_PLUGINS@
+PLUGIN: frama-clang @WP_PLUGINS@ @EVA_PLUGINS@
 
 FILTER:sed  -e "s|@FRAMAC_SHARE@|FRAMAC_SHARE|g" -e "s|$(pwd -P)/||g"
 OPT: @MACHDEP@ -print -check @CXX@