diff --git a/core/modules/datetime/datetime.views.inc b/core/modules/datetime/datetime.views.inc
index 539f4bf..46d6665 100644
--- a/core/modules/datetime/datetime.views.inc
+++ b/core/modules/datetime/datetime.views.inc
@@ -11,7 +11,7 @@
  * Implements hook_field_views_data().
  */
 function datetime_field_views_data(FieldStorageConfigInterface $field_storage) {
-  return datetime_type_field_views_data($field_storage, [], 'value');
+  return datetime_type_field_views_data($field_storage, [], $field_storage->getMainPropertyName());
 }
 
 /**
@@ -53,9 +53,13 @@ function datetime_type_field_views_data(FieldStorageConfigInterface $field_stora
       'full_date' => t('Date in the form of CCYYMMDD.'),
     ];
     foreach ($arguments as $argument_type => $help_text) {
-      $column_name_text = $column_name !== 'value' ? ':' . $column_name : '';
+      $column_name_text = $column_name !== $field_storage->getMainPropertyName() ? ':' . $column_name : '';
       $data[$table_name][$field_storage->getName() . '_' . $column_name . '_' . $argument_type] = [
-        'title' => $field_storage->getLabel() . $column_name_text . ' (' . $argument_type . ')',
+        'title' => t('@label@column (@argument)', [
+          '@label' => $field_storage->getLabel(),
+          '@column' => $column_name_text,
+          '@argument' => $argument_type,
+        ]),
         'help' => $help_text,
         'argument' => [
           'field' => $field_storage->getName() . '_' . $column_name,