diff --git a/core/modules/comment/comment.views.inc b/core/modules/comment/comment.views.inc
index e74c97c..f578345 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' => 'created_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' => 'created_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' => 'created_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' => 'created_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' => 'created_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..ffbb14b 100644
--- a/core/modules/node/node.views.inc
+++ b/core/modules/node/node.views.inc
@@ -266,7 +266,7 @@ function node_views_data() {
     'help' => t('Date in the form of CCYYMMDD.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_fulldate',
+      'id' => 'created_fulldate',
     ),
   );
 
@@ -275,7 +275,7 @@ function node_views_data() {
     'help' => t('Date in the form of YYYYMM.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_year_month',
+      'id' => 'created_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' => 'created_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' => 'created_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' => 'created_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' => 'created_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' => 'created_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' => 'created_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' => 'created_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' => 'created_week',
     ),
   );
 
diff --git a/core/modules/user/user.views.inc b/core/modules/user/user.views.inc
index 13b1690..d724a46 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' => 'created_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' => 'created_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' => 'created_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' => 'created_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' => 'created_week',
     ),
   );
 
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedDay.php
similarity index 83%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedDay.php
index fd7ebe5..99ef08f 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedDay.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedDay.php
@@ -2,22 +2,21 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedDay.
+ * Contains \Drupal\views\Plugin\views\argument\CreatedDay.
  */
 
-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 {
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedFullDate.php
similarity index 76%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedFullDate.php
index 0b098cf..39952d4 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedFullDate.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedFullDate.php
@@ -2,22 +2,21 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedFullDate.
+ * Contains \Drupal\views\Plugin\views\argument\CreatedFullDate.
  */
 
-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 = "created_fulldate",
  *   arg_format = "Ymd",
  *   format = "F j, Y",
- *   module = "node"
+ *   module = "views"
  * )
  */
 class CreatedFullDate extends Date {
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedMonth.php
similarity index 81%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedMonth.php
index a156a7b..e61a1be 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedMonth.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedMonth.php
@@ -2,22 +2,21 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedMonth.
+ * Contains \Drupal\views\Plugin\views\argument\CreatedMonth.
  */
 
-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 = "created_month",
  *   arg_format = "m",
  *   format = "F",
- *   module = "node"
+ *   module = "views"
  * )
  */
 class CreatedMonth extends Date {
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedWeek.php
similarity index 65%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedWeek.php
index e6174b1..882daf5 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedWeek.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedWeek.php
@@ -2,21 +2,20 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedWeek.
+ * Contains \Drupal\views\Plugin\views\argument\CreatedWeek.
  */
 
-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 = "created_week",
  *   arg_format = "W",
- *   module = "node"
+ *   module = "views"
  * )
  */
 class CreatedWeek extends Date {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedYear.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedYear.php
new file mode 100644
index 0000000..a47922c
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedYear.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Plugin\views\argument\CreatedYear.
+ */
+
+namespace Drupal\views\Plugin\views\argument;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Argument handler for a year (CCYY)
+ *
+ * @Plugin(
+ *   id = "created_year",
+ *   arg_format = "Y",
+ *   module = "views"
+ * )
+ */
+class CreatedYear 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/CreatedYearMonth.php
similarity index 76%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedYearMonth.php
index 26f268d..3b7d1b2 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYearMonth.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedYearMonth.php
@@ -2,22 +2,21 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedYearMonth.
+ * Contains \Drupal\views\Plugin\views\argument\CreatedYearMonth.
  */
 
-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 = "created_year_month",
  *   format = "F Y",
  *   arg_format = "Ym",
- *   module = "node"
+ *   module = "views"
  * )
  */
 class CreatedYearMonth extends Date {