diff --git a/README.org b/README.org
index 674446612426e114408082ba9238a1474ef1e2f4..57a571824b4dec7cfc7373fba05815aafcec5fe7 100644
--- a/README.org
+++ b/README.org
@@ -25,7 +25,7 @@ linear algebra algorithms on very different type of architecture:
 laptop, many-core nodes, CPUs-GPUs, multiple nodes. For example,
 Chameleon is able to perform a Cholesky factorization
 (double-precision) at 80 TFlop/s on a dense matrix of order 400 000
-(i.e. 4 min). Chameleon is a sub-project of [[http://icl.cs.utk.edu/morse/][CHAMELEON]] specifically
+(i.e. 4 min). Chameleon is a sub-project of [[http://icl.cs.utk.edu/morse/][MORSE]] specifically
 dedicated to dense linear algebra.
 
 * Get Chameleon
diff --git a/control/chameleon_zcf90.F90 b/control/chameleon_zcf90.F90
index f05c5d92e2bdd3aabed9faad301826f2a45adf8c..dc36329f3cacbb32ab07719f0e52a0463bb7f3fb 100644
--- a/control/chameleon_zcf90.F90
+++ b/control/chameleon_zcf90.F90
@@ -6,19 +6,19 @@
 ! This software is a computer program whose purpose is to process
 ! Matrices Over Runtime Systems @ Exascale (MORSE). More information
 ! can be found on the following website: http://www.inria.fr/en/teams/morse.
-! 
+!
 ! This software is governed by the CeCILL-B license under French law and
-! abiding by the rules of distribution of free software.  You can  use, 
+! abiding by the rules of distribution of free software.  You can  use,
 ! modify and/ or redistribute the software under the terms of the CeCILL-B
 ! license as circulated by CEA, CNRS and INRIA at the following URL
-! "http://www.cecill.info". 
-! 
+! "http://www.cecill.info".
+!
 ! As a counterpart to the access to the source code and  rights to copy,
 ! modify and redistribute granted by the license, users are provided only
 ! with a limited warranty  and the software's author,  the holder of the
 ! economic rights,  and the successive licensors  have only  limited
-! liability. 
-! 
+! liability.
+!
 ! In this respect, the user's attention is drawn to the risks associated
 ! with loading,  using,  modifying and/or developing or reproducing the
 ! software by the user in light of its specific status of free software,
@@ -26,10 +26,10 @@
 ! therefore means  that it is reserved for developers  and  experienced
 ! professionals having in-depth computer knowledge. Users are therefore
 ! encouraged to load and test the software's suitability as regards their
-! requirements in conditions enabling the security of their systems and/or 
-! data to be ensured and,  more generally, to use and operate it in the 
-! same conditions as regards security. 
-! 
+! requirements in conditions enabling the security of their systems and/or
+! data to be ensured and,  more generally, to use and operate it in the
+! same conditions as regards security.
+!
 ! The fact that you are presently reading this means that you have had
 ! knowledge of the CeCILL-B license and that you accept its terms.
 !
@@ -37,7 +37,7 @@
 
 !
 !     Copyright © 2011 The Numerical Algorithms Group Ltd. All rights reserved.
-!   
+!
 !     Redistribution and use in source and binary forms, with or without
 !     modification, are permitted provided that the following conditions are
 !     met:
@@ -50,7 +50,7 @@
 !     - Neither the name of the copyright holders nor the names of its
 !       contributors may be used to endorse or promote products derived from
 !       this software without specific prior written permission.
-!     
+!
 !     This software is provided by the copyright holders and contributors "as
 !     is" and any express or implied warranties, including, but not limited
 !     to, the implied warranties of merchantability and fitness for a