diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
index e8e7d67a78cf8a14fba1278656324b17f56c5183..c19b84ccc9dfc3c6e896582ce70924eda6089737 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/NodeNewComments.php
@@ -91,7 +91,7 @@ public function query() {
     $this->field_alias = $this->table . '_' . $this->field;
   }
 
-  function pre_render(&$values) {
+  public function preRender(&$values) {
     global $user;
     if (!$user->uid || empty($values)) {
       return;
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
index 2e18fa93bb5d6310ecccaf4b8d3c169a398d3910..a363babb7cb1aa54b17309fa7762bb5a72e31fe1 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
@@ -54,7 +54,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     );
   }
 
-  function pre_render($result) {
+  public function preRender($result) {
     $cids = array();
     $nids = array();
 
diff --git a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
index 8a3b4bbb6929febb3a8eadf3fd37cb22c637bac2..7409dbb35210b0feb3505ea8b850ca92e3e95ed3 100644
--- a/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
+++ b/core/modules/contextual/lib/Drupal/contextual/Plugin/views/field/ContextualLinks.php
@@ -51,7 +51,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     );
   }
 
-  function pre_render(&$values) {
+  public function preRender(&$values) {
     // Add a row plugin css class for the contextual link.
     $class = 'contextual-region';
     if (!empty($this->view->style_plugin->options['row_class'])) {
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
index 30915190c6c77126e57c6b7872c3f433a3a15269..0696896043258a7fbef9f48b0125d9a2a2b8acc3 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/views/row/EntityReference.php
@@ -47,15 +47,15 @@ public function buildOptionsForm(&$form, &$form_state) {
   }
 
   /**
-   * Overrides \Drupal\views\Plugin\views\row\Fields::pre_render().
+   * {@inheritdoc}
    */
-  public function pre_render($row) {
+  public function preRender($row) {
     // Force all fields to be inline by default.
     if (empty($this->options['inline'])) {
       $fields = $this->view->getItems('field', $this->displayHandler->display['id']);
       $this->options['inline'] = drupal_map_assoc(array_keys($fields));
     }
 
-    return parent::pre_render($row);
+    return parent::preRender($row);
   }
 }
diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php b/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php
index fbdbbf7a27229aebbc0c4b4c20d80327f7d51e26..49cc52aa79f0fb3d919aacc8312b3f1f0b837f2e 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php
@@ -32,7 +32,7 @@ class Rss extends RowPluginBase {
 
   var $base_field = 'nid';
 
-  // Stores the nodes loaded with pre_render.
+  // Stores the nodes loaded with preRender.
   var $nodes = array();
 
   protected function defineOptions() {
@@ -79,7 +79,7 @@ public function summaryTitle() {
     return check_plain($options[$this->options['item_length']]);
   }
 
-  function pre_render($values) {
+  public function preRender($values) {
     $nids = array();
     foreach ($values as $row) {
       $nids[] = $row->{$this->field_alias};
diff --git a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php
index bca1e8c29776a6db7e5056f72b21eef11d130b74..9d216600095c9ef694f5c47f20b65e470309f343 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkFormBase.php
@@ -57,10 +57,10 @@ public function render($values) {
   }
 
   /**
-   * Overrides \Drupal\views\Plugin\views\Plugin\field\FieldPluginBase::pre_render().
+   * {@inheritdoc}
    */
-  public function pre_render(&$values) {
-    parent::pre_render($values);
+  public function preRender(&$values) {
+    parent::preRender($values);
 
     // If the view is using a table style, provide a placeholder for a
     // "select all" checkbox.
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
index 45f8d69c3260a26f33da7af02dbcad1fa3da115b..8cbb9fbbe09860dbf80c78dbc35254c07f7362b5 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/TaxonomyIndexTid.php
@@ -91,7 +91,7 @@ public function query() {
     $this->addAdditionalFields();
   }
 
-  function pre_render(&$values) {
+  public function preRender(&$values) {
     $vocabularies = entity_load_multiple('taxonomy_vocabulary');
     $this->field_alias = $this->aliases['nid'];
     $nids = array();
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
index 96e3609e031c276a1f4117e7a379e5d76eaa6a4f..34bedd8a1c2eb3efb79ba25802925a2c62bd5483 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Permissions.php
@@ -69,7 +69,7 @@ public function query() {
     $this->field_alias = $this->aliases['uid'];
   }
 
-  function pre_render(&$values) {
+  public function preRender(&$values) {
     $uids = array();
     $this->items = array();
 
diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
index 298a39edd413475afafb47c81215d01cd2ed7880..22c2819d1304090586f3a81e6cbcae0f5bba79e6 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/views/field/Roles.php
@@ -69,7 +69,7 @@ public function query() {
     $this->field_alias = $this->aliases['uid'];
   }
 
-  function pre_render(&$values) {
+  public function preRender(&$values) {
     $uids = array();
     $this->items = array();
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
index 476b5cd9c613864c5d0e98471c813dd0560f325c..28e998377c3511047e0e606adf6f6e91e4cd59ef 100644
--- a/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/Views/HandlerFieldRoleTest.php
@@ -49,8 +49,8 @@ public function testRole() {
     $view = views_get_view('test_views_handler_field_role');
     $this->executeView($view);
     $view->row_index = 0;
-    // The role field is populated during pre_render.
-    $view->field['rid']->pre_render($view->result);
+    // The role field is populated during preRender.
+    $view->field['rid']->preRender($view->result);
     $render = $view->field['rid']->advancedRender($view->result[0]);
 
     $this->assertEqual($rolename_b . $rolename_a, $render, 'View test_views_handler_field_role renders role assigned to user in the correct order.');
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
index cd7bb42809b9401f542aafdc425da20f071cbc53..bceb0762c96b1b588e6d472988fa3ca9828d3236 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -274,7 +274,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     // Some form elements belong in a fieldset for presentation, but can't
     // be moved into one because of the form_state['values'] hierarchy. Those
     // elements can add a #fieldset => 'fieldset_name' property, and they'll
-    // be moved to their fieldset during pre_render.
+    // be moved to their fieldset during preRender.
     $form['#pre_render'][] = 'views_ui_pre_render_add_fieldset_markup';
 
     $form['admin_label'] = array(
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php
index 7fc2c8697d5f00370f8da9bf20b58f604098d185..bc8769ed61517a9825bc8cde7d2a87528e054121 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/PluginBase.php
@@ -184,7 +184,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     // Some form elements belong in a fieldset for presentation, but can't
     // be moved into one because of the form_state['values'] hierarchy. Those
     // elements can add a #fieldset => 'fieldset_name' property, and they'll
-    // be moved to their fieldset during pre_render.
+    // be moved to their fieldset during preRender.
     $form['#pre_render'][] = 'views_ui_pre_render_add_fieldset_markup';
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
index c58c582f2f54dab25f1538958e7f989616b1ebeb..625a2bff0f9ed79df32b175252d3310e4186e7c1 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -173,7 +173,7 @@ public function query() {
     }
   }
 
-  function pre_render($values) { }
+  public function preRender($values) { }
 
   public function postRender(&$output) { }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
index 2376f56aea5ebfb9f93abdc6012f329170858ac6..38eebeeb8737e4bcdfb868c9181f8d8aa2b2eca2 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
@@ -71,7 +71,7 @@ protected function exposedFilterApplied() {
     return $cache;
   }
 
-  function pre_render($values) {
+  public function preRender($values) {
     if (!$this->exposedFilterApplied()) {
       $options = array(
         'id' => 'area',
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
index c95913d2e3cc8295f850fab535d21cd71565c2c4..38982ee90aa6f79608cc1ebebe14d03b8f27a7ce 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Custom.php
@@ -38,7 +38,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     unset($form['alter']['alter_text']);
     unset($form['alter']['text']['#states']);
     unset($form['alter']['help']['#states']);
-    $form['#pre_render'][] = array($this, 'preRender');
+    $form['#pre_render'][] = array($this, 'preRenderCustomForm');
   }
 
   function render($values) {
@@ -55,7 +55,7 @@ function render($values) {
    * @return array
    *   The modified form build array.
    */
-  public function preRender($form) {
+  public function preRenderCustomForm($form) {
     $form['text'] = $form['alter']['text'];
     $form['help'] = $form['alter']['help'];
     unset($form['alter']['text']);
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 631d109413e2feb5b30bcd15d727cde2b9eef4c0..9b770cc4ec15ff0467989ef47282e39d0b3bceff 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -1090,7 +1090,7 @@ public function adminSummary() {
    * @param $values
    *   An array of all objects returned from the query.
    */
-  function pre_render(&$values) { }
+  public function preRender(&$values) { }
 
   /**
    * Render the field.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
index 86d8d02f7f388074e164c7eb6cd114067a9edd12..6632da429d69add32c46c37446af13c1dafe5975 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/MachineName.php
@@ -62,7 +62,7 @@ public function buildOptionsForm(&$form, &$form_state) {
     );
   }
 
-  function pre_render(&$values) {
+  public function preRender(&$values) {
     $this->getValueOptions();
   }
 
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
index accd78e91f894fff862b7fa3dd6b1e479afc1a16..01ee041e1e227c059e87536e508d07888d8f7457 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/PrerenderList.php
@@ -12,7 +12,7 @@
 /**
  * Field handler to provide a list of items.
  *
- * The items are expected to be loaded by a child object during pre_render,
+ * The items are expected to be loaded by a child object during preRender,
  * and 'my field' is expected to be the pointer to the items in the list.
  *
  * Items to render should be in a list in $this->items
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 cac71eac607b6c051da699e12263d8349981053a..9455174fd3830d8a31a6075b61edbcac39831ee0 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
@@ -493,8 +493,8 @@ public function showExposeButton(&$form, &$form_state) {
   public function buildExposeForm(&$form, &$form_state) {
     $form['#theme'] = 'views_ui_expose_filter_form';
     // #flatten will move everything from $form['expose'][$key] to $form[$key]
-    // prior to rendering. That's why the pre_render for it needs to run first,
-    // so that when the next pre_render (the one for fieldsets) runs, it gets
+    // prior to rendering. That's why the preRender for it needs to run first,
+    // so that when the next preRender (the one for fieldsets) runs, it gets
     // the flattened data.
     array_unshift($form['#pre_render'], 'views_ui_pre_render_flatten_data');
     $form['expose']['#flatten'] = TRUE;
@@ -836,8 +836,8 @@ protected function buildExposedFiltersGroupForm(&$form, &$form_state) {
     $form['#theme'] = 'views_ui_build_group_filter_form';
 
     // #flatten will move everything from $form['group_info'][$key] to $form[$key]
-    // prior to rendering. That's why the pre_render for it needs to run first,
-    // so that when the next pre_render (the one for fieldsets) runs, it gets
+    // prior to rendering. That's why the preRender for it needs to run first,
+    // so that when the next preRender (the one for fieldsets) runs, it gets
     // the flattened data.
     array_unshift($form['#pre_render'], 'views_ui_pre_render_flatten_data');
     $form['group_info']['#flatten'] = TRUE;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
index 316eb883a8681f8b80da011802210d206594f9d1..9994cf5621e7c97e6c0fa4f90371319f0e00efce 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
@@ -215,7 +215,7 @@ public function postExecute(&$result) { }
   /**
    * Perform any needed actions just before rendering.
    */
-  function pre_render(&$result) { }
+  public function preRender(&$result) { }
 
   /**
    * Render the pager.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
index ef28d0db834a1a9231b198114a197419cb56153e..10ae7928bd6d7c61e0705f09b78321ef2a8320d2 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/EntityRow.php
@@ -142,10 +142,10 @@ public function summaryTitle() {
   }
 
   /**
-   * Overrides Drupal\views\Plugin\views\row\RowPluginBase::pre_render().
+   * {@inheritdoc}
    */
-  public function pre_render($result) {
-    parent::pre_render($result);
+  public function preRender($result) {
+    parent::preRender($result);
 
     if ($result) {
       // Get all entities which will be used to render in rows.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
index 81b559f9bb229e14da88404199df33c0d0703793..44df69f0b6a82f6768ebaa2c73a78f1ff605e090 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
@@ -135,7 +135,7 @@ public function query() {
    * @param $result
    *   The full array of results from the query.
    */
-  function pre_render($result) { }
+  public function preRender($result) { }
 
   /**
    * Render a row object. This usually passes through to a theme template
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
index fc2bf8f8b3d5ad9962ce9929f35599bdee98c135..ddd022c92c91e15a2ac2844586f084ae730d6092 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
@@ -188,8 +188,8 @@ protected function sortOptions() {
 
   public function buildExposeForm(&$form, &$form_state) {
     // #flatten will move everything from $form['expose'][$key] to $form[$key]
-    // prior to rendering. That's why the pre_render for it needs to run first,
-    // so that when the next pre_render (the one for fieldsets) runs, it gets
+    // prior to rendering. That's why the preRender for it needs to run first,
+    // so that when the next preRender (the one for fieldsets) runs, it gets
     // the flattened data.
     array_unshift($form['#pre_render'], 'views_ui_pre_render_flatten_data');
     $form['expose']['#flatten'] = TRUE;
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
index d0a76dbd1f2ce8f788a812aa6f197f4aa5cfe106..032c8235a2de3f32e93c27b93c8448cfcb46f541 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
@@ -399,9 +399,9 @@ public function buildSortPost() { }
    * @param $result
    *   The full array of results from the query.
    */
-  function pre_render($result) {
+  public function preRender($result) {
     if (!empty($this->view->rowPlugin)) {
-      $this->view->rowPlugin->pre_render($result);
+      $this->view->rowPlugin->preRender($result);
     }
   }
 
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index 68027f404439ea7ffd4976c593bb59014d9de97c..76acf8a95e73d594e588f7f7dbe2efcca34f1ecf 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -1227,7 +1227,7 @@ public function render($display_id = NULL) {
     $config = config('views.settings');
 
     $exposed_form = $this->display_handler->getPlugin('exposed_form');
-    $exposed_form->pre_render($this->result);
+    $exposed_form->preRender($this->result);
 
     $module_handler = \Drupal::moduleHandler();
 
@@ -1246,9 +1246,9 @@ public function render($display_id = NULL) {
         $cache->cacheStart();
       }
 
-      // Run pre_render for the pager as it might change the result.
+      // Run preRender for the pager as it might change the result.
       if (!empty($this->pager)) {
-        $this->pager->pre_render($this->result);
+        $this->pager->preRender($this->result);
       }
 
       // Initialize the style plugin.
@@ -1264,12 +1264,12 @@ public function render($display_id = NULL) {
       if ($this->style_plugin->usesFields()) {
         foreach ($this->field as $id => $handler) {
           if (!empty($this->field[$id])) {
-            $this->field[$id]->pre_render($this->result);
+            $this->field[$id]->preRender($this->result);
           }
         }
       }
 
-      $this->style_plugin->pre_render($this->result);
+      $this->style_plugin->preRender($this->result);
 
       // Let each area handler have access to the result set.
       $areas = array('header', 'footer');
diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php
index f61ece2fa85b89093dfc7dabf577854c927f2d6b..6f46a965ada1abf93d9afbdd4008a942db8e3bb3 100644
--- a/core/modules/views/views.api.php
+++ b/core/modules/views/views.api.php
@@ -431,7 +431,7 @@ function hook_views_pre_execute(ViewExecutable &$view) {
 /**
  * Act on the view immediately after the query has been executed.
  *
- * At this point the query has been executed, but the pre_render() phase has
+ * At this point the query has been executed, but the preRender() phase has
  * not yet happened for handlers.
  *
  * Output can be added to the view by setting $view->attachment_before
@@ -455,7 +455,7 @@ function hook_views_post_execute(ViewExecutable &$view) {
 /**
  * Act on the view immediately before rendering it.
  *
- * At this point the query has been executed, and the pre_render() phase has
+ * At this point the query has been executed, and the preRender() phase has
  * already happened for handlers, so all data should be available. This hook
  * can be utilized by themes.
  *
diff --git a/core/modules/views_ui/admin.inc b/core/modules/views_ui/admin.inc
index a723854f65881973a245e064573f9e4aa2866683..02c62d835cb2e1436076e3b6675c264eab2872a3 100644
--- a/core/modules/views_ui/admin.inc
+++ b/core/modules/views_ui/admin.inc
@@ -258,7 +258,7 @@ function views_ui_taxonomy_autocomplete_validate($element, &$form_state) {
  *
  * Many views forms use #tree = TRUE to keep their values in a hierarchy for
  * easier storage. Moving the form elements into fieldsets during form building
- * would break up that hierarchy. Therefore, we wait until the pre_render stage,
+ * would break up that hierarchy. Therefore, we wait until the preRender stage,
  * where any changes we make affect presentation only and aren't reflected in
  * $form_state['values'].
  */