diff --git a/core/CHANGELOG.txt b/core/CHANGELOG.txt
index 5ef8eaf..5833d63 100644
--- a/core/CHANGELOG.txt
+++ b/core/CHANGELOG.txt
@@ -520,7 +520,7 @@ Drupal 5.0, 2007-01-15
 - Removed the archive module.
 - Upgrade system:
     * Created space for update branches.
-- Forms API:
+- Form API:
     * Made it possible to programmatically submit forms.
     * Improved api for multistep forms.
 - Theme system:
diff --git a/core/includes/ajax.inc b/core/includes/ajax.inc
index 6d21c98..e12e3b7 100644
--- a/core/includes/ajax.inc
+++ b/core/includes/ajax.inc
@@ -166,7 +166,7 @@
  *   displayed while awaiting a response from the callback, and add an optional
  *   message. Possible keys: 'type', 'message', 'url', 'interval'.
  *   More information is available in the
- *   @link forms_api_reference.html Form API Reference @endlink
+ *   @link form_api_reference.html Form API Reference @endlink
  *
  * In addition to using Form API for doing in-form modification, Ajax may be
  * enabled by adding classes to buttons and links. By adding the 'use-ajax'
diff --git a/core/includes/form.inc b/core/includes/form.inc
index 29bce00..8bc7dd2 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -82,7 +82,7 @@ use Drupal\Core\Template\Attribute;
  * the elements and properties of the form. For information on the array
  * components and format, and more detailed explanations of the Form API
  * workflow, see the
- * @link forms_api_reference.html Form API reference @endlink
+ * @link form_api_reference.html Form API reference @endlink
  * and the
  * @link http://drupal.org/node/37775 Form API documentation section. @endlink
  * In addition, there is a set of Form API tutorials in
@@ -223,7 +223,7 @@ function drupal_get_form($form_id) {
  *     validation functions and submit functions use this array for nearly all
  *     their decision making. (Note that #tree determines whether the values
  *     are a flat array or an array whose structure parallels the $form array.
- *     See the @link forms_api_reference.html Form API reference @endlink for
+ *     See the @link form_api_reference.html Form API reference @endlink for
  *     more information.)
  *   - input: The array of values as they were submitted by the user. These are
  *     raw and unvalidated, so should not be used without a thorough
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 3b69ce3..5defe93 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1820,7 +1820,7 @@ function install_check_requirements($install_state) {
 }
 
 /**
- * Returns a Forms API array definition for site configuration.
+ * Returns a Form API array definition for site configuration.
  *
  * @see install_configure_form()
  * @see install_configure_form_validate()
diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index 1f76def..fb68069 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -690,7 +690,7 @@ function hook_field_is_empty($item, $field) {
  * which widget to use. Widget types are defined by implementing
  * hook_field_widget_info().
  *
- * Widgets are @link forms_api_reference.html Form API @endlink
+ * Widgets are @link form_api_reference.html Form API @endlink
  * elements with additional processing capabilities. Widget hooks are typically
  * called by the Field Attach API during the creation of the field form
  * structure with field_attach_form().
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 7add837..adb2003 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -2745,7 +2745,7 @@ function node_search_validate($form, &$form_state) {
 
   // Insert extra restrictions into the search keywords string.
   if (isset($form_state['values']['type']) && is_array($form_state['values']['type'])) {
-    // Retrieve selected types - Forms API sets the value of unselected
+    // Retrieve selected types - Form API sets the value of unselected
     // checkboxes to 0.
     $form_state['values']['type'] = array_filter($form_state['values']['type']);
     if (count($form_state['values']['type'])) {
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index 14f3630..85ac889 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -206,7 +206,7 @@ function hook_queue_info_alter(&$queues) {
 }
 
 /**
- * Allows modules to declare their own Forms API element types and specify their
+ * Allows modules to declare their own Form API element types and specify their
  * default values.
  *
  * This hook allows modules to declare their own form element types and to
@@ -1215,7 +1215,7 @@ function hook_page_alter(&$page) {
  *
  * @see hook_form_BASE_FORM_ID_alter()
  * @see hook_form_FORM_ID_alter()
- * @see forms_api_reference.html
+ * @see form_api_reference.html
  */
 function hook_form_alter(&$form, &$form_state, $form_id) {
   if (isset($form['type']) && $form['type']['#value'] . '_node_settings' == $form_id) {
@@ -1252,7 +1252,7 @@ function hook_form_alter(&$form, &$form_state, $form_id) {
  * @see hook_form_alter()
  * @see hook_form_BASE_FORM_ID_alter()
  * @see drupal_prepare_form()
- * @see forms_api_reference.html
+ * @see form_api_reference.html
  */
 function hook_form_FORM_ID_alter(&$form, &$form_state, $form_id) {
   // Modification for the form with the given form ID goes here. For example, if
diff --git a/core/modules/system/theme.api.php b/core/modules/system/theme.api.php
index b98132e..0001cba 100644
--- a/core/modules/system/theme.api.php
+++ b/core/modules/system/theme.api.php
@@ -70,8 +70,8 @@
  * Allow themes to alter the theme-specific settings form.
  *
  * With this hook, themes can alter the theme-specific settings form in any way
- * allowable by Drupal's Forms API, such as adding form elements, changing
- * default values and removing form elements. See the Forms API documentation on
+ * allowable by Drupal's Form API, such as adding form elements, changing
+ * default values and removing form elements. See the Form API documentation on
  * api.drupal.org for detailed information.
  *
  * Note that the base theme's form alterations will be run before any sub-theme