diff --git a/doc/manual/source/running-dynare.rst b/doc/manual/source/running-dynare.rst
index 11c13e6dd695e94303099296ddb5ce3cdf760503..be6d0aa3c6037cb2e785ad3d67f74e6e4ae0dfd2 100644
--- a/doc/manual/source/running-dynare.rst
+++ b/doc/manual/source/running-dynare.rst
@@ -346,9 +346,9 @@ by the ``dynare`` command.
         quotes<quote-note>` for info on passing a ``FILENAME`` argument
         containing spaces.
 
-    .. option:: parallel_slave_open_mode
+    .. option:: parallel_follower_open_mode
 
-        Instructs Dynare to leave the connection to the slave node
+        Instructs Dynare to leave the connection to the follower node
         open after computation is complete, closing this connection
         only when Dynare finishes processing.
 
diff --git a/doc/manual/source/the-configuration-file.rst b/doc/manual/source/the-configuration-file.rst
index b4dfad7445c12dd5d51c46af5aeb1f01f16e661f..05ade49cb88c11cb5257601ece9943e8a51e9d85 100644
--- a/doc/manual/source/the-configuration-file.rst
+++ b/doc/manual/source/the-configuration-file.rst
@@ -147,7 +147,7 @@ For a Windows grid:
 
         * a standard Windows network (SMB) must be in place;
         * the `PsTools`_ suite must be installed in the path of the
-          master Windows machine;
+          leader Windows machine;
         * the Windows user on the leader machine has to be user of any
           other follower machine in the cluster, and that user will be
           used for the remote computations.
@@ -161,10 +161,10 @@ For a UNIX grid:
           the leader to the follower can be done without passwords, or
           using an SSH agent.
 
-.. warning:: Compatibility considerations between master and slave
+.. warning:: Compatibility considerations between leader and follower
 
     It is highly recommended to use the same version of Dynare on both the
-    master and all slaves. Different versions regularly cause problems like
+    leader and all followers. Different versions regularly cause problems like
     zero acceptance rates during estimation. When upgrading to a newer Dynare
     version do not forget to adjust the ``DynarePath``.
 
diff --git a/preprocessor b/preprocessor
index 9b04c5436ef01aca68140e504e3d6381402d7a1b..2a68f5a3af2886ce40149b1af10a9c08d5b4099c 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit 9b04c5436ef01aca68140e504e3d6381402d7a1b
+Subproject commit 2a68f5a3af2886ce40149b1af10a9c08d5b4099c