diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 4d298ea..41c82b8 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2857,7 +2857,7 @@ function ip_address() {
 }
 
 /**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
  * @{
  */
 
@@ -2973,12 +2973,12 @@ function drupal_get_complete_schema($rebuild = FALSE) {
 }
 
 /**
- * @} End of "ingroup schemaapi".
+ * @} End of "addtogroup schemaapi".
  */
 
 
 /**
- * @ingroup registry
+ * @addtogroup registry
  * @{
  */
 
@@ -3118,7 +3118,7 @@ function registry_update() {
 }
 
 /**
- * @} End of "ingroup registry".
+ * @} End of "addtogroup registry".
  */
 
 /**
diff --git a/core/includes/common.inc b/core/includes/common.inc
index c6a29b7..c3a5080 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -1009,7 +1009,7 @@ function drupal_http_request($url, array $options = array()) {
   return $result;
 }
 /**
- * @} End of "HTTP handling".
+ * @} End of "defgroup http_handling".
  */
 
 function _fix_gpc_magic(&$item) {
@@ -6723,7 +6723,7 @@ function drupal_common_theme() {
 }
 
 /**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
  * @{
  */
 
@@ -7023,7 +7023,7 @@ function drupal_write_record($table, &$record, $primary_keys = array()) {
 }
 
 /**
- * @} End of "ingroup schemaapi".
+ * @} End of "addtogroup schemaapi".
  */
 
 /**
diff --git a/core/includes/database/database.inc b/core/includes/database/database.inc
index 77584f9..375fc3a 100644
--- a/core/includes/database/database.inc
+++ b/core/includes/database/database.inc
@@ -2665,7 +2665,7 @@ function db_condition($conjunction) {
 
 
 /**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
  * @{
  */
 
@@ -2982,7 +2982,7 @@ function db_change_field($table, $field, $field_new, $spec, $keys_new = array())
 }
 
 /**
- * @} End of "ingroup schemaapi".
+ * @} End of "addtogroup schemaapi".
  */
 
 /**
diff --git a/core/includes/database/mysql/database.inc b/core/includes/database/mysql/database.inc
index a57f7dd..b1a72de 100644
--- a/core/includes/database/mysql/database.inc
+++ b/core/includes/database/mysql/database.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * @ingroup database
+ * @addtogroup database
  * @{
  */
 
@@ -197,5 +197,5 @@ class DatabaseConnection_mysql extends DatabaseConnection {
 
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
diff --git a/core/includes/database/mysql/query.inc b/core/includes/database/mysql/query.inc
index 888b6a5..cedd2e0 100644
--- a/core/includes/database/mysql/query.inc
+++ b/core/includes/database/mysql/query.inc
@@ -1,15 +1,14 @@
 <?php
 
 /**
- * @ingroup database
- * @{
- */
-
-/**
  * @file
  * Query code for MySQL embedded database engine.
  */
 
+/**
+ * @addtogroup database
+ * @{
+ */
 
 class InsertQuery_mysql extends InsertQuery {
 
@@ -103,5 +102,5 @@ class TruncateQuery_mysql extends TruncateQuery {
 }
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
diff --git a/core/includes/database/mysql/schema.inc b/core/includes/database/mysql/schema.inc
index 4e88fa1..a1557ec 100644
--- a/core/includes/database/mysql/schema.inc
+++ b/core/includes/database/mysql/schema.inc
@@ -5,9 +5,8 @@
  * Database schema code for MySQL database servers.
  */
 
-
 /**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
  * @{
  */
 
@@ -527,5 +526,5 @@ class DatabaseSchema_mysql extends DatabaseSchema {
 }
 
 /**
- * @} End of "ingroup schemaapi".
+ * @} End of "addtogroup schemaapi".
  */
diff --git a/core/includes/database/pgsql/database.inc b/core/includes/database/pgsql/database.inc
index 68300e5..1f714cb 100644
--- a/core/includes/database/pgsql/database.inc
+++ b/core/includes/database/pgsql/database.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * @ingroup database
+ * @addtogroup database
  * @{
  */
 
@@ -210,5 +210,5 @@ class DatabaseConnection_pgsql extends DatabaseConnection {
 }
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
diff --git a/core/includes/database/pgsql/query.inc b/core/includes/database/pgsql/query.inc
index f3783a9..f9b52c9 100644
--- a/core/includes/database/pgsql/query.inc
+++ b/core/includes/database/pgsql/query.inc
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @ingroup database
- * @{
+ * @file
+ * Query code for PostgreSQL embedded database engine.
  */
 
 /**
- * @file
- * Query code for PostgreSQL embedded database engine.
+ * @addtogroup database
+ * @{
  */
 
 
@@ -207,3 +207,7 @@ class UpdateQuery_pgsql extends UpdateQuery {
     return $stmt->rowCount();
   }
 }
+
+/**
+ * @} End of "addtogroup database".
+ */
diff --git a/core/includes/database/pgsql/schema.inc b/core/includes/database/pgsql/schema.inc
index 9ed8a26..7300406 100644
--- a/core/includes/database/pgsql/schema.inc
+++ b/core/includes/database/pgsql/schema.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
  * @{
  */
 
@@ -615,3 +615,7 @@ class DatabaseSchema_pgsql extends DatabaseSchema {
     }
   }
 }
+
+/**
+ * @} End of "addtogroup schemaapi".
+ */
diff --git a/core/includes/database/pgsql/select.inc b/core/includes/database/pgsql/select.inc
index d1d8382..f6a83db 100644
--- a/core/includes/database/pgsql/select.inc
+++ b/core/includes/database/pgsql/select.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * @ingroup database
+ * @addtogroup database
  * @{
  */
 
@@ -103,6 +103,6 @@ class SelectQuery_pgsql extends SelectQuery {
 }
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
 
diff --git a/core/includes/database/prefetch.inc b/core/includes/database/prefetch.inc
index 4f2b19d..3b36a4e 100644
--- a/core/includes/database/prefetch.inc
+++ b/core/includes/database/prefetch.inc
@@ -9,7 +9,7 @@
  */
 
 /**
- * @ingroup database
+ * @addtogroup database
  * @{
  */
 
@@ -502,6 +502,6 @@ class DatabaseStatementPrefetch implements Iterator, DatabaseStatementInterface
 }
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
 
diff --git a/core/includes/database/query.inc b/core/includes/database/query.inc
index 9cdd878..c94140e 100644
--- a/core/includes/database/query.inc
+++ b/core/includes/database/query.inc
@@ -1,13 +1,13 @@
 <?php
 
 /**
- * @ingroup database
- * @{
+ * @file
+ * Non-specific Database query code. Used by all engines.
  */
 
 /**
- * @file
- * Non-specific Database query code. Used by all engines.
+ * @addtogroup database
+ * @{
  */
 
 /**
@@ -1946,5 +1946,5 @@ class DatabaseCondition implements QueryConditionInterface, Countable {
 }
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
diff --git a/core/includes/database/select.inc b/core/includes/database/select.inc
index 7504778..069ba87 100644
--- a/core/includes/database/select.inc
+++ b/core/includes/database/select.inc
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @ingroup database
+ * @addtogroup database
  * @{
  */
 
@@ -1626,5 +1626,5 @@ class SelectQuery extends Query implements SelectQueryInterface {
 }
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
diff --git a/core/includes/database/sqlite/database.inc b/core/includes/database/sqlite/database.inc
index 98b35a2..0558082 100644
--- a/core/includes/database/sqlite/database.inc
+++ b/core/includes/database/sqlite/database.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * @ingroup database
+ * @addtogroup database
  * @{
  */
 
@@ -517,5 +517,5 @@ class DatabaseStatement_sqlite extends DatabaseStatementPrefetch implements Iter
 }
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
diff --git a/core/includes/database/sqlite/query.inc b/core/includes/database/sqlite/query.inc
index 6b8a72f..74ff9ba 100644
--- a/core/includes/database/sqlite/query.inc
+++ b/core/includes/database/sqlite/query.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * @ingroup database
+ * @addtogroup database
  * @{
  */
 
@@ -156,5 +156,5 @@ class TruncateQuery_sqlite extends TruncateQuery {
 }
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
diff --git a/core/includes/database/sqlite/schema.inc b/core/includes/database/sqlite/schema.inc
index c5882f1..872950b 100644
--- a/core/includes/database/sqlite/schema.inc
+++ b/core/includes/database/sqlite/schema.inc
@@ -7,7 +7,7 @@
 
 
 /**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
  * @{
  */
 
@@ -681,3 +681,7 @@ class DatabaseSchema_sqlite extends DatabaseSchema {
     return $result->fetchAllKeyed(0, 0);
   }
 }
+
+/**
+ * @} End of "addtogroup schemaapi".
+ */
diff --git a/core/includes/database/sqlite/select.inc b/core/includes/database/sqlite/select.inc
index fb926ef..9037a0e 100644
--- a/core/includes/database/sqlite/select.inc
+++ b/core/includes/database/sqlite/select.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * @ingroup database
+ * @addtogroup database
  * @{
  */
 
@@ -21,7 +21,7 @@ class SelectQuery_sqlite extends SelectQuery {
 }
 
 /**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
  */
 
 
diff --git a/core/includes/gettext.inc b/core/includes/gettext.inc
index 08fa38f..97d1c31 100644
--- a/core/includes/gettext.inc
+++ b/core/includes/gettext.inc
@@ -8,7 +8,7 @@
  */
 
 /**
- * @defgroup locale-api-import-export Translation import/export API.
+ * @defgroup locale_api_import_export Translation import/export API
  * @{
  * Functions to import and export translations.
  *
@@ -1096,5 +1096,5 @@ function _locale_export_remove_plural($entry) {
   return preg_replace('/(@count)\[[0-9]\]/', '\\1', $entry);
 }
 /**
- * @} End of "locale-api-import-export"
+ * @} End of "defgroup locale_api_import_export".
  */
diff --git a/core/includes/locale.inc b/core/includes/locale.inc
index 4cd0c59..b9789ad 100644
--- a/core/includes/locale.inc
+++ b/core/includes/locale.inc
@@ -97,7 +97,7 @@ const LOCALE_LANGUAGE_NEGOTIATION_URL_PREFIX = 0;
 const LOCALE_LANGUAGE_NEGOTIATION_URL_DOMAIN = 1;
 
 /**
- * @defgroup locale-languages-negotiation Language negotiation options
+ * @defgroup locale_languages_negotiation Language negotiation options
  * @{
  * Functions for language negotiation.
  *
@@ -513,7 +513,7 @@ function locale_language_url_rewrite_session(&$path, &$options) {
 }
 
 /**
- * @} End of "locale-languages-negotiation"
+ * @} End of "defgroup locale_languages_negotiation".
  */
 
 /**
@@ -866,7 +866,7 @@ function _locale_rebuild_js($langcode = NULL) {
 }
 
 /**
- * @defgroup locale-api-predefined List of predefined languages
+ * @defgroup locale_api_predefined List of predefined languages
  * @{
  * API to provide a list of predefined languages.
  */
@@ -890,7 +890,7 @@ function _locale_prepare_predefined_list() {
 }
 
 /**
- * @} End of "locale-api-languages-predefined"
+ * @} End of "defgroup locale_api_languages_predefined".
  */
 
 /**
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index 13b4c7d..c0a9193 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -121,7 +121,7 @@ const MENU_IS_LOCAL_TASK = 0x0080;
 const MENU_IS_LOCAL_ACTION = 0x0100;
 
 /**
- * @} End of "Menu flags".
+ * @} End of "defgroup menu_flags".
  */
 
 /**
@@ -186,7 +186,7 @@ define('MENU_DEFAULT_LOCAL_TASK', MENU_IS_LOCAL_TASK | MENU_LINKS_TO_PARENT | ME
 define('MENU_LOCAL_ACTION', MENU_IS_LOCAL_TASK | MENU_IS_LOCAL_ACTION | MENU_VISIBLE_IN_BREADCRUMB);
 
 /**
- * @} End of "Menu item types".
+ * @} End of "defgroup menu_item_types".
  */
 
 /**
@@ -214,7 +214,7 @@ const MENU_CONTEXT_PAGE = 0x0001;
 const MENU_CONTEXT_INLINE = 0x0002;
 
 /**
- * @} End of "Menu context types".
+ * @} End of "defgroup menu_context_types".
  */
 
 /**
@@ -249,7 +249,7 @@ const MENU_SITE_OFFLINE = 4;
 const MENU_SITE_ONLINE = 5;
 
 /**
- * @} End of "Menu status codes".
+ * @} End of "defgroup menu_status_codes".
  */
 
 /**
@@ -271,7 +271,7 @@ const MENU_MAX_DEPTH = 9;
 
 
 /**
- * @} End of "Menu tree parameters".
+ * @} End of "defgroup menu_tree_parameters".
  */
 
 /**
diff --git a/core/includes/pager.inc b/core/includes/pager.inc
index a5d3e6b..a9d154d 100644
--- a/core/includes/pager.inc
+++ b/core/includes/pager.inc
@@ -634,7 +634,7 @@ function theme_pager_link($variables) {
 }
 
 /**
- * @} End of "Pager pieces".
+ * @} End of "defgroup pagerpieces".
  */
 
 /**
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 902907a..d7c3e66 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -31,7 +31,7 @@ const MARK_NEW = 1;
 const MARK_UPDATED = 2;
 
 /**
- * @} End of "Content markers".
+ * @} End of "defgroup content_flags".
  */
 
 /**
@@ -1458,7 +1458,7 @@ function theme_disable($theme_list) {
 }
 
 /**
- * @ingroup themeable
+ * @addtogroup themeable
  * @{
  */
 
@@ -2137,7 +2137,7 @@ function theme_indentation($variables) {
 }
 
 /**
- * @} End of "ingroup themeable".
+ * @} End of "addtogroup themeable".
  */
 
 /**
diff --git a/core/includes/update.inc b/core/includes/update.inc
index 289d27a..fd23ff2 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -716,7 +716,7 @@ function update_retrieve_dependencies() {
 }
 
 /**
- * @defgroup update-api-7.x-to-8.x Update versions of API functions
+ * @defgroup update_api_7_x_to_8_x Update versions of API functions
  * @{
  * Functions similar to normal API function but not firing hooks.
  *
@@ -726,5 +726,5 @@ function update_retrieve_dependencies() {
  */
 
 /**
- * @} End of "defgroup update-api-7.x-to-8.x"
+ * @} End of "defgroup update_api_7_x_to_8_x".
  */
diff --git a/core/modules/block/block.install b/core/modules/block/block.install
index c2d4185..b12986b 100644
--- a/core/modules/block/block.install
+++ b/core/modules/block/block.install
@@ -187,7 +187,7 @@ function block_install() {
 }
 
 /**
- * @addtogroup updates-7.x-to-8.x
+ * @addtogroup updates_7_x_to_8_x
  * @{
  */
 
@@ -199,6 +199,6 @@ function block_update_8000() {
 }
 
 /**
- * @} End of "addtogroup updates-7.x-to-8.x"
+ * @} End of "addtogroup updates_7_x_to_8_x".
  * The next series of updates should start at 9000.
  */
diff --git a/core/modules/book/book.admin.inc b/core/modules/book/book.admin.inc
index 7b9dea3..5ef2488 100644
--- a/core/modules/book/book.admin.inc
+++ b/core/modules/book/book.admin.inc
@@ -68,7 +68,7 @@ function book_admin_settings_validate($form, &$form_state) {
  *
  * @see book_admin_edit_submit()
  *
- * @ingroup forms.
+ * @ingroup forms
  */
 function book_admin_edit($form, $form_state, $node) {
   drupal_set_title($node->title);
diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index 4b71248..07f03ed 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @ingroup hooks
+ * @addtogroup hooks
  * @{
  */
 
@@ -1144,11 +1144,11 @@ function hook_field_formatter_view($entity_type, $entity, $field, $instance, $la
 }
 
 /**
- * @} End of "ingroup field_type"
+ * @} End of "defgroup field_type".
  */
 
 /**
- * @ingroup field_attach
+ * @addtogroup field_attach
  * @{
  */
 
@@ -1500,11 +1500,11 @@ function hook_field_attach_delete_bundle($entity_type, $bundle, $instances) {
 }
 
 /**
- * @} End of "ingroup field_attach"
+ * @} End of "addtogroup field_attach".
  */
 
 /**
- * @ingroup field_storage
+ * @addtogroup field_storage
  * @{
  */
 
@@ -2337,11 +2337,11 @@ function hook_field_widget_properties_ENTITY_TYPE_alter(&$widget, $context) {
 }
 
 /**
- * @} End of "ingroup field_storage"
+ * @} End of "addtogroup field_storage".
  */
 
 /**
- * @ingroup field_crud
+ * @addtogroup field_crud
  * @{
  */
 
@@ -2590,7 +2590,7 @@ function hook_field_storage_purge($entity_type, $entity, $field, $instance) {
 }
 
 /**
- * @} End of "ingroup field_crud"
+ * @} End of "addtogroup field_crud".
  */
 
 /**
@@ -2621,5 +2621,5 @@ function hook_field_access($op, $field, $entity_type, $entity, $account) {
 }
 
 /**
- * @} End of "ingroup hooks"
+ * @} End of "addtogroup hooks".
  */
diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc
index 482659e..92e644b 100644
--- a/core/modules/field/field.attach.inc
+++ b/core/modules/field/field.attach.inc
@@ -64,7 +64,7 @@ const FIELD_STORAGE_UPDATE = 'update';
 const FIELD_STORAGE_INSERT = 'insert';
 
 /**
- * @} End of "defgroup field_storage"
+ * @} End of "defgroup field_storage".
  */
 
 /**
@@ -1357,5 +1357,5 @@ function field_attach_delete_bundle($entity_type, $bundle) {
 
 
 /**
- * @} End of "defgroup field_attach"
+ * @} End of "defgroup field_attach".
  */
diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc
index dda7f2f..b82aff1 100644
--- a/core/modules/field/field.info.inc
+++ b/core/modules/field/field.info.inc
@@ -898,5 +898,5 @@ function field_info_storage_settings($type) {
 }
 
 /**
- * @} End of "defgroup field_info"
+ * @} End of "defgroup field_info".
  */
diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index 16b09e1..1fffc3f 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -170,7 +170,7 @@ function field_schema() {
 /**
  * Utility function: create a field by writing directly to the database.
  *
- * @ingroup update-api-7.x-to-8.x
+ * @ingroup update_api_7_x_to_8_x
  */
 function _update_7000_field_create_field(&$field) {
   // Merge in default values.`
@@ -248,7 +248,7 @@ function _update_7000_field_create_field(&$field) {
  * @param $field_name
  *   The field name to delete.
  *
- * @ingroup update-api-7.x-to-8.x
+ * @ingroup update_api_7_x_to_8_x
  */
 function _update_7000_field_delete_field($field_name) {
   $table_name = 'field_data_' . $field_name;
@@ -277,7 +277,7 @@ function _update_7000_field_delete_field($field_name) {
  *
  * BEWARE: this function deletes user data from the field storage tables.
  *
- * @ingroup update-api-7.x-to-8.x
+ * @ingroup update_api_7_x_to_8_x
  */
 function _update_7000_field_delete_instance($field_name, $entity_type, $bundle) {
   // Delete field instance configuration data.
@@ -315,7 +315,7 @@ function _update_7000_field_delete_instance($field_name, $entity_type, $bundle)
  * @return
  *   An array of fields matching $conditions, keyed by the property specified
  *   by the $key parameter.
- * @ingroup update-api-7.x-to-8.x
+ * @ingroup update_api_7_x_to_8_x
  */
 function _update_7000_field_read_fields(array $conditions = array(), $key = 'id') {
   $fields = array();
@@ -347,7 +347,7 @@ function _update_7000_field_read_fields(array $conditions = array(), $key = 'id'
 /**
  * Utility function: write a field instance directly to the database.
  *
- * @ingroup update-api-7.x-to-8.x
+ * @ingroup update_api_7_x_to_8_x
  */
 function _update_7000_field_create_instance($field, &$instance) {
   // Merge in defaults.
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index b52fe0d..110a107 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -1120,7 +1120,7 @@ function template_process_field(&$variables, $hook) {
   }
 }
 /**
- * @} End of "defgroup field"
+ * @} End of "defgroup field".
  */
 
 /**
diff --git a/core/modules/field/modules/field_sql_storage/field_sql_storage.install b/core/modules/field/modules/field_sql_storage/field_sql_storage.install
index 4a3a00e..cc38b14 100644
--- a/core/modules/field/modules/field_sql_storage/field_sql_storage.install
+++ b/core/modules/field/modules/field_sql_storage/field_sql_storage.install
@@ -27,7 +27,7 @@ function field_sql_storage_schema() {
 /**
  * Utility function: write field data directly to SQL storage.
  *
- * @ingroup update-api-7.x-to-8.x
+ * @ingroup update_api_7_x_to_8_x
  */
 function _update_7000_field_sql_storage_write($entity_type, $bundle, $entity_id, $revision_id, $field_name, $data) {
   $table_name = "field_data_{$field_name}";
diff --git a/core/modules/field_ui/field_ui.api.php b/core/modules/field_ui/field_ui.api.php
index f903e12..cb34329 100644
--- a/core/modules/field_ui/field_ui.api.php
+++ b/core/modules/field_ui/field_ui.api.php
@@ -6,7 +6,7 @@
  */
 
 /**
- * @ingroup field_ui_field_type
+ * @addtogroup field_ui_field_type
  * @{
  */
 
@@ -200,5 +200,5 @@ function hook_field_formatter_settings_summary($field, $instance, $view_mode) {
 }
 
 /**
- * @} End of "ingroup field_ui_field_type"
+ * @} End of "addtogroup field_ui_field_type".
  */
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 204a48f..53e0bd9 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -956,7 +956,7 @@ function file_icon_map($file) {
 }
 
 /**
- * @defgroup file-module-api File module public API functions
+ * @defgroup file_module_api File module public API functions
  * @{
  * These functions may be used to determine if and where a file is in use.
  */
@@ -999,5 +999,5 @@ function file_get_file_references($file, $field = NULL, $age = FIELD_LOAD_REVISI
 }
 
 /**
- * @} End of "defgroup file-module-api".
+ * @} End of "defgroup file_module_api".
  */
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index e857224..e4c6fd2 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -1685,5 +1685,5 @@ function _filter_html_escape_tips($filter, $format, $long = FALSE) {
 }
 
 /**
- * @} End of "Standard filters".
+ * @} End of "defgroup standard_filters".
  */
diff --git a/core/modules/locale/locale.admin.inc b/core/modules/locale/locale.admin.inc
index 5732697..f8e6299 100644
--- a/core/modules/locale/locale.admin.inc
+++ b/core/modules/locale/locale.admin.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * @defgroup locale-language-administration Language administration interface
+ * @defgroup locale_language_administration Language administration interface
  * @{
  * Administration interface for languages.
  *
@@ -800,7 +800,7 @@ function locale_language_providers_session_form($form, &$form_state) {
 }
 
 /**
- * @} End of "locale-language-administration"
+ * @} End of "defgroup locale_language_administration".
  */
 
 /**
diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install
index 4ae03fc..002d44e 100644
--- a/core/modules/locale/locale.install
+++ b/core/modules/locale/locale.install
@@ -208,7 +208,7 @@ function locale_schema() {
 }
 
 /**
- * @addtogroup updates-7.x-to-8.x
+ * @addtogroup updates_7_x_to_8_x
  * @{
  */
 
@@ -297,6 +297,6 @@ function locale_update_8003() {
 }
 
 /**
- * @} End of "addtogroup updates-7.x-to-8.x"
+ * @} End of "addtogroup updates_7_x_to_8_x".
  * The next series of updates should start at 9000.
  */
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index a6d0b7a..bc1f0e2 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -446,7 +446,7 @@ function node_install() {
 /**
  * Fetches node types directly from the database.
  *
- * @ingroup update-api-7.x-to-8.x
+ * @ingroup update_api_7_x_to_8_x
  */
 function _update_7000_node_get_types() {
   $node_types = db_query('SELECT * FROM {node_type}')->fetchAllAssoc('type', PDO::FETCH_OBJ);
diff --git a/core/modules/openid/openid.install b/core/modules/openid/openid.install
index 2df39aa..2b6014b 100644
--- a/core/modules/openid/openid.install
+++ b/core/modules/openid/openid.install
@@ -118,7 +118,7 @@ function openid_requirements($phase) {
 }
 
 /**
- * @addtogroup updates-6.x-to-7.x
+ * @addtogroup updates_6_x_to_7_x
  * @{
  */
 
@@ -156,5 +156,5 @@ function openid_update_6000() {
 }
 
 /**
- * @} End of "addtogroup updates-6.x-to-7.x"
+ * @} End of "addtogroup updates_6_x_to_7_x".
  */
diff --git a/core/modules/system/image.gd.inc b/core/modules/system/image.gd.inc
index 39f86dc..91c0b05 100644
--- a/core/modules/system/image.gd.inc
+++ b/core/modules/system/image.gd.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * @ingroup image
+ * @addtogroup image
  * @{
  */
 
@@ -363,5 +363,5 @@ function image_gd_get_info(stdClass $image) {
 }
 
 /**
- * @} End of "ingroup image".
+ * @} End of "addtogroup image".
  */
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 6711471..4fbb616 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1617,7 +1617,7 @@ function system_update_last_removed() {
 }
 
 /**
- * @defgroup updates-7.x-to-8.x Updates from 7.x to 8.x
+ * @defgroup updates_7_x_to_8_x Updates from 7.x to 8.x
  * @{
  * Update functions from 7.x to 8.x.
  */
@@ -1642,6 +1642,6 @@ function system_update_8001() {
 }
 
 /**
- * @} End of "defgroup updates-7.x-to-8.x"
+ * @} End of "defgroup updates_7_x_to_8_x".
  * The next series of updates should start at 9000.
  */
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 242a4c7..b75b06b 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -1804,5 +1804,5 @@ function taxonomy_taxonomy_term_delete($term) {
 }
 
 /**
- * @} End of "defgroup taxonomy_index"
+ * @} End of "defgroup taxonomy_index".
  */
diff --git a/core/modules/user/user.install b/core/modules/user/user.install
index f7175c3..8f545bf 100644
--- a/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -337,7 +337,7 @@ function user_install() {
 }
 
 /**
- * @addtogroup updates-7.x-to-8.x
+ * @addtogroup updates_7_x_to_8_x
  * @{
  */
 
@@ -354,5 +354,5 @@ function user_update_8000() {
 }
 
 /**
- * @} End of "addtogroup updates-7.x-to-8.x"
+ * @} End of "addtogroup updates_7_x_to_8_x".
  */