diff --git a/AUTHORS.rst b/AUTHORS.rst
index 09205bc266811630dc031d2aa2bf82f69ba12792..cce4283a476ce425a3d219ec94c880f7571dd96d 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -20,9 +20,9 @@
 .. You should have received a copy of the GNU Affero Public License along     ..
 .. with the BEAT platform. If not, see http://www.gnu.org/licenses/.          ..
 
-===========================================================
- Authors of the Biometrics Evaluation and Testing Platform
-===========================================================
+==============================
+ Authors of the BEAT Platform
+==============================
 
 Andre Anjos <andre.anjos@idiap.ch>
 Flavio Tarsetti <flavio.tarsetti@idiap.ch>
diff --git a/beat/web/navigation/templates/navigation/legal_disclaimer.rst b/beat/web/navigation/templates/navigation/legal_disclaimer.rst
index 3fbf9e9b87cd9addea1accbce2256fba052a363d..b84c7de399f66d79c6bcdd830e1b3d2aff7c146b 100644
--- a/beat/web/navigation/templates/navigation/legal_disclaimer.rst
+++ b/beat/web/navigation/templates/navigation/legal_disclaimer.rst
@@ -37,7 +37,7 @@
 
    Version 1.0 (effective as of March 1st, 2014)
 
-The Biometrics Evaluation and Testing ("**BEAT**") project is a four-year
+The "**BEAT**" project is a four-year
 European research project led by THE FOUNDATION OF IDIAP RESEARCH INSTITUTE
 ("**IDIAP**"), Centre du Parc, Rue Marconi 19, PO Box 592, CH - 1920 Martigny,
 Switzerland, which aims at developing a platform for the testing, evaluation
diff --git a/beat/web/navigation/templates/navigation/terms_of_service.rst b/beat/web/navigation/templates/navigation/terms_of_service.rst
index d9792a1761dac49b0be4d06fb2aae655f9dfd5e3..57bd7ff2cffde79c7ea46814f026c418e0f10d8f 100644
--- a/beat/web/navigation/templates/navigation/terms_of_service.rst
+++ b/beat/web/navigation/templates/navigation/terms_of_service.rst
@@ -39,11 +39,11 @@
 
    Version 1.0 (effective as of March 1st, 2014)
 
-The Biometrics Evaluation and Testing ("**BEAT**") project is a four-year
+The "**BEAT**" project is a four-year
 European research project led by THE FOUNDATION OF IDIAP RESEARCH INSTITUTE
 ("**IDIAP**"), Centre du Parc, Rue Marconi 19, PO Box 592, CH - 1920 Martigny,
 Switzerland, which aims at developing a platform for the testing, evaluation
-and attestation of biometric systems, in particular by the sharing of open
+and attestation of machine learning systems, in particular by the sharing of open
 source implementations of algorithms.
 
 =============
diff --git a/doc/admin/index.rst b/doc/admin/index.rst
index 27baa3e7ca32b55fa73b7d08ac6f4cd272b21e55..651620fd168e423fae03f15a7dd3d4690e1f0bb2 100644
--- a/doc/admin/index.rst
+++ b/doc/admin/index.rst
@@ -23,16 +23,15 @@
 
 .. _beat_web_admin:
 
-=========================
-BEAT Administrator Guide
-=========================
+==========================
+ BEAT Administrator Guide
+==========================
 
-BEAT stands for "Biometrics Evaluation And Testing". It is a EC-FP7 sponsored
-project to build a web-based, biometry-independent platform for Biometrics
+BEAT is a EC-FP7 sponsored
+project to build a web-based platform for machine learning
 research and certification. By making use of such a system, academic or
 industrial parties enable users to easily compare results from distinct
-algorithms or/and parameterizations with minimal interaction using one or
-potentially many biometric traits.
+algorithms or/and parameterizations with minimal interaction.
 
 This document contains resources for system administrators regarding the
 conception, dimensioning, hardware implementation and installation of a
diff --git a/doc/api/conf.py b/doc/api/conf.py
index 0cd45a9e42de6af015f357d331b2b362ad54b7d0..19920e6587f0aaea79519ae91f5fa2bc6fdca35f 100644
--- a/doc/api/conf.py
+++ b/doc/api/conf.py
@@ -146,7 +146,7 @@ pygments_style = 'sphinx'
 
 # Some variables which are useful for generated material
 project_variable = project.replace('.', '_').replace(' ', '_')
-short_description = u'Biometrics Evaluation and Testing Platform (Web Modules)'
+short_description = u'BEAT Platform (Web Modules)'
 owner = [u'Idiap Research Institute']
 
 
diff --git a/doc/conf.py b/doc/conf.py
index 27b3137db1115de9b67a0ec2392adefb094f2236..850d53c3fbe1d7f5fdff54712d51556e08c5ff3e 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -150,7 +150,7 @@ pygments_style = 'sphinx'
 
 # Some variables which are useful for generated material
 project_variable = project.replace('.', '_')
-short_description = u'Biometrics Evaluation and Testing Platform (Web Modules)'
+short_description = u'BEAT Platform (Web Modules)'
 owner = [u'Idiap Research Institute']
 
 
diff --git a/setup.py b/setup.py
index d5aa4e4bb296f7701bf3f6a9c62cc591d20ce3bd..b57afb99ad49516644321db6b0653522170cf9bb 100644
--- a/setup.py
+++ b/setup.py
@@ -38,7 +38,7 @@ def load_requirements(f):
 setup(
     name="beat.web",
     version=open("version.txt").read().rstrip(),
-    description="Biometrics Evaluation and Testing Platform (Web Modules)",
+    description="BEAT Platform (Web Modules)",
     url="https://gitlab.idiap.ch/beat/beat.web",
     license="AGPLv3",
     author="Idiap Research Institute",