diff --git a/core/modules/comment/comment.views.inc b/core/modules/comment/comment.views.inc
index e74c97c..1b313a5 100644
--- a/core/modules/comment/comment.views.inc
+++ b/core/modules/comment/comment.views.inc
@@ -179,7 +179,7 @@ function comment_views_data() {
     'help' => t('Date in the form of CCYYMMDD.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_fulldate',
+      'id' => 'date_fulldate',
     ),
   );
 
@@ -188,7 +188,7 @@ function comment_views_data() {
     'help' => t('Date in the form of YYYYMM.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_year_month',
+      'id' => 'date_year_month',
     ),
   );
 
@@ -197,7 +197,7 @@ function comment_views_data() {
     'help' => t('Date in the form of YYYY.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_year',
+      'id' => 'date_year',
     ),
   );
 
@@ -206,7 +206,7 @@ function comment_views_data() {
     'help' => t('Date in the form of MM (01 - 12).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_month',
+      'id' => 'date_month',
     ),
   );
 
@@ -215,7 +215,7 @@ function comment_views_data() {
     'help' => t('Date in the form of DD (01 - 31).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_day',
+      'id' => 'created_day',
     ),
   );
 
@@ -224,7 +224,7 @@ function comment_views_data() {
     'help' => t('Date in the form of WW (01 - 53).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_week',
+      'id' => 'date_week',
     ),
   );
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php b/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php
deleted file mode 100644
index 68bab30..0000000
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedYear.
- */
-
-namespace Drupal\node\Plugin\views\argument;
-
-use Drupal\Component\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
-
-/**
- * Argument handler for a year (CCYY)
- *
- * @Plugin(
- *   id = "node_created_year",
- *   arg_format = "Y",
- *   module = "node"
- * )
- */
-class CreatedYear extends Date {
-
-}
diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc
index 5d14a38..b231e8e 100644
--- a/core/modules/node/node.views.inc
+++ b/core/modules/node/node.views.inc
@@ -266,16 +266,16 @@ function node_views_data() {
     'help' => t('Date in the form of CCYYMMDD.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_fulldate',
+      'id' => 'date_fulldate',
     ),
   );
 
-  $data['node']['created_year_month'] = array(
+  $data['node']['date_year_month'] = array(
     'title' => t('Created year + month'),
     'help' => t('Date in the form of YYYYMM.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_year_month',
+      'id' => 'date_year_month',
     ),
   );
 
@@ -284,7 +284,7 @@ function node_views_data() {
     'help' => t('Date in the form of YYYY.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_year',
+      'id' => 'date_year',
     ),
   );
 
@@ -293,7 +293,7 @@ function node_views_data() {
     'help' => t('Date in the form of MM (01 - 12).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_month',
+      'id' => 'date_month',
     ),
   );
 
@@ -302,7 +302,7 @@ function node_views_data() {
     'help' => t('Date in the form of DD (01 - 31).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_day',
+      'id' => 'created_day',
     ),
   );
 
@@ -311,7 +311,7 @@ function node_views_data() {
     'help' => t('Date in the form of WW (01 - 53).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_week',
+      'id' => 'date_week',
     ),
   );
 
@@ -320,7 +320,7 @@ function node_views_data() {
     'help' => t('Date in the form of CCYYMMDD.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_fulldate',
+      'id' => 'date_fulldate',
     ),
   );
 
@@ -329,7 +329,7 @@ function node_views_data() {
     'help' => t('Date in the form of YYYYMM.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_year_month',
+      'id' => 'date_year_month',
     ),
   );
 
@@ -338,7 +338,7 @@ function node_views_data() {
     'help' => t('Date in the form of YYYY.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_year',
+      'id' => 'date_year',
     ),
   );
 
@@ -347,7 +347,7 @@ function node_views_data() {
     'help' => t('Date in the form of MM (01 - 12).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_month',
+      'id' => 'date_month',
     ),
   );
 
@@ -356,7 +356,7 @@ function node_views_data() {
     'help' => t('Date in the form of DD (01 - 31).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_day',
+      'id' => 'created_day',
     ),
   );
 
@@ -365,7 +365,7 @@ function node_views_data() {
     'help' => t('Date in the form of WW (01 - 53).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_week',
+      'id' => 'date_week',
     ),
   );
 
diff --git a/core/modules/user/user.views.inc b/core/modules/user/user.views.inc
index 13b1690..3b3d033 100644
--- a/core/modules/user/user.views.inc
+++ b/core/modules/user/user.views.inc
@@ -170,7 +170,7 @@ function user_views_data() {
     'help' => t('Date in the form of CCYYMMDD.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_fulldate',
+      'id' => 'date_fulldate',
     ),
   );
 
@@ -179,7 +179,7 @@ function user_views_data() {
     'help' => t('Date in the form of YYYYMM.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_year_month',
+      'id' => 'date_year_month',
     ),
   );
 
@@ -188,7 +188,7 @@ function user_views_data() {
     'help' => t('Date in the form of YYYY.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_year',
+      'id' => 'date_year',
     ),
   );
 
@@ -197,7 +197,7 @@ function user_views_data() {
     'help' => t('Date in the form of MM (01 - 12).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_month',
+      'id' => 'date_month',
     ),
   );
 
@@ -206,7 +206,7 @@ function user_views_data() {
     'help' => t('Date in the form of DD (01 - 31).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_day',
+      'id' => 'created_day',
     ),
   );
 
@@ -215,7 +215,7 @@ function user_views_data() {
     'help' => t('Date in the form of WW (01 - 53).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_week',
+      'id' => 'date_week',
     ),
   );
 
diff --git a/core/modules/views/config/views.view.archive.yml b/core/modules/views/config/views.view.archive.yml
index 660e4d1..8bf8276 100644
--- a/core/modules/views/config/views.view.archive.yml
+++ b/core/modules/views/config/views.view.archive.yml
@@ -52,7 +52,7 @@ display:
             override: true
             items_per_page: '30'
           specify_validation: 1
-          plugin_id: node_created_year_month
+          plugin_id: date_year_month
       filters:
         status:
           id: status
@@ -104,4 +104,4 @@ display:
           summary_options:
             items_per_page: '30'
           specify_validation: 1
-          plugin_id: node_created_year_month
+          plugin_id: date_year_month
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
similarity index 80%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
index fd7ebe5..745a8f4 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/DayDate.php
@@ -2,25 +2,24 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedDay.
+ * Contains \Drupal\views\Plugin\views\argument\DayDate.
  */
 
-namespace Drupal\node\Plugin\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Component\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a day (DD)
  *
  * @Plugin(
- *   id = "node_created_day",
+ *   id = "created_day",
  *   arg_format = "d",
  *   format = "j",
- *   module = "node"
+ *   module = "views"
  * )
  */
-class CreatedDay extends Date {
+class DayDate extends Date {
 
   /**
    * Provide a link to the next level of the view
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
similarity index 72%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
index 0b098cf..9d34ba7 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/FullDate.php
@@ -2,25 +2,24 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedFullDate.
+ * Contains \Drupal\views\Plugin\views\argument\FullDate.
  */
 
-namespace Drupal\node\Plugin\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Component\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a full date (CCYYMMDD)
  *
  * @Plugin(
- *   id = "node_created_fulldate",
+ *   id = "date_fulldate",
  *   arg_format = "Ymd",
  *   format = "F j, Y",
- *   module = "node"
+ *   module = "views"
  * )
  */
-class CreatedFullDate extends Date {
+class FullDate extends Date {
 
   /**
    * Provide a link to the next level of the view
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
similarity index 79%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
index a156a7b..00a587e 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/MonthDate.php
@@ -2,25 +2,24 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedMonth.
+ * Contains \Drupal\views\Plugin\views\argument\MonthDate.
  */
 
-namespace Drupal\node\Plugin\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Component\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a month (MM)
  *
  * @Plugin(
- *   id = "node_created_month",
+ *   id = "date_month",
  *   arg_format = "m",
  *   format = "F",
- *   module = "node"
+ *   module = "views"
  * )
  */
-class CreatedMonth extends Date {
+class MonthDate extends Date {
 
   /**
    * Provide a link to the next level of the view
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
similarity index 59%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
index e6174b1..8348804 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/WeekDate.php
@@ -2,24 +2,23 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedWeek.
+ * Contains \Drupal\views\Plugin\views\argument\WeekDate.
  */
 
-namespace Drupal\node\Plugin\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Component\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a week.
  *
  * @Plugin(
- *   id = "node_created_week",
+ *   id = "date_week",
  *   arg_format = "W",
- *   module = "node"
+ *   module = "views"
  * )
  */
-class CreatedWeek extends Date {
+class WeekDate extends Date {
 
   /**
    * Provide a link to the next level of the view
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php
new file mode 100644
index 0000000..44baf1a
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearDate.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Plugin\views\argument\YearDate.
+ */
+
+namespace Drupal\views\Plugin\views\argument;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Argument handler for a year (CCYY)
+ *
+ * @Plugin(
+ *   id = "date_year",
+ *   arg_format = "Y",
+ *   module = "views"
+ * )
+ */
+class YearDate extends Date {
+
+}
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
similarity index 72%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
index 26f268d..ae52ab6 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/YearMonthDate.php
@@ -2,25 +2,24 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedYearMonth.
+ * Contains \Drupal\views\Plugin\views\argument\YearMonthDate.
  */
 
-namespace Drupal\node\Plugin\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Component\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a year plus month (CCYYMM)
  *
  * @Plugin(
- *   id = "node_created_year_month",
+ *   id = "date_year_month",
  *   format = "F Y",
  *   arg_format = "Ym",
- *   module = "node"
+ *   module = "views"
  * )
  */
-class CreatedYearMonth extends Date {
+class YearMonthDate extends Date {
 
   /**
    * Provide a link to the next level of the view
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml
index 5758759..5c7798f 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_destroy.yml
@@ -43,14 +43,14 @@ display:
           id: created_fulldate
           style_plugin: default_summary
           table: node
-          plugin_id: node_created_fulldate
+          plugin_id: date_fulldate
         created_month:
           default_argument_type: fixed
           field: created_month
           id: created_month
           style_plugin: default_summary
           table: node
-          plugin_id: node_created_month
+          plugin_id: date_month
       cache:
         type: none
       empty: