diff --git a/_data/dynare_team.yml b/_data/dynare_team.yml
index 9ae7e335170522fe3ffe59eb96488ef8f78ea4e5..3b368628330c7f02cfd54a62793e7388d5785ce0 100644
--- a/_data/dynare_team.yml
+++ b/_data/dynare_team.yml
@@ -4,7 +4,7 @@
   webpage: https://stepan.adjemian.eu/
 
 - name: Houtan Bastani
-  affiliation: Cepremap
+  affiliation: CEPREMAP
   img: /assets/images/team/houtan.png
   webpage: http://www.dynare.org/houtan
 
@@ -24,7 +24,7 @@
   webpage: http://f.karame.free.fr/index.php
 
 - name: Dóra Kocsis
-  affiliation: Cepremap
+  affiliation: CEPREMAP
   img: /assets/images/team/dora.jpg
 
 - name: Junior Maih
@@ -53,6 +53,6 @@
   webpage: https://ideas.repec.org/f/pra217.html#research
 
 - name: Sébastien Villemot
-  affiliation: Cepremap
+  affiliation: CEPREMAP
   img: /assets/images/team/sebastien.jpeg
   webpage: http://sebastien.villemot.name/
diff --git a/_includes/footer.html b/_includes/footer.html
index bee41cac87a28072845c9e70ed30316e122fac91..6911c87f32391896ecc33fa5259dbf01d2c86bb2 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -19,5 +19,5 @@
 <div class="page__footer-copyright">&copy; {{site.copyright_begin}} - {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. Content licensed under a <a href="https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License</a></div>
 
 <div class="page__footer-copyright">
-  <i class="fas fa-map-pin footer-icon" aria-hidden="true"></i> <a href="http://www.cepremap.fr">Cepremap</a>, 48 boulevard Jourdan, 75014 Paris, France
+  <i class="fas fa-map-pin footer-icon" aria-hidden="true"></i> <a href="http://www.cepremap.fr">CEPREMAP</a>, 48 boulevard Jourdan, 75014 Paris, France
 </div>
diff --git a/_posts/2018-02-03-dynare-4.5.4-released.markdown b/_posts/2018-02-03-dynare-4.5.4-released.markdown
index 383431566f3b7083cfb4c1f964a3308676d37620..79dd56b23b711c44b4da3aa76d57d3501a4839c7 100644
--- a/_posts/2018-02-03-dynare-4.5.4-released.markdown
+++ b/_posts/2018-02-03-dynare-4.5.4-released.markdown
@@ -31,7 +31,7 @@ been fixed in version 4.5.4:
 - Various bug fixes in shock decompositions.
 - Bug in reading in macro arrays passed on dynare command line via the `-D` option.
 - Estimation with missing values was crashing if the `prefilter` option was used.
-- Added a workaround for a difference in behaviour between Octave and Matlab regarding the creation of function handles for functions that do not exist in the path. With Octave 4.2.1, steady state files did not work if no auxiliary variables were created.
+- Added a workaround for a difference in behaviour between Octave and MATLAB regarding the creation of function handles for functions that do not exist in the path. With Octave 4.2.1, steady state files did not work if no auxiliary variables were created.
 - The `stoch_simul` command was crashing with a cryptic message if option `order=3` was used without setting `k_order_solver`.
 - In cases where the prior bounds are infinite and the mode is estimated at exactly 0, no mode_check graphs were displayed.
 - Parallel execution of MCMC was broken in models without auxiliary variables.
diff --git a/_posts/2018-03-13-dynare-summer-school-2018-applications-open.markdown b/_posts/2018-03-13-dynare-summer-school-2018-applications-open.markdown
index 9b230777bd02206c1d641983d784f84ca1231a6e..1039c6e1e02dbc2bee4cc0c8152dfc3b4959b7a0 100644
--- a/_posts/2018-03-13-dynare-summer-school-2018-applications-open.markdown
+++ b/_posts/2018-03-13-dynare-summer-school-2018-applications-open.markdown
@@ -33,7 +33,7 @@ Registration fee (including lunches, coffee breaks and one diner): €200 for ac
 ## Workshop Animators
 
 - Stéphane Adjemian (Université du Maine)
-- Thomas Brand (Cepremap)
+- Thomas Brand (CEPREMAP)
 - Michel Juillard (Banque de France)
 - Frédéric Karamé (Université du Maine)
 - Marco Ratto (JRC)
diff --git a/_posts/2019-01-24-dynare-summer-school-2019-applications-open.markdown b/_posts/2019-01-24-dynare-summer-school-2019-applications-open.markdown
index 5dd6fcfdb4ea964fba09c3b66951690edbf3b74c..7fb63ea711e1046ce10bc4263782b8b96cb50cb5 100644
--- a/_posts/2019-01-24-dynare-summer-school-2019-applications-open.markdown
+++ b/_posts/2019-01-24-dynare-summer-school-2019-applications-open.markdown
@@ -56,11 +56,11 @@ Thomas will present his Dynare toolbox for estimating heterogenous agent models
 ## Animators
 
 - [Stéphane Adjemian](https://stepan.adjemian.eu/) (Université du Maine)
-- [Houtan Bastani](https://www.dynare.org/houtan/) (Cepremap)
+- [Houtan Bastani](https://www.dynare.org/houtan/) (CEPREMAP)
 - [Michel Juillard](https://ideas.repec.org/e/pju1.html#research) (Banque de France)
 - [Frédéric Karamé](http://f.karame.free.fr/index.php) (Université du Maine)
 - [Marco Ratto](https://ideas.repec.org/f/pra217.html#research) (European Commission Joint Research Centre)
-- [Sébastien Villemot](http://sebastien.villemot.name/) (Cepremap)
+- [Sébastien Villemot](http://sebastien.villemot.name/) (CEPREMAP)
 
 This workshop is organized with the support of École Normale Supérieure,
 CEPREMAP, Banque de France, and DSGE-net.
diff --git a/about.md b/about.md
index 1377da64c983e2d86473e6c82ccca3d9b6e9e088..bdd4ba1cd594ce3e529aa77b9ee89e0d362c9ff0 100644
--- a/about.md
+++ b/about.md
@@ -17,7 +17,7 @@ Various public bodies (central banks, ministries of economy and finance, interna
 # Team
 
 The Dynare project is hosted at <i class="fas fa-external-link-alt"></i>
-[Cepremap](http://www.cepremap.org), 48 boulevard Jourdan, 75014 Paris,
+[CEPREMAP](http://www.cepremap.org), 48 boulevard Jourdan, 75014 Paris,
 France. Development is undertaken by a core team of researchers who devote part
 of their time to software development.
 
diff --git a/index.md b/index.md
index 1bb22472d087ef0257a39dad8a3a7e6814babf14..7ecc71ce9acef6ddfecaea32c0bfb00702bdfeb6 100644
--- a/index.md
+++ b/index.md
@@ -47,7 +47,7 @@ We organize a Summer School and a Conference every year (applications every Spri
 </div>
 <div class="dynare_home_page_about_column" markdown="1">
 <h3>Platforms</h3>
-Dynare runs on top of Matlab, [Octave](https://www.gnu.org/software/octave/), and, in the not too distant future, [Julia](https://julialang.org/)!
+Dynare runs on top of MATLAB, [Octave](https://www.gnu.org/software/octave/), and, in the not too distant future, [Julia](https://julialang.org/)!
 </div>
 </div>
 
diff --git a/resources/index.md b/resources/index.md
index 60bc9c39c73fcca7d55383a05c65c61065b4297a..8ace60784619955e3687613a88e31d24ad8cba84 100644
--- a/resources/index.md
+++ b/resources/index.md
@@ -109,7 +109,7 @@ distribution, (iii) plot the prior versus the posterior distribution, together
 with the mode of the posterior, (iv) assess the convergence of the MCMC chain
 through CUSUM procedure, and (v) compare the correlation between the estimated
 parameters implied by both the Hessian and the chain. The toolbox makes use of
-few Matlab routines of Dynare 4.3.
+few MATLAB routines of Dynare 4.3.
 </p>
 
 <p class="indent" markdown="1">