diff --git a/README.md b/README.md
index 53c631ddb1..d372bd274c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 <h2 align="center">
-  <a href="http://mlpack.org"><img src="https://cdn.rawgit.com/mlpack/mlpack.org/e7d36ed8/mlpack-black.svg" style="background-color:rgba(0,0,0,0);" height=230 alt="mlpack: a scalable C++ machine learning library"></a>
-  <br>a scalable C++ machine learning library<br>
+  <a href="http://mlpack.org"><img
+src="https://cdn.rawgit.com/mlpack/mlpack.org/e7d36ed8/mlpack-black.svg" style="background-color:rgba(0,0,0,0);" height=230 alt="mlpack: a fast, flexible machine learning library"></a>
+  <br>a fast, flexible machine learning library<br>
 </h2>
 
 <h5 align="center">
@@ -25,11 +26,12 @@
   </em>
 </p>
 
-**mlpack** is an intuitive, fast, scalable C++ machine learning library, meant to be
-a machine learning analog to LAPACK. It aims to implement a wide array of
-machine learning methods and functions as a "swiss army knife" for machine
-learning researchers.  In addition to its powerful C++ interface, mlpack also
-provides command-line programs and Python bindings.
+**mlpack** is an intuitive, fast, and flexible C++ machine learning library with
+bindings to other languages.  It is meant to be a machine learning analog to
+LAPACK, and aims to implement a wide array of machine learning methods and
+functions as a "swiss army knife" for machine learning researchers.  In addition
+to its powerful C++ interface, mlpack also provides command-line programs and
+Python bindings.
 
 ### 0. Contents
 
diff --git a/src/mlpack/core.hpp b/src/mlpack/core.hpp
index 6a0d6b7e03..4989323097 100644
--- a/src/mlpack/core.hpp
+++ b/src/mlpack/core.hpp
@@ -1,8 +1,8 @@
 /**
  * @file core.hpp
  *
- * Include all of the base components required to write MLPACK methods, and the
- * main MLPACK Doxygen documentation.
+ * Include all of the base components required to write mlpack methods, and the
+ * main mlpack Doxygen documentation.
  *
  * mlpack is free software; you may redistribute it and/or modify it under the
  * terms of the 3-clause BSD license.  You should have received a copy of the
@@ -17,11 +17,11 @@
  *
  * @section intro_sec Introduction
  *
- * mlpack is an intuitive, fast, scalable C++ machine learning library, meant to
- * be a machine learning analog to LAPACK.  It aims to implement a wide array of
- * machine learning methods and function as a "swiss army knife" for machine
- * learning researchers.  The mlpack development website can be found at
- * http://mlpack.org.
+ * mlpack is an intuitive, fast, and flexible C++ machine learning library with
+ * bindings to other languages.  It is meant to be a machine learning analog to
+ * LAPACK, and aims to implement a wide array of machine learning methods and
+ * function as a "swiss army knife" for machine learning researchers.  The
+ * mlpack development website can be found at http://mlpack.org.
  *
  * mlpack uses the Armadillo C++ matrix library (http://arma.sourceforge.net)
  * for general matrix, vector, and linear algebra support.  mlpack also uses the