diff --git a/theme/simple/config.php b/theme/simple/config.php
index 07704f7f10e..d131739693c 100644
--- a/theme/simple/config.php
+++ b/theme/simple/config.php
@@ -23,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  * http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   Moodle Simple theme
+ * @package   theme_simple
  * @copyright 2013 Moodle, moodle.org
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/simple/lang/en/theme_simple.php b/theme/simple/lang/en/theme_simple.php
index 0c69e03c84c..6d52d9e0d8b 100644
--- a/theme/simple/lang/en/theme_simple.php
+++ b/theme/simple/lang/en/theme_simple.php
@@ -13,10 +13,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
 /**
  * Strings for component 'theme_simple', language 'en'
  *
- * @package   simple theme
+ * @package   theme_simple
  * @copyright 2013 Bas Brands, www.basbrands.nl
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/simple/layout/general.php b/theme/simple/layout/general.php
index 3c7931699a9..ebcc279968f 100644
--- a/theme/simple/layout/general.php
+++ b/theme/simple/layout/general.php
@@ -23,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  * http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   Moodle Simple theme
+ * @package   theme_simple
  * @copyright 2013 Moodle, moodle.org
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/simple/lib.php b/theme/simple/lib.php
index 7e997988886..25322c52f71 100644
--- a/theme/simple/lib.php
+++ b/theme/simple/lib.php
@@ -23,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  * http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   Moodle Simple theme
+ * @package   theme_simple
  * @copyright 2013 Moodle, moodle.org
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/simple/settings.php b/theme/simple/settings.php
index b27a8be2603..30f4e2bd132 100644
--- a/theme/simple/settings.php
+++ b/theme/simple/settings.php
@@ -23,7 +23,7 @@
  * For full information about creating Moodle themes, see:
  * http://docs.moodle.org/dev/Themes_2.0
  *
- * @package   Moodle Simple theme
+ * @package   theme_simple
  * @copyright 2013 Moodle, moodle.org
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/theme/simple/version.php b/theme/simple/version.php
index 29ff4836ed6..722fce49225 100644
--- a/theme/simple/version.php
+++ b/theme/simple/version.php
@@ -23,8 +23,7 @@
  * For full information about creating Moodle themes, see:
  * http://docs.moodle.org/dev/Themes_2.0
  *
- * @package    theme
- * @subpackage Simple
+ * @package    theme_simple
  * @copyright  2013 Moodle, moodle.org
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */