diff --git a/LICENSE.md b/LICENSE.md
index ea80a3567d9969b1b0b8a3d911588a43f6aecc53..aa82a217eabf46a7184a61bbe38889edad2a82dd 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 > Copyright (C) 2014-2018 Dynare Team
 >
-> The dseries and dates Matlab/Octave classes are licensed under GNU GPL as published by
+> The dseries and dates MATLAB/Octave classes are licensed under GNU GPL as published by
 > the Free Software Foundation, either version 3 of the License, or (at
 > your option) any later version.
 >
diff --git a/README.md b/README.md
index 3b63ee4f3e75304ea4b91b7032117e33c3921f10..3cac86b2228a2d26476e94c62add90e2a1f098eb 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![pipeline status](https://git.dynare.org/Dynare/dseries/badges/master/pipeline.svg)](https://git.dynare.org/Dynare/dseries/commits/master)
 
-This Matlab/Octave toolbox comes with two classes:
+This MATLAB/Octave toolbox comes with two classes:
 
  - `@dates` which is used to handle dates.
  - `@dseries` which is used to handle time series data.
@@ -8,7 +8,7 @@ This Matlab/Octave toolbox comes with two classes:
 The package is a dependence of
 [Dynare](https=//git.dynare.org/Dynare/dynare), but can also be used
 as a standalone package without Dynare. The package is
-compatible with Matlab 2008a and following versions, and (almost
+compatible with MATLAB 2008a and following versions, and (almost
 compatible with) the latest Octave version.
 
 ## Installation
@@ -25,17 +25,17 @@ or downloading a zip archive:
 
 ## Usage
 
-Add the `dseries/src` folder to the Matlab/Octave path, and run the following command (on Matlab/Octave) prompt:
+Add the `dseries/src` folder to the MATLAB/Octave path, and run the following command (on MATLAB/Octave) prompt:
 
     >> dseries().initialize()
 
 which, depending on your system, will add the necessary subfolders to
-the Matlab/Octave path. Also, if
+the MATLAB/Octave path. Also, if
 [X13-ARIMA-SEATS](https://www.census.gov/srd/www/x13as/) is not
 installed in your system (on debian it is possible to install it with
 the `apt-get`) you will need (only the first time) to install the
 binary. Scripts are available to install (or update) this
-dependency. From the Matlab/Octave prompt:
+dependency. From the MATLAB/Octave prompt:
 
     >> cd dseries/externals/x13
     >> installx13()
diff --git a/src/@dseries/extract.m b/src/@dseries/extract.m
index 07aa80424ad7633968223230e9819f0252673847..f7b4094dd14d59aac34020c1fe92f89a50a6d750 100644
--- a/src/@dseries/extract.m
+++ b/src/@dseries/extract.m
@@ -64,7 +64,7 @@ for i=1:nargin-1
     end
     % Check that square brackets in regular expressions
     if useregularexpression && ~usewildcardparameter && ~isequal(length(idBracket.open),length(idBracket.open))
-        error('dseries::extract: (Matlab/Octave''s regular expressions) Check opening and closing square brackets!')
+        error('dseries::extract: (MATLAB/Octave''s regular expressions) Check opening and closing square brackets!')
     end
     % Loops and regular expressions are not compatible
     if useregularexpression && useimplicitloops
diff --git a/src/@dseries/subsasgn.m b/src/@dseries/subsasgn.m
index e66505bff681717f6c2850f95fe7d0cde6233d90..778fc756f13b5771bb7dd70e44c5f605d27640d8 100644
--- a/src/@dseries/subsasgn.m
+++ b/src/@dseries/subsasgn.m
@@ -45,7 +45,7 @@ switch length(S)
             idBracket.open = strfind(element, '[');
             idBracket.close = strfind(element, ']');
             if ~isequal(length(idBracket.open),length(idBracket.open))
-                error('dseries::subsasgn: (Matlab/Octave''s regular expressions) Check opening and closing square brackets!')
+                error('dseries::subsasgn: (MATLAB/Octave''s regular expressions) Check opening and closing square brackets!')
             end
             % Loops and regular expressions are not compatible
             if length(idArobase) && length(idBracket.open)