diff --git a/core/modules/comment/comment.views.inc b/core/modules/comment/comment.views.inc
index 8f5b186..38855ab 100644
--- a/core/modules/comment/comment.views.inc
+++ b/core/modules/comment/comment.views.inc
@@ -189,7 +189,7 @@ function comment_views_data() {
     'help' => t('Date in the form of CCYYMMDD.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_fulldate',
+      'id' => 'views_created_fulldate',
     ),
   );
 
@@ -198,7 +198,7 @@ function comment_views_data() {
     'help' => t('Date in the form of YYYYMM.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_year_month',
+      'id' => 'views_created_year_month',
     ),
   );
 
@@ -207,7 +207,7 @@ function comment_views_data() {
     'help' => t('Date in the form of YYYY.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_year',
+      'id' => 'views_created_year',
     ),
   );
 
@@ -216,7 +216,7 @@ function comment_views_data() {
     'help' => t('Date in the form of MM (01 - 12).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_month',
+      'id' => 'views_created_month',
     ),
   );
 
@@ -225,7 +225,7 @@ function comment_views_data() {
     'help' => t('Date in the form of DD (01 - 31).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_day',
+      'id' => 'views_created_day',
     ),
   );
 
@@ -234,7 +234,7 @@ function comment_views_data() {
     'help' => t('Date in the form of WW (01 - 53).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_week',
+      'id' => 'views_created_week',
     ),
   );
 
diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc
index d3fb851..6370c60 100644
--- a/core/modules/node/node.views.inc
+++ b/core/modules/node/node.views.inc
@@ -282,7 +282,7 @@ function node_views_data() {
     'help' => t('Date in the form of CCYYMMDD.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_fulldate',
+      'id' => 'views_created_fulldate',
     ),
   );
 
@@ -291,7 +291,7 @@ function node_views_data() {
     'help' => t('Date in the form of YYYYMM.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_year_month',
+      'id' => 'views_created_year_month',
     ),
   );
 
@@ -300,7 +300,7 @@ function node_views_data() {
     'help' => t('Date in the form of YYYY.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_year',
+      'id' => 'views_created_year',
     ),
   );
 
@@ -309,7 +309,7 @@ function node_views_data() {
     'help' => t('Date in the form of MM (01 - 12).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_month',
+      'id' => 'views_created_month',
     ),
   );
 
@@ -318,7 +318,7 @@ function node_views_data() {
     'help' => t('Date in the form of DD (01 - 31).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_day',
+      'id' => 'views_created_day',
     ),
   );
 
@@ -327,7 +327,7 @@ function node_views_data() {
     'help' => t('Date in the form of WW (01 - 53).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_week',
+      'id' => 'views_created_week',
     ),
   );
 
@@ -336,7 +336,7 @@ function node_views_data() {
     'help' => t('Date in the form of CCYYMMDD.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_fulldate',
+      'id' => 'views_created_fulldate',
     ),
   );
 
@@ -345,7 +345,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',
     ),
   );
 
@@ -354,7 +354,7 @@ function node_views_data() {
     'help' => t('Date in the form of YYYY.'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_year',
+      'id' => 'created_year',
     ),
   );
 
@@ -363,7 +363,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',
     ),
   );
 
@@ -372,7 +372,7 @@ function node_views_data() {
     'help' => t('Date in the form of DD (01 - 31).'),
     'argument' => array(
       'field' => 'changed',
-      'id' => 'node_created_day',
+      'id' => 'views_created_day',
     ),
   );
 
@@ -381,7 +381,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 4107938..0afae1e 100644
--- a/core/modules/user/user.views.inc
+++ b/core/modules/user/user.views.inc
@@ -180,7 +180,7 @@ function user_views_data() {
     'help' => t('Date in the form of CCYYMMDD.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_fulldate',
+      'id' => 'views_created_fulldate',
     ),
   );
 
@@ -189,7 +189,7 @@ function user_views_data() {
     'help' => t('Date in the form of YYYYMM.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_year_month',
+      'id' => 'views_created_year_month',
     ),
   );
 
@@ -198,7 +198,7 @@ function user_views_data() {
     'help' => t('Date in the form of YYYY.'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_year',
+      'id' => 'views_created_year',
     ),
   );
 
@@ -207,7 +207,7 @@ function user_views_data() {
     'help' => t('Date in the form of MM (01 - 12).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_month',
+      'id' => 'views_created_month',
     ),
   );
 
@@ -216,7 +216,7 @@ function user_views_data() {
     'help' => t('Date in the form of DD (01 - 31).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_day',
+      'id' => 'views_created_day',
     ),
   );
 
@@ -225,7 +225,7 @@ function user_views_data() {
     'help' => t('Date in the form of WW (01 - 53).'),
     'argument' => array(
       'field' => 'created',
-      'id' => 'node_created_week',
+      'id' => 'views_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 85%
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 1601302..e5f126b 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\Core\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a day (DD)
  *
  * @Plugin(
- *   id = "node_created_day",
+ *   id = "views_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 80%
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 17f53ef..00e773f 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\Core\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a full date (CCYYMMDD)
  *
  * @Plugin(
- *   id = "node_created_fulldate",
+ *   id = "views_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 84%
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 f521e9f..06e46d2 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\Core\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a month (MM)
  *
  * @Plugin(
- *   id = "node_created_month",
+ *   id = "views_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 73%
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 1b75912..125ffb3 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\Core\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a week.
  *
  * @Plugin(
- *   id = "node_created_week",
+ *   id = "views_created_week",
  *   arg_format = "w",
- *   module = "node"
+ *   module = "views"
  * )
  */
 class CreatedWeek extends Date {
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedYear.php
similarity index 65%
rename from core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php
rename to core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedYear.php
index 0a666c8..63e4bc0 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/argument/CreatedYear.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/argument/CreatedYear.php
@@ -2,21 +2,20 @@
 
 /**
  * @file
- * Definition of Drupal\node\Plugin\views\argument\CreatedYear.
+ * Contains \Drupal\views\Plugin\views\argument\CreatedYear.
  */
 
-namespace Drupal\node\Plugin\views\argument;
+namespace Drupal\views\Plugin\views\argument;
 
 use Drupal\Core\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a year (CCYY)
  *
  * @Plugin(
- *   id = "node_created_year",
+ *   id = "views_created_year",
  *   arg_format = "Y",
- *   module = "node"
+ *   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 80%
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 a024118..d011b7f 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\Core\Annotation\Plugin;
-use Drupal\views\Plugin\views\argument\Date;
 
 /**
  * Argument handler for a year plus month (CCYYMM)
  *
  * @Plugin(
- *   id = "node_created_year_month",
+ *   id = "views_created_year_month",
  *   format = "F Y",
  *   arg_format = "Ym",
- *   module = "node"
+ *   module = "views"
  * )
  */
 class CreatedYearMonth extends Date {