diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 20c43eaa310bbeabaaedfb6e83e97799a3ce4d9c..790949a62e7d7c9cbb7e6bde1f4d67d077067e0e 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -371,7 +371,7 @@ function drupal_theme_rebuild() {
  *     defined, 'template' is not used.
  *   - 'template': The filename of the template generating output for this
  *     theme hook. The template is in the directory defined by the 'path' key of
- *     hook_theme() or defaults to $path.
+ *     hook_theme() or defaults to "$path/templates".
  *   - 'variables': The variables for this theme hook as defined in
  *     hook_theme(). If there is more than one implementation and 'variables' is
  *     not specified in a later one, then the previous definition is kept.
diff --git a/core/modules/field/theme/field.tpl.php b/core/modules/field/templates/field.tpl.php
similarity index 100%
rename from core/modules/field/theme/field.tpl.php
rename to core/modules/field/templates/field.tpl.php