Index: LICENSE
===================================================================
--- LICENSE	(revision bdd516a5257cb93cc0c5b4a4c343cc112252022a)
+++ LICENSE	(revision c11e31cbaeeeb0709ef952223453f301da13d515)
@@ -1,5 +1,5 @@
-This software Cforall is published under the BSD license as listed below.
+BSD Licence
 
-Copyright (c) 2015 Huawei Technologies Co., Ltd and University of Waterloo.
+Copyright (c) 2015 University of Waterloo.
 All rights reserved.
 
@@ -8,19 +8,18 @@
 
 1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+list of conditions and the following disclaimer.
 
 2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
 
-3. Neither the name of Huawei Technologies Co., Ltd., nor University of
-   Waterloo, nor the names of the contributors to Cfoall may be used to endorse
-   or promote products derived from this software without specific prior
-   written permission.
+3. Neither the name of the copyright holder 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 PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR