diff --git a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php b/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
index 48f4b10..422f87d 100644
--- a/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
+++ b/core/modules/history/lib/Drupal/history/Plugin/views/filter/HistoryUserTimestamp.php
@@ -33,7 +33,7 @@ public function buildExposeForm(&$form, &$form_state) {
     unset($form['expose']['remember']);
   }
 
-  function value_form(&$form, &$form_state) {
+  protected function valueForm(&$form, &$form_state) {
     // Only present a checkbox for the exposed filter itself. There's no way
     // to tell the difference between not checked and the default value, so
     // specifying the default value via the views UI is meaningless.
diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
index afb7724..f92c0cd 100644
--- a/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
+++ b/core/modules/search/lib/Drupal/search/Plugin/views/filter/Search.php
@@ -63,7 +63,7 @@ function operator_form(&$form, &$form_state) {
   /**
    * Provide a simple textfield for equality
    */
-  function value_form(&$form, &$form_state) {
+  protected function valueForm(&$form, &$form_state) {
     $form['value'] = array(
       '#type' => 'textfield',
       '#size' => 15,
diff --git a/core/modules/system/system.module.rej b/core/modules/system/system.module.rej
new file mode 100644
index 0000000..5664c47
--- /dev/null
+++ b/core/modules/system/system.module.rej
@@ -0,0 +1,25 @@
+diff a/core/modules/system/system.module b/core/modules/system/system.module	(rejected hunks)
+@@ -882,7 +886,7 @@ function system_menu() {
+     'weight' => -10,
+     'file' => 'system.admin.inc',
+   );
+-  $items['admin/config/regional/date-time/formats/%system_date_format/edit'] = array(
++  $items['admin/config/regional/settings/date-time/formats/%system_date_format/edit'] = array(
+     'title' => 'Edit date format',
+     'description' => 'Allow users to edit a configured date format.',
+     'page callback' => 'drupal_get_form',
+@@ -890,12 +894,12 @@ function system_menu() {
+     'access arguments' => array('administer site configuration'),
+     'file' => 'system.admin.inc',
+   );
+-  $items['admin/config/regional/date-time/formats/%system_date_format/delete'] = array(
++  $items['admin/config/regional/settings/date-time/formats/%system_date_format/delete'] = array(
+     'title' => 'Delete date format',
+     'description' => 'Allow users to delete a configured date format.',
+     'route_name' => 'date_format_delete',
+   );
+-  $items['admin/config/regional/date-time/formats/lookup'] = array(
++  $items['admin/config/regional/settings/date-time/formats/lookup'] = array(
+     'title' => 'Date and time lookup',
+     'page callback' => 'system_date_time_lookup',
+     'access arguments' => array('administer site configuration'),
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
index f485ac6..72329fc 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
@@ -95,7 +95,7 @@ public function buildExtraOptionsForm(&$form, &$form_state) {
     );
   }
 
-  function value_form(&$form, &$form_state) {
+  function valueForm(&$form, &$form_state) {
     $vocabulary = entity_load('taxonomy_vocabulary', $this->options['vid']);
     if (empty($vocabulary) && $this->options['limit']) {
       $form['markup'] = array(
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
index 8c5104c..0f9d486 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/filter/Name.php
@@ -21,7 +21,7 @@ class Name extends InOperator {
 
   var $always_multiple = TRUE;
 
-  function value_form(&$form, &$form_state) {
+  protected function valueForm(&$form, &$form_state) {
     $values = array();
     if ($this->value) {
       $result = entity_load_multiple_by_properties('user', array('uid' => $this->value));
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
index e5327f1..aa986e4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/BooleanOperator.php
@@ -100,7 +100,7 @@ function operator_form(&$form, &$form_state) {
     $form['operator'] = array();
   }
 
-  function value_form(&$form, &$form_state) {
+  protected function valueForm(&$form, &$form_state) {
     if (empty($this->value_options)) {
       // Initialize the array of possible values for this filter.
       $this->get_value_options();
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
index ea46efc..46f976c 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Date.php
@@ -30,7 +30,7 @@ protected function defineOptions() {
   /**
    * Add a type selector to the value form
    */
-  function value_form(&$form, &$form_state) {
+  protected function valueForm(&$form, &$form_state) {
     if (empty($form_state['exposed'])) {
       $form['value']['type'] = array(
         '#type' => 'radios',
@@ -42,7 +42,7 @@ function value_form(&$form, &$form_state) {
         '#default_value' => !empty($this->value['type']) ? $this->value['type'] : 'date',
       );
     }
-    parent::value_form($form, $form_state);
+    parent::valueForm($form, $form_state);
   }
 
   public function validateOptionsForm(&$form, &$form_state) {
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
index f6af850..22bd48b 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Equality.php
@@ -34,7 +34,7 @@ function operator_options() {
   /**
    * Provide a simple textfield for equality
    */
-  function value_form(&$form, &$form_state) {
+  protected function valueForm(&$form, &$form_state) {
     $form['value'] = array(
       '#type' => 'textfield',
       '#title' => t('Value'),
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index e0dd2d5..9254b23 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -218,7 +218,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     else {
       // Add the subform from operator_form().
       $this->show_operator_form($form, $form_state);
-      // Add the subform from value_form().
+      // Add the subform from valueForm().
       $this->show_value_form($form, $form_state);
       $form['clear_markup_end'] = array(
         '#markup' => '</div>',
@@ -312,7 +312,7 @@ function operator_submit($form, &$form_state) { }
    * Shortcut to display the value form.
    */
   function show_value_form(&$form, &$form_state) {
-    $this->value_form($form, $form_state);
+    $this->valueForm($form, $form_state);
     if (empty($this->no_operator)) {
       $form['value']['#prefix'] = '<div class="views-group-box views-right-70">' . (isset($form['value']['#prefix']) ? $form['value']['#prefix'] : '');
       $form['value']['#suffix'] = (isset($form['value']['#suffix']) ? $form['value']['#suffix'] : '') . '</div>';
@@ -327,7 +327,7 @@ function show_value_form(&$form, &$form_state) {
    *
    * @see buildOptionsForm()
    */
-  function value_form(&$form, &$form_state) { $form['value'] = array(); }
+  protected function valueForm(&$form, &$form_state) { $form['value'] = array(); }
 
   /**
    * Validate the options form.
@@ -802,7 +802,7 @@ public function buildExposedForm(&$form, &$form_state) {
     // Build the form and set the value based on the identifier.
     if (!empty($this->options['expose']['identifier'])) {
       $value = $this->options['expose']['identifier'];
-      $this->value_form($form, $form_state);
+      $this->valueForm($form, $form_state);
       $form[$value] = $form['value'];
 
       if (isset($form[$value]['#title']) && !empty($form[$value]['#type']) && $form[$value]['#type'] != 'checkbox') {
@@ -967,7 +967,7 @@ function build_group_form(&$form, &$form_state) {
       // radios and they occupy a lot of space in a table row.
       $row['operator']['#type'] = 'select';
       $row['operator']['#title'] = '';
-      $this->value_form($row, $form_state);
+      $this->valueForm($row, $form_state);
 
       // Fix the dependencies to update value forms when operators
       // changes. This is needed because forms are inside a new form and
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
index dfe89ea..9223111 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/InOperator.php
@@ -164,7 +164,7 @@ function operator_values($values = 1) {
     return $options;
   }
 
-  function value_form(&$form, &$form_state) {
+  protected function valueForm(&$form, &$form_state) {
     $form['value'] = array();
     $options = array();
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
index 1f3a672..23bca59 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/ManyToOne.php
@@ -17,7 +17,7 @@
  * such as terms (many terms per node) or roles (many roles per user).
  *
  * The construct method needs to be overridden to provide a list of options;
- * alternately, the value_form and adminSummary methods need to be overriden
+ * alternately, the valueForm and adminSummary methods need to be overriden
  * to provide something that isn't just a select list.
  *
  * @ingroup views_filter_handlers
@@ -108,8 +108,8 @@ function operators() {
   }
 
   var $value_form_type = 'select';
-  function value_form(&$form, &$form_state) {
-    parent::value_form($form, $form_state);
+  protected function valueForm(&$form, &$form_state) {
+    parent::valueForm($form, $form_state);
 
     if (empty($form_state['exposed'])) {
       $this->helper->buildOptionsForm($form, $form_state);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
index 3c2f753..b98e199 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php
@@ -145,7 +145,7 @@ function operator_values($values = 1) {
   /**
    * Provide a simple textfield for equality
    */
-  function value_form(&$form, &$form_state) {
+  protected function valueForm(&$form, &$form_state) {
     $form['value']['#tree'] = TRUE;
 
     // We have to make some choices when creating this as an exposed
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
index c80e39d..524e313 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php
@@ -188,7 +188,7 @@ function operator_values($values = 1) {
   /**
    * Provide a simple textfield for equality
    */
-  function value_form(&$form, &$form_state) {
+  protected function valueForm(&$form, &$form_state) {
     // We have to make some choices when creating this as an exposed
     // filter form. For example, if the operator is locked and thus
     // not rendered, we can't render dependencies; instead we only