diff --git a/core/modules/search/search.api.php b/core/modules/search/search.api.php
index ce581b0..2a90921 100644
--- a/core/modules/search/search.api.php
+++ b/core/modules/search/search.api.php
@@ -38,7 +38,7 @@
  *     search_view() to get an array of additional search conditions to pass to
  *     search_data(). For example, a search module may get additional keywords,
  *     filters, or modifiers for the search from the query string. Sample
- *     callback function: sample_search_conditions_callback().
+ *     callback function: callback_search_conditions().
  *
  * @ingroup search
  */
@@ -46,7 +46,7 @@ function hook_search_info() {
   return array(
     'title' => 'Content',
     'path' => 'node',
-    'conditions_callback' => 'sample_search_conditions_callback',
+    'conditions_callback' => 'callback_search_conditions',
   );
 }
 
@@ -57,11 +57,18 @@ function hook_search_info() {
  * (i.e. from the query string of the request). The conditions may also be
  * generated internally - for example based on a module's settings.
  *
- * @see hook_search_info()
+ * Callback for hook_search_info().
+ *
+ * @param $keys
+ *   The search keywords as entered by the user. Defaults to NULL.
+ *
+ * @return
+ *   An array of additional conditions, such as filters. Defaults to NULL.
  *
  * @ingroup search
  */
-function sample_search_conditions_callback($keys) {
+
+function callback_search_conditions($keys) {
   $conditions = array();
 
   if (!empty($_REQUEST['keys'])) {
diff --git a/core/modules/search/tests/modules/search_extra_type/search_extra_type.module b/core/modules/search/tests/modules/search_extra_type/search_extra_type.module
index 89cd283..576d578 100644
--- a/core/modules/search/tests/modules/search_extra_type/search_extra_type.module
+++ b/core/modules/search/tests/modules/search_extra_type/search_extra_type.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_search_info().
+ * Implements callback_search_conditions().
  */
 function search_extra_type_search_info() {
   return array(