diff --git a/core/modules/field/tests/modules/field_test/field_test.entity.inc b/core/modules/field/tests/modules/field_test/field_test.entity.inc
index af13590..8324566 100644
--- a/core/modules/field/tests/modules/field_test/field_test.entity.inc
+++ b/core/modules/field/tests/modules/field_test/field_test.entity.inc
@@ -43,7 +43,8 @@ function field_test_entity_info_translatable($entity_type = NULL, $translatable
 /**
  * Form combining two separate entities.
  *
- * @deprecated Use \Drupal\field_test\Form\FieldTestForm::testEntityNestedForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\field_test\Form\FieldTestForm::testEntityNestedForm().
  */
 function field_test_entity_nested_form($form, &$form_state, EntityInterface $entity_1, EntityInterface $entity_2) {
   // First entity.
diff --git a/core/modules/file/tests/file_module_test/file_module_test.module b/core/modules/file/tests/file_module_test/file_module_test.module
index 8d7015a..c0e6cc3 100644
--- a/core/modules/file/tests/file_module_test/file_module_test.module
+++ b/core/modules/file/tests/file_module_test/file_module_test.module
@@ -16,7 +16,8 @@
  * @see file_module_test_form_submit()
  * @ingroup forms
  *
- * @deprecated Use \Drupal\file_module_test\Form\FileModuleTestForm::managedFileTest()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\file_module_test\Form\FileModuleTestForm::managedFileTest().
  */
 function file_module_test_form($form, &$form_state, $tree = TRUE, $extended = TRUE, $multiple = FALSE, $default_fids = NULL) {
   $form['#tree'] = (bool) $tree;
diff --git a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
index 1521436..d135532 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
+++ b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
@@ -12,7 +12,8 @@
 /**
  * Tests form_state['values'] during callback.
  *
- * @deprecated Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::getForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::getForm().
  */
 function ajax_forms_test_simple_form($form, &$form_state) {
   $object = new Callbacks();
@@ -66,7 +67,8 @@ function ajax_forms_test_simple_form($form, &$form_state) {
 /**
  * Form constructor for the Ajax Command display form.
  *
- * @deprecated Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::commandsForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::commandsForm().
  */
 function ajax_forms_test_ajax_commands_form($form, &$form_state) {
   $form = array();
@@ -448,7 +450,8 @@ function ajax_forms_test_advanced_commands_settings_with_merging_callback($form,
  *
  * @see ajax_forms_test_validation_form_submit()
  *
- * @deprecated Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::validationForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::validationForm().
  */
 function ajax_forms_test_validation_form($form, &$form_state) {
 
@@ -522,7 +525,8 @@ function ajax_forms_test_validation_number_form_callback($form, $form_state) {
 /**
  * Form builder: Builds a form that triggers a simple AJAX callback.
  *
- * @deprecated Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::lazyLoadForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\ajax_forms_test\Form\AjaxFormsTestForm::lazyLoadForm().
  */
 function ajax_forms_test_lazy_load_form($form, &$form_state) {
   // We attach a JavaScript setting, so that one of the generated AJAX commands
diff --git a/core/modules/system/tests/modules/ajax_test/ajax_test.module b/core/modules/system/tests/modules/ajax_test/ajax_test.module
index bca7d69..39037e0 100644
--- a/core/modules/system/tests/modules/ajax_test/ajax_test.module
+++ b/core/modules/system/tests/modules/ajax_test/ajax_test.module
@@ -28,7 +28,8 @@ function ajax_test_system_theme_info() {
  * incorporates JavaScript settings generated during the page request by
  * invoking _drupal_add_js() with a dummy setting.
  *
- * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::render()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\ajax_test\Controller\AjaxTestController::render().
  */
 function ajax_test_render() {
   $attached = array(
@@ -51,7 +52,8 @@ function ajax_test_render() {
  *
  * Helps verifying AjaxResponse reorders commands to ensure correct execution.
  *
- * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::order()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\ajax_test\Controller\AjaxTestController::order().
  */
 function ajax_test_order() {
   $response = new AjaxResponse();
@@ -84,7 +86,8 @@ function ajax_test_order() {
 /**
  * Menu callback: Returns AJAX element with #error property set.
  *
- * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::renderError()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\ajax_test\Controller\AjaxTestController::renderError().
  */
 function ajax_test_error() {
   $message = '';
@@ -124,7 +127,8 @@ function ajax_test_dialog_contents() {
 /**
  * Menu callback: Close the ajax dialog.
  *
- * @deprecated \Drupal\ajax_test\Controller\AjaxTestController::dialogClose()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\ajax_test\Controller\AjaxTestController::dialogClose().
  */
 function ajax_test_dialog_close() {
   $response = new AjaxResponse();
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.module b/core/modules/system/tests/modules/batch_test/batch_test.module
index ba8b273..0fd4b32 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.module
+++ b/core/modules/system/tests/modules/batch_test/batch_test.module
@@ -24,7 +24,8 @@ function batch_test_menu() {
  *
  * @see batch_test_simple_form_submit()
  *
- * @deprecated Use \Drupal\batch_test\Form\BatchTestForm::testForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\batch_test\Form\BatchTestForm::testForm().
  */
 function batch_test_simple_form() {
   $form['batch'] = array(
@@ -66,7 +67,8 @@ function batch_test_simple_form_submit($form, &$form_state) {
  *
  * @see batch_test_multistep_form_submit()
  *
- * @deprecated Use \Drupal\batch_test\Form\BatchTestForm::testMultistepForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\batch_test\Form\BatchTestForm::testMultistepForm().
  */
 function batch_test_multistep_form($form, &$form_state) {
   if (empty($form_state['storage']['step'])) {
@@ -118,7 +120,8 @@ function batch_test_multistep_form_submit($form, &$form_state) {
  * @see batch_test_chained_form_submit_3()
  * @see batch_test_chained_form_submit_4()
  *
- * @deprecated Use \Drupal\batch_test\Form\BatchTestForm::testChainedForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\batch_test\Form\BatchTestForm::testChainedForm().
  */
 function batch_test_chained_form() {
   // This value is used to test that $form_state persists through batched
diff --git a/core/modules/system/tests/modules/database_test/database_test.module b/core/modules/system/tests/modules/database_test/database_test.module
index f41ad30..2da1408 100644
--- a/core/modules/system/tests/modules/database_test/database_test.module
+++ b/core/modules/system/tests/modules/database_test/database_test.module
@@ -52,7 +52,8 @@ function database_test_query_database_test_alter_remove_range_alter(AlterableInt
  * separate menu callback request; After this request is done, the temporary
  * table should automatically dropped.
  *
- * @deprecated \Drupal\database_test\Controller\DatabaseTestController::dbQueryTemporary()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\database_test\Controller\DatabaseTestController::dbQueryTemporary().
  */
 function database_test_db_query_temporary() {
   $table_name = db_query_temporary('SELECT age FROM {test}', array());
@@ -68,7 +69,8 @@ function database_test_db_query_temporary() {
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
  *
- * @deprecated \Drupal\database_test\Controller\DatabaseTestController::pagerQueryEven()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\database_test\Controller\DatabaseTestController::pagerQueryEven().
  */
 function database_test_even_pager_query($limit) {
 
@@ -95,7 +97,8 @@ function database_test_even_pager_query($limit) {
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
  *
- * @deprecated \Drupal\database_test\Controller\DatabaseTestController::pagerQueryOdd()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\database_test\Controller\DatabaseTestController::pagerQueryOdd().
  */
 function database_test_odd_pager_query($limit) {
 
@@ -122,7 +125,8 @@ function database_test_odd_pager_query($limit) {
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
  *
- * @deprecated \Drupal\database_test\Controller\DatabaseTestController::testTablesort()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\database_test\Controller\DatabaseTestController::testTablesort().
  */
 function database_test_tablesort() {
   $header = array(
@@ -154,7 +158,8 @@ function database_test_tablesort() {
  * This function does care about the page GET parameter, as set by the
  * simpletest HTTP call.
  *
- * @deprecated \Drupal\database_test\Controller\DatabaseTestController::testTablesortFirst()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\database_test\Controller\DatabaseTestController::testTablesortFirst().
  */
 function database_test_tablesort_first() {
   $header = array(
@@ -184,7 +189,8 @@ function database_test_tablesort_first() {
 /**
  * Outputs a form without setting a header sort.
  *
- * @deprecated \Drupal\database_test\Form\DatabaseTestForm::testTablesortDefaultSort()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\database_test\Form\DatabaseTestForm::testTablesortDefaultSort().
  */
 function database_test_theme_tablesort($form, &$form_state) {
   $header = array(
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index a46a1e7..0a19120 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -282,7 +282,8 @@ function entity_test_form_node_form_alter(&$form, &$form_state, $form_id) {
  *
  * @see entity_test_menu()
  *
- * @deprecated \Drupal\entity_test\Controller\EntityTestController::testAdd()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\entity_test\Controller\EntityTestController::testAdd().
  */
 function entity_test_add($entity_type) {
   drupal_set_title(t('Create an @type', array('@type' => $entity_type)));
@@ -301,7 +302,8 @@ function entity_test_add($entity_type) {
  *
  * @see entity_test_menu()
  *
- * @deprecated \Drupal\entity_test\Controller\EntityTestController::testEdit()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\entity_test\Controller\EntityTestController::testEdit().
  */
 function entity_test_edit(EntityInterface $entity) {
   drupal_set_title($entity->label(), PASS_THROUGH);
diff --git a/core/modules/system/tests/modules/form_test/form_test.module b/core/modules/system/tests/modules/form_test/form_test.module
index 0e8bdb9..32984b7 100644
--- a/core/modules/system/tests/modules/form_test/form_test.module
+++ b/core/modules/system/tests/modules/form_test/form_test.module
@@ -43,7 +43,8 @@ function _form_test_submit_values_json($form, &$form_state) {
 /**
  * Form builder for testing hook_form_alter() and hook_form_FORM_ID_alter().
  *
- * @deprecated Use \Drupal\form_test\alterForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\alterForm().
  */
 function form_test_alter_form($form, &$form_state) {
   // Elements can be added as needed for future testing needs, but for now,
@@ -94,7 +95,8 @@ function system_form_form_test_alter_form_alter(&$form, &$form_state) {
  * - #validate handlers should be able to alter the $form and the alterations
  *   should be contained in the rebuilt form.
  *
- * @deprecated Use \Drupal\form_test\validateForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\validateForm().
  */
 function form_test_validate_form($form, &$form_state) {
   $object = new Callbacks();
@@ -137,7 +139,8 @@ function form_test_validate_form_validate(&$form, &$form_state) {
 /**
  * Form constructor to test the #required property.
  *
- * @deprecated Use \Drupal\form_test\validateRequiredForm()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\validateRequiredForm().
  */
 function form_test_validate_required_form($form, &$form_state) {
   $options = drupal_map_assoc(array('foo', 'bar'));
@@ -207,7 +210,8 @@ function form_test_validate_required_form_submit($form, &$form_state) {
 /**
  * Form constructor to test the #required property without #title.
  *
- * @deprecated Use \Drupal\form_test\validateRequiredFormNoTitle()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\validateRequiredFormNoTitle().
  */
 function form_test_validate_required_form_no_title($form, &$form_state) {
   $form['textfield'] = array(
@@ -229,7 +233,8 @@ function form_test_validate_required_form_no_title_submit($form, &$form_state) {
 /**
  * Builds a simple form with a button triggering partial validation.
  *
- * @deprecated Use \Drupal\form_test\validateFormWithErrorSuppression()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\validateFormWithErrorSuppression().
  */
 function form_test_limit_validation_errors_form($form, &$form_state) {
   $form['title'] = array(
@@ -314,7 +319,8 @@ function form_test_limit_validation_errors_form_partial_submit($form, $form_stat
 /**
  * Builds a simple form using the FAPI #pattern proterty.
  *
- * @deprecated Use \Drupal\form_test\validatePattern()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\validatePattern().
  */
 function form_test_pattern_form($form, &$form_state) {
   $form['textfield'] = array(
@@ -421,7 +427,8 @@ function _form_test_tableselect_form_builder($form, $form_state, $element_proper
 /**
  * Test the tableselect #multiple = TRUE functionality.
  *
- * @deprecated Use \Drupal\form_test\testTableSelectCheckboxes()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testTableSelectCheckboxes().
  */
 function _form_test_tableselect_multiple_true_form($form, $form_state) {
   return _form_test_tableselect_form_builder($form, $form_state, array('#multiple' => TRUE));
@@ -440,7 +447,8 @@ function _form_test_tableselect_multiple_true_form_submit($form, &$form_state) {
 /**
  * Test the tableselect #multiple = FALSE functionality.
  *
- * @deprecated Use \Drupal\form_test\testTableSelectRadios()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testTableSelectRadios().
  */
 function _form_test_tableselect_multiple_false_form($form, $form_state) {
   return _form_test_tableselect_form_builder($form, $form_state, array('#multiple' => FALSE));
@@ -449,7 +457,8 @@ function _form_test_tableselect_multiple_false_form($form, $form_state) {
 /**
  * Test the tableselect #colspan functionality.
  *
- * @deprecated Use \Drupal\form_test\testTableSelectColspan()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testTableSelectColspan().
  */
 function _form_test_tableselect_colspan_form($form, $form_state) {
   list($header, $options) = _form_test_tableselect_get_data();
@@ -481,7 +490,8 @@ function _form_test_tableselect_multiple_false_form_submit($form, &$form_state)
 /**
  * Test functionality of the tableselect #empty property.
  *
- * @deprecated Use \Drupal\form_test\testTableSelectEmptyText()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testTableSelectEmptyText().
  */
 function _form_test_tableselect_empty_form($form, $form_state) {
   return _form_test_tableselect_form_builder($form, $form_state, array('#options' => array()));
@@ -490,7 +500,8 @@ function _form_test_tableselect_empty_form($form, $form_state) {
 /**
  * Test functionality of the tableselect #js_select property.
  *
- * @deprecated Use \Drupal\form_test\testTableSelectJS()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testTableSelectJS().
  */
 function _form_test_tableselect_js_select_form($form, $form_state, $action) {
   switch ($action) {
@@ -517,7 +528,8 @@ function _form_test_tableselect_js_select_form($form, $form_state, $action) {
 /**
  * Tests functionality of vertical tabs.
  *
- * @deprecated Use \Drupal\form_test\testVerticalTabs()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testVerticalTabs().
  */
 function _form_test_vertical_tabs_form($form, &$form_state) {
   $form['vertical_tabs'] = array(
@@ -556,7 +568,8 @@ function _form_test_vertical_tabs_form($form, &$form_state) {
  *
  * @see form_test_storage_form_submit()
  *
- * @deprecated Use \Drupal\form_test\testStorage()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testStorage().
  */
 function form_test_storage_form($form, &$form_state) {
   if ($form_state['rebuild']) {
@@ -654,7 +667,8 @@ function form_test_storage_form_submit($form, &$form_state) {
 /**
  * A form for testing form labels and required marks.
  *
- * @deprecated Use \Drupal\form_test\testLabel()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testLabel().
  */
 function form_label_test_form() {
   $form['form_checkboxes_test'] = array(
@@ -746,7 +760,8 @@ function form_label_test_form() {
 /**
  * Form builder for form_state_values_clean() test.
  *
- * @deprecated Use \Drupal\form_test\testFormStateClean()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testFormStateClean().
  */
 function form_test_form_state_values_clean_form($form, &$form_state) {
   // Build an example form containing multiple submit and button elements; not
@@ -775,7 +790,8 @@ function form_test_form_state_values_clean_form_submit($form, &$form_state) {
 /**
  * Form constructor for the form_state_values_clean() test.
  *
- * @deprecated Use \Drupal\form_test\testFormStateCleanAdvanced()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testFormStateCleanAdvanced().
  */
 function form_test_form_state_values_clean_advanced_form($form, &$form_state) {
   // Build an example form containing a managed file and a submit form element.
@@ -804,7 +820,8 @@ function form_test_form_state_values_clean_advanced_form_submit($form, &$form_st
 /**
  * Build a form to test a checkbox.
  *
- * @deprecated Use \Drupal\form_test\testCheckbox()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testCheckbox().
  */
 function _form_test_checkbox($form, &$form_state) {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -875,7 +892,8 @@ function _form_test_checkbox($form, &$form_state) {
 /**
  * Builds a form to test #type 'select' validation.
  *
- * @deprecated Use \Drupal\form_test\testSelect()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testSelect().
  */
 function form_test_select($form, &$form_state) {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -980,7 +998,8 @@ function form_test_select($form, &$form_state) {
 /**
  * Builds a form to test select elements when #options is not an array.
  *
- * @deprecated Use \Drupal\form_test\testEmptySelect()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testEmptySelect().
  */
 function form_test_empty_select($form, &$form_state) {
   $form['empty_select'] = array(
@@ -995,7 +1014,8 @@ function form_test_empty_select($form, &$form_state) {
 /**
  * Builds a form to test the language select form element.
  *
- * @deprecated Use \Drupal\form_test\testLanguageSelect()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testLanguageSelect().
  */
 function form_test_language_select() {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -1041,9 +1061,8 @@ function form_test_language_select() {
  * @param $element
  *   The element type to test. Can be 'number' or 'range'. Defaults to 'number'.
  *
- * @deprecated Use \Drupal\form_test\testNumber()
- *
- * @deprecated Use \Drupal\form_test\testNumberRange()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testNumber() or \Drupal\form_test\testNumberRange().
  */
 function form_test_number($form, &$form_state, $element = 'number') {
   $base = array(
@@ -1163,7 +1182,8 @@ function form_test_number($form, &$form_state, $element = 'number') {
  * @see form_test_range_submit()
  * @ingroup forms
  *
- * @deprecated Use \Drupal\form_test\testRange()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testRange().
  */
 function form_test_range($form, &$form_state) {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -1212,7 +1232,8 @@ function form_test_range($form, &$form_state) {
  *
  * @ingroup forms
  *
- * @deprecated Use \Drupal\form_test\testRangeInvalid()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testRangeInvalid().
  */
 function form_test_range_invalid($form, &$form_state) {
   $form['minmax'] = array(
@@ -1235,7 +1256,8 @@ function form_test_range_invalid($form, &$form_state) {
  * @see form_test_color_submit()
  * @ingroup forms
  *
- * @deprecated Use \Drupal\form_test\testColor()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testColor().
  */
 function form_test_color($form, &$form_state) {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -1254,7 +1276,8 @@ function form_test_color($form, &$form_state) {
 /**
  * Builds a form to test the placeholder attribute.
  *
- * @deprecated Use \Drupal\form_test\testPlaceholder()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testPlaceholder().
  */
 function form_test_placeholder_test($form, &$form_state) {
   foreach (array('textfield', 'textarea', 'url', 'password', 'search', 'tel', 'email', 'number') as $type) {
@@ -1271,7 +1294,8 @@ function form_test_placeholder_test($form, &$form_state) {
 /**
  * Form constructor to test expansion of #type checkboxes and radios.
  *
- * @deprecated Use \Drupal\form_test\testCheckboxesRadios()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testCheckboxesRadios().
  */
 function form_test_checkboxes_radios($form, &$form_state, $customize = FALSE) {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -1335,7 +1359,8 @@ function form_test_checkboxes_radios($form, &$form_state, $customize = FALSE) {
  * @see form_test_email_submit()
  * @ingroup forms
  *
- * @deprecated Use \Drupal\form_test\testEmail()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testEmail().
  */
 function form_test_email($form, &$form_state) {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -1363,7 +1388,8 @@ function form_test_email($form, &$form_state) {
  * @see form_test_url_submit()
  * @ingroup forms
  *
- * @deprecated Use \Drupal\form_test\testUrl()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testUrl().
  */
 function form_test_url($form, &$form_state) {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -1388,7 +1414,8 @@ function form_test_url($form, &$form_state) {
 /**
  * Build a form to test disabled elements.
  *
- * @deprecated Use \Drupal\form_test\testDisabledElements()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testDisabledElements().
  */
 function _form_test_disabled_elements($form, &$form_state) {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -1589,7 +1616,8 @@ function _form_test_disabled_elements($form, &$form_state) {
 /**
  * Build a form to test input forgery of enabled elements.
  *
- * @deprecated Use \Drupal\form_test\testInputForgery()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testInputForgery().
  */
 function _form_test_input_forgery($form, &$form_state) {
   $form['#submit'] = array('_form_test_submit_values_json');
@@ -1614,7 +1642,8 @@ function _form_test_input_forgery($form, &$form_state) {
 /**
  * Form builder for testing preservation of values during a rebuild.
  *
- * @deprecated Use \Drupal\form_test\testRebuildPreservation()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testRebuildPreservation().
  */
 function form_test_form_rebuild_preserve_values_form($form, &$form_state) {
   // Start the form with two checkboxes, to test different defaults, and a
@@ -1694,7 +1723,8 @@ function form_test_form_rebuild_preserve_values_form_submit($form, &$form_state)
 /**
  * Form constructor for testing form state persistence.
  *
- * @deprecated Use \Drupal\form_test\testStatePersistence()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testStatePersistence().
  */
 function form_test_state_persist($form, &$form_state) {
   $form['title'] = array(
@@ -1817,7 +1847,8 @@ function form_test_programmatic_form_submit($form, &$form_state) {
 /**
  * Form builder to test button click detection.
  *
- * @deprecated Use \Drupal\form_test\testClickedButton()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testClickedButton().
  */
 function form_test_clicked_button($form, &$form_state, $first, $second, $third) {
   // A single text field. In IE, when a form has only one non-button input field
@@ -1897,7 +1928,8 @@ function form_test_clicked_button_submit($form, &$form_state) {
 /**
  * Form builder to detect form redirect.
  *
- * @deprecated Use \Drupal\form_test\testRedirect()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testRedirect().
  */
 function form_test_redirect($form, &$form_state) {
   $form['redirection'] = array(
@@ -1972,7 +2004,8 @@ function form_test_checkbox_type_juggling($form, $form_state, $default_value, $r
 /**
  * Tests checkboxes zero.
  *
- * @deprecated Use \Drupal\form_test\testCheckboxesZero()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testCheckboxesZero().
  */
 function form_test_checkboxes_zero($form, &$form_state, $json = TRUE) {
   $form['checkbox_off'] = array(
@@ -2012,7 +2045,8 @@ function _form_test_checkboxes_zero_no_redirect($form, &$form_state) {
 /**
  * Builds a form to test the required attribute.
  *
- * @deprecated Use \Drupal\form_test\testRequired()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testRequired().
  */
 function form_test_required_attribute($form, &$form_state) {
   foreach (array('textfield', 'textarea', 'password') as $type) {
@@ -2029,7 +2063,8 @@ function form_test_required_attribute($form, &$form_state) {
 /**
  * Builds a simple form to test form button classes.
  *
- * @deprecated Use \Drupal\form_test\testButtonClass()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testButtonClass().
  */
 function form_test_button_class($form, &$form_state) {
   $form['button'] = array(
@@ -2048,7 +2083,8 @@ function form_test_button_class($form, &$form_state) {
 /**
  * Builds a simple form to test the #group property on #type 'details'.
  *
- * @deprecated Use \Drupal\form_test\testGroupDetails()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testGroupDetails().
  */
 function form_test_group_details() {
   $form['details'] = array(
@@ -2070,7 +2106,8 @@ function form_test_group_details() {
 /**
  * Builds a simple form to test the #group property on #type 'container'.
  *
- * @deprecated Use \Drupal\form_test\testGroupContainer()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testGroupContainer().
  */
 function form_test_group_container() {
   $form['container'] = array(
@@ -2091,7 +2128,8 @@ function form_test_group_container() {
 /**
  * Builds a simple form to test the #group property on #type 'fieldset'.
  *
- * @deprecated Use \Drupal\form_test\testGroupFieldset()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testGroupFieldset().
  */
 function form_test_group_fieldset() {
   $form['fieldset'] = array(
@@ -2113,7 +2151,8 @@ function form_test_group_fieldset() {
 /**
  * Builds a simple form to test the #group property on #type 'vertical_tabs'.
  *
- * @deprecated Use \Drupal\form_test\testGroupVerticalTabs()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testGroupVerticalTabs().
  */
 function form_test_group_vertical_tabs() {
   $form['vertical_tabs'] = array(
@@ -2143,7 +2182,8 @@ function form_test_group_vertical_tabs() {
 /**
  * Builds a form which gets the database connection stored in the form state.
  *
- * @deprecated Use \Drupal\form_test\testFormStateDatabase()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\form_test\testFormStateDatabase().
  */
 function form_test_form_state_database($form, &$form_state) {
   $form['text'] = array(
diff --git a/core/modules/system/tests/modules/menu_test/menu_test.module b/core/modules/system/tests/modules/menu_test/menu_test.module
index 5eb3098..009c18a 100644
--- a/core/modules/system/tests/modules/menu_test/menu_test.module
+++ b/core/modules/system/tests/modules/menu_test/menu_test.module
@@ -508,7 +508,8 @@ function menu_test_other_argument_load($arg1) {
  *
  * @see menu_test_menu().
  *
- * @deprecated Use \Drupal\menu_test\Controller\MenuTestController::menuTestCallback()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\menu_test\Controller\MenuTestController::menuTestCallback().
  */
 function menu_test_callback() {
   return 'This is menu_test_callback().';
@@ -525,7 +526,8 @@ function menu_test_callback() {
  *
  * @see menu_test_menu().
  *
- * @deprecated Use \Drupal\menu_test\Controller\MenuTestController::menuTrail()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\menu_test\Controller\MenuTestController::menuTrail().
  */
 function menu_test_menu_trail_callback() {
   $menu_path = \Drupal::state()->get('menu_test.menu_tree_set_path') ?: array();
@@ -543,7 +545,8 @@ function menu_test_menu_trail_callback() {
  *
  * @see menu_test_menu().
  *
- * @deprecated Use \Drupal\menu_test\Controller\MenuTestController::custom403404()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\menu_test\Controller\MenuTestController::custom403404().
  */
 function menu_test_custom_403_404_callback() {
   // When requested by one of the TrailTest tests, record the final
@@ -569,7 +572,8 @@ function menu_test_custom_403_404_callback() {
  *
  * @see menu_test_menu().
  *
- * @deprecated Use \Drupal\menu_test\Controller\MenuTestController::themePage()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\menu_test\Controller\MenuTestController::themePage().
  */
 function menu_test_theme_page_callback($inherited = FALSE) {
   global $theme_key;
diff --git a/core/modules/system/tests/modules/module_test/module_test.module b/core/modules/system/tests/modules/module_test/module_test.module
index e0ae6f4..af778c2 100644
--- a/core/modules/system/tests/modules/module_test/module_test.module
+++ b/core/modules/system/tests/modules/module_test/module_test.module
@@ -93,7 +93,8 @@ function module_test_menu() {
  * If the hook is dynamically loaded correctly, the menu callback should
  * return 'success!'.
  *
- * @deprecated \Drupal\module_test\Controller\ModuleTestController::hookDynamicLoadingInvoke()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\module_test\Controller\ModuleTestController::hookDynamicLoadingInvoke().
  */
 function module_test_hook_dynamic_loading_invoke() {
   $result = \Drupal::moduleHandler()->invoke('module_test', 'test_hook');
@@ -106,7 +107,8 @@ function module_test_hook_dynamic_loading_invoke() {
  * If the hook is dynamically loaded correctly, the menu callback should
  * return 'success!'.
  *
- * @deprecated \Drupal\module_test\Controller\ModuleTestController::hookDynamicLoadingInvokeAll()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\module_test\Controller\ModuleTestController::hookDynamicLoadingInvokeAll().
  */
 function module_test_hook_dynamic_loading_invoke_all() {
   $result = \Drupal::moduleHandler()->invokeAll('test_hook');
@@ -131,7 +133,8 @@ function module_test_load($param) {
  * 'Drupal\\module_autoload_test\\SomeClass::testMethod() was invoked.'. If
  * that module is not enabled, this function should return nothing.
  *
- * @deprecated \Drupal\module_test\Controller\ModuleTestController::testClassLoading()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\module_test\Controller\ModuleTestController::testClassLoading().
  */
 function module_test_class_loading() {
   if (class_exists('Drupal\module_autoload_test\SomeClass')) {
diff --git a/core/modules/system/tests/modules/system_test/system_test.module b/core/modules/system/tests/modules/system_test/system_test.module
index 1eda491..d42ee53 100644
--- a/core/modules/system/tests/modules/system_test/system_test.module
+++ b/core/modules/system/tests/modules/system_test/system_test.module
@@ -5,7 +5,8 @@
 /**
  * Sets a header.
  *
- * @deprecated \Drupal\system_test\Controller\SystemTestController::setHeader()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\system_test\Controller\SystemTestController::setHeader().
  */
 function system_test_set_header() {
   $query = \Drupal::request()->query->all();
@@ -74,7 +75,8 @@ function system_test_system_info_alter(&$info, $file, $type) {
 /**
  * Try to acquire a named lock and report the outcome.
  *
- * @deprecated \Drupal\system_test\Controller\SystemTestController::lockAcquire()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\system_test\Controller\SystemTestController::lockAcquire().
  */
 function system_test_lock_acquire() {
   if (lock()->acquire('system_test_lock_acquire')) {
@@ -89,7 +91,8 @@ function system_test_lock_acquire() {
 /**
  * Try to acquire a specific lock, and then exit.
  *
- * @deprecated \Drupal\system_test\Controller\SystemTestController::lockExit()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\system_test\Controller\SystemTestController::lockExit().
  */
 function system_test_lock_exit() {
   if (lock()->acquire('system_test_lock_exit', 900)) {
@@ -130,7 +133,8 @@ function system_test_page_build(&$page) {
 /**
  * A simple page callback which adds a register shutdown function.
  *
- * @deprecated \Drupal\system_test\Controller\SystemTestController::shutdownFunctions()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\system_test\Controller\SystemTestController::shutdownFunctions().
  */
 function system_test_page_shutdown_functions($arg1, $arg2) {
   drupal_register_shutdown_function('_system_test_first_shutdown_function', $arg1, $arg2);
@@ -177,7 +181,8 @@ function system_test_filetransfer_info() {
  *
  * @see system_authorized_init().
  *
- * @deprecated \Drupal\system_test\Controller\SystemTestController::authorizeInit()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\system_test\Controller\SystemTestController::authorizeInit().
  */
 function system_test_authorize_init_page($page_title) {
   $authorize_url = $GLOBALS['base_url'] . '/core/authorize.php';
diff --git a/core/modules/system/tests/modules/test_page_test/test_page_test.module b/core/modules/system/tests/modules/test_page_test/test_page_test.module
index 7933a85..7e93103 100644
--- a/core/modules/system/tests/modules/test_page_test/test_page_test.module
+++ b/core/modules/system/tests/modules/test_page_test/test_page_test.module
@@ -15,7 +15,8 @@ function test_page_test_menu() {
 /**
  * Page callback: Returns a test page and sets the title.
  *
- * @deprecated Use \Drupal\test_page_test\Controller\TestPageTestController::testPage()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\test_page_test\Controller\TestPageTestController::testPage().
  */
 function test_page_test_page() {
   $attached['js'][] = array(
diff --git a/core/modules/update/tests/modules/update_test/update_test.module b/core/modules/update/tests/modules/update_test/update_test.module
index 249ad83..5c3a835 100644
--- a/core/modules/update/tests/modules/update_test/update_test.module
+++ b/core/modules/update/tests/modules/update_test/update_test.module
@@ -86,7 +86,8 @@ function update_test_update_status_alter(&$projects) {
  *
  * @see update_test_menu()
  *
- * @deprecated \Drupal\update_test\Controller\UpdateTestController::updateTest()
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.
+ *   Use \Drupal\update_test\Controller\UpdateTestController::updateTest().
  */
 function update_test_mock_page($project_name) {
   $xml_map = \Drupal::config('update_test.settings')->get('xml_map');