diff --git a/core/modules/datetime/datetime.views.inc b/core/modules/datetime/datetime.views.inc
index 46d6665..19e5bdc 100644
--- a/core/modules/datetime/datetime.views.inc
+++ b/core/modules/datetime/datetime.views.inc
@@ -11,14 +11,15 @@
  * Implements hook_field_views_data().
  */
 function datetime_field_views_data(FieldStorageConfigInterface $field_storage) {
-  return datetime_type_field_views_data($field_storage, [], $field_storage->getMainPropertyName());
+  return datetime_type_field_views_data_helper($field_storage, [], $field_storage->getMainPropertyName());
 }
 
 /**
- * Helper for datetime based fields.
+ * Provides Views integration for any datetime-based fields.
  *
- * Override the default Views data for a datetime based fields,
- * adding datetime views plugins.
+ * Overrides the default Views data for datetime-based fields, adding datetime
+ * views plugins. Modules defining new datetime-based fields may use this
+ * function to simplify Views integration.
  *
  * @param FieldStorageConfigInterface $field_storage
  *   The field storage config entity.
@@ -29,8 +30,11 @@ function datetime_field_views_data(FieldStorageConfigInterface $field_storage) {
  *
  * @return array
  *   The array of field views data with the datetime plugin.
+ *
+ * @see datetime_field_views_data()
+ * @see datetime_range_field_views_data()
  */
-function datetime_type_field_views_data(FieldStorageConfigInterface $field_storage, $data, $column_name) {
+function datetime_type_field_views_data_helper(FieldStorageConfigInterface $field_storage, array $data, $column_name) {
   // @todo This code only covers configurable fields, handle base table fields
   //   in https://www.drupal.org/node/2489476.
   $data = (empty($data)) ? views_field_default_views_data($field_storage) : $data;
diff --git a/core/modules/datetime_range/datetime_range.module b/core/modules/datetime_range/datetime_range.module
index 2cc7a68..131d1bb 100644
--- a/core/modules/datetime_range/datetime_range.module
+++ b/core/modules/datetime_range/datetime_range.module
@@ -32,7 +32,11 @@ function datetime_range_help($route_name, RouteMatchInterface $route_match) {
 /**
  * Implements hook_view_presave().
  *
- * Provides BC layer for modules using datetime_range filter/sort plugins.
+ * When a view is saved using the old string or standard plugin format for
+ * Datetime Range filters or sorts, they will automatically be updated to
+ * Datetime filters or sorts. Old plugins usage must to be considered
+ * deprecated and must be converted before 9.0.0, when this updating layer will
+ * be removed.
  *
  * @deprecated in Drupal 8.4.x and will be removed before 9.0.0.
  *
@@ -143,7 +147,7 @@ function datetime_range_view_presave(ViewEntityInterface $view) {
             // Set datetime plugin_id.
             $sort['plugin_id'] = 'datetime';
             $changed = TRUE;
-            @trigger_error('Use of daterange sort handlers for datetime_range fields is deprecated. Use the datetime sort handlers instead.', E_USER_DEPRECATED);
+            @trigger_error('Use of standard sort handlers for datetime_range fields is deprecated. Use the datetime sort handlers instead.', E_USER_DEPRECATED);
           }
         }
       }
diff --git a/core/modules/datetime_range/datetime_range.views.inc b/core/modules/datetime_range/datetime_range.views.inc
index 0823a84..7517340 100644
--- a/core/modules/datetime_range/datetime_range.views.inc
+++ b/core/modules/datetime_range/datetime_range.views.inc
@@ -14,8 +14,8 @@ function datetime_range_field_views_data(FieldStorageConfigInterface $field_stor
   \Drupal::moduleHandler()->loadInclude('datetime', 'inc', 'datetime.views');
 
   // Get datetime field data for value and end_value.
-  $data = datetime_type_field_views_data($field_storage, [], 'value');
-  $data = datetime_type_field_views_data($field_storage, $data, 'end_value');
+  $data = datetime_type_field_views_data_helper($field_storage, [], 'value');
+  $data = datetime_type_field_views_data_helper($field_storage, $data, 'end_value');
 
   return $data;
 }