diff --git a/.gitattributes b/.gitattributes
index 0beecd60e00821268527af8b715b6a728585e2b9..2de3f44bc5c94ecb9a00c9f01bf5c2623cad104a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -246,7 +246,7 @@ README* header_spec=.ignore
 /doc/**/*.sh header_spec=.ignore
 
 /headers/open-source/* header_spec=.ignore
-/headers/close-source/* header_spec=.ignore
+/headers/closed-source/* header_spec=.ignore
 
 /licenses/* header_spec=.ignore
 
diff --git a/dev/make-distrib.sh b/dev/make-distrib.sh
index fd4015e4198345e1cf87f451dfa7394578649bba..0a60322339a9744e2af40e96c8816ae824d278b0 100755
--- a/dev/make-distrib.sh
+++ b/dev/make-distrib.sh
@@ -75,7 +75,7 @@ do
             echo "OPTIONS"
             echo ""
             echo "  --help            Print this help message"
-            echo "  --close-source    Set close source header mode (default)"
+            echo "  --closed-source   Set closed source header mode (default)"
             echo "  --open-source     Set open source header mode"
             echo "  --ci-link         Symlink to frama-c.tar.gz"
             echo "  --hdrck <cmd>     Check headers command"
@@ -86,7 +86,7 @@ do
             echo ""
             echo "  HDRCK=<cmd> (overriden set by --hdrck)"
             echo "  VERSION_CODENAME=<name> (overriden by --codename)"
-            echo "  OPEN_SOURCE=yes|no (overriden by --open-source and --close-source)"
+            echo "  OPEN_SOURCE=yes|no (overriden by --open-source and --closed-source)"
             echo "  CI_LINK=yes|no (also set by --ci-link)"
             echo ""
             exit 0
@@ -102,7 +102,7 @@ do
         "--open-source")
             OPEN_SOURCE=yes
             ;;
-        "--close-source")
+        "--closed-source")
             OPEN_SOURCE=no
             ;;
         "--ci-link")
@@ -153,7 +153,7 @@ if [ "$OPEN_SOURCE" == "yes" ]
 then
     echo "Headers: OPEN SOURCE"
 else
-    echo "Headers: CLOSE SOURCE"
+    echo "Headers: CLOSED SOURCE"
 fi
 echo "----------------------------------------------------------------"
 
@@ -222,12 +222,12 @@ done
 CHECK_HEADER_OPT="-header-dirs headers/open-source"
 
 # For plugins, either they can be open-source and we assume they have OS headers
-# or they are close-source
+# or they are closed-source
 for plugin in $PLUGINS ; do
   if [ -d "$plugin/headers/open-source" ] ; then
     CHECK_HEADER_OPT="$CHECK_HEADER_OPT -header-dirs $plugin/headers/open-source"
-  elif [ -d "$plugin/headers/close-source" ] ; then
-    CHECK_HEADER_OPT="$CHECK_HEADER_OPT -header-dirs $plugin/headers/close-source"
+  elif [ -d "$plugin/headers/closed-source" ] ; then
+    CHECK_HEADER_OPT="$CHECK_HEADER_OPT -header-dirs $plugin/headers/closed-source"
   fi
 done
 
@@ -237,24 +237,24 @@ done
 if [[ "$OPEN_SOURCE" == "yes" ]]; then
   HEADER_KIND="open-source"
 else
-  HEADER_KIND="close-source"
+  HEADER_KIND="closed-source"
 fi
 
 MAKE_HEADER_OPT="-header-dirs headers/$HEADER_KIND"
 
 # Plugins can:
-# - have both open and close -> just use header kind
-# - have only close -> just use header kind, if it is open, build will fail
+# - have both open and closed -> just use header kind
+# - have only closed -> just use header kind, if it is open, build will fail
 # - have only open -> just use open
 for plugin in $PLUGINS ; do
   if [ -d "$plugin/headers" ] ; then
     if [ "$OPEN_SOURCE" == "yes" ] ; then
       MAKE_HEADER_OPT="$MAKE_HEADER_OPT -header-dirs $plugin/headers/open-source"
     else
-      if [ ! -d "$plugin/headers/close-source" ] ; then
+      if [ ! -d "$plugin/headers/closed-source" ] ; then
         MAKE_HEADER_OPT="$MAKE_HEADER_OPT -header-dirs $plugin/headers/open-source"
       else
-        MAKE_HEADER_OPT="$MAKE_HEADER_OPT -header-dirs $plugin/headers/close-source"
+        MAKE_HEADER_OPT="$MAKE_HEADER_OPT -header-dirs $plugin/headers/closed-source"
       fi
     fi
   fi
@@ -279,7 +279,7 @@ $HDRCK -update $MAKE_HEADER_OPT -spec-format="3-fields-by-line" -C "$TMP_DIR/$FR
 if [ "$OPEN_SOURCE" == "yes" ] ; then
   OUT=$(grep -Iir "Contact CEA LIST for licensing." $TMP_DIR | grep -v "headers/" | grep -v "dev/make-distrib.sh")
   if [ "$?" == "0" ]; then
-    echo "Looks like there are some files containing undetected close source licences"
+    echo "Looks like there are some files containing undetected closed source licences"
     exit 1
   fi
 fi
diff --git a/doc/release/branch.tex b/doc/release/branch.tex
index 548f6c95ef6ecc737abf3146c7e49316a2b5031f..8efc99d39565177b3258f8983c1433f46590bb83 100644
--- a/doc/release/branch.tex
+++ b/doc/release/branch.tex
@@ -106,11 +106,11 @@ Check that the date in copyright headers is correct. If not then:
 \begin{itemize}
   \item update the dates in the license files in:
   \begin{itemize}
-    \item \texttt{headers/close-source/*}
+    \item \texttt{headers/closed-source/*}
     \item \texttt{headers/open-source/*}
-    \item \texttt{ivette/headers/close-source/*}
+    \item \texttt{ivette/headers/closed-source/*}
     \item \texttt{ivette/headers/open-source/*}
-    \item \texttt{src/plugins/e-acsl/headers/close-source/*}
+    \item \texttt{src/plugins/e-acsl/headers/closed-source/*}
     \item \texttt{src/plugins/e-acsl/headers/open-source/*}
   \end{itemize}
   \item update the headers with the following command:
diff --git a/headers/close-source/AORAI_LGPL b/headers/closed-source/AORAI_LGPL
similarity index 100%
rename from headers/close-source/AORAI_LGPL
rename to headers/closed-source/AORAI_LGPL
diff --git a/headers/close-source/CDDL b/headers/closed-source/CDDL
similarity index 100%
rename from headers/close-source/CDDL
rename to headers/closed-source/CDDL
diff --git a/headers/close-source/CEA_FSF_LGPL b/headers/closed-source/CEA_FSF_LGPL
similarity index 100%
rename from headers/close-source/CEA_FSF_LGPL
rename to headers/closed-source/CEA_FSF_LGPL
diff --git a/headers/close-source/CEA_INRIA_LGPL b/headers/closed-source/CEA_INRIA_LGPL
similarity index 100%
rename from headers/close-source/CEA_INRIA_LGPL
rename to headers/closed-source/CEA_INRIA_LGPL
diff --git a/headers/close-source/CEA_LGPL b/headers/closed-source/CEA_LGPL
similarity index 100%
rename from headers/close-source/CEA_LGPL
rename to headers/closed-source/CEA_LGPL
diff --git a/headers/close-source/CEA_LGPL_OR_PROPRIETARY b/headers/closed-source/CEA_LGPL_OR_PROPRIETARY
similarity index 100%
rename from headers/close-source/CEA_LGPL_OR_PROPRIETARY
rename to headers/closed-source/CEA_LGPL_OR_PROPRIETARY
diff --git a/headers/close-source/CEA_PROPRIETARY b/headers/closed-source/CEA_PROPRIETARY
similarity index 100%
rename from headers/close-source/CEA_PROPRIETARY
rename to headers/closed-source/CEA_PROPRIETARY
diff --git a/headers/close-source/CEA_PR_LGPL b/headers/closed-source/CEA_PR_LGPL
similarity index 100%
rename from headers/close-source/CEA_PR_LGPL
rename to headers/closed-source/CEA_PR_LGPL
diff --git a/headers/close-source/CEA_WP b/headers/closed-source/CEA_WP
similarity index 100%
rename from headers/close-source/CEA_WP
rename to headers/closed-source/CEA_WP
diff --git a/headers/close-source/CIL b/headers/closed-source/CIL
similarity index 100%
rename from headers/close-source/CIL
rename to headers/closed-source/CIL
diff --git a/headers/close-source/INRIA_BSD b/headers/closed-source/INRIA_BSD
similarity index 100%
rename from headers/close-source/INRIA_BSD
rename to headers/closed-source/INRIA_BSD
diff --git a/headers/close-source/JCF_LGPL b/headers/closed-source/JCF_LGPL
similarity index 100%
rename from headers/close-source/JCF_LGPL
rename to headers/closed-source/JCF_LGPL
diff --git a/headers/close-source/MODIFIED_CAMOMILE b/headers/closed-source/MODIFIED_CAMOMILE
similarity index 100%
rename from headers/close-source/MODIFIED_CAMOMILE
rename to headers/closed-source/MODIFIED_CAMOMILE
diff --git a/headers/close-source/MODIFIED_MENHIR b/headers/closed-source/MODIFIED_MENHIR
similarity index 100%
rename from headers/close-source/MODIFIED_MENHIR
rename to headers/closed-source/MODIFIED_MENHIR
diff --git a/headers/close-source/MODIFIED_OCAMLGRAPH b/headers/closed-source/MODIFIED_OCAMLGRAPH
similarity index 100%
rename from headers/close-source/MODIFIED_OCAMLGRAPH
rename to headers/closed-source/MODIFIED_OCAMLGRAPH
diff --git a/headers/close-source/MODIFIED_WHY3 b/headers/closed-source/MODIFIED_WHY3
similarity index 100%
rename from headers/close-source/MODIFIED_WHY3
rename to headers/closed-source/MODIFIED_WHY3
diff --git a/headers/close-source/OCAML_STDLIB b/headers/closed-source/OCAML_STDLIB
similarity index 100%
rename from headers/close-source/OCAML_STDLIB
rename to headers/closed-source/OCAML_STDLIB
diff --git a/headers/close-source/UNMODIFIED_WHY3 b/headers/closed-source/UNMODIFIED_WHY3
similarity index 100%
rename from headers/close-source/UNMODIFIED_WHY3
rename to headers/closed-source/UNMODIFIED_WHY3
diff --git a/headers/close-source/XL_COMPCERT b/headers/closed-source/XL_COMPCERT
similarity index 100%
rename from headers/close-source/XL_COMPCERT
rename to headers/closed-source/XL_COMPCERT
diff --git a/share/Makefile.headers b/share/Makefile.headers
index b55d1a6919c60a5d538abc01f158d1fa686ad8cd..50ea67a57569b2d4edf8a72f67915057cc067b58 100644
--- a/share/Makefile.headers
+++ b/share/Makefile.headers
@@ -42,7 +42,7 @@ HEADER_DIRS?=headers $(wildcard src/plugins/*/headers)
 # Can be set to unset/yes/no/<relative sub-directory>
 # - unset: look at $(HEADER_DIRS)
 # - yes:   look at $(HEADER_DIRS)/open-source
-# - no:    look at $(HEADER_DIRS)/close-source
+# - no:    look at $(HEADER_DIRS)/closed-source
 # - <dir>: look at $(HEADER_DIRS)/<dir>
 HEADER_OPEN_SOURCE?=yes
 
@@ -113,7 +113,7 @@ ifeq ($(HEADER_OPEN_SOURCE),yes)
 HDRCK.OPTS+= $(addprefix -header-dirs=,$(addsuffix /open-source,$(HEADER_DIRS)))
 else
 ifeq ($(HEADER_OPEN_SOURCE),no)
-HDRCK.OPTS+= $(addprefix -header-dirs=,$(addsuffix /close-source,$(HEADER_DIRS)))
+HDRCK.OPTS+= $(addprefix -header-dirs=,$(addsuffix /closed-source,$(HEADER_DIRS)))
 else
 ifeq ($(HEADER_OPEN_SOURCE),)
 HDRCK.OPTS+= $(addprefix -header-dirs=,$(HEADER_DIRS))
diff --git a/src/plugins/e-acsl/.gitattributes b/src/plugins/e-acsl/.gitattributes
index 9d7633a570624354415012aa73ba25e820304174..88dec68a316871e6ecb5212168857d51337adb01 100644
--- a/src/plugins/e-acsl/.gitattributes
+++ b/src/plugins/e-acsl/.gitattributes
@@ -47,7 +47,7 @@ README header_spec=.ignore
 /examples/demo/TODO header_spec=.ignore
 /examples/ensuresec/push-alerts/.env-example header_spec=.ignore
 
-/headers/close-source/* header_spec=.ignore
+/headers/closed-source/* header_spec=.ignore
 /headers/open-source/* header_spec=.ignore
 
 /license/* header_spec=.ignore
diff --git a/src/plugins/e-acsl/headers/close-source/CEA_LGPL_OR_PROPRIETARY.E_ACSL b/src/plugins/e-acsl/headers/closed-source/CEA_LGPL_OR_PROPRIETARY.E_ACSL
similarity index 100%
rename from src/plugins/e-acsl/headers/close-source/CEA_LGPL_OR_PROPRIETARY.E_ACSL
rename to src/plugins/e-acsl/headers/closed-source/CEA_LGPL_OR_PROPRIETARY.E_ACSL
diff --git a/src/plugins/e-acsl/headers/close-source/MODIFIED_DLMALLOC b/src/plugins/e-acsl/headers/closed-source/MODIFIED_DLMALLOC
similarity index 100%
rename from src/plugins/e-acsl/headers/close-source/MODIFIED_DLMALLOC
rename to src/plugins/e-acsl/headers/closed-source/MODIFIED_DLMALLOC
diff --git a/src/plugins/e-acsl/headers/close-source/MODIFIED_LIB_GMP b/src/plugins/e-acsl/headers/closed-source/MODIFIED_LIB_GMP
similarity index 100%
rename from src/plugins/e-acsl/headers/close-source/MODIFIED_LIB_GMP
rename to src/plugins/e-acsl/headers/closed-source/MODIFIED_LIB_GMP
diff --git a/src/plugins/e-acsl/headers/close-source/MODIFIED_SPARETIMELABS b/src/plugins/e-acsl/headers/closed-source/MODIFIED_SPARETIMELABS
similarity index 100%
rename from src/plugins/e-acsl/headers/close-source/MODIFIED_SPARETIMELABS
rename to src/plugins/e-acsl/headers/closed-source/MODIFIED_SPARETIMELABS